From 87e8390efd69864ce7f2881a74386ce4619e5109 Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Thu, 15 Jan 2026 14:05:04 -0500
Subject: [PATCH 01/20] feat: avatar s3 feature for discussions app

---
 amplify-migration-apps/discussions/README.md  |  33 +++--
 amplify-migration-apps/discussions/index.html | 112 ++++++++++++++++-
 .../discussions/src/main.js                   | 114 ++++++++++++++++--
 3 files changed, 237 insertions(+), 22 deletions(-)

diff --git a/amplify-migration-apps/discussions/README.md b/amplify-migration-apps/discussions/README.md
index 3cf95d51d9e..0080497fdcc 100644
--- a/amplify-migration-apps/discussions/README.md
+++ b/amplify-migration-apps/discussions/README.md
@@ -2,11 +2,7 @@
 
 ![](./images/app.png)
 
-A discussion application built featuring authentication, GraphQL API, Lambda functions, and DynamoDB storage.
-
-> [!NOTICE]
-> Since amplify operations add files to your local directory, its better not to operate within this repo.
-> Instead, create your own private GitHub repository and copy the app over.
+A discussion application built featuring authentication, GraphQL API, Lambda functions, DynamoDB storage, and S3.
 
 ## Install Dependencies
 
@@ -169,6 +165,23 @@ https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.Core
 ✔ Do you want to add a Lambda Trigger for your Table? (y/N) · no
 ```
 
+### Storage (S3 Avatars)
+
+S3 bucket for storing user profile pictures.
+
+```console
+amplify add storage
+```
+
+```console
+? Select from one of the below mentioned services: Content (Images, audio, video, etc.)
+✔ Provide a friendly name for your resource that will be used to label this category in the project: · avatars
+✔ Provide bucket name: · discus-avatars
+✔ Who should have access: · Auth users only
+✔ What kind of access do you want for Authenticated users? · create/update, read, delete
+✔ Do you want to add a Lambda Trigger for your S3 Bucket? (y/N) · no
+```
+
 ### Function
 
 **Node.js Lambda function that retrieves user activity from DynamoDB storage.**
@@ -280,6 +293,8 @@ amplify push
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Storage  │ activity                    │ Create    │ awscloudformation │
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
+│ Storage  │ avatars                     │ Create    │ awscloudformation │
+├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Function │ fetchuseractivity           │ Create    │ awscloudformation │
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Function │ recorduseractivity          │ Create    │ awscloudformation │
@@ -332,11 +347,7 @@ this process for any number of users.
 
 > Based on https://github.com/aws-amplify/amplify-cli/blob/gen2-migration/GEN2_MIGRATION_GUIDE.md
 
-> [!WARNING]
-> Migration is not fully supported for this app yet due to a missing feature for refactoring DynamoDB storage tables.
-> This guide ends at the `generate` step.
-
-First and install the experimental CLI package the provides the new commands:
+First install the experimental amplify CLI package that provides the migration commands.
 
 ```console
 npm install --no-save @aws-amplify/cli-internal-gen2-migration-experimental-alpha
@@ -419,4 +430,4 @@ Now connect the `gen2-main` branch to the hosting service:
 ![](./images/deploying-gen2-main-branch.png)
 
 
-Wait for the deployment to finish successfully.
+Wait for the deployment to finish successfully.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/index.html b/amplify-migration-apps/discussions/index.html
index 558a994e5b4..e0d813dd9e0 100644
--- a/amplify-migration-apps/discussions/index.html
+++ b/amplify-migration-apps/discussions/index.html
@@ -489,6 +489,89 @@
     /* Utilities */
     .hidden { display: none; }
     
+    /* Profile Page */
+    .profile-section {
+      display: flex;
+      align-items: center;
+      gap: 30px;
+      padding: 40px;
+      background: #f7fafc;
+      border-radius: 16px;
+      margin-bottom: 30px;
+    }
+    .profile-avatar-container {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 15px;
+    }
+    .profile-avatar {
+      width: 120px;
+      height: 120px;
+      font-size: 40px;
+      border-radius: 50%;
+      object-fit: cover;
+    }
+    .avatar-upload-btn {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+      padding: 10px 20px;
+      border-radius: 25px;
+      cursor: pointer;
+      font-size: 14px;
+      font-weight: 600;
+      transition: all 0.3s;
+    }
+    .avatar-upload-btn:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+    }
+    .profile-info {
+      flex: 1;
+    }
+    .profile-name {
+      font-size: 24px;
+      font-weight: 700;
+      color: #2d3748;
+      margin-bottom: 5px;
+    }
+    .profile-meta {
+      color: #718096;
+      font-size: 16px;
+    }
+    .upload-status {
+      padding: 15px;
+      border-radius: 12px;
+      text-align: center;
+      font-weight: 600;
+    }
+    .upload-status.success {
+      background: #c6f6d5;
+      color: #276749;
+    }
+    .upload-status.error {
+      background: #fed7d7;
+      color: #c53030;
+    }
+    .upload-status.loading {
+      background: #e9d8fd;
+      color: #553c9a;
+    }
+    .clickable-avatar {
+      cursor: pointer;
+      transition: transform 0.2s, box-shadow 0.2s;
+    }
+    .clickable-avatar:hover {
+      transform: scale(1.1);
+      box-shadow: 0 4px 12px rgba(0,0,0,0.3);
+    }
+    .avatar-img {
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+      object-fit: cover;
+    }
+    
     /* Page Header */
     .page-header {
       margin-bottom: 25px;
@@ -565,7 +648,7 @@ <h2>Confirm Your Account</h2>
       </div>
       <div class="user-section">
         <button class="signout-btn" id="activityBtn" style="margin-right: 10px;">📊 Activity</button>
-        <div class="avatar" id="userAvatar">U</div>
+        <div class="avatar clickable-avatar" id="userAvatar" title="Edit Profile">U</div>
         <button class="signout-btn" id="signoutBtn">Sign Out</button>
       </div>
     </div>
@@ -624,6 +707,33 @@ <h1 class="page-title" id="topicTitle"></h1>
         </div>
       </div>
 
+      <!-- Profile Page -->
+      <div id="profilePage" class="hidden">
+        <div class="content-area">
+          <button class="back-btn" id="backFromProfile">← Back</button>
+          <div class="page-header">
+            <h1 class="page-title">Profile</h1>
+            <p class="page-subtitle">Manage your account</p>
+          </div>
+          
+          <div class="profile-section">
+            <div class="profile-avatar-container">
+              <div class="avatar profile-avatar" id="profileAvatar">U</div>
+              <label class="avatar-upload-btn" for="avatarInput">
+                📷 Change Photo
+              </label>
+              <input type="file" id="avatarInput" accept="image/*" style="display: none;" />
+            </div>
+            <div class="profile-info">
+              <div class="profile-name" id="profilePhone">+1234567890</div>
+              <div class="profile-meta">Member</div>
+            </div>
+          </div>
+          
+          <div id="avatarUploadStatus" class="upload-status hidden"></div>
+        </div>
+      </div>
+
       <!-- Activity Page -->
       <div id="activityPage" class="hidden">
         <div class="content-area">
diff --git a/amplify-migration-apps/discussions/src/main.js b/amplify-migration-apps/discussions/src/main.js
index 1b6ff0cc543..e8781ea2d63 100644
--- a/amplify-migration-apps/discussions/src/main.js
+++ b/amplify-migration-apps/discussions/src/main.js
@@ -1,6 +1,7 @@
 import { Amplify } from 'aws-amplify';
 import { signUp, confirmSignUp, signIn, signOut, getCurrentUser } from 'aws-amplify/auth';
 import { generateClient } from 'aws-amplify/api';
+import { uploadData, getUrl } from 'aws-amplify/storage';
 import awsconfig from './aws-exports';
 import * as mutations from './graphql/mutations';
 import * as queries from './graphql/queries';
@@ -15,6 +16,7 @@ let currentTopicName = null;
 let currentPostId = null;
 let currentUserPhone = null;
 let currentUserId = null;
+let currentUserAvatarUrl = null;
 
 const DISCUSSIONS = [
   { id: 'tech', name: 'Technology', icon: '💻', color: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)' },
@@ -73,16 +75,16 @@ async function checkAuthState() {
     const user = await getCurrentUser();
     currentUserPhone = user.signInDetails.loginId;
     currentUserId = user.userId;
-    showMainApp();
+    await showMainApp();
   } catch {
     showPage('signinPage');
   }
 }
 
-function showMainApp() {
+async function showMainApp() {
   showPage('mainApp');
-  const initials = currentUserPhone ? currentUserPhone.substring(1, 3).toUpperCase() : 'U';
-  document.querySelectorAll('.avatar').forEach((el) => (el.textContent = initials));
+  await loadUserAvatar();
+  updateHeaderAvatar();
   showDiscussions();
 }
 
@@ -129,7 +131,7 @@ document.getElementById('signinBtn').addEventListener('click', async () => {
     const user = await getCurrentUser();
     currentUserPhone = phone;
     currentUserId = user.userId;
-    showMainApp();
+    await showMainApp();
   } catch (error) {
     alert('Error: ' + error.message);
   }
@@ -137,11 +139,101 @@ document.getElementById('signinBtn').addEventListener('click', async () => {
 
 document.getElementById('signoutBtn').addEventListener('click', async () => {
   await signOut();
+  currentUserAvatarUrl = null;
   showPage('signinPage');
 });
 
+// Profile
+document.getElementById('userAvatar').addEventListener('click', () => {
+  ['discussionsPage', 'topicsPage', 'postsPage', 'postDetailPage', 'activityPage'].forEach((id) => {
+    document.getElementById(id).classList.add('hidden');
+  });
+  document.getElementById('profilePage').classList.remove('hidden');
+  loadProfile();
+});
+
+document.getElementById('backFromProfile').addEventListener('click', () => {
+  document.getElementById('profilePage').classList.add('hidden');
+  showDiscussions();
+});
+
+document.getElementById('avatarInput').addEventListener('change', async (e) => {
+  const file = e.target.files[0];
+  if (!file) return;
+
+  const status = document.getElementById('avatarUploadStatus');
+  status.classList.remove('hidden', 'success', 'error');
+  status.classList.add('loading');
+  status.textContent = 'Uploading...';
+
+  try {
+    await uploadAvatar(file);
+    status.classList.remove('loading');
+    status.classList.add('success');
+    status.textContent = 'Avatar updated successfully!';
+
+    // Refresh avatar display
+    await loadUserAvatar();
+    updateHeaderAvatar();
+    loadProfile();
+  } catch (error) {
+    console.error('Upload error:', error);
+    status.classList.remove('loading');
+    status.classList.add('error');
+    status.textContent = 'Upload failed: ' + error.message;
+  }
+});
+
+async function loadProfile() {
+  document.getElementById('profilePhone').textContent = currentUserPhone || 'Unknown';
+
+  const profileAvatar = document.getElementById('profileAvatar');
+  if (currentUserAvatarUrl) {
+    profileAvatar.innerHTML = `<img src="${currentUserAvatarUrl}" class="avatar-img" alt="Avatar" />`;
+  } else {
+    const initials = currentUserPhone ? currentUserPhone.substring(1, 3).toUpperCase() : 'U';
+    profileAvatar.textContent = initials;
+  }
+}
+
+async function uploadAvatar(file) {
+  const path = `public/avatars/${currentUserId}`;
+
+  await uploadData({
+    path,
+    data: file,
+    options: {
+      contentType: file.type,
+    },
+  }).result;
+}
+
+async function loadUserAvatar() {
+  if (!currentUserId) return;
+
+  try {
+    const result = await getUrl({
+      path: `public/avatars/${currentUserId}`,
+      options: { validateObjectExistence: true },
+    });
+    currentUserAvatarUrl = result.url.toString();
+  } catch {
+    currentUserAvatarUrl = null;
+  }
+}
+
+function updateHeaderAvatar() {
+  const el = document.getElementById('userAvatar');
+  const initials = currentUserPhone ? currentUserPhone.substring(1, 3).toUpperCase() : 'U';
+  if (currentUserAvatarUrl) {
+    el.innerHTML = `<img src="${currentUserAvatarUrl}" class="avatar-img" alt="Avatar" />`;
+  } else {
+    el.textContent = initials;
+  }
+}
+
 document.getElementById('activityBtn').addEventListener('click', () => {
-  ['discussionsPage', 'topicsPage', 'postsPage', 'postDetailPage'].forEach((id) => {
+  ['discussionsPage', 'topicsPage', 'postsPage', 'postDetailPage', 'profilePage'].forEach((id) => {
     document.getElementById(id).classList.add('hidden');
   });
   document.getElementById('activityPage').classList.remove('hidden');
@@ -361,12 +453,12 @@ async function loadPosts(topicId) {
     }
 
     for (const post of result.data.listPosts.items) {
-      // Get comments count
       const commentsResult = await client.graphql({
         query: queries.listComments,
         variables: { filter: { postCommentsId: { eq: post.id } } },
       });
       const commentsCount = commentsResult.data.listComments.items.length;
+      const initials = post.createdByUserId.substring(0, 2).toUpperCase();
 
       const card = document.createElement('div');
       card.className = 'post-card';
@@ -374,7 +466,7 @@ async function loadPosts(topicId) {
       card.onclick = () => viewPost(post.id);
       card.innerHTML = `
         <div class="post-header">
-          <div class="avatar">U</div>
+          <div class="avatar">${initials}</div>
           <div class="post-content-area">
             <div class="post-author">
               <span class="username">${post.createdByUserId}</span>
@@ -422,6 +514,7 @@ async function loadPostDetail(postId) {
     });
 
     const post = result.data.getPost;
+    const initials = post.createdByUserId.substring(0, 2).toUpperCase();
 
     // Get fresh comments count
     const commentsResult = await client.graphql({
@@ -433,7 +526,7 @@ async function loadPostDetail(postId) {
     document.getElementById('postDetail').innerHTML = `
       <div class="post-card">
         <div class="post-header">
-          <div class="avatar">U</div>
+          <div class="avatar">${initials}</div>
           <div class="post-content-area">
             <div class="post-author">
               <span class="username">${post.createdByUserId}</span>
@@ -501,10 +594,11 @@ async function loadComments(postId) {
     }
 
     for (const comment of result.data.listComments.items) {
+      const initials = comment.createdByUserId.substring(0, 2).toUpperCase();
       const div = document.createElement('div');
       div.className = 'comment';
       div.innerHTML = `
-        <div class="avatar">U</div>
+        <div class="avatar">${initials}</div>
         <div class="comment-content">
           <div class="post-author">
             <span class="username">${comment.createdByUserId}</span>

From 7474e4e01e00138cefceee6e827f1c73b4a5874f Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Tue, 17 Mar 2026 22:25:53 +0000
Subject: [PATCH 02/20] feat(cli): generate per-table stacks for multiple DDB
 tables

Previously, all DynamoDB tables were placed in a single shared storage
stack, causing conflicts when multiple tables existed. Each DDB table
now gets its own nested stack via backend.createStack('storage<name>'),
matching the Gen1 nested stack naming convention.

Also fixes resolveOutputs() crash when a Gen2 storage stack has no
Outputs section (happens when no cross-stack references exist for a
table).

Closes #14608, #14597
---
 .../amplify/backend.ts                        |  20 +-
 ...3255CD-QQN18S0SITDH-holding.mappings.json} |   4 +-
 ...QQN18S0SITDH-holding.source.template.json} |   0
 ...QQN18S0SITDH-holding.target.template.json} |   0
 ...10DAF62-VUSO8KNEET17-holding.mappings.json |  12 +
 ...-VUSO8KNEET17-holding.source.template.json | 281 ++++++++++++++
 ...-VUSO8KNEET17-holding.target.template.json |  80 ++++
 ...tivityEF3255CD-QQN18S0SITDH.mappings.json} |   2 +-
 ...F3255CD-QQN18S0SITDH.source.template.json} |   0
 ...F3255CD-QQN18S0SITDH.target.template.json} |   0
 ...okmarks210DAF62-VUSO8KNEET17.mappings.json |  12 +
 ...210DAF62-VUSO8KNEET17.source.template.json |  64 ++++
 ...210DAF62-VUSO8KNEET17.target.template.json | 341 +++++++++++++++++
 ...vityEF3255CD-QQN18S0SITDH.parameters.json} |   0
 ...tivityEF3255CD-QQN18S0SITDH.template.json} |   0
 ...arks210DAF62-VUSO8KNEET17.parameters.json} |   0
 ...okmarks210DAF62-VUSO8KNEET17.template.json | 354 ++++++++++++++++++
 ...ragebookmarks-19Q2XZYRDN4T.parameters.json |  26 ++
 ...toragebookmarks-19Q2XZYRDN4T.template.json | 124 ++++++
 .../#current-cloud-backend/amplify-meta.json  |  20 +
 .../build/root-cloudformation-stack.json      |  14 +
 .../bookmarks-cloudformation-template.json    | 156 ++++++++
 .../storage/bookmarks/build/parameters.json   |   7 +
 .../storage/bookmarks/cli-inputs.json         |  22 ++
 .../amplify/team-provider-info.json           |   3 +-
 ...vityEF3255CD-QQN18S0SITDH.description.txt} |   0
 ...ctivityEF3255CD-QQN18S0SITDH.outputs.json} |   0
 ...ivityEF3255CD-QQN18S0SITDH.parameters.json |   1 +
 ...tivityEF3255CD-QQN18S0SITDH.template.json} |   0
 ...marks210DAF62-VUSO8KNEET17.description.txt |   1 +
 ...ookmarks210DAF62-VUSO8KNEET17.outputs.json |   1 +
 ...marks210DAF62-VUSO8KNEET17.parameters.json |   1 +
 ...okmarks210DAF62-VUSO8KNEET17.template.json | 354 ++++++++++++++++++
 ...s-gen2main-branch-96dfd1dc44.template.json |  58 ++-
 ...ragebookmarks-19Q2XZYRDN4T.description.txt |   1 +
 ...storagebookmarks-19Q2XZYRDN4T.outputs.json |  34 ++
 ...ragebookmarks-19Q2XZYRDN4T.parameters.json |  26 ++
 ...toragebookmarks-19Q2XZYRDN4T.template.json | 156 ++++++++
 ...plify-discussions-main-d5a80.template.json |  14 +
 .../amplify/backend.generator.test.ts         |  25 ++
 .../storage/dynamodb.generator.test.ts        |  44 ++-
 .../amplify/storage/dynamodb.renderer.test.ts |  23 ++
 .../refactor/cfn-output-resolver.test.ts      |  26 +-
 .../gen2-migration/refactor/refactor.test.ts  |   4 +-
 .../commands/gen2-migration/cfn-template.ts   |   2 +-
 .../generate/amplify/backend.generator.ts     |  16 +
 .../amplify/storage/dynamodb.generator.ts     |   4 +-
 .../amplify/storage/dynamodb.renderer.ts      |   6 +-
 .../gen2-migration/refactor/refactor.ts       |  47 ++-
 .../refactor/resolvers/cfn-output-resolver.ts |   8 +-
 .../storage/storage-dynamo-forward.ts         |  14 +-
 .../storage/storage-dynamo-rollback.ts        |  14 +-
 52 files changed, 2374 insertions(+), 48 deletions(-)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.mappings.json => refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json} (75%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.source.template.json => refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.target.template.json => refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json => update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json => update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json} (100%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json => _snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt => amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json => amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json => amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json

diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
index a7439aa72ee..f059af343b6 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
@@ -19,8 +19,8 @@ const backend = defineBackend({
   fetchuseractivity,
   recorduseractivity,
 });
-const storageStack = backend.createStack('storage');
-const activity = new Table(storageStack, 'activity', {
+const storageActivityStack = backend.createStack('storageactivity');
+const activity = new Table(storageActivityStack, 'activity', {
   partitionKey: { name: 'id', type: AttributeType.STRING },
   billingMode: BillingMode.PROVISIONED,
   readCapacity: 5,
@@ -36,6 +36,22 @@ activity.addGlobalSecondaryIndex({
   readCapacity: 5,
   writeCapacity: 5,
 });
+const storageBookmarksStack = backend.createStack('storagebookmarks');
+const bookmarks = new Table(storageBookmarksStack, 'bookmarks', {
+  partitionKey: { name: 'userId', type: AttributeType.STRING },
+  billingMode: BillingMode.PROVISIONED,
+  readCapacity: 5,
+  writeCapacity: 5,
+  stream: StreamViewType.NEW_IMAGE,
+  sortKey: { name: 'postId', type: AttributeType.STRING },
+});
+// Add this property to the Table above post refactor: tableName: 'bookmarks-main'
+bookmarks.addGlobalSecondaryIndex({
+  indexName: 'byPost',
+  partitionKey: { name: 'postId', type: AttributeType.STRING },
+  readCapacity: 5,
+  writeCapacity: 5,
+});
 const cfnUserPool = backend.auth.resources.cfnResources.cfnUserPool;
 cfnUserPool.usernameAttributes = ['phone_number'];
 cfnUserPool.policies = {
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json
similarity index 75%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json
index 0484781a42e..c59fe6b272c 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json
@@ -1,11 +1,11 @@
 [
   {
     "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH",
+      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH",
       "LogicalResourceId": "activity1E902D9C"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding",
+      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding",
       "LogicalResourceId": "activity1E902D9C"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json
new file mode 100644
index 00000000000..92415786b81
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17",
+      "LogicalResourceId": "bookmarksA4548304"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json
new file mode 100644
index 00000000000..f987b018e48
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json
@@ -0,0 +1,281 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Resources": {
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json
new file mode 100644
index 00000000000..c79d5be4596
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json
@@ -0,0 +1,80 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Temporary holding stack for Gen2 migration",
+  "Resources": {
+    "bookmarksA4548304": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-main"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/bookmarks/Resource"
+      }
+    }
+  },
+  "Outputs": {}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json
index 7c0f1c98009..cb1cf369c91 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "DynamoDBTable"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH",
+      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH",
       "LogicalResourceId": "activity1E902D9C"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json
new file mode 100644
index 00000000000..5ad7f310f79
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T",
+      "LogicalResourceId": "DynamoDBTable"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json
new file mode 100644
index 00000000000..b27d2d1c9e9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json
@@ -0,0 +1,64 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "main",
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "MigrationPlaceholder": {
+      "Type": "AWS::CloudFormation::WaitConditionHandle",
+      "Properties": {}
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": "bookmarks-main"
+    },
+    "Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
+    },
+    "StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591"
+    },
+    "PartitionKeyName": {
+      "Value": "userId"
+    },
+    "PartitionKeyType": {
+      "Value": "S"
+    },
+    "SortKeyName": {
+      "Value": "postId"
+    },
+    "SortKeyType": {
+      "Value": "S"
+    },
+    "Region": {
+      "Value": "us-east-1"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json
new file mode 100644
index 00000000000..1b56de8055f
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json
@@ -0,0 +1,341 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Resources": {
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
+    "bookmarksA4548304": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "bookmarks",
+              "-",
+              "main"
+            ]
+          ]
+        }
+      }
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
new file mode 100644
index 00000000000..62d511a6bab
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
@@ -0,0 +1,354 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Resources": {
+    "bookmarksA4548304": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-main"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/bookmarks/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
new file mode 100644
index 00000000000..5862fff0861
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "partitionKeyName",
+    "ParameterValue": "userId"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "main"
+  },
+  {
+    "ParameterKey": "sortKeyName",
+    "ParameterValue": "postId"
+  },
+  {
+    "ParameterKey": "sortKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "tableName",
+    "ParameterValue": "bookmarks"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
new file mode 100644
index 00000000000..b649afc3c56
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
@@ -0,0 +1,124 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "main",
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "bookmarks",
+              "-",
+              "main"
+            ]
+          ]
+        }
+      }
+    },
+    "MigrationPlaceholder": {
+      "Type": "AWS::CloudFormation::WaitConditionHandle",
+      "Properties": {}
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": "bookmarks-main"
+    },
+    "Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
+    },
+    "StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591"
+    },
+    "PartitionKeyName": {
+      "Value": "userId"
+    },
+    "PartitionKeyType": {
+      "Value": "S"
+    },
+    "SortKeyName": {
+      "Value": "postId"
+    },
+    "SortKeyType": {
+      "Value": "S"
+    },
+    "Region": {
+      "Value": "us-east-1"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
index 9de8dab1e35..6a7b46d0b8a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
@@ -104,6 +104,26 @@
         "Name": "activity-main"
       },
       "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
+    },
+    "bookmarks": {
+      "service": "DynamoDB",
+      "providerPlugin": "awscloudformation",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "logicalId": "storagebookmarks"
+      },
+      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
+      "output": {
+        "PartitionKeyName": "userId",
+        "SortKeyName": "postId",
+        "SortKeyType": "S",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591",
+        "PartitionKeyType": "S",
+        "Name": "bookmarks-main"
+      },
+      "lastPushDirHash": "MKrx9n9rI5MFeuTLmyTA2Bho0zg="
     }
   },
   "function": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 3c701beabac..8de772e2dc5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -286,6 +286,20 @@
         }
       }
     },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "main"
+        }
+      }
+    },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
new file mode 100644
index 00000000000..976119728ee
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
@@ -0,0 +1,156 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "tableName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "tableName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "DynamoDBTable"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "Arn"
+        ]
+      }
+    },
+    "StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "StreamArn"
+        ]
+      }
+    },
+    "PartitionKeyName": {
+      "Value": {
+        "Ref": "partitionKeyName"
+      }
+    },
+    "PartitionKeyType": {
+      "Value": {
+        "Ref": "partitionKeyType"
+      }
+    },
+    "SortKeyName": {
+      "Value": {
+        "Ref": "sortKeyName"
+      }
+    },
+    "SortKeyType": {
+      "Value": {
+        "Ref": "sortKeyType"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  }
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json
new file mode 100644
index 00000000000..b15111598db
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json
@@ -0,0 +1,7 @@
+{
+  "tableName": "bookmarks",
+  "partitionKeyName": "userId",
+  "partitionKeyType": "S",
+  "sortKeyName": "postId",
+  "sortKeyType": "S"
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
new file mode 100644
index 00000000000..4eff10ee1dd
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
@@ -0,0 +1,22 @@
+{
+  "resourceName": "bookmarks",
+  "tableName": "bookmarks",
+  "partitionKey": {
+    "fieldName": "userId",
+    "fieldType": "string"
+  },
+  "sortKey": {
+    "fieldName": "postId",
+    "fieldType": "string"
+  },
+  "gsi": [
+    {
+      "name": "byPost",
+      "partitionKey": {
+        "fieldName": "postId",
+        "fieldType": "string"
+      }
+    }
+  ],
+  "triggerFunctions": []
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
index a44c217ba8e..1d5e6f66713 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
@@ -29,7 +29,8 @@
         "discussions": {}
       },
       "storage": {
-        "activity": {}
+        "activity": {},
+        "bookmarks": {}
       }
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt
new file mode 100644
index 00000000000..220f5abc26b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.0","stackType":"custom","metadata":{}}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json
new file mode 100644
index 00000000000..fe51488c706
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json
@@ -0,0 +1 @@
+[]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
new file mode 100644
index 00000000000..fe51488c706
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
@@ -0,0 +1 @@
+[]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
new file mode 100644
index 00000000000..d3faf56eb23
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
@@ -0,0 +1,354 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Resources": {
+    "bookmarksA4548304": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-main"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/bookmarks/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
index aa07d690ed6..0653c815185 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
@@ -692,19 +692,19 @@
         "Parameters": {
           "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
             "Fn::GetAtt": [
-              "storage0EC3F24A",
+              "storageactivityEF3255CD",
               "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
             ]
           },
           "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
             "Fn::GetAtt": [
-              "storage0EC3F24A",
+              "storageactivityEF3255CD",
               "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn"
             ]
           },
           "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
             "Fn::GetAtt": [
-              "storage0EC3F24A",
+              "storageactivityEF3255CD",
               "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef"
             ]
           },
@@ -774,7 +774,7 @@
         "aws:asset:property": "TemplateURL"
       }
     },
-    "storage0EC3F24A": {
+    "storageactivityEF3255CD": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Tags": [
@@ -824,6 +824,56 @@
         "aws:asset:property": "TemplateURL"
       }
     },
+    "storagebookmarks210DAF62": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-main"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/bb3ec2369678c897d14fcba7ccfffd1b1e19ec841f3277a078f65e8981c75abe.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44storagebookmarks4D210E3A.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
new file mode 100644
index 00000000000..4f6a85b2847
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
new file mode 100644
index 00000000000..4b5c89a736f
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
@@ -0,0 +1,34 @@
+[
+  {
+    "OutputKey": "PartitionKeyName",
+    "OutputValue": "userId"
+  },
+  {
+    "OutputKey": "SortKeyName",
+    "OutputValue": "postId"
+  },
+  {
+    "OutputKey": "SortKeyType",
+    "OutputValue": "S"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
+  },
+  {
+    "OutputKey": "StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591"
+  },
+  {
+    "OutputKey": "PartitionKeyType",
+    "OutputValue": "S"
+  },
+  {
+    "OutputKey": "Name",
+    "OutputValue": "bookmarks-main"
+  }
+]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
new file mode 100644
index 00000000000..951a2ac0cf4
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "partitionKeyName",
+    "ParameterValue": "userId"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "main"
+  },
+  {
+    "ParameterKey": "sortKeyName",
+    "ParameterValue": "postId"
+  },
+  {
+    "ParameterKey": "sortKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "tableName",
+    "ParameterValue": "bookmarks"
+  }
+]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
new file mode 100644
index 00000000000..976119728ee
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
@@ -0,0 +1,156 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "tableName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "tableName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "DynamoDBTable"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "Arn"
+        ]
+      }
+    },
+    "StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "StreamArn"
+        ]
+      }
+    },
+    "PartitionKeyName": {
+      "Value": {
+        "Ref": "partitionKeyName"
+      }
+    },
+    "PartitionKeyType": {
+      "Value": {
+        "Ref": "partitionKeyType"
+      }
+    },
+    "SortKeyName": {
+      "Value": {
+        "Ref": "sortKeyName"
+      }
+    },
+    "SortKeyType": {
+      "Value": {
+        "Ref": "sortKeyType"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  }
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
index 0260279e6a7..52a7b73f7af 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
@@ -356,6 +356,20 @@
         }
       }
     },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "main"
+        }
+      }
+    },
     "UpdateRolesWithIDPFunction": {
       "DependsOn": [
         "AuthRole",
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/backend.generator.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/backend.generator.test.ts
index 6154f4e322b..9b379ae11a4 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/backend.generator.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/backend.generator.test.ts
@@ -119,6 +119,31 @@ describe('BackendGenerator', () => {
     });
   });
 
+  describe('createDynamoDBStack', () => {
+    it('returns unique variable names for different resources', () => {
+      const gen = new BackendGenerator(outputDir);
+      const varName1 = gen.createDynamoDBStack('activity');
+      const varName2 = gen.createDynamoDBStack('bookmarks');
+
+      expect(varName1).toBe('storageActivityStack');
+      expect(varName2).toBe('storageBookmarksStack');
+      expect(varName1).not.toBe(varName2);
+    });
+
+    it('emits separate createStack calls for each DDB table', () => {
+      const gen = new BackendGenerator(outputDir);
+      gen.createDynamoDBStack('activity');
+      gen.createDynamoDBStack('bookmarks');
+
+      return verifyBackendTs(gen, (content) => {
+        expect(content).toContain("backend.createStack('storageactivity')");
+        expect(content).toContain("backend.createStack('storagebookmarks')");
+        expect(content).toContain('const storageActivityStack');
+        expect(content).toContain('const storageBookmarksStack');
+      });
+    });
+  });
+
   describe('import sorting', () => {
     it('sorts resource imports before CDK imports before @aws-amplify/backend', () => {
       const gen = new BackendGenerator(outputDir);
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.test.ts
index 77ead8b5bf6..0999b43e50b 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.test.ts
@@ -78,7 +78,7 @@ describe('DynamoDBGenerator', () => {
     });
 
     const addImportSpy = jest.spyOn(backendGenerator, 'addImport');
-    const ensureStorageStackSpy = jest.spyOn(backendGenerator, 'ensureStorageStack');
+    const createDynamoDBStackSpy = jest.spyOn(backendGenerator, 'createDynamoDBStack');
     const addEarlyStatementSpy = jest.spyOn(backendGenerator, 'addEarlyStatement');
 
     const generator = new DynamoDBGenerator(gen1App, backendGenerator, 'myTable', false);
@@ -86,11 +86,11 @@ describe('DynamoDBGenerator', () => {
     await ops[0].execute();
 
     expect(addImportSpy).toHaveBeenCalledWith('aws-cdk-lib/aws-dynamodb', expect.arrayContaining(['Table', 'AttributeType']));
-    expect(ensureStorageStackSpy).toHaveBeenCalledWith(false);
+    expect(createDynamoDBStackSpy).toHaveBeenCalledWith('myTable');
     expect(addEarlyStatementSpy).toHaveBeenCalled();
   });
 
-  it('passes hasS3Bucket=true to ensureStorageStack', async () => {
+  it('creates per-table stack regardless of hasS3Bucket flag', async () => {
     const gen1App = createMockGen1App();
     (gen1App.meta as jest.Mock).mockReturnValue({
       myTable: {
@@ -105,13 +105,13 @@ describe('DynamoDBGenerator', () => {
       ProvisionedThroughput: {},
     });
 
-    const ensureStorageStackSpy = jest.spyOn(backendGenerator, 'ensureStorageStack');
+    const createDynamoDBStackSpy = jest.spyOn(backendGenerator, 'createDynamoDBStack');
 
     const generator = new DynamoDBGenerator(gen1App, backendGenerator, 'myTable', true);
     const ops = await generator.plan();
     await ops[0].execute();
 
-    expect(ensureStorageStackSpy).toHaveBeenCalledWith(true);
+    expect(createDynamoDBStackSpy).toHaveBeenCalledWith('myTable');
   });
 
   it('throws when table is not found in AWS', async () => {
@@ -164,6 +164,40 @@ describe('DynamoDBGenerator', () => {
     expect(addEarlyStatementSpy.mock.calls.length).toBeGreaterThanOrEqual(2);
   });
 
+  it('creates separate stacks for two DDB tables', async () => {
+    const gen1App = createMockGen1App();
+    (gen1App.meta as jest.Mock).mockReturnValue({
+      activity: {
+        service: 'DynamoDB',
+        output: { Name: 'activity-abc123' },
+      },
+      bookmarks: {
+        service: 'DynamoDB',
+        output: { Name: 'bookmarks-abc123' },
+      },
+    });
+    (gen1App.aws.fetchTableDescription as jest.Mock).mockResolvedValue({
+      KeySchema: [{ AttributeName: 'id', KeyType: 'HASH' }],
+      AttributeDefinitions: [{ AttributeName: 'id', AttributeType: 'S' }],
+      BillingModeSummary: { BillingMode: 'PAY_PER_REQUEST' },
+      ProvisionedThroughput: {},
+    });
+
+    const createDynamoDBStackSpy = jest.spyOn(backendGenerator, 'createDynamoDBStack');
+
+    const gen1 = new DynamoDBGenerator(gen1App, backendGenerator, 'activity', false);
+    const gen2 = new DynamoDBGenerator(gen1App, backendGenerator, 'bookmarks', false);
+
+    const ops1 = await gen1.plan();
+    await ops1[0].execute();
+    const ops2 = await gen2.plan();
+    await ops2[0].execute();
+
+    expect(createDynamoDBStackSpy).toHaveBeenCalledTimes(2);
+    expect(createDynamoDBStackSpy).toHaveBeenCalledWith('activity');
+    expect(createDynamoDBStackSpy).toHaveBeenCalledWith('bookmarks');
+  });
+
   it('uses resourceName as table name when output.Name is missing', async () => {
     const gen1App = createMockGen1App();
     (gen1App.meta as jest.Mock).mockReturnValue({
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts
index ae72e87e036..0ba5ebea3ca 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts
@@ -152,6 +152,29 @@ describe('DynamoDBRenderer', () => {
       `);
     });
 
+    it('uses custom scope variable name when provided', () => {
+      const table: DynamoDBTableDefinition = {
+        tableName: 'MyTable-abc123',
+        partitionKey: { name: 'id', type: 'STRING' },
+        billingMode: 'PAY_PER_REQUEST',
+      };
+      const output = printStatements(renderer.renderTable(table, 'storageActivityStack'));
+
+      expect(output).toContain('storageActivityStack');
+      expect(output).not.toContain('storageStack');
+    });
+
+    it('defaults to storageStack scope when no scope provided', () => {
+      const table: DynamoDBTableDefinition = {
+        tableName: 'MyTable-abc123',
+        partitionKey: { name: 'id', type: 'STRING' },
+        billingMode: 'PAY_PER_REQUEST',
+      };
+      const output = printStatements(renderer.renderTable(table));
+
+      expect(output).toContain('storageStack');
+    });
+
     it('handles BINARY attribute type', () => {
       const table: DynamoDBTableDefinition = {
         tableName: 'BinaryTable-abc',
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/cfn-output-resolver.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/cfn-output-resolver.test.ts
index 703361e6867..dd917c4088e 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/cfn-output-resolver.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/cfn-output-resolver.test.ts
@@ -270,9 +270,29 @@ describe('resolveOutputs - error paths', () => {
     );
   });
 
-  it('throws when template is missing Outputs or Resources', () => {
+  it('throws when template is missing Resources', () => {
     expect(() =>
-      resolveOutputs({ template: { Resources: {} } as any, stackOutputs: [], stackResources: [], region: 'us-east-1', accountId: '123' }),
-    ).toThrow('missing Outputs or Resources');
+      resolveOutputs({ template: {} as any, stackOutputs: [], stackResources: [], region: 'us-east-1', accountId: '123' }),
+    ).toThrow('missing Resources');
+  });
+
+  it('works when template has Resources but no Outputs section', () => {
+    const template: CFNTemplate = {
+      AWSTemplateFormatVersion: '2010-09-09',
+      Description: 'test',
+      Resources: {
+        MyTable: { Type: 'AWS::DynamoDB::Table', Properties: {} },
+      },
+    };
+    const result = resolveOutputs({
+      template,
+      stackOutputs: [],
+      stackResources: [],
+      region: 'us-east-1',
+      accountId: '123',
+    });
+    // Should return the template unchanged (no outputs to resolve)
+    expect(result.Resources.MyTable.Type).toBe('AWS::DynamoDB::Table');
+    expect(result.Outputs).toBeUndefined();
   });
 });
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
index ea82a6b3249..2afc72a339a 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
@@ -232,7 +232,7 @@ describe('AmplifyMigrationRefactorStep', () => {
       ]);
 
       const step = createStep();
-      await expect(step.execute()).rejects.toThrow(/Multiple resources in 'storage'/);
+      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storage'/);
     });
   });
 
@@ -275,7 +275,7 @@ describe('AmplifyMigrationRefactorStep', () => {
       ]);
 
       const step = createStep();
-      await expect(step.rollback()).rejects.toThrow(/Multiple resources in 'auth'/);
+      await expect(step.rollback()).rejects.toThrow(/Multiple resources map to stack 'auth'/);
     });
   });
 });
diff --git a/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts b/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts
index 8c1ad6ee0bc..b56844b98b5 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts
@@ -53,7 +53,7 @@ export interface CFNTemplate {
   // Resources and Outputs are mutable: resolvers clone templates then transform them in place.
   // The clone-then-mutate pattern is the standard way to produce modified templates.
   Resources: Record<string, CFNResource>;
-  Outputs: Record<string, CFNOutput>;
+  Outputs?: Record<string, CFNOutput>;
 }
 
 export enum CFNStackStatus {
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts
index e84fc3752c5..350f6fa3a8b 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/backend.generator.ts
@@ -102,6 +102,22 @@ export class BackendGenerator implements Planner {
     this.earlyStatements.push(TS.constDecl('storageStack', stackExpression));
   }
 
+  /**
+   * Creates a per-DDB-table stack via `backend.createStack('storage' + resourceName)`.
+   * Returns the variable name used to reference the stack (e.g., `storageActivityStack`).
+   * Each DDB table gets its own nested stack, enabling multi-table support.
+   */
+  public createDynamoDBStack(resourceName: string): string {
+    const varName = `storage${resourceName.charAt(0).toUpperCase()}${resourceName.slice(1)}Stack`;
+    const stackExpression = factory.createCallExpression(
+      TS.propAccess('backend', 'createStack') as ts.PropertyAccessExpression,
+      undefined,
+      [factory.createStringLiteral('storage' + resourceName)],
+    );
+    this.earlyStatements.push(TS.constDecl(varName, stackExpression));
+    return varName;
+  }
+
   /**
    * Assembles all accumulated imports, properties, and statements into backend.ts.
    */
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.ts
index 4bc9ad9aece..7b21e45160f 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.generator.ts
@@ -41,9 +41,9 @@ export class DynamoDBGenerator implements Planner {
         execute: async () => {
           const imports = this.renderer.requiredImports();
           this.backendGenerator.addImport(imports.source, imports.identifiers);
-          this.backendGenerator.ensureStorageStack(this.hasS3Bucket);
+          const scopeVarName = this.backendGenerator.createDynamoDBStack(this.resourceName);
 
-          for (const statement of this.renderer.renderTable(table)) {
+          for (const statement of this.renderer.renderTable(table, scopeVarName)) {
             this.backendGenerator.addEarlyStatement(statement);
           }
         },
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts
index 7af2046eb09..4a2324eba4e 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts
@@ -52,7 +52,7 @@ export class DynamoDBRenderer {
   /**
    * Produces CDK Table construct statements for a single DynamoDB table.
    */
-  public renderTable(table: DynamoDBTableDefinition): ts.Statement[] {
+  public renderTable(table: DynamoDBTableDefinition, scopeVarName = 'storageStack'): ts.Statement[] {
     const statements: ts.Statement[] = [];
     const baseTableName = table.tableName.replace(/-[^-]+$/, '');
     const sanitizedName = sanitizeVariableName(baseTableName);
@@ -128,7 +128,7 @@ export class DynamoDBRenderer {
                 undefined,
                 undefined,
                 factory.createNewExpression(factory.createIdentifier('Table'), undefined, [
-                  factory.createIdentifier('storageStack'),
+                  factory.createIdentifier(scopeVarName),
                   factory.createStringLiteral(sanitizedName),
                   factory.createObjectLiteralExpression(tableProps),
                 ]),
@@ -142,7 +142,7 @@ export class DynamoDBRenderer {
       statements.push(
         factory.createExpressionStatement(
           factory.createNewExpression(factory.createIdentifier('Table'), undefined, [
-            factory.createIdentifier('storageStack'),
+            factory.createIdentifier(scopeVarName),
             factory.createStringLiteral(sanitizedName),
             factory.createObjectLiteralExpression(tableProps),
           ]),
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
index 9c68d7ed0c3..0213b4177b9 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
@@ -73,7 +73,7 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
 
     const refactorers: Refactorer[] = [];
 
-    validateSingleResourcePerCategory(discovered);
+    validateSingleResourcePerStack(discovered);
 
     for (const resource of discovered) {
       switch (resource.key) {
@@ -86,7 +86,7 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
           refactorers.push(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
           break;
         case 'storage:DynamoDB':
-          refactorers.push(new StorageDynamoForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
+          refactorers.push(new StorageDynamoForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId, resource.resourceName));
           break;
         case 'analytics:Kinesis':
           refactorers.push(new AnalyticsKinesisForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
@@ -117,7 +117,7 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
 
     const refactorers: Refactorer[] = [];
 
-    validateSingleResourcePerCategory(discovered);
+    validateSingleResourcePerStack(discovered);
 
     for (const resource of discovered) {
       switch (resource.key) {
@@ -128,7 +128,9 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
           refactorers.push(new StorageS3RollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
           break;
         case 'storage:DynamoDB':
-          refactorers.push(new StorageDynamoRollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
+          refactorers.push(
+            new StorageDynamoRollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId, resource.resourceName),
+          );
           break;
         case 'analytics:Kinesis':
           refactorers.push(new AnalyticsKinesisRollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
@@ -193,21 +195,38 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
 }
 
 /**
- * Throws if any refactorer category has more than one resource.
- * Refactorers assume a single resource per category — multiple
- * resources would produce incorrect mappings.
+ * Throws if any two discovered resources would produce the same stack name.
+ *
+ * DDB resources use 'storage' + resourceName as their stack prefix. Other
+ * stateful categories (auth, analytics) use the bare category name. If two
+ * resources would map to the same stack name, the refactor would be ambiguous.
  */
-function validateSingleResourcePerCategory(discovered: readonly DiscoveredResource[]): void {
-  const refactorCategories = new Set(['auth', 'storage', 'analytics']);
-  const categoryCounts = new Map<string, number>();
+function validateSingleResourcePerStack(discovered: readonly DiscoveredResource[]): void {
+  const stackNameCounts = new Map<string, number>();
   for (const r of discovered) {
-    if (!refactorCategories.has(r.category)) continue;
-    categoryCounts.set(r.category, (categoryCounts.get(r.category) ?? 0) + 1);
+    let stackName: string;
+    switch (r.key) {
+      case 'storage:DynamoDB':
+        stackName = 'storage' + r.resourceName;
+        break;
+      case 'auth:Cognito':
+        stackName = 'auth';
+        break;
+      case 'storage:S3':
+        stackName = 'storage';
+        break;
+      case 'analytics:Kinesis':
+        stackName = 'analytics';
+        break;
+      default:
+        continue; // non-stateful categories — no stack conflict possible
+    }
+    stackNameCounts.set(stackName, (stackNameCounts.get(stackName) ?? 0) + 1);
   }
-  for (const [category, count] of categoryCounts) {
+  for (const [stackName, count] of stackNameCounts) {
     if (count > 1) {
       throw new AmplifyError('MigrationError', {
-        message: `Multiple resources in '${category}' category detected. The refactor step does not yet support multiple resources per category.`,
+        message: `Multiple resources map to stack '${stackName}'. Each resource must have a unique stack name.`,
       });
     }
   }
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts
index df2ad793146..bad580e1a91 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts
@@ -28,16 +28,16 @@ export function resolveOutputs(params: {
   const templateOutputs = cloned.Outputs;
   const templateResources = cloned.Resources;
 
-  if (!templateOutputs || !templateResources) {
+  if (!templateResources) {
     throw new AmplifyError('InvalidStackError', {
-      message: 'Template is missing Outputs or Resources section',
+      message: 'Template is missing Resources section',
     });
   }
 
   // Build separate lookups for Ref-based and GetAtt-based outputs.
   // A single resource can appear in both (e.g., UserPool has Ref → pool ID, GetAtt → ARN).
   // Conflating them into one map would overwrite the Ref value with the GetAtt value.
-  const { refLookup, getAttLookup } = buildOutputLookup(templateOutputs, stackOutputs);
+  const { refLookup, getAttLookup } = buildOutputLookup(templateOutputs ?? {}, stackOutputs);
 
   // Phase 1: Resolve Ref/GetAtt in Resources using stack outputs
   cloned.Resources = walkCfnTree(templateResources, (node) => {
@@ -101,7 +101,7 @@ export function resolveOutputs(params: {
   }) as Record<string, CFNResource>;
 
   // Phase 3: Replace Output values with runtime stack output values
-  for (const [outputKey, outputDef] of Object.entries(cloned.Outputs)) {
+  for (const [outputKey, outputDef] of Object.entries(cloned.Outputs ?? {})) {
     const runtimeOutput = stackOutputs.find((o) => o.OutputKey === outputKey);
     if (!runtimeOutput?.OutputValue) {
       throw new AmplifyError('InvalidStackError', {
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-forward.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-forward.ts
index cba5cd7b1e3..12d4c4a09fa 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-forward.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-forward.ts
@@ -1,16 +1,26 @@
 import { ForwardCategoryRefactorer } from '../workflow/forward-category-refactorer';
+import { StackFacade } from '../stack-facade';
+import { AwsClients } from '../../aws-clients';
 
 /**
  * Forward refactorer for DynamoDB storage resources.
  * Moves DynamoDB tables from Gen1 to Gen2.
+ * Each table gets its own nested stack using 'storage' + resourceName as prefix.
  */
 export class StorageDynamoForwardRefactorer extends ForwardCategoryRefactorer {
+  private readonly resourceName: string;
+
+  constructor(gen1Env: StackFacade, gen2Branch: StackFacade, clients: AwsClients, region: string, accountId: string, resourceName: string) {
+    super(gen1Env, gen2Branch, clients, region, accountId);
+    this.resourceName = resourceName;
+  }
+
   protected async fetchSourceStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen1Env, 'storage');
+    return this.findNestedStack(this.gen1Env, 'storage' + this.resourceName);
   }
 
   protected async fetchDestStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen2Branch, 'storage');
+    return this.findNestedStack(this.gen2Branch, 'storage' + this.resourceName);
   }
 
   protected resourceTypes(): string[] {
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.ts
index dcdfa0942c3..1cb8a44800b 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-dynamo-rollback.ts
@@ -1,18 +1,28 @@
 import { RollbackCategoryRefactorer } from '../workflow/rollback-category-refactorer';
+import { StackFacade } from '../stack-facade';
+import { AwsClients } from '../../aws-clients';
 
 /**
  * Rollback refactorer for DynamoDB storage resources.
  * Moves DynamoDB tables from Gen2 back to Gen1.
+ * Each table gets its own nested stack using 'storage' + resourceName as prefix.
  */
 export class StorageDynamoRollbackRefactorer extends RollbackCategoryRefactorer {
   protected override readonly gen1LogicalIds = new Map<string, string>([['AWS::DynamoDB::Table', 'DynamoDBTable']]);
 
+  private readonly resourceName: string;
+
+  constructor(gen1Env: StackFacade, gen2Branch: StackFacade, clients: AwsClients, region: string, accountId: string, resourceName: string) {
+    super(gen1Env, gen2Branch, clients, region, accountId);
+    this.resourceName = resourceName;
+  }
+
   protected async fetchSourceStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen2Branch, 'storage');
+    return this.findNestedStack(this.gen2Branch, 'storage' + this.resourceName);
   }
 
   protected async fetchDestStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen1Env, 'storage');
+    return this.findNestedStack(this.gen1Env, 'storage' + this.resourceName);
   }
 
   protected resourceTypes(): string[] {

From 76b479979a6382c121e8b926a11a81d1b1b96dae Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Wed, 18 Mar 2026 00:10:19 +0000
Subject: [PATCH 03/20] fix(discussions): replace hand-crafted snapshots with
 real infrastructure data

Recapture discussions app snapshots from live deployments:
- Gen1: amplify-discussionsblade-blade-4edfd (activity + bookmarks tables)
- Gen2: amplify-d1skq8aomhb772-e2etest-branch (per-table stacks)

Pre-generate inputs use real amplify-pull data for bookmarks resource.
Pre-refactor templates fetched from deployed CloudFormation stacks.
Post-generate and post-refactor regenerated by test framework.

Also adds bookmarks to migration-config.json and fixes snapshot.ts
to use TemplateStage: Original for unprocessed templates.
---
 .../amplify/backend.ts                        |    2 +-
 ...9371D7-19LVPI73QPSY7-holding.mappings.json |   52 +
 ...9LVPI73QPSY7-holding.source.template.json} |   42 +-
 ...19LVPI73QPSY7-holding.target.template.json |  154 ++
 ...46F297-1PHSGRJSW0US5-holding.mappings.json |   12 +
 ...PHSGRJSW0US5-holding.source.template.json} |   18 +-
 ...PHSGRJSW0US5-holding.target.template.json} |   33 +-
 ...10DAF62-AOPTK1NWQZNJ-holding.mappings.json |   12 +
 ...AOPTK1NWQZNJ-holding.source.template.json} |    4 +-
 ...AOPTK1NWQZNJ-holding.target.template.json} |   33 +-
 ...79371D7-DAPL7YOMHRB4-holding.mappings.json |   52 -
 ...-DAPL7YOMHRB4-holding.target.template.json |  222 --
 ...F3255CD-QQN18S0SITDH-holding.mappings.json |   12 -
 ...10DAF62-VUSO8KNEET17-holding.mappings.json |   12 -
 ...-auth179371D7-19LVPI73QPSY7.mappings.json} |   10 +-
 ...9371D7-19LVPI73QPSY7.source.template.json} |    0
 ...9371D7-19LVPI73QPSY7.target.template.json} |   42 +-
 ...ivityA346F297-1PHSGRJSW0US5.mappings.json} |    2 +-
 ...46F297-1PHSGRJSW0US5.source.template.json} |    0
 ...46F297-1PHSGRJSW0US5.target.template.json} |   18 +-
 ...kmarks210DAF62-AOPTK1NWQZNJ.mappings.json} |    2 +-
 ...10DAF62-AOPTK1NWQZNJ.source.template.json} |    8 +-
 ...10DAF62-AOPTK1NWQZNJ.target.template.json} |    4 +-
 ...uth179371D7-19LVPI73QPSY7.parameters.json} |    0
 ...-auth179371D7-19LVPI73QPSY7.template.json} |  398 ++-
 ...ityA346F297-1PHSGRJSW0US5.parameters.json} |    0
 ...ivityA346F297-1PHSGRJSW0US5.template.json} |   67 +-
 ...arks210DAF62-AOPTK1NWQZNJ.parameters.json} |    0
 ...kmarks210DAF62-AOPTK1NWQZNJ.template.json} |   55 +-
 ...ragebookmarks-19Q2XZYRDN4T.parameters.json |   12 +-
 ...toragebookmarks-19Q2XZYRDN4T.template.json |    8 +-
 .../#current-cloud-backend/amplify-meta.json  |   14 +-
 .../build/root-cloudformation-stack.json      |   28 +-
 .../bookmarks-cloudformation-template.json    |  156 ++
 .../bookmarks-cloudformation-template.json    |  156 ++
 .../bookmarks/bookmarks/build/parameters.json |    7 +
 .../bookmarks/bookmarks/cli-inputs.json       |   22 +
 .../bookmarks-cloudformation-template.json    |    4 +-
 .../storage/bookmarks/build/parameters.json   |    2 +-
 .../amplify/backend/amplify-meta.json         |   20 +
 .../bookmarks-cloudformation-template.json    |  156 ++
 .../bookmarks-cloudformation-template.json    |  156 ++
 .../storage/bookmarks/build/parameters.json   |    7 +
 .../backend/storage/bookmarks/cli-inputs.json |   22 +
 ...NestedStackA-1KJBI9SVOWO6G.description.txt |    0
 ...gerNestedStackA-1KJBI9SVOWO6G.outputs.json |    6 +
 ...NestedStackA-1KJBI9SVOWO6G.parameters.json |    6 +
 ...erNestedStackA-1KJBI9SVOWO6G.template.json |  759 ++++++
 ...ommentNested-18DBZ8BQTMK8E.description.txt |    0
 ...ckCommentNested-18DBZ8BQTMK8E.outputs.json |   26 +
 ...ommentNested-18DBZ8BQTMK8E.parameters.json |   46 +
 ...kCommentNested-18DBZ8BQTMK8E.template.json | 2074 +++++++++++++++
 ...edStackConne-1OWUZYB5XE48X.description.txt |    0
 ...stedStackConne-1OWUZYB5XE48X.outputs.json} |    0
 ...edStackConne-1OWUZYB5XE48X.parameters.json |   46 +
 ...stedStackConne-1OWUZYB5XE48X.template.json |  863 +++++++
 ...ackNestedSta-1U3PX8KU9ZZ8H.description.txt |    1 +
 ...eStackNestedSta-1U3PX8KU9ZZ8H.outputs.json |    1 +
 ...ackNestedSta-1U3PX8KU9ZZ8H.parameters.json |   22 +
 ...StackNestedSta-1U3PX8KU9ZZ8H.template.json |  556 ++++
 ...tNestedStackR-QQ10UZAFYJQD.description.txt |    0
 ...PostNestedStackR-QQ10UZAFYJQD.outputs.json |   26 +
 ...tNestedStackR-QQ10UZAFYJQD.parameters.json |   46 +
 ...ostNestedStackR-QQ10UZAFYJQD.template.json | 2074 +++++++++++++++
 ...picNestedStac-Y6NEQZHYFNZU.description.txt |    0
 ...kTopicNestedStac-Y6NEQZHYFNZU.outputs.json |   26 +
 ...picNestedStac-Y6NEQZHYFNZU.parameters.json |   46 +
 ...TopicNestedStac-Y6NEQZHYFNZU.template.json | 2040 +++++++++++++++
 ...auth179371D7-19LVPI73QPSY7.description.txt |    1 +
 ...92-auth179371D7-19LVPI73QPSY7.outputs.json |   22 +
 ...auth179371D7-19LVPI73QPSY7.parameters.json |    1 +
 ...2-auth179371D7-19LVPI73QPSY7.template.json |  545 ++++
 ...-data7552DF31-G2MUTCUFR08M.description.txt |    1 +
 ...a92-data7552DF31-G2MUTCUFR08M.outputs.json |   30 +
 ...-data7552DF31-G2MUTCUFR08M.parameters.json |   38 +
 ...92-data7552DF31-G2MUTCUFR08M.template.json | 2255 +++++++++++++++++
 ...ction1351588B-H9TILALYT3XU.description.txt |    1 +
 ...function1351588B-H9TILALYT3XU.outputs.json |   10 +
 ...ction1351588B-H9TILALYT3XU.parameters.json |   26 +
 ...unction1351588B-H9TILALYT3XU.template.json |  832 ++++++
 ...ityA346F297-1PHSGRJSW0US5.description.txt} |    2 +-
 ...ctivityA346F297-1PHSGRJSW0US5.outputs.json |   14 +
 ...vityA346F297-1PHSGRJSW0US5.parameters.json |    1 +
 ...tivityA346F297-1PHSGRJSW0US5.template.json |  372 +++
 ...marks210DAF62-AOPTK1NWQZNJ.description.txt |    1 +
 ...ookmarks210DAF62-AOPTK1NWQZNJ.outputs.json |    1 +
 ...marks210DAF62-AOPTK1NWQZNJ.parameters.json |    1 +
 ...kmarks210DAF62-AOPTK1NWQZNJ.template.json} |   57 +-
 ...-e2etest-branch-75c4329a92.description.txt |    1 +
 ...772-e2etest-branch-75c4329a92.outputs.json |  126 +
 ...-e2etest-branch-75c4329a92.parameters.json |    7 +
 ...72-e2etest-branch-75c4329a92.template.json | 1188 +++++++++
 ...rage0EC3F24A-QQN18S0SITDH.description.txt} |    0
 ...storage0EC3F24A-QQN18S0SITDH.outputs.json} |    0
 ...orage0EC3F24A-QQN18S0SITDH.parameters.json |    1 +
 ...torage0EC3F24A-QQN18S0SITDH.template.json} |    0
 ...ookmarks210DAF62-VUSO8KNEET17.outputs.json |    1 -
 ...marks210DAF62-VUSO8KNEET17.parameters.json |    1 -
 ...s-gen2main-branch-96dfd1dc44.template.json |   58 +-
 ...ragebookmarks-19Q2XZYRDN4T.description.txt |    1 -
 ...storagebookmarks-19Q2XZYRDN4T.outputs.json |   32 +-
 ...ragebookmarks-19Q2XZYRDN4T.parameters.json |   14 +-
 ...toragebookmarks-19Q2XZYRDN4T.template.json |    4 +-
 ...plify-discussions-main-d5a80.template.json |   28 +-
 ...irectiveStack-JUWBQLX2MIUS.description.txt |    1 +
 ...onDirectiveStack-JUWBQLX2MIUS.outputs.json |    1 +
 ...irectiveStack-JUWBQLX2MIUS.parameters.json |   22 +
 ...nDirectiveStack-JUWBQLX2MIUS.template.json |  281 ++
 ...AYY7-Comment-1JNK5MYREU7SI.description.txt |    0
 ...PRDAYY7-Comment-1JNK5MYREU7SI.outputs.json |   28 +
 ...AYY7-Comment-1JNK5MYREU7SI.parameters.json |   66 +
 ...RDAYY7-Comment-1JNK5MYREU7SI.template.json | 1195 +++++++++
 ...nectionStack-1V0C4C1EXD8J9.description.txt |    0
 ...ConnectionStack-1V0C4C1EXD8J9.outputs.json |    1 +
 ...nectionStack-1V0C4C1EXD8J9.parameters.json |   42 +
 ...onnectionStack-1V0C4C1EXD8J9.template.json |  422 +++
 ...esourcesjson-1TP4VIYV7SW7T.description.txt |    1 +
 ...omResourcesjson-1TP4VIYV7SW7T.outputs.json |    7 +
 ...esourcesjson-1TP4VIYV7SW7T.parameters.json |   22 +
 ...mResourcesjson-1TP4VIYV7SW7T.template.json |   61 +
 ...PRDAYY7-Post-14Y25NP173QZR.description.txt |    0
 ...T4EPRDAYY7-Post-14Y25NP173QZR.outputs.json |   28 +
 ...PRDAYY7-Post-14Y25NP173QZR.parameters.json |   66 +
 ...4EPRDAYY7-Post-14Y25NP173QZR.template.json | 1195 +++++++++
 ...PRDAYY7-Topic-H46P3V70TYLP.description.txt |    0
 ...T4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json |   56 +
 ...PRDAYY7-Topic-H46P3V70TYLP.parameters.json |   42 +
 ...4EPRDAYY7-Topic-H46P3V70TYLP.template.json | 1470 +++++++++++
 ...pidiscussions-IQT4EPRDAYY7.description.txt |    1 +
 ...d-apidiscussions-IQT4EPRDAYY7.outputs.json |   20 +
 ...pidiscussions-IQT4EPRDAYY7.parameters.json |   38 +
 ...-apidiscussions-IQT4EPRDAYY7.template.json | 1066 ++++++++
 ...67c6822367c68-AZ1ABOD9U7XR.description.txt |    1 +
 ...22367c6822367c68-AZ1ABOD9U7XR.outputs.json |   40 +
 ...67c6822367c68-AZ1ABOD9U7XR.parameters.json |  166 ++
 ...2367c6822367c68-AZ1ABOD9U7XR.template.json |  272 ++
 ...huseractivity-62CQ5IY9UUX6.description.txt |    1 +
 ...etchuseractivity-62CQ5IY9UUX6.outputs.json |   22 +
 ...huseractivity-62CQ5IY9UUX6.parameters.json |   30 +
 ...tchuseractivity-62CQ5IY9UUX6.template.json |  270 ++
 ...useractivity-18VPX4OJ3YT33.description.txt |    1 +
 ...orduseractivity-18VPX4OJ3YT33.outputs.json |   22 +
 ...useractivity-18VPX4OJ3YT33.parameters.json |   38 +
 ...rduseractivity-18VPX4OJ3YT33.template.json |  455 ++++
 ...rageactivity-1OKZSX7N0DR6H.description.txt |    1 +
 ...storageactivity-1OKZSX7N0DR6H.outputs.json |   34 +
 ...rageactivity-1OKZSX7N0DR6H.parameters.json |   26 +
 ...torageactivity-1OKZSX7N0DR6H.template.json |   64 +
 ...agebookmarks-1319IZBITHXQD.description.txt |    1 +
 ...toragebookmarks-1319IZBITHXQD.outputs.json |   34 +
 ...agebookmarks-1319IZBITHXQD.parameters.json |   26 +
 ...oragebookmarks-1319IZBITHXQD.template.json |   64 +
 ...scussionsblade-blade-4edfd.description.txt |    1 +
 ...-discussionsblade-blade-4edfd.outputs.json |   42 +
 ...scussionsblade-blade-4edfd.parameters.json |   14 +
 ...discussionsblade-blade-4edfd.template.json |  577 +++++
 .../discussions/migration-config.json         |   11 +
 amplify-migration-apps/snapshot.ts            |    2 +-
 158 files changed, 23826 insertions(+), 894 deletions(-)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.source.template.json => refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json} (83%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json => refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json => refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json} (71%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json => refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json} (97%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json => refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json} (68%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.target.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json} (88%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json} (79%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json} (97%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json => update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json => update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json} (63%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json => update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json => update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json => update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json => update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json} (90%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json => amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt => amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt} (55%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json => amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json} (90%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.description.txt => amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.outputs.json => amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json => amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json} (100%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json

diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
index f059af343b6..fea0a1a756e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
@@ -45,7 +45,7 @@ const bookmarks = new Table(storageBookmarksStack, 'bookmarks', {
   stream: StreamViewType.NEW_IMAGE,
   sortKey: { name: 'postId', type: AttributeType.STRING },
 });
-// Add this property to the Table above post refactor: tableName: 'bookmarks-main'
+// Add this property to the Table above post refactor: tableName: 'bookmarks-blade'
 bookmarks.addGlobalSecondaryIndex({
   indexName: 'byPost',
   partitionKey: { name: 'postId', type: AttributeType.STRING },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
new file mode 100644
index 00000000000..f8e3faad3b9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
@@ -0,0 +1,52 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
index 847baa10ccd..c570fa01a43 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.1\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
   "Resources": {
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
       "Type": "AWS::IAM::Role",
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -27,11 +27,11 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "discussions"
+            "Value": "d1skq8aomhb772"
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "e2etest"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -77,11 +77,11 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "discussions"
+            "Value": "d1skq8aomhb772"
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "e2etest"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,16 +98,16 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv8V7urbBg1fpyYtIxbPEZNVt0w00q0VC/l2KVHuamTczGvSmgnJlxlhY1xWerpAOGAXdSYztlBnjJdlwZ5IA6RxxOIbgVX3jn59N7QlZltWf7B2ykLzn8zI3weNOxNhHjyxZkekhTXAaTppzVhwcQhvXL62h2kK5aiNRMTxZqEdovvoBH9Args4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -379,20 +379,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef": {
-      "Value": "us-east-1_olNpwuJIL"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+      "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref": {
-      "Value": "6bdqt8vavvh3efopgb031lc3jg"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+      "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-      "Value": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-      "Value": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-      "Value": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
new file mode 100644
index 00000000000..3dd5b4788c3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
@@ -0,0 +1,154 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Temporary holding stack for Gen2 migration",
+  "Resources": {
+    "amplifyAuthUserPool4BA7F805": {
+      "Type": "AWS::Cognito::UserPool",
+      "Properties": {
+        "AutoVerifiedAttributes": [
+          "email"
+        ],
+        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationSubject": "Verification",
+        "MfaConfiguration": "OFF",
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": "8",
+            "RequireLowercase": false,
+            "RequireNumbers": false,
+            "RequireSymbols": false,
+            "RequireUppercase": false
+          }
+        },
+        "Schema": [
+          {
+            "Mutable": true,
+            "Name": "email",
+            "Required": true
+          },
+          {
+            "Mutable": true,
+            "Name": "phone_number",
+            "Required": true
+          }
+        ],
+        "SmsAuthenticationMessage": "Your authentication code is {####}",
+        "SmsConfiguration": {
+          "ExternalId": "discus22367c68_role_external_id",
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
+        },
+        "SmsVerificationMessage": "Your verification code is {####}",
+        "UserAttributeUpdateSettings": {
+          "AttributesRequireVerificationBeforeUpdate": [
+            "email"
+          ]
+        },
+        "UserPoolName": {
+          "Fn::Join": [
+            "",
+            [
+              "discussions22367c68_userpool_22367c68",
+              "-",
+              "blade"
+            ]
+          ]
+        },
+        "UsernameAttributes": [
+          "phone_number"
+        ],
+        "UsernameConfiguration": {
+          "CaseSensitive": false
+        }
+      },
+      "DependsOn": []
+    },
+    "amplifyAuthUserPoolAppClient2626C6F8": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discus22367c68_app_clientWeb",
+        "RefreshTokenValidity": "120",
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": "us-east-1_3t0fqaGQN"
+      },
+      "DependsOn": [
+        "amplifyAuthUserPool4BA7F805"
+      ]
+    },
+    "amplifyAuthUserPoolNativeAppClient79534448": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discus22367c68_app_client",
+        "GenerateSecret": "false",
+        "RefreshTokenValidity": "120",
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": "us-east-1_3t0fqaGQN"
+      },
+      "DependsOn": [
+        "amplifyAuthUserPool4BA7F805"
+      ]
+    },
+    "amplifyAuthIdentityPool3FDE84CC": {
+      "Type": "AWS::Cognito::IdentityPool",
+      "Properties": {
+        "AllowUnauthenticatedIdentities": "false",
+        "CognitoIdentityProviders": [
+          {
+            "ClientId": "7oh5id275ip4505msdvhrtv5vq",
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": "us-east-1_3t0fqaGQN"
+                }
+              ]
+            }
+          },
+          {
+            "ClientId": "7t0bpmsnis3540umt8r65jcicc",
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": "us-east-1_3t0fqaGQN"
+                }
+              ]
+            }
+          }
+        ],
+        "IdentityPoolName": {
+          "Fn::Join": [
+            "",
+            [
+              "discussions22367c68_identitypool_22367c68__",
+              "blade"
+            ]
+          ]
+        }
+      }
+    },
+    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
+      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+      "Properties": {
+        "IdentityPoolId": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
+        "Roles": {
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
+        }
+      },
+      "DependsOn": [
+        "amplifyAuthIdentityPool3FDE84CC"
+      ]
+    }
+  },
+  "Outputs": {}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
new file mode 100644
index 00000000000..3ff6b77ff76
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
+      "LogicalResourceId": "activity1E902D9C"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding",
+      "LogicalResourceId": "activity1E902D9C"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
index 925acc7bf10..ec8ace2f02d 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
@@ -1,13 +1,13 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6MGi+3tLdReJplZiJ8EnERZxLsvaPWeAdPUUBV4ina06NVbuDqWxDQkdIvCUyb6BdwiWbhGtCur9hue3KpniXl3fKsQiWGW8jAG6g9UxSze6z2H5DeG/vUPUV/XUG4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -279,14 +279,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS/stream/2026-03-07T18:02:23.205"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
-      "Value": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
index 9d199bf4263..32eb1abed6f 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
@@ -58,29 +58,16 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/activity/Resource"
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "activity",
+              "-",
+              "blade"
+            ]
+          ]
+        }
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
new file mode 100644
index 00000000000..62daa29e7bc
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
+      "LogicalResourceId": "bookmarksA4548304"
+    },
+    "Destination": {
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
similarity index 97%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
index f987b018e48..f5457481c3c 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
index c79d5be4596..2c1f80cb718 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
@@ -50,29 +50,16 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/bookmarks/Resource"
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "bookmarks",
+              "-",
+              "blade"
+            ]
+          ]
+        }
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.mappings.json
deleted file mode 100644
index 514e117ec84..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.mappings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.target.template.json
deleted file mode 100644
index f5445c5ca22..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4-holding.target.template.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Temporary holding stack for Gen2 migration",
-  "Resources": {
-    "amplifyAuthUserPool4BA7F805": {
-      "Type": "AWS::Cognito::UserPool",
-      "Properties": {
-        "AccountRecoverySetting": {
-          "RecoveryMechanisms": [
-            {
-              "Name": "verified_email",
-              "Priority": 1
-            }
-          ]
-        },
-        "AdminCreateUserConfig": {
-          "AllowAdminCreateUserOnly": false
-        },
-        "AutoVerifiedAttributes": [
-          "email"
-        ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
-        "EmailVerificationSubject": "Verification",
-        "MfaConfiguration": "OFF",
-        "Policies": {
-          "PasswordPolicy": {
-            "MinimumLength": 8,
-            "RequireLowercase": false,
-            "RequireNumbers": false,
-            "RequireSymbols": false,
-            "RequireUppercase": false,
-            "TemporaryPasswordValidityDays": 7
-          }
-        },
-        "Schema": [
-          {
-            "Mutable": true,
-            "Name": "email",
-            "Required": true
-          },
-          {
-            "Mutable": true,
-            "Name": "phone_number",
-            "Required": true
-          }
-        ],
-        "SmsVerificationMessage": "The verification code to your new account is {####}",
-        "UserAttributeUpdateSettings": {
-          "AttributesRequireVerificationBeforeUpdate": [
-            "email"
-          ]
-        },
-        "UserPoolTags": {
-          "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
-          "amplify:deployment-type": "branch",
-          "amplify:friendly-name": "amplifyAuth",
-          "created-by": "amplify"
-        },
-        "UsernameAttributes": [
-          "phone_number"
-        ],
-        "UsernameConfiguration": {
-          "CaseSensitive": false
-        },
-        "VerificationMessageTemplate": {
-          "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "Here is your verification code {####}",
-          "EmailSubject": "Verification",
-          "SmsMessage": "The verification code to your new account is {####}"
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPool/Resource"
-      }
-    },
-    "amplifyAuthUserPoolNativeAppClient79534448": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "AllowedOAuthFlowsUserPoolClient": false,
-        "AuthSessionValidity": 3,
-        "EnablePropagateAdditionalUserContextData": false,
-        "EnableTokenRevocation": true,
-        "GenerateSecret": false,
-        "RefreshTokenValidity": 172800,
-        "SupportedIdentityProviders": [
-          "COGNITO"
-        ],
-        "TokenValidityUnits": {
-          "RefreshToken": "minutes"
-        },
-        "UserPoolId": "us-east-1_olNpwuJIL"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
-      }
-    },
-    "amplifyAuthUserPoolAppClient2626C6F8": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "AllowedOAuthFlows": [
-          "code"
-        ],
-        "AllowedOAuthFlowsUserPoolClient": true,
-        "AllowedOAuthScopes": [
-          "profile",
-          "phone",
-          "email",
-          "openid",
-          "aws.cognito.signin.user.admin"
-        ],
-        "CallbackURLs": [
-          "https://example.com"
-        ],
-        "ExplicitAuthFlows": [
-          "ALLOW_CUSTOM_AUTH",
-          "ALLOW_USER_SRP_AUTH",
-          "ALLOW_REFRESH_TOKEN_AUTH"
-        ],
-        "PreventUserExistenceErrors": "ENABLED",
-        "SupportedIdentityProviders": [
-          "COGNITO"
-        ],
-        "UserPoolId": "us-east-1_olNpwuJIL"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPoolAppClient/Resource"
-      }
-    },
-    "amplifyAuthIdentityPool3FDE84CC": {
-      "Type": "AWS::Cognito::IdentityPool",
-      "Properties": {
-        "AllowUnauthenticatedIdentities": false,
-        "CognitoIdentityProviders": [
-          {
-            "ClientId": "6bdqt8vavvh3efopgb031lc3jg",
-            "ProviderName": {
-              "Fn::Join": [
-                "",
-                [
-                  "cognito-idp.",
-                  {
-                    "Ref": "AWS::Region"
-                  },
-                  ".amazonaws.com/",
-                  "us-east-1_olNpwuJIL"
-                ]
-              ]
-            }
-          }
-        ],
-        "IdentityPoolTags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyAuth"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "SupportedLoginProviders": {}
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/IdentityPool"
-      }
-    },
-    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
-      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
-      "Properties": {
-        "IdentityPoolId": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689",
-        "RoleMappings": {
-          "UserPoolWebClientRoleMapping": {
-            "AmbiguousRoleResolution": "AuthenticatedRole",
-            "IdentityProvider": {
-              "Fn::Join": [
-                "",
-                [
-                  "cognito-idp.",
-                  {
-                    "Ref": "AWS::Region"
-                  },
-                  ".amazonaws.com/",
-                  "us-east-1_olNpwuJIL",
-                  ":",
-                  "6bdqt8vavvh3efopgb031lc3jg"
-                ]
-              ]
-            },
-            "Type": "Token"
-          }
-        },
-        "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-        }
-      },
-      "DependsOn": [
-        "amplifyAuthIdentityPool3FDE84CC",
-        "amplifyAuthUserPoolAppClient2626C6F8"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/IdentityPoolRoleAttachment"
-      }
-    }
-  },
-  "Outputs": {}
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json
deleted file mode 100644
index c59fe6b272c..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH",
-      "LogicalResourceId": "activity1E902D9C"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH-holding",
-      "LogicalResourceId": "activity1E902D9C"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json
deleted file mode 100644
index 92415786b81..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17",
-      "LogicalResourceId": "bookmarksA4548304"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17-holding",
-      "LogicalResourceId": "bookmarksA4548304"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
index 46ccb104e47..46fa61acd20 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "UserPool"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
     }
   },
@@ -15,7 +15,7 @@
       "LogicalResourceId": "UserPoolClientWeb"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
     }
   },
@@ -25,7 +25,7 @@
       "LogicalResourceId": "UserPoolClient"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
     }
   },
@@ -35,7 +35,7 @@
       "LogicalResourceId": "IdentityPool"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
     }
   },
@@ -45,7 +45,7 @@
       "LogicalResourceId": "IdentityPoolRoleMap"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
index 05a72f6824d..36050371f8e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.1\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
   "Resources": {
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
       "Type": "AWS::IAM::Role",
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -27,11 +27,11 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "discussions"
+            "Value": "d1skq8aomhb772"
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "e2etest"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -77,11 +77,11 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "discussions"
+            "Value": "d1skq8aomhb772"
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "e2etest"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,16 +98,16 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv8V7urbBg1fpyYtIxbPEZNVt0w00q0VC/l2KVHuamTczGvSmgnJlxlhY1xWerpAOGAXdSYztlBnjJdlwZ5IA6RxxOIbgVX3jn59N7QlZltWf7B2ykLzn8zI3weNOxNhHjyxZkekhTXAaTppzVhwcQhvXL62h2kK5aiNRMTxZqEdovvoBH9Args4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -526,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef": {
-      "Value": "us-east-1_olNpwuJIL"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+      "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref": {
-      "Value": "6bdqt8vavvh3efopgb031lc3jg"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+      "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-      "Value": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-      "Value": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-      "Value": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
index cb1cf369c91..135ff106702 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "DynamoDBTable"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
       "LogicalResourceId": "activity1E902D9C"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
index c801abd04fe..e0a6302a937 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
@@ -1,13 +1,13 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6MGi+3tLdReJplZiJ8EnERZxLsvaPWeAdPUUBV4ina06NVbuDqWxDQkdIvCUyb6BdwiWbhGtCur9hue3KpniXl3fKsQiWGW8jAG6g9UxSze6z2H5DeG/vUPUV/XUG4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -347,14 +347,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS/stream/2026-03-07T18:02:23.205"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
-      "Value": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
index 5ad7f310f79..bdf385c56a9 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "DynamoDBTable"
     },
     "Destination": {
-      "StackName": "amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17",
+      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
       "LogicalResourceId": "bookmarksA4548304"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
similarity index 79%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
index b27d2d1c9e9..049bbe9a8e8 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "DDB Resource for AWS Amplify CLI",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -37,13 +37,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "bookmarks-main"
+      "Value": "bookmarks-blade"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
     },
     "PartitionKeyName": {
       "Value": "userId"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
similarity index 97%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
index 1b56de8055f..ccabe6404f7 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
similarity index 63%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
index 995d534b583..d74377c775d 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
@@ -1,183 +1,6 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.1\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
   "Resources": {
-    "amplifyAuthUserPool4BA7F805": {
-      "Type": "AWS::Cognito::UserPool",
-      "Properties": {
-        "AccountRecoverySetting": {
-          "RecoveryMechanisms": [
-            {
-              "Name": "verified_email",
-              "Priority": 1
-            }
-          ]
-        },
-        "AdminCreateUserConfig": {
-          "AllowAdminCreateUserOnly": false
-        },
-        "AutoVerifiedAttributes": [
-          "email"
-        ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
-        "EmailVerificationSubject": "Verification",
-        "MfaConfiguration": "OFF",
-        "Policies": {
-          "PasswordPolicy": {
-            "MinimumLength": 8,
-            "RequireLowercase": false,
-            "RequireNumbers": false,
-            "RequireSymbols": false,
-            "RequireUppercase": false,
-            "TemporaryPasswordValidityDays": 7
-          }
-        },
-        "Schema": [
-          {
-            "Mutable": true,
-            "Name": "email",
-            "Required": true
-          },
-          {
-            "Mutable": true,
-            "Name": "phone_number",
-            "Required": true
-          }
-        ],
-        "SmsVerificationMessage": "The verification code to your new account is {####}",
-        "UserAttributeUpdateSettings": {
-          "AttributesRequireVerificationBeforeUpdate": [
-            "email"
-          ]
-        },
-        "UserPoolTags": {
-          "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
-          "amplify:deployment-type": "branch",
-          "amplify:friendly-name": "amplifyAuth",
-          "created-by": "amplify"
-        },
-        "UsernameAttributes": [
-          "phone_number"
-        ],
-        "UsernameConfiguration": {
-          "CaseSensitive": false
-        },
-        "VerificationMessageTemplate": {
-          "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "Here is your verification code {####}",
-          "EmailSubject": "Verification",
-          "SmsMessage": "The verification code to your new account is {####}"
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPool/Resource"
-      }
-    },
-    "amplifyAuthUserPoolNativeAppClient79534448": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "AllowedOAuthFlowsUserPoolClient": false,
-        "AuthSessionValidity": 3,
-        "EnablePropagateAdditionalUserContextData": false,
-        "EnableTokenRevocation": true,
-        "GenerateSecret": false,
-        "RefreshTokenValidity": 172800,
-        "SupportedIdentityProviders": [
-          "COGNITO"
-        ],
-        "TokenValidityUnits": {
-          "RefreshToken": "minutes"
-        },
-        "UserPoolId": "us-east-1_olNpwuJIL"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
-      }
-    },
-    "amplifyAuthUserPoolAppClient2626C6F8": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "AllowedOAuthFlows": [
-          "code"
-        ],
-        "AllowedOAuthFlowsUserPoolClient": true,
-        "AllowedOAuthScopes": [
-          "profile",
-          "phone",
-          "email",
-          "openid",
-          "aws.cognito.signin.user.admin"
-        ],
-        "CallbackURLs": [
-          "https://example.com"
-        ],
-        "ExplicitAuthFlows": [
-          "ALLOW_CUSTOM_AUTH",
-          "ALLOW_USER_SRP_AUTH",
-          "ALLOW_REFRESH_TOKEN_AUTH"
-        ],
-        "PreventUserExistenceErrors": "ENABLED",
-        "SupportedIdentityProviders": [
-          "COGNITO"
-        ],
-        "UserPoolId": "us-east-1_olNpwuJIL"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPoolAppClient/Resource"
-      }
-    },
-    "amplifyAuthIdentityPool3FDE84CC": {
-      "Type": "AWS::Cognito::IdentityPool",
-      "Properties": {
-        "AllowUnauthenticatedIdentities": false,
-        "CognitoIdentityProviders": [
-          {
-            "ClientId": "6bdqt8vavvh3efopgb031lc3jg",
-            "ProviderName": {
-              "Fn::Join": [
-                "",
-                [
-                  "cognito-idp.",
-                  {
-                    "Ref": "AWS::Region"
-                  },
-                  ".amazonaws.com/",
-                  "us-east-1_olNpwuJIL"
-                ]
-              ]
-            }
-          }
-        ],
-        "IdentityPoolTags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyAuth"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "SupportedLoginProviders": {}
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/IdentityPool"
-      }
-    },
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
       "Type": "AWS::IAM::Role",
       "Properties": {
@@ -187,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -204,11 +27,11 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "discussions"
+            "Value": "d1skq8aomhb772"
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "e2etest"
           },
           {
             "Key": "amplify:deployment-type",
@@ -225,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -237,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -254,11 +77,11 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "discussions"
+            "Value": "d1skq8aomhb772"
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "e2etest"
           },
           {
             "Key": "amplify:deployment-type",
@@ -275,56 +98,165 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
-    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
-      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "IdentityPoolId": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689",
-        "RoleMappings": {
-          "UserPoolWebClientRoleMapping": {
-            "AmbiguousRoleResolution": "AuthenticatedRole",
-            "IdentityProvider": {
-              "Fn::Join": [
-                "",
-                [
-                  "cognito-idp.",
-                  {
-                    "Ref": "AWS::Region"
-                  },
-                  ".amazonaws.com/",
-                  "us-east-1_olNpwuJIL",
-                  ":",
-                  "6bdqt8vavvh3efopgb031lc3jg"
-                ]
-              ]
-            },
-            "Type": "Token"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
+    "amplifyAuthUserPool4BA7F805": {
+      "Type": "AWS::Cognito::UserPool",
+      "Properties": {
+        "AutoVerifiedAttributes": [
+          "email"
+        ],
+        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationSubject": "Verification",
+        "MfaConfiguration": "OFF",
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": "8",
+            "RequireLowercase": false,
+            "RequireNumbers": false,
+            "RequireSymbols": false,
+            "RequireUppercase": false
           }
         },
-        "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
+        "Schema": [
+          {
+            "Mutable": true,
+            "Name": "email",
+            "Required": true
+          },
+          {
+            "Mutable": true,
+            "Name": "phone_number",
+            "Required": true
+          }
+        ],
+        "SmsAuthenticationMessage": "Your authentication code is {####}",
+        "SmsConfiguration": {
+          "ExternalId": "discus22367c68_role_external_id",
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
+        },
+        "SmsVerificationMessage": "Your verification code is {####}",
+        "UserAttributeUpdateSettings": {
+          "AttributesRequireVerificationBeforeUpdate": [
+            "email"
+          ]
+        },
+        "UserPoolName": {
+          "Fn::Join": [
+            "",
+            [
+              "discussions22367c68_userpool_22367c68",
+              "-",
+              "blade"
+            ]
+          ]
+        },
+        "UsernameAttributes": [
+          "phone_number"
+        ],
+        "UsernameConfiguration": {
+          "CaseSensitive": false
         }
       },
+      "DependsOn": []
+    },
+    "amplifyAuthUserPoolAppClient2626C6F8": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discus22367c68_app_clientWeb",
+        "RefreshTokenValidity": "120",
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": "us-east-1_3t0fqaGQN"
+      },
       "DependsOn": [
-        "amplifyAuthIdentityPool3FDE84CC",
-        "amplifyAuthUserPoolAppClient2626C6F8"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/IdentityPoolRoleAttachment"
-      }
+        "amplifyAuthUserPool4BA7F805"
+      ]
     },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
+    "amplifyAuthUserPoolNativeAppClient79534448": {
+      "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv8V7urbBg1fpyYtIxbPEZNVt0w00q0VC/l2KVHuamTczGvSmgnJlxlhY1xWerpAOGAXdSYztlBnjJdlwZ5IA6RxxOIbgVX3jn59N7QlZltWf7B2ykLzn8zI3weNOxNhHjyxZkekhTXAaTppzVhwcQhvXL62h2kK5aiNRMTxZqEdovvoBH9Args4AAAA="
+        "ClientName": "discus22367c68_app_client",
+        "GenerateSecret": "false",
+        "RefreshTokenValidity": "120",
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": "us-east-1_3t0fqaGQN"
       },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/CDKMetadata/Default"
+      "DependsOn": [
+        "amplifyAuthUserPool4BA7F805"
+      ]
+    },
+    "amplifyAuthIdentityPool3FDE84CC": {
+      "Type": "AWS::Cognito::IdentityPool",
+      "Properties": {
+        "AllowUnauthenticatedIdentities": "false",
+        "CognitoIdentityProviders": [
+          {
+            "ClientId": "7oh5id275ip4505msdvhrtv5vq",
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": "us-east-1_3t0fqaGQN"
+                }
+              ]
+            }
+          },
+          {
+            "ClientId": "7t0bpmsnis3540umt8r65jcicc",
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": "us-east-1_3t0fqaGQN"
+                }
+              ]
+            }
+          }
+        ],
+        "IdentityPoolName": {
+          "Fn::Join": [
+            "",
+            [
+              "discussions22367c68_identitypool_22367c68__",
+              "blade"
+            ]
+          ]
+        }
+      }
+    },
+    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
+      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+      "Properties": {
+        "IdentityPoolId": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
+        "Roles": {
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
+        }
       },
-      "Condition": "CDKMetadataAvailable"
+      "DependsOn": [
+        "amplifyAuthIdentityPool3FDE84CC"
+      ]
     }
   },
   "Conditions": {
@@ -594,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef": {
-      "Value": "us-east-1_olNpwuJIL"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+      "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref": {
-      "Value": "6bdqt8vavvh3efopgb031lc3jg"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+      "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-      "Value": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-      "Value": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-      "Value": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
index cd2d773d886..8fb7eb0f166 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
@@ -1,6 +1,16 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
     "activity1E902D9C": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
@@ -57,40 +67,17 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/activity/Resource"
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "activity",
+              "-",
+              "blade"
+            ]
+          ]
+        }
       }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6MGi+3tLdReJplZiJ8EnERZxLsvaPWeAdPUUBV4ina06NVbuDqWxDQkdIvCUyb6BdwiWbhGtCur9hue3KpniXl3fKsQiWGW8jAG6g9UxSze6z2H5DeG/vUPUV/XUG4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
@@ -360,14 +347,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS/stream/2026-03-07T18:02:23.205"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
-      "Value": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
similarity index 90%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
index 62d511a6bab..5118fac917e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
@@ -1,6 +1,16 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
     "bookmarksA4548304": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
@@ -49,40 +59,17 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/bookmarks/Resource"
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "bookmarks",
+              "-",
+              "blade"
+            ]
+          ]
+        }
       }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
index 5862fff0861..7fe1ed68a50 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
@@ -1,12 +1,16 @@
 [
   {
-    "ParameterKey": "partitionKeyType",
-    "ParameterValue": "S"
+    "ParameterKey": "tableName",
+    "ParameterValue": "bookmarks"
   },
   {
     "ParameterKey": "partitionKeyName",
     "ParameterValue": "userId"
   },
+  {
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
+  },
   {
     "ParameterKey": "env",
     "ParameterValue": "main"
@@ -18,9 +22,5 @@
   {
     "ParameterKey": "sortKeyType",
     "ParameterValue": "S"
-  },
-  {
-    "ParameterKey": "tableName",
-    "ParameterValue": "bookmarks"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
index b649afc3c56..9b64da5ced9 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "DDB Resource for AWS Amplify CLI",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -97,13 +97,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "bookmarks-main"
+      "Value": "bookmarks-blade"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
     },
     "PartitionKeyName": {
       "Value": "userId"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
index 6a7b46d0b8a..ac02d5dbee5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
@@ -106,24 +106,24 @@
       "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
     },
     "bookmarks": {
-      "service": "DynamoDB",
       "providerPlugin": "awscloudformation",
+      "service": "DynamoDB",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "logicalId": "storagebookmarks"
       },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
+      "lastPushTimeStamp": "2026-03-17T15:42:17.113Z",
       "output": {
         "PartitionKeyName": "userId",
         "SortKeyName": "postId",
         "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107",
         "PartitionKeyType": "S",
-        "Name": "bookmarks-main"
+        "Name": "bookmarks-blade"
       },
-      "lastPushDirHash": "MKrx9n9rI5MFeuTLmyTA2Bho0zg="
+      "lastPushDirHash": "UcosRNORY7WR8bi+QNNLl+eX+Eo="
     }
   },
   "function": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 8de772e2dc5..d020db31af2 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -286,20 +286,6 @@
         }
       }
     },
-    "storagebookmarks": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "bookmarks",
-          "partitionKeyName": "userId",
-          "partitionKeyType": "S",
-          "sortKeyName": "postId",
-          "sortKeyType": "S",
-          "env": "main"
-        }
-      }
-    },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
@@ -572,6 +558,20 @@
           }
         ]
       }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "main"
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json
new file mode 100644
index 00000000000..f19e532fe34
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json
@@ -0,0 +1,156 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "tableName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "tableName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "DynamoDBTable"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "Arn"
+        ]
+      }
+    },
+    "StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "StreamArn"
+        ]
+      }
+    },
+    "PartitionKeyName": {
+      "Value": {
+        "Ref": "partitionKeyName"
+      }
+    },
+    "PartitionKeyType": {
+      "Value": {
+        "Ref": "partitionKeyType"
+      }
+    },
+    "SortKeyName": {
+      "Value": {
+        "Ref": "sortKeyName"
+      }
+    },
+    "SortKeyType": {
+      "Value": {
+        "Ref": "sortKeyType"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json
new file mode 100644
index 00000000000..f19e532fe34
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json
@@ -0,0 +1,156 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "tableName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "tableName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "DynamoDBTable"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "Arn"
+        ]
+      }
+    },
+    "StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "StreamArn"
+        ]
+      }
+    },
+    "PartitionKeyName": {
+      "Value": {
+        "Ref": "partitionKeyName"
+      }
+    },
+    "PartitionKeyType": {
+      "Value": {
+        "Ref": "partitionKeyType"
+      }
+    },
+    "SortKeyName": {
+      "Value": {
+        "Ref": "sortKeyName"
+      }
+    },
+    "SortKeyType": {
+      "Value": {
+        "Ref": "sortKeyType"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json
new file mode 100644
index 00000000000..ec5a22f98a9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json
@@ -0,0 +1,7 @@
+{
+  "tableName": "bookmarks",
+  "partitionKeyName": "userId",
+  "partitionKeyType": "S",
+  "sortKeyName": "postId",
+  "sortKeyType": "S"
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json
new file mode 100644
index 00000000000..4eff10ee1dd
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json
@@ -0,0 +1,22 @@
+{
+  "resourceName": "bookmarks",
+  "tableName": "bookmarks",
+  "partitionKey": {
+    "fieldName": "userId",
+    "fieldType": "string"
+  },
+  "sortKey": {
+    "fieldName": "postId",
+    "fieldType": "string"
+  },
+  "gsi": [
+    {
+      "name": "byPost",
+      "partitionKey": {
+        "fieldName": "postId",
+        "fieldType": "string"
+      }
+    }
+  ],
+  "triggerFunctions": []
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
index 976119728ee..f19e532fe34 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -153,4 +153,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json
index b15111598db..ec5a22f98a9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/build/parameters.json
@@ -4,4 +4,4 @@
   "partitionKeyType": "S",
   "sortKeyName": "postId",
   "sortKeyType": "S"
-}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
index 9de8dab1e35..ac02d5dbee5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
@@ -104,6 +104,26 @@
         "Name": "activity-main"
       },
       "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
+    },
+    "bookmarks": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "logicalId": "storagebookmarks"
+      },
+      "lastPushTimeStamp": "2026-03-17T15:42:17.113Z",
+      "output": {
+        "PartitionKeyName": "userId",
+        "SortKeyName": "postId",
+        "SortKeyType": "S",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107",
+        "PartitionKeyType": "S",
+        "Name": "bookmarks-blade"
+      },
+      "lastPushDirHash": "UcosRNORY7WR8bi+QNNLl+eX+Eo="
     }
   },
   "function": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json
new file mode 100644
index 00000000000..f19e532fe34
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/bookmarks/build/bookmarks-cloudformation-template.json
@@ -0,0 +1,156 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "tableName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "tableName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "DynamoDBTable"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "Arn"
+        ]
+      }
+    },
+    "StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "StreamArn"
+        ]
+      }
+    },
+    "PartitionKeyName": {
+      "Value": {
+        "Ref": "partitionKeyName"
+      }
+    },
+    "PartitionKeyType": {
+      "Value": {
+        "Ref": "partitionKeyType"
+      }
+    },
+    "SortKeyName": {
+      "Value": {
+        "Ref": "sortKeyName"
+      }
+    },
+    "SortKeyType": {
+      "Value": {
+        "Ref": "sortKeyType"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
new file mode 100644
index 00000000000..a3e4723d6a1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
@@ -0,0 +1,156 @@
+{
+  "Description": "DDB Resource for AWS Amplify CLI",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "DynamoDBTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postId",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byPost",
+            "KeySchema": [
+              {
+                "AttributeName": "postId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "userId",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "postId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "tableName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "tableName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "DynamoDBTable"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "Arn"
+        ]
+      }
+    },
+    "StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "DynamoDBTable",
+          "StreamArn"
+        ]
+      }
+    },
+    "PartitionKeyName": {
+      "Value": {
+        "Ref": "partitionKeyName"
+      }
+    },
+    "PartitionKeyType": {
+      "Value": {
+        "Ref": "partitionKeyType"
+      }
+    },
+    "SortKeyName": {
+      "Value": {
+        "Ref": "sortKeyName"
+      }
+    },
+    "SortKeyType": {
+      "Value": {
+        "Ref": "sortKeyType"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/parameters.json
new file mode 100644
index 00000000000..ec5a22f98a9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/parameters.json
@@ -0,0 +1,7 @@
+{
+  "tableName": "bookmarks",
+  "partitionKeyName": "userId",
+  "partitionKeyType": "S",
+  "sortKeyName": "postId",
+  "sortKeyType": "S"
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
new file mode 100644
index 00000000000..4eff10ee1dd
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
@@ -0,0 +1,22 @@
+{
+  "resourceName": "bookmarks",
+  "tableName": "bookmarks",
+  "partitionKey": {
+    "fieldName": "userId",
+    "fieldType": "string"
+  },
+  "sortKey": {
+    "fieldName": "postId",
+    "fieldType": "string"
+  },
+  "gsi": [
+    {
+      "name": "byPost",
+      "partitionKey": {
+        "fieldName": "postId",
+        "fieldType": "string"
+      }
+    }
+  ],
+  "triggerFunctions": []
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
new file mode 100644
index 00000000000..c4501138453
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
@@ -0,0 +1,6 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
new file mode 100644
index 00000000000..5e28a9c5893
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
new file mode 100644
index 00000000000..3747c4484f6
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
@@ -0,0 +1,759 @@
+{
+  "Resources": {
+    "AmplifyManagedTableIsCompleteRoleF825222C": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:CreateTable",
+                    "dynamodb:UpdateTable",
+                    "dynamodb:DeleteTable",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:DescribeContinuousBackups",
+                    "dynamodb:DescribeTimeToLive",
+                    "dynamodb:UpdateContinuousBackups",
+                    "dynamodb:UpdateTimeToLive",
+                    "dynamodb:TagResource",
+                    "dynamodb:UntagResource",
+                    "dynamodb:ListTagsOfResource"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": {
+                    "Fn::Sub": [
+                      "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
+                      {
+                        "apiId": {
+                          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                        },
+                        "envName": "NONE"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "Action": "lambda:ListTags",
+                  "Effect": "Allow",
+                  "Resource": {
+                    "Fn::Sub": [
+                      "arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:*TableManager*",
+                      {}
+                    ]
+                  }
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "CreateUpdateDeleteTablesPolicy"
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
+      }
+    },
+    "AmplifyManagedTableOnEventRoleB4E71DEA": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:CreateTable",
+                    "dynamodb:UpdateTable",
+                    "dynamodb:DeleteTable",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:DescribeContinuousBackups",
+                    "dynamodb:DescribeTimeToLive",
+                    "dynamodb:UpdateContinuousBackups",
+                    "dynamodb:UpdateTimeToLive",
+                    "dynamodb:TagResource",
+                    "dynamodb:UntagResource",
+                    "dynamodb:ListTagsOfResource"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": {
+                    "Fn::Sub": [
+                      "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
+                      {
+                        "apiId": {
+                          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                        },
+                        "envName": "NONE"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "Action": "lambda:ListTags",
+                  "Effect": "Allow",
+                  "Resource": {
+                    "Fn::Sub": [
+                      "arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:*TableManager*",
+                      {}
+                    ]
+                  }
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "CreateUpdateDeleteTablesPolicy"
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
+      }
+    },
+    "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "states:StartExecution",
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "AmplifyTableWaiterStateMachine060600BC"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6",
+        "Roles": [
+          {
+            "Ref": "AmplifyManagedTableOnEventRoleB4E71DEA"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
+      }
+    },
+    "TableManagerCustomProviderframeworkonEvent1DFC2ECC": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
+        },
+        "Description": "AmplifyManagedTable - onEvent (amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Environment": {
+          "Variables": {
+            "WAITER_STATE_MACHINE_ARN": {
+              "Ref": "AmplifyTableWaiterStateMachine060600BC"
+            }
+          }
+        },
+        "Handler": "amplify-table-manager-handler.onEvent",
+        "Role": {
+          "Fn::GetAtt": [
+            "AmplifyManagedTableOnEventRoleB4E71DEA",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs24.x",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 840
+      },
+      "DependsOn": [
+        "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6",
+        "AmplifyManagedTableOnEventRoleB4E71DEA"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
+        "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
+        "aws:asset:is-bundled": false,
+        "aws:asset:property": "Code"
+      }
+    },
+    "TableManagerCustomProviderframeworkisComplete2E51021B": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
+        },
+        "Description": "AmplifyManagedTable - isComplete (amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Handler": "amplify-table-manager-handler.isComplete",
+        "Role": {
+          "Fn::GetAtt": [
+            "AmplifyManagedTableIsCompleteRoleF825222C",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs24.x",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 840
+      },
+      "DependsOn": [
+        "AmplifyManagedTableIsCompleteRoleF825222C"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
+        "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
+        "aws:asset:is-bundled": false,
+        "aws:asset:property": "Code"
+      }
+    },
+    "AmplifyTableWaiterStateMachineRole470BE899": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "states.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
+      }
+    },
+    "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "lambda:InvokeFunction",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "TableManagerCustomProviderframeworkisComplete2E51021B",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "TableManagerCustomProviderframeworkisComplete2E51021B",
+                          "Arn"
+                        ]
+                      },
+                      ":*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A",
+        "Roles": [
+          {
+            "Ref": "AmplifyTableWaiterStateMachineRole470BE899"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
+      }
+    },
+    "AmplifyTableWaiterStateMachine060600BC": {
+      "Type": "AWS::StepFunctions::StateMachine",
+      "Properties": {
+        "DefinitionString": {
+          "Fn::Join": [
+            "",
+            [
+              "{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":10,\"MaxAttempts\":360,\"BackoffRate\":1}],\"Type\":\"Task\",\"Resource\":\"",
+              {
+                "Fn::GetAtt": [
+                  "TableManagerCustomProviderframeworkisComplete2E51021B",
+                  "Arn"
+                ]
+              },
+              "\"}}}"
+            ]
+          ]
+        },
+        "RoleArn": {
+          "Fn::GetAtt": [
+            "AmplifyTableWaiterStateMachineRole470BE899",
+            "Arn"
+          ]
+        }
+      },
+      "DependsOn": [
+        "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A",
+        "AmplifyTableWaiterStateMachineRole470BE899"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNyw6CMBBFv4V9GRHYuBQTl8bAB5ChHUl5tAnTSkzTfzeArs65OYubQ14WkCW4cirVmE66g/AgdqQah3IUuHIbNM4QajuRuL3MzqedtPxs87AoJpw7hRDu3kinrdna36PgokVmcgzXDYILqLwcyVXIFEVNbP0iSey1cdhr0+9nvxCFsYpg4NM7z+B8gTIZWOt08cbpmaA++AUjkpGTzwAAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Type": "String"
+    }
+  },
+  "Outputs": {
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "TableManagerCustomProviderframeworkonEvent1DFC2ECC",
+          "Arn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
new file mode 100644
index 00000000000..0a93dc270eb
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
+    "OutputValue": "CommentTable"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
+  },
+  {
+    "OutputKey": "GetAttCommentTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:CommentTable:StreamArn"
+  },
+  {
+    "OutputKey": "GetAttCommentTableName",
+    "OutputValue": "Comment-2264xbjvizfhfljloltcb4xr3e-NONE",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:CommentTable:Name"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
new file mode 100644
index 00000000000..e9875388e2a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
new file mode 100644
index 00000000000..f2e653f6447
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
@@ -0,0 +1,2074 @@
+{
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "NONE",
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "ShouldUsePayPerRequestBilling": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBBillingMode"
+        },
+        "PAY_PER_REQUEST"
+      ]
+    },
+    "ShouldUsePointInTimeRecovery": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnablePointInTimeRecovery"
+        },
+        "true"
+      ]
+    },
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Resources": {
+    "CommentTable": {
+      "Type": "Custom::AmplifyDynamoDBTable",
+      "Properties": {
+        "ServiceToken": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+        },
+        "tableName": {
+          "Fn::Join": [
+            "",
+            [
+              "Comment-",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "-NONE"
+            ]
+          ]
+        },
+        "attributeDefinitions": [
+          {
+            "attributeName": "id",
+            "attributeType": "S"
+          },
+          {
+            "attributeName": "postCommentsId",
+            "attributeType": "S"
+          }
+        ],
+        "keySchema": [
+          {
+            "attributeName": "id",
+            "keyType": "HASH"
+          }
+        ],
+        "globalSecondaryIndexes": [
+          {
+            "indexName": "gsi-Post.comments",
+            "keySchema": [
+              {
+                "attributeName": "postCommentsId",
+                "keyType": "HASH"
+              }
+            ],
+            "projection": {
+              "projectionType": "ALL"
+            },
+            "provisionedThroughput": {
+              "Fn::If": [
+                "ShouldUsePayPerRequestBilling",
+                {
+                  "Ref": "AWS::NoValue"
+                },
+                {
+                  "ReadCapacityUnits": {
+                    "Ref": "DynamoDBModelTableReadIOPS"
+                  },
+                  "WriteCapacityUnits": {
+                    "Ref": "DynamoDBModelTableWriteIOPS"
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "provisionedThroughput": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            {
+              "Ref": "AWS::NoValue"
+            },
+            {
+              "ReadCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "WriteCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
+            }
+          ]
+        },
+        "sseSpecification": {
+          "sseEnabled": false
+        },
+        "streamSpecification": {
+          "streamViewType": "NEW_AND_OLD_IMAGES"
+        },
+        "deletionProtectionEnabled": false,
+        "allowDestructiveGraphqlSchemaUpdates": true,
+        "replaceTableUponGsiUpdate": false,
+        "pointInTimeRecoverySpecification": {
+          "Fn::If": [
+            "ShouldUsePointInTimeRecovery",
+            {
+              "PointInTimeRecoveryEnabled": true
+            },
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "billingMode": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            "PAY_PER_REQUEST",
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentTable/Default/Default"
+      }
+    },
+    "CommentIAMRoleD5EC5F51": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:BatchGetItem",
+                    "dynamodb:BatchWriteItem",
+                    "dynamodb:PutItem",
+                    "dynamodb:DeleteItem",
+                    "dynamodb:GetItem",
+                    "dynamodb:Scan",
+                    "dynamodb:Query",
+                    "dynamodb:UpdateItem",
+                    "dynamodb:ConditionCheckItem",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:GetRecords",
+                    "dynamodb:GetShardIterator"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Comment-",
+                                {
+                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                },
+                                "-NONE"
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Comment-",
+                                {
+                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                },
+                                "-NONE"
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "DynamoDBAccess"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "CommentIAMRole20388d-",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "-NONE"
+            ]
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentIAMRole/Resource"
+      }
+    },
+    "CommentDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DynamoDBConfig": {
+          "AwsRegion": {
+            "Ref": "AWS::Region"
+          },
+          "TableName": {
+            "Fn::Select": [
+              1,
+              {
+                "Fn::Split": [
+                  "/",
+                  {
+                    "Fn::Select": [
+                      5,
+                      {
+                        "Fn::Split": [
+                          ":",
+                          {
+                            "Fn::GetAtt": [
+                              "CommentTable",
+                              "TableArn"
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        "Name": "CommentTable",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "CommentIAMRoleD5EC5F51",
+            "Arn"
+          ]
+        },
+        "Type": "AMAZON_DYNAMODB"
+      },
+      "DependsOn": [
+        "CommentIAMRoleD5EC5F51"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentDataSource/Resource"
+      }
+    },
+    "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryGetCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/08f4d557693d96c1a4efba0f9dc91330e4b19772fd5477c156468843e3d9cb5e.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c6a2d29f01c6091bd1d9afe16e5849d456c96f17c3b215938c8067399532719.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "GetCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "getComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "CommentTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryGetCommentResolver"
+      }
+    },
+    "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerylistCommentsauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
+      }
+    },
+    "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerylistCommentspostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
+      }
+    },
+    "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryListCommentsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ListCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "listComments",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "CommentTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryListCommentsResolver"
+      }
+    },
+    "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateCommentinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a183ddccbd956316c38ef97177b8f088ef0826f62023323f5ae6053d348ccffc.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
+      }
+    },
+    "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d637c1fb7301003b8a5ada269338cf2e8df6cc0dc412ef13acc6158d680b6d3e.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationCreateCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c01fe250817e3727b22216dee7e6c75fbb7c9166595000655c6879d0b33b582d.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "CreateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "createComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "CommentTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationCreateCommentResolver"
+      }
+    },
+    "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateCommentinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06db846fd14e6fc371f22b12b5545ba8e2dbfeda85d8c8d586c71c282166657b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
+      }
+    },
+    "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f92efd98b1034df0e2497fe31a97de6975de554b8a22e0677d05d6efcafa59.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationUpdateCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/474bf0776ec2164a13191d1a0a9e057154931e4918fea5086f49850d02a5371b.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "UpdateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "updateComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "CommentTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationUpdateCommentResolver"
+      }
+    },
+    "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeleteCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e3416b4d47414f29c21e59a70e83bddb959ef0625854ed7fb0ca376573e99069.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeleteCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationDeleteCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f7907d1209a2c9953a0c053df402c634e359546d70c7cc5c2e8e21ea734880f.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "DeleteCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "deleteComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "CommentTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationDeleteCommentResolver"
+      }
+    },
+    "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreateCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreateCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnCreateCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononCreateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onCreateComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
+      }
+    },
+    "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononUpdateCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononUpdateCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnUpdateCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononUpdateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onUpdateComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
+      }
+    },
+    "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononDeleteCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononDeleteCommentpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnDeleteCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononDeleteCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onDeleteComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Outputs": {
+    "GetAttCommentTableStreamArn": {
+      "Description": "Your DynamoDB table StreamArn.",
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentTable",
+          "TableStreamArn"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "GetAtt:CommentTable:StreamArn"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttCommentTableName": {
+      "Description": "Your DynamoDB table name.",
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "Comment-",
+            {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+            },
+            "-NONE"
+          ]
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "GetAtt:CommentTable:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentDataSource",
+          "Name"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentTable",
+          "TableArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentTable",
+          "TableStreamArn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
new file mode 100644
index 00000000000..727f83af600
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
+    "ParameterValue": "CommentTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
+    "ParameterValue": "TopicTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
+    "ParameterValue": "PostTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
new file mode 100644
index 00000000000..449667e0ee5
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
@@ -0,0 +1,863 @@
+{
+  "Resources": {
+    "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "Topicpostsauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
+      }
+    },
+    "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "TopicPostsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0452137320035df37094760b82b5149298b81accf971d76ad38ee60f3b29d5e7.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/49e7a1f2fb4c809b82bed6b0242a2a3bcfa2c5276ebd2539ff330fee36f8fe18.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
+      }
+    },
+    "TopicpostsResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "posts",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Topic"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/topicPostsResolver"
+      }
+    },
+    "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "Postcommentsauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
+      }
+    },
+    "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "PostCommentsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/444a200bade4d50fad7f149c350401ee16cad72a4c043f9e9734f522754f11ef.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/49e7a1f2fb4c809b82bed6b0242a2a3bcfa2c5276ebd2539ff330fee36f8fe18.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
+      }
+    },
+    "PostcommentsResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "comments",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Post"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postCommentsResolver"
+      }
+    },
+    "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "Posttopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
+      }
+    },
+    "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "PostTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/da20b1b19b27f9de5414e30169ea8b7e9b7d0576828fa460b512ecff6b3130ec.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dcb70e4856bc9a423e02b8b9e9c2ab3f71479784572d4c04a02d1f5b61a9f9ac.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "PosttopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "topic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Post"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postTopicResolver"
+      }
+    },
+    "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "Commentpostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
+      }
+    },
+    "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "CommentPostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d9b82f67424a0a70dc059a69c4a0bbc6fd4c387ca5ad9f1b396a96a8c7c10b62.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dcb70e4856bc9a423e02b8b9e9c2ab3f71479784572d4c04a02d1f5b61a9f9ac.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "CommentpostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "post",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Comment"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/commentPostResolver"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMMQ6CQBBA0bPQLyMCjaWQWFrAAci4DGQAZwmzCzGEuxu0evnNTyHNM0gi3DS27RhP/IL9SeqprT3a0eCmza5Zg6rkFe4nRjMogh3JF6hkcJ71Ixb2spNHEOvZSemk4z4seIYpO6lI3bTSchzm96g99iz9YcS1BINe1jSB6w3yaFDmeAni+U1Q/f0C+wjzPacAAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+      "Type": "String"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
new file mode 100644
index 00000000000..87d574fa42f
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
@@ -0,0 +1 @@
+An auto-generated nested stack for the @function directive.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
new file mode 100644
index 00000000000..d516b01de8b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
new file mode 100644
index 00000000000..9375462cb15
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
@@ -0,0 +1,556 @@
+{
+  "Description": "An auto-generated nested stack for the @function directive.",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "NONE",
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Resources": {
+    "FetchuseractivityE2etestLambdaDataSourceServiceRole258F8F8C": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/Resource"
+      }
+    },
+    "FetchuseractivityE2etestLambdaDataSourceServiceRoleDefaultPolicyB52936FD": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "lambda:InvokeFunction",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::If": [
+                    "HasEnvironmentParameter",
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest",
+                        {}
+                      ]
+                    },
+                    {
+                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest"
+                    }
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::If": [
+                          "HasEnvironmentParameter",
+                          {
+                            "Fn::Sub": [
+                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest",
+                              {}
+                            ]
+                          },
+                          {
+                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest"
+                          }
+                        ]
+                      },
+                      ":*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "FetchuseractivityE2etestLambdaDataSourceServiceRoleDefaultPolicyB52936FD",
+        "Roles": [
+          {
+            "Ref": "FetchuseractivityE2etestLambdaDataSourceServiceRole258F8F8C"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
+      }
+    },
+    "FetchuseractivityE2etestLambdaDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "LambdaConfig": {
+          "LambdaFunctionArn": {
+            "Fn::If": [
+              "HasEnvironmentParameter",
+              {
+                "Fn::Sub": [
+                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest",
+                  {}
+                ]
+              },
+              {
+                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest"
+              }
+            ]
+          }
+        },
+        "Name": "FetchuseractivityE2etestLambdaDataSource",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "FetchuseractivityE2etestLambdaDataSourceServiceRole258F8F8C",
+            "Arn"
+          ]
+        },
+        "Type": "AWS_LAMBDA"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/Resource"
+      }
+    },
+    "InvokeFetchuseractivityE2etestLambdaDataSourceInvokeFetchuseractivityE2etestLambdaDataSourceAppSyncFunction6E36199C": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "FetchuseractivityE2etestLambdaDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "InvokeFetchuseractivityE2etestLambdaDataSource",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/27a049a8fa587376b8d043aea1b8951aa5394d883829a3fb11c88ce812329e9a.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a20e304512b1fde77dc16ed9d5e0ed03817afcab629ce87ef11c99877b7b1e30.vtl"
+        }
+      },
+      "DependsOn": [
+        "FetchuseractivityE2etestLambdaDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityE2etestLambdaDataSource/InvokeFetchuseractivityE2etestLambdaDataSource.AppSyncFunction"
+      }
+    },
+    "QueryfetchUserActivityResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "fetchUserActivity",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "InvokeFetchuseractivityE2etestLambdaDataSourceInvokeFetchuseractivityE2etestLambdaDataSourceAppSyncFunction6E36199C",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "## [Start] Stash resolver specific context.. **\n$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"fetchUserActivity\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:aws:sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/387d5992f5fc03d05de27289457dcc374a84c42a889acb504aff1031047dde00.vtl"
+        },
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
+      }
+    },
+    "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryFetchUserActivityAuthFN",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOsW7DMAxEvyW7zKZ2lo6Ni05FUdgfEDASbTCWqcCUEgSG/72Qgg6dHu/IO7CG+tDAfod3raybKs9nWL9JI7k+op1MO0gbxHHkIAbvelo9zmeH8JnEZvOISgavV32IhfWrLD8wYh/SYinn/6u/XBtk4DEtWJrbQTrS4G+0bIZxhrULvtwX/gTP9pHlc9qMNidUpajwnmG0gWOyE8X8z2aK2UccWcbNSHAEF3251Xt4fYPD7qLM1ZIk8kzQPfkL3nAzgQsBAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Parameters": {
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+      "Type": "String"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
new file mode 100644
index 00000000000..54c02a04791
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "OutputKey": "GetAttPostTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:PostTable:StreamArn"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
+    "OutputValue": "PostTable"
+  },
+  {
+    "OutputKey": "GetAttPostTableName",
+    "OutputValue": "Post-2264xbjvizfhfljloltcb4xr3e-NONE",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:PostTable:Name"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
new file mode 100644
index 00000000000..e9875388e2a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
new file mode 100644
index 00000000000..960f94dac0f
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
@@ -0,0 +1,2074 @@
+{
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "NONE",
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "ShouldUsePayPerRequestBilling": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBBillingMode"
+        },
+        "PAY_PER_REQUEST"
+      ]
+    },
+    "ShouldUsePointInTimeRecovery": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnablePointInTimeRecovery"
+        },
+        "true"
+      ]
+    },
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Resources": {
+    "PostTable": {
+      "Type": "Custom::AmplifyDynamoDBTable",
+      "Properties": {
+        "ServiceToken": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+        },
+        "tableName": {
+          "Fn::Join": [
+            "",
+            [
+              "Post-",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "-NONE"
+            ]
+          ]
+        },
+        "attributeDefinitions": [
+          {
+            "attributeName": "id",
+            "attributeType": "S"
+          },
+          {
+            "attributeName": "topicPostsId",
+            "attributeType": "S"
+          }
+        ],
+        "keySchema": [
+          {
+            "attributeName": "id",
+            "keyType": "HASH"
+          }
+        ],
+        "globalSecondaryIndexes": [
+          {
+            "indexName": "gsi-Topic.posts",
+            "keySchema": [
+              {
+                "attributeName": "topicPostsId",
+                "keyType": "HASH"
+              }
+            ],
+            "projection": {
+              "projectionType": "ALL"
+            },
+            "provisionedThroughput": {
+              "Fn::If": [
+                "ShouldUsePayPerRequestBilling",
+                {
+                  "Ref": "AWS::NoValue"
+                },
+                {
+                  "ReadCapacityUnits": {
+                    "Ref": "DynamoDBModelTableReadIOPS"
+                  },
+                  "WriteCapacityUnits": {
+                    "Ref": "DynamoDBModelTableWriteIOPS"
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "provisionedThroughput": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            {
+              "Ref": "AWS::NoValue"
+            },
+            {
+              "ReadCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "WriteCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
+            }
+          ]
+        },
+        "sseSpecification": {
+          "sseEnabled": false
+        },
+        "streamSpecification": {
+          "streamViewType": "NEW_AND_OLD_IMAGES"
+        },
+        "deletionProtectionEnabled": false,
+        "allowDestructiveGraphqlSchemaUpdates": true,
+        "replaceTableUponGsiUpdate": false,
+        "pointInTimeRecoverySpecification": {
+          "Fn::If": [
+            "ShouldUsePointInTimeRecovery",
+            {
+              "PointInTimeRecoveryEnabled": true
+            },
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "billingMode": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            "PAY_PER_REQUEST",
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/PostTable/Default/Default"
+      }
+    },
+    "PostIAMRole83BF708F": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:BatchGetItem",
+                    "dynamodb:BatchWriteItem",
+                    "dynamodb:PutItem",
+                    "dynamodb:DeleteItem",
+                    "dynamodb:GetItem",
+                    "dynamodb:Scan",
+                    "dynamodb:Query",
+                    "dynamodb:UpdateItem",
+                    "dynamodb:ConditionCheckItem",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:GetRecords",
+                    "dynamodb:GetShardIterator"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Post-",
+                                {
+                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                },
+                                "-NONE"
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Post-",
+                                {
+                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                },
+                                "-NONE"
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "DynamoDBAccess"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "PostIAMRolebbce9b-",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "-NONE"
+            ]
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/PostIAMRole/Resource"
+      }
+    },
+    "PostDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DynamoDBConfig": {
+          "AwsRegion": {
+            "Ref": "AWS::Region"
+          },
+          "TableName": {
+            "Fn::Select": [
+              1,
+              {
+                "Fn::Split": [
+                  "/",
+                  {
+                    "Fn::Select": [
+                      5,
+                      {
+                        "Fn::Split": [
+                          ":",
+                          {
+                            "Fn::GetAtt": [
+                              "PostTable",
+                              "TableArn"
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        "Name": "PostTable",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "PostIAMRole83BF708F",
+            "Arn"
+          ]
+        },
+        "Type": "AMAZON_DYNAMODB"
+      },
+      "DependsOn": [
+        "PostIAMRole83BF708F"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/PostDataSource/Resource"
+      }
+    },
+    "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetPostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
+      }
+    },
+    "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetPostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryGetPostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/08f4d557693d96c1a4efba0f9dc91330e4b19772fd5477c156468843e3d9cb5e.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c6a2d29f01c6091bd1d9afe16e5849d456c96f17c3b215938c8067399532719.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "GetPostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "getPost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "PostTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/queryGetPostResolver"
+      }
+    },
+    "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerylistPostsauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
+      }
+    },
+    "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerylistPostspostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
+      }
+    },
+    "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryListPostsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ListPostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "listPosts",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "PostTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/queryListPostsResolver"
+      }
+    },
+    "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreatePostinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a183ddccbd956316c38ef97177b8f088ef0826f62023323f5ae6053d348ccffc.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
+      }
+    },
+    "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreatePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d637c1fb7301003b8a5ada269338cf2e8df6cc0dc412ef13acc6158d680b6d3e.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreatePostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationCreatePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d9c0ce2470c3063dc011dd1d638ec0a40507568b27b44b56eaf9b85a94b5f506.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "CreatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "createPost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "PostTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationCreatePostResolver"
+      }
+    },
+    "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdatePostinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06db846fd14e6fc371f22b12b5545ba8e2dbfeda85d8c8d586c71c282166657b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
+      }
+    },
+    "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdatePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f92efd98b1034df0e2497fe31a97de6975de554b8a22e0677d05d6efcafa59.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdatePostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationUpdatePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/474bf0776ec2164a13191d1a0a9e057154931e4918fea5086f49850d02a5371b.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "UpdatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "updatePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "PostTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationUpdatePostResolver"
+      }
+    },
+    "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeletePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e3416b4d47414f29c21e59a70e83bddb959ef0625854ed7fb0ca376573e99069.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeletePostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationDeletePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f7907d1209a2c9953a0c053df402c634e359546d70c7cc5c2e8e21ea734880f.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "DeletePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "deletePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "PostTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationDeletePostResolver"
+      }
+    },
+    "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreatePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreatePostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnCreatePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononCreatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onCreatePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnCreatePostResolver"
+      }
+    },
+    "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononUpdatePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononUpdatePostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnUpdatePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononUpdatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onUpdatePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
+      }
+    },
+    "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononDeletePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononDeletePostpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnDeletePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononDeletePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onDeletePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnDeletePostResolver"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Outputs": {
+    "GetAttPostTableStreamArn": {
+      "Description": "Your DynamoDB table StreamArn.",
+      "Value": {
+        "Fn::GetAtt": [
+          "PostTable",
+          "TableStreamArn"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "GetAtt:PostTable:StreamArn"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttPostTableName": {
+      "Description": "Your DynamoDB table name.",
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "Post-",
+            {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+            },
+            "-NONE"
+          ]
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "GetAtt:PostTable:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+      "Value": {
+        "Fn::GetAtt": [
+          "PostDataSource",
+          "Name"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "PostTable",
+          "TableArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "PostTable",
+          "TableStreamArn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
new file mode 100644
index 00000000000..e4c284ee979
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "GetAttTopicTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:TopicTable:StreamArn"
+  },
+  {
+    "OutputKey": "GetAttTopicTableName",
+    "OutputValue": "Topic-2264xbjvizfhfljloltcb4xr3e-NONE",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:TopicTable:Name"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
+    "OutputValue": "TopicTable"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
new file mode 100644
index 00000000000..e9875388e2a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
new file mode 100644
index 00000000000..6c9ff437cd6
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
@@ -0,0 +1,2040 @@
+{
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "NONE",
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "ShouldUsePayPerRequestBilling": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBBillingMode"
+        },
+        "PAY_PER_REQUEST"
+      ]
+    },
+    "ShouldUsePointInTimeRecovery": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnablePointInTimeRecovery"
+        },
+        "true"
+      ]
+    },
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Resources": {
+    "TopicTable": {
+      "Type": "Custom::AmplifyDynamoDBTable",
+      "Properties": {
+        "ServiceToken": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+        },
+        "tableName": {
+          "Fn::Join": [
+            "",
+            [
+              "Topic-",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "-NONE"
+            ]
+          ]
+        },
+        "attributeDefinitions": [
+          {
+            "attributeName": "id",
+            "attributeType": "S"
+          }
+        ],
+        "keySchema": [
+          {
+            "attributeName": "id",
+            "keyType": "HASH"
+          }
+        ],
+        "provisionedThroughput": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            {
+              "Ref": "AWS::NoValue"
+            },
+            {
+              "ReadCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "WriteCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
+            }
+          ]
+        },
+        "sseSpecification": {
+          "sseEnabled": false
+        },
+        "streamSpecification": {
+          "streamViewType": "NEW_AND_OLD_IMAGES"
+        },
+        "deletionProtectionEnabled": false,
+        "allowDestructiveGraphqlSchemaUpdates": true,
+        "replaceTableUponGsiUpdate": false,
+        "pointInTimeRecoverySpecification": {
+          "Fn::If": [
+            "ShouldUsePointInTimeRecovery",
+            {
+              "PointInTimeRecoveryEnabled": true
+            },
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "billingMode": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            "PAY_PER_REQUEST",
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicTable/Default/Default"
+      }
+    },
+    "TopicIAMRoleD9B4C845": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:BatchGetItem",
+                    "dynamodb:BatchWriteItem",
+                    "dynamodb:PutItem",
+                    "dynamodb:DeleteItem",
+                    "dynamodb:GetItem",
+                    "dynamodb:Scan",
+                    "dynamodb:Query",
+                    "dynamodb:UpdateItem",
+                    "dynamodb:ConditionCheckItem",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:GetRecords",
+                    "dynamodb:GetShardIterator"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Topic-",
+                                {
+                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                },
+                                "-NONE"
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Topic-",
+                                {
+                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                },
+                                "-NONE"
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "DynamoDBAccess"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "TopicIAMRole014e70-",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "-NONE"
+            ]
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicIAMRole/Resource"
+      }
+    },
+    "TopicDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DynamoDBConfig": {
+          "AwsRegion": {
+            "Ref": "AWS::Region"
+          },
+          "TableName": {
+            "Fn::Select": [
+              1,
+              {
+                "Fn::Split": [
+                  "/",
+                  {
+                    "Fn::Select": [
+                      5,
+                      {
+                        "Fn::Split": [
+                          ":",
+                          {
+                            "Fn::GetAtt": [
+                              "TopicTable",
+                              "TableArn"
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        "Name": "TopicTable",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "TopicIAMRoleD9B4C845",
+            "Arn"
+          ]
+        },
+        "Type": "AMAZON_DYNAMODB"
+      },
+      "DependsOn": [
+        "TopicIAMRoleD9B4C845"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicDataSource/Resource"
+      }
+    },
+    "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryGetTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/08f4d557693d96c1a4efba0f9dc91330e4b19772fd5477c156468843e3d9cb5e.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c6a2d29f01c6091bd1d9afe16e5849d456c96f17c3b215938c8067399532719.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "GetTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "getTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "TopicTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryGetTopicResolver"
+      }
+    },
+    "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerylistTopicsauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
+      }
+    },
+    "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerylistTopicspostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
+      }
+    },
+    "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryListTopicsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ListTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "listTopics",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "TopicTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryListTopicsResolver"
+      }
+    },
+    "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateTopicinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a183ddccbd956316c38ef97177b8f088ef0826f62023323f5ae6053d348ccffc.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
+      }
+    },
+    "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d637c1fb7301003b8a5ada269338cf2e8df6cc0dc412ef13acc6158d680b6d3e.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationCreateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ca0a2092670d57f0d8f4bf761892a704a1e6511c2f50757265b4b4ff9b33cdf2.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "CreateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "createTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "TopicTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationCreateTopicResolver"
+      }
+    },
+    "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateTopicinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06db846fd14e6fc371f22b12b5545ba8e2dbfeda85d8c8d586c71c282166657b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
+      }
+    },
+    "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f92efd98b1034df0e2497fe31a97de6975de554b8a22e0677d05d6efcafa59.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationUpdateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/474bf0776ec2164a13191d1a0a9e057154931e4918fea5086f49850d02a5371b.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "UpdateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "updateTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "TopicTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationUpdateTopicResolver"
+      }
+    },
+    "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeleteTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e3416b4d47414f29c21e59a70e83bddb959ef0625854ed7fb0ca376573e99069.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeleteTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationDeleteTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f7907d1209a2c9953a0c053df402c634e359546d70c7cc5c2e8e21ea734880f.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "DeleteTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "deleteTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Fn::Select": [
+                  1,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Fn::Select": [
+                          5,
+                          {
+                            "Fn::Split": [
+                              ":",
+                              {
+                                "Fn::GetAtt": [
+                                  "TopicTable",
+                                  "TableArn"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationDeleteTopicResolver"
+      }
+    },
+    "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreateTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnCreateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononCreateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onCreateTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
+      }
+    },
+    "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononUpdateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononUpdateTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnUpdateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononUpdateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onUpdateTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
+      }
+    },
+    "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononDeleteTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononDeleteTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
+      }
+    },
+    "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnDeleteTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
+      }
+    },
+    "SubscriptiononDeleteTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        },
+        "FieldName": "onDeleteTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Outputs": {
+    "GetAttTopicTableStreamArn": {
+      "Description": "Your DynamoDB table StreamArn.",
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicTable",
+          "TableStreamArn"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "GetAtt:TopicTable:StreamArn"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttTopicTableName": {
+      "Description": "Your DynamoDB table name.",
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "Topic-",
+            {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+            },
+            "-NONE"
+          ]
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              },
+              "GetAtt:TopicTable:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicDataSource",
+          "Name"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicTable",
+          "TableArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicTable",
+          "TableStreamArn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
new file mode 100644
index 00000000000..72751282334
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.11.2","stackType":"auth-Cognito","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
new file mode 100644
index 00000000000..e4c2ee6c9b0
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "OutputValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "OutputValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "OutputValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref",
+    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
+    "OutputValue": "us-east-1_dgn42NPnC"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
new file mode 100644
index 00000000000..d74377c775d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
@@ -0,0 +1,545 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
+  "Resources": {
+    "amplifyAuthauthenticatedUserRoleD8DA3689": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRoleWithWebIdentity",
+              "Condition": {
+                "StringEquals": {
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                },
+                "ForAnyValue:StringLike": {
+                  "cognito-identity.amazonaws.com:amr": "authenticated"
+                }
+              },
+              "Effect": "Allow",
+              "Principal": {
+                "Federated": "cognito-identity.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyAuth"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+      }
+    },
+    "amplifyAuthunauthenticatedUserRole2B524D9E": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRoleWithWebIdentity",
+              "Condition": {
+                "StringEquals": {
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                },
+                "ForAnyValue:StringLike": {
+                  "cognito-identity.amazonaws.com:amr": "unauthenticated"
+                }
+              },
+              "Effect": "Allow",
+              "Principal": {
+                "Federated": "cognito-identity.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyAuth"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
+    "amplifyAuthUserPool4BA7F805": {
+      "Type": "AWS::Cognito::UserPool",
+      "Properties": {
+        "AutoVerifiedAttributes": [
+          "email"
+        ],
+        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationSubject": "Verification",
+        "MfaConfiguration": "OFF",
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": "8",
+            "RequireLowercase": false,
+            "RequireNumbers": false,
+            "RequireSymbols": false,
+            "RequireUppercase": false
+          }
+        },
+        "Schema": [
+          {
+            "Mutable": true,
+            "Name": "email",
+            "Required": true
+          },
+          {
+            "Mutable": true,
+            "Name": "phone_number",
+            "Required": true
+          }
+        ],
+        "SmsAuthenticationMessage": "Your authentication code is {####}",
+        "SmsConfiguration": {
+          "ExternalId": "discus22367c68_role_external_id",
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
+        },
+        "SmsVerificationMessage": "Your verification code is {####}",
+        "UserAttributeUpdateSettings": {
+          "AttributesRequireVerificationBeforeUpdate": [
+            "email"
+          ]
+        },
+        "UserPoolName": {
+          "Fn::Join": [
+            "",
+            [
+              "discussions22367c68_userpool_22367c68",
+              "-",
+              "blade"
+            ]
+          ]
+        },
+        "UsernameAttributes": [
+          "phone_number"
+        ],
+        "UsernameConfiguration": {
+          "CaseSensitive": false
+        }
+      },
+      "DependsOn": []
+    },
+    "amplifyAuthUserPoolAppClient2626C6F8": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discus22367c68_app_clientWeb",
+        "RefreshTokenValidity": "120",
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": "us-east-1_3t0fqaGQN"
+      },
+      "DependsOn": [
+        "amplifyAuthUserPool4BA7F805"
+      ]
+    },
+    "amplifyAuthUserPoolNativeAppClient79534448": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discus22367c68_app_client",
+        "GenerateSecret": "false",
+        "RefreshTokenValidity": "120",
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": "us-east-1_3t0fqaGQN"
+      },
+      "DependsOn": [
+        "amplifyAuthUserPool4BA7F805"
+      ]
+    },
+    "amplifyAuthIdentityPool3FDE84CC": {
+      "Type": "AWS::Cognito::IdentityPool",
+      "Properties": {
+        "AllowUnauthenticatedIdentities": "false",
+        "CognitoIdentityProviders": [
+          {
+            "ClientId": "7oh5id275ip4505msdvhrtv5vq",
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": "us-east-1_3t0fqaGQN"
+                }
+              ]
+            }
+          },
+          {
+            "ClientId": "7t0bpmsnis3540umt8r65jcicc",
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": "us-east-1_3t0fqaGQN"
+                }
+              ]
+            }
+          }
+        ],
+        "IdentityPoolName": {
+          "Fn::Join": [
+            "",
+            [
+              "discussions22367c68_identitypool_22367c68__",
+              "blade"
+            ]
+          ]
+        }
+      }
+    },
+    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
+      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+      "Properties": {
+        "IdentityPoolId": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
+        "Roles": {
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
+        }
+      },
+      "DependsOn": [
+        "amplifyAuthIdentityPool3FDE84CC"
+      ]
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+      "Value": "us-east-1_dgn42NPnC"
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+      "Value": "32gd06g1ofsno77g3aj6a7aenm"
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
new file mode 100644
index 00000000000..e0c9e600428
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.0","stackType":"api-AppSync","metadata":{"dataSources":"dynamodb","authorizationModes":"amazon_cognito_identity_pools,amazon_cognito_user_pools,api_key,aws_iam","customOperations":"queries"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
new file mode 100644
index 00000000000..3bf5957c40b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
@@ -0,0 +1,30 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl",
+    "OutputValue": "https://ugegaqplxndhddmmhzi2j4rj4u.appsync-api.us-east-1.amazonaws.com/graphql"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn",
+    "OutputValue": "arn:aws:s3:::amplify-d1skq8aomhb772-e2-amplifydataamplifycodege-g8qjz8miowur"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey",
+    "OutputValue": "da2-3ikaaaabp5gubimmave6av37ga"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "OutputValue": "2264xbjvizfhfljloltcb4xr3e"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
new file mode 100644
index 00000000000..09183bda5c7
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
@@ -0,0 +1,38 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
+    "ParameterValue": "us-east-1_dgn42NPnC"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
new file mode 100644
index 00000000000..9ac079c4e15
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
@@ -0,0 +1,2255 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"api-AppSync\",\"metadata\":{\"dataSources\":\"dynamodb\",\"authorizationModes\":\"amazon_cognito_identity_pools,amazon_cognito_user_pools,api_key,aws_iam\",\"customOperations\":\"queries\"}}",
+  "Resources": {
+    "amplifyDataGraphQLAPI42A6FA33": {
+      "Type": "AWS::AppSync::GraphQLApi",
+      "Properties": {
+        "AdditionalAuthenticationProviders": [
+          {
+            "AuthenticationType": "AMAZON_COGNITO_USER_POOLS",
+            "UserPoolConfig": {
+              "AwsRegion": {
+                "Ref": "AWS::Region"
+              },
+              "UserPoolId": {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+              }
+            }
+          },
+          {
+            "AuthenticationType": "AWS_IAM"
+          }
+        ],
+        "AuthenticationType": "API_KEY",
+        "Name": "amplifyData",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/Resource"
+      }
+    },
+    "amplifyDataGraphQLAPITransformerSchemaFF50A789": {
+      "Type": "AWS::AppSync::GraphQLSchema",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DefinitionS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9199994c2fc1278c43c8dc8f4f5b81dec0666ee6dbb2bcbc8080f8aa8161eb18.graphql"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/TransformerSchema"
+      }
+    },
+    "amplifyDataGraphQLAPIDefaultApiKey1C8ED374": {
+      "Type": "AWS::AppSync::ApiKey",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "Expires": 1774388952
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/DefaultApiKey"
+      }
+    },
+    "amplifyDataGraphQLAPINONEDS684BF699": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "Name": "NONE_DS",
+        "Type": "NONE"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
+      }
+    },
+    "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPI42A6FA33",
+              "ApiId"
+            ]
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/7f6f71c1468eb8f31ff0be89060d711b4484a0142cbd9129aab40593b23951c2.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManager045FD64D.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "amplifyDataTopicNestedStackTopicNestedStackResource252EB182": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+            "Fn::GetAtt": [
+              "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPI42A6FA33",
+              "ApiId"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPINONEDS684BF699",
+              "Name"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/8cde071152fa4a75f448531303124a6794c4e537fcd354d7af6a33781c570e3e.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicC2CFEE26.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+            "Fn::GetAtt": [
+              "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPI42A6FA33",
+              "ApiId"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPINONEDS684BF699",
+              "Name"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/dd685c6a6b5ff170b54aa73b26ff6f51dba21261affde8ec634951bd2a33314b.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostF0FC9DBC.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+            "Fn::GetAtt": [
+              "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPI42A6FA33",
+              "ApiId"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPINONEDS684BF699",
+              "Name"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/5a08b98fa6bc1baaa4008a64326eadd79628adae379bafe9c662242cac4768e9.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentF8B0B0A5.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "amplifyDataFunctionDirectiveStackNestedStackFunctionDirectiveStackNestedStackResource1246A302": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPI42A6FA33",
+              "ApiId"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPINONEDS684BF699",
+              "Name"
+            ]
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/b3a27056a8fad1527a236b694bd74e13885a6e74ce217d007a6f4db8c31646d8.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataFunctionDirectiveStack46497AEA.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "amplifyDataConnectionStackNestedStackConnectionStackNestedStackResourceAB0F312B": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPI42A6FA33",
+              "ApiId"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+            "Fn::GetAtt": [
+              "amplifyDataGraphQLAPINONEDS684BF699",
+              "Name"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+            "Fn::GetAtt": [
+              "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+            "Fn::GetAtt": [
+              "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+            "Fn::GetAtt": [
+              "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+            "Fn::GetAtt": [
+              "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+            "Fn::GetAtt": [
+              "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+            "Fn::GetAtt": [
+              "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
+            ]
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/4e15e8ab0c7fbbf6de4689a693f67b66b10ff79991eb568bcdf7482185e8a709.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789",
+        "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
+        "amplifyDataTopicNestedStackTopicNestedStackResource252EB182"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataConnectionStackC6E786F3.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "amplifyDataActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunctionA4906098": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPINONEDS684BF699",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityIdDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b99568f372e3dffae86aabe466815f3e987cdb1b01a7b4bba0c044556f46fca1.vtl"
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ActivityidResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "FieldName": "id",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "amplifyDataActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunctionA4906098",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "amplifyDataGraphQLAPI42A6FA33",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityIdResolver"
+      }
+    },
+    "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPINONEDS684BF699",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityUserIdDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b53de7a6facbe87f6af1986109f92af3b546c8741e3201a920e1bbb4402997a4.vtl"
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ActivityuserIdResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "FieldName": "userId",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "amplifyDataGraphQLAPI42A6FA33",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityUserIdResolver"
+      }
+    },
+    "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPINONEDS684BF699",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityActivityTypeDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8564d5899569ca37f23c0c2ab60b42e9624b0374ea9ed0dd34b3836f24a7d6ef.vtl"
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ActivityactivityTypeResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "FieldName": "activityType",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "amplifyDataGraphQLAPI42A6FA33",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityActivityTypeResolver"
+      }
+    },
+    "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPINONEDS684BF699",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityTimestampDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9ef1ff70f2fb1662ee5d5fef0e6ca25043179817bdfc6515940c3bb3124e50fa.vtl"
+        }
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
+      }
+    },
+    "ActivitytimestampResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "ApiId"
+          ]
+        },
+        "FieldName": "timestamp",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "amplifyDataGraphQLAPI42A6FA33",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":sts::",
+              {
+                "Ref": "AWS::AccountId"
+              },
+              ":assumed-role/",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              },
+              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
+              {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityTimestampResolver"
+      }
+    },
+    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD"
+              ],
+              "AllowedOrigins": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "https://",
+                      {
+                        "Ref": "AWS::Region"
+                      },
+                      ".console.aws.amazon.com/amplify"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyData"
+          },
+          {
+            "Key": "aws-cdk:auto-delete-objects",
+            "Value": "true"
+          },
+          {
+            "Key": "aws-cdk:cr-owned:6650decd",
+            "Value": "true"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
+      }
+    },
+    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "s3:PutBucketPolicy",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": {
+                  "Fn::GetAtt": [
+                    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+                    "Arn"
+                  ]
+                }
+              },
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
+      }
+    },
+    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketAutoDeleteObjectsCustomResource437F26F5": {
+      "Type": "Custom::S3AutoDeleteObjects",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+            "Arn"
+          ]
+        },
+        "BucketName": {
+          "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
+        }
+      },
+      "DependsOn": [
+        "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
+      }
+    },
+    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905": {
+      "Type": "AWS::Lambda::LayerVersion",
+      "Properties": {
+        "Content": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip"
+        },
+        "Description": "/opt/awscli/aws"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
+        "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
+        "aws:asset:is-bundled": false,
+        "aws:asset:property": "Content"
+      }
+    },
+    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929": {
+      "Type": "Custom::CDKBucketDeployment",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21",
+            "Arn"
+          ]
+        },
+        "SourceBucketNames": [
+          {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          }
+        ],
+        "SourceObjectKeys": [
+          "37e4ecf3800c81b25de6b1bdb0f9126a435db3b9d3881b1a6de9545ff9e8ee91.zip"
+        ],
+        "SourceMarkers": [
+          {}
+        ],
+        "DestinationBucketName": {
+          "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
+        },
+        "WaitForDistributionInvalidation": true,
+        "Prune": true,
+        "OutputObjectKeys": true,
+        "DestinationBucketArn": {
+          "Fn::GetAtt": [
+            "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
+            "Arn"
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ]
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip"
+        },
+        "Timeout": 900,
+        "MemorySize": 128,
+        "Handler": "index.handler",
+        "Role": {
+          "Fn::GetAtt": [
+            "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Description": {
+          "Fn::Join": [
+            "",
+            [
+              "Lambda function for auto-deleting objects in ",
+              {
+                "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
+              },
+              " S3 bucket."
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
+        "aws:asset:property": "Code"
+      }
+    },
+    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
+      }
+    },
+    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "s3:GetObject*",
+                "s3:GetBucket*",
+                "s3:List*"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:",
+                      {
+                        "Ref": "AWS::Partition"
+                      },
+                      ":s3:::",
+                      {
+                        "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+                      }
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:",
+                      {
+                        "Ref": "AWS::Partition"
+                      },
+                      ":s3:::",
+                      {
+                        "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:GetObject*",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*",
+                "s3:PutObject",
+                "s3:PutObjectLegalHold",
+                "s3:PutObjectRetention",
+                "s3:PutObjectTagging",
+                "s3:PutObjectVersionTagging",
+                "s3:Abort*"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:GetObject*",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*",
+                "s3:PutObject",
+                "s3:PutObjectLegalHold",
+                "s3:PutObjectRetention",
+                "s3:PutObjectTagging",
+                "s3:PutObjectVersionTagging",
+                "s3:Abort*"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "modelIntrospectionSchemaBucketF566B665",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "modelIntrospectionSchemaBucketF566B665",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B",
+        "Roles": [
+          {
+            "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
+      }
+    },
+    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9.zip"
+        },
+        "Environment": {
+          "Variables": {
+            "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
+          }
+        },
+        "Handler": "index.handler",
+        "Layers": [
+          {
+            "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905"
+          }
+        ],
+        "MemorySize": 1536,
+        "Role": {
+          "Fn::GetAtt": [
+            "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2",
+            "Arn"
+          ]
+        },
+        "Runtime": "python3.13",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 900
+      },
+      "DependsOn": [
+        "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B",
+        "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
+        "aws:asset:path": "asset.3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9",
+        "aws:asset:is-bundled": false,
+        "aws:asset:property": "Code"
+      }
+    },
+    "modelIntrospectionSchemaBucketF566B665": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "aws-cdk:auto-delete-objects",
+            "Value": "true"
+          },
+          {
+            "Key": "aws-cdk:cr-owned:b3bc092a",
+            "Value": "true"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Resource"
+      }
+    },
+    "modelIntrospectionSchemaBucketPolicy4DAB0D15": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "modelIntrospectionSchemaBucketF566B665"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "modelIntrospectionSchemaBucketF566B665",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "modelIntrospectionSchemaBucketF566B665",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:PutBucketPolicy",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": {
+                  "Fn::GetAtt": [
+                    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+                    "Arn"
+                  ]
+                }
+              },
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "modelIntrospectionSchemaBucketF566B665",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "modelIntrospectionSchemaBucketF566B665",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Policy/Resource"
+      }
+    },
+    "modelIntrospectionSchemaBucketAutoDeleteObjectsCustomResourceFE57309F": {
+      "Type": "Custom::S3AutoDeleteObjects",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+            "Arn"
+          ]
+        },
+        "BucketName": {
+          "Ref": "modelIntrospectionSchemaBucketF566B665"
+        }
+      },
+      "DependsOn": [
+        "modelIntrospectionSchemaBucketPolicy4DAB0D15"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
+      }
+    },
+    "modelIntrospectionSchemaBucketDeploymentAwsCliLayer13C432F7": {
+      "Type": "AWS::Lambda::LayerVersion",
+      "Properties": {
+        "Content": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip"
+        },
+        "Description": "/opt/awscli/aws"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
+        "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
+        "aws:asset:is-bundled": false,
+        "aws:asset:property": "Content"
+      }
+    },
+    "modelIntrospectionSchemaBucketDeploymentCustomResource1536MiB104B97EC": {
+      "Type": "Custom::CDKBucketDeployment",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21",
+            "Arn"
+          ]
+        },
+        "SourceBucketNames": [
+          {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          }
+        ],
+        "SourceObjectKeys": [
+          "df198b893678487bb17a3e38f72236bb108e7549e60e05070d2dc0c226d763c2.zip"
+        ],
+        "SourceMarkers": [
+          {}
+        ],
+        "DestinationBucketName": {
+          "Ref": "modelIntrospectionSchemaBucketF566B665"
+        },
+        "WaitForDistributionInvalidation": true,
+        "Prune": true,
+        "OutputObjectKeys": true
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
+      }
+    },
+    "AMPLIFYDATAGRAPHQLENDPOINTParameter1C2CBB16": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
+        "Tags": {
+          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:branch-name": "e2etest",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": {
+          "Fn::GetAtt": [
+            "amplifyDataGraphQLAPI42A6FA33",
+            "GraphQLUrl"
+          ]
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
+      }
+    },
+    "AMPLIFYDATAMODELINTROSPECTIONSCHEMABUCKETNAMEParameter47BF4F44": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
+        "Tags": {
+          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:branch-name": "e2etest",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": {
+          "Ref": "modelIntrospectionSchemaBucketF566B665"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
+      }
+    },
+    "AMPLIFYDATAMODELINTROSPECTIONSCHEMAKEYParameterB6AEAE8A": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
+        "Tags": {
+          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:branch-name": "e2etest",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": "modelIntrospectionSchema.json"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
+      }
+    },
+    "AMPLIFYDATADEFAULTNAMEParameterE7C23CC4": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_DEFAULT_NAME",
+        "Tags": {
+          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:branch-name": "e2etest",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": "amplifyData"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSTW/bMAz9Lc1ZUbukl/XmOtgOK7osBnoZioCRGZeJPjxRTmoI/u+DrCxNt1OxE/lI8eFRjzM5u53Lmys48lTV+6mmjYyPyAHrKoDaixWy67xCAUdeR2hb7q2S8auH9uWXLlq6B0ZRbu1Y+fFQtHSBKvWCBlKhaOkb9uLRWVxAgCqTllv7Hn3prArkbOnslprOQwKpkXToA/pB8HwdgRkDyyIFUWOrXW/QBnnfqT2GxbmQXsuYq6PQnCbCnP2ME0OvZCd3k8svSMvyXI4tPrEWXXAL1Bjw+2aHKvBkEP81/XxSs3SaVP+mKeMPKMsDVYCAaemPCft3+HkQGsymBhnLrX2AHv0Tek5GVGQbjcGdfRLn5MK8QRAYGVdOj56O8W3JnA2C2chYBU+2WYIHgwH92P8DhkGMBlcBGrJN6uWbLDsOzpwv83QdY56Fr3USvYYjK02yOHKpadzjHf9fPEvvDlSjT3cyCOtqlDu+Psxu5KfP8vZqx0RT39lABuUqx9+1Jlu8PgMAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataGraphQLAPI42A6FA33",
+          "ApiId"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataGraphQLAPI42A6FA33",
+          "GraphQLUrl"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929",
+          "DestinationBucketArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataGraphQLAPIDefaultApiKey1C8ED374",
+          "ApiKey"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
new file mode 100644
index 00000000000..6cad6da1b61
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.17.0","stackType":"function-Lambda","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
new file mode 100644
index 00000000000..9a397efba6e
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
@@ -0,0 +1,10 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref",
+    "OutputValue": "fetchuseractivity-e2etest"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref",
+    "OutputValue": "recorduseractivity-e2etest"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
new file mode 100644
index 00000000000..528e60938a8
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref",
+    "ParameterValue": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
new file mode 100644
index 00000000000..5f8b55fefd8
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
@@ -0,0 +1,832 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.17.0\",\"stackType\":\"function-Lambda\",\"metadata\":{}}",
+  "Resources": {
+    "fetchuseractivitye2etestlambdaServiceRole5FC09E26": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "fetchuseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/Resource"
+      }
+    },
+    "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "dynamodb:Get*",
+                "dynamodb:BatchGetItem",
+                "dynamodb:List*",
+                "dynamodb:Describe*",
+                "dynamodb:Scan",
+                "dynamodb:Query",
+                "dynamodb:PartiQLSelect"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                      },
+                      "/index/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744",
+        "Roles": [
+          {
+            "Ref": "fetchuseractivitye2etestlambdaServiceRole5FC09E26"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
+      }
+    },
+    "fetchuseractivitye2etestlambdaE00C3C26": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Architectures": [
+          "x86_64"
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "bf8313617a5ef1feb1d15c5f1c48fa145b413fc1ff7c4f8bb6548c4ccfee2ff5.zip"
+        },
+        "Environment": {
+          "Variables": {
+            "ENV": "e2etest",
+            "REGION": "us-east-1",
+            "AMPLIFY_SSM_ENV_CONFIG": "{}",
+            "STORAGE_ACTIVITY_STREAMARN": {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn"
+            },
+            "STORAGE_ACTIVITY_ARN": {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+            },
+            "STORAGE_ACTIVITY_NAME": {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref"
+            }
+          }
+        },
+        "EphemeralStorage": {
+          "Size": 512
+        },
+        "FunctionName": "fetchuseractivity-e2etest",
+        "Handler": "index.handler",
+        "MemorySize": 128,
+        "Role": {
+          "Fn::GetAtt": [
+            "fetchuseractivitye2etestlambdaServiceRole5FC09E26",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "fetchuseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 25
+      },
+      "DependsOn": [
+        "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744",
+        "fetchuseractivitye2etestlambdaServiceRole5FC09E26"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/Resource",
+        "aws:asset:path": "asset.bf8313617a5ef1feb1d15c5f1c48fa145b413fc1ff7c4f8bb6548c4ccfee2ff5",
+        "aws:asset:is-bundled": true,
+        "aws:asset:property": "Code"
+      }
+    },
+    "recorduseractivitye2etestlambdaServiceRoleC563F9C3": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "recorduseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/Resource"
+      }
+    },
+    "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "dynamodb:Put*",
+                "dynamodb:Create*",
+                "dynamodb:BatchWriteItem",
+                "dynamodb:PartiQLInsert",
+                "dynamodb:Get*",
+                "dynamodb:BatchGetItem",
+                "dynamodb:List*",
+                "dynamodb:Describe*",
+                "dynamodb:Scan",
+                "dynamodb:Query",
+                "dynamodb:PartiQLSelect",
+                "dynamodb:Update*",
+                "dynamodb:RestoreTable*",
+                "dynamodb:PartiQLUpdate",
+                "dynamodb:Delete*",
+                "dynamodb:PartiQLDelete"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                      },
+                      "/index/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "dynamodb:ListStreams",
+              "Effect": "Allow",
+              "Resource": "*"
+            },
+            {
+              "Action": [
+                "dynamodb:DescribeStream",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator"
+              ],
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
+              }
+            },
+            {
+              "Action": [
+                "dynamodb:DescribeStream",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator"
+              ],
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
+              }
+            },
+            {
+              "Action": [
+                "dynamodb:DescribeStream",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator"
+              ],
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762",
+        "Roles": [
+          {
+            "Ref": "recorduseractivitye2etestlambdaServiceRoleC563F9C3"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
+      }
+    },
+    "recorduseractivitye2etestlambdaB6DEA24D": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Architectures": [
+          "x86_64"
+        ],
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "d01b5f499fc09d13cdf4f24026ec6fef4895803e5403f632102094b02df2a465.zip"
+        },
+        "Environment": {
+          "Variables": {
+            "ENV": "e2etest",
+            "REGION": "us-east-1",
+            "AMPLIFY_SSM_ENV_CONFIG": "{}",
+            "STORAGE_ACTIVITY_STREAMARN": {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn"
+            },
+            "STORAGE_ACTIVITY_ARN": {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+            },
+            "STORAGE_ACTIVITY_NAME": {
+              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref"
+            }
+          }
+        },
+        "EphemeralStorage": {
+          "Size": 512
+        },
+        "FunctionName": "recorduseractivity-e2etest",
+        "Handler": "index.handler",
+        "MemorySize": 128,
+        "Role": {
+          "Fn::GetAtt": [
+            "recorduseractivitye2etestlambdaServiceRoleC563F9C3",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "recorduseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 25
+      },
+      "DependsOn": [
+        "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762",
+        "recorduseractivitye2etestlambdaServiceRoleC563F9C3"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/Resource",
+        "aws:asset:path": "asset.d01b5f499fc09d13cdf4f24026ec6fef4895803e5403f632102094b02df2a465",
+        "aws:asset:is-bundled": true,
+        "aws:asset:property": "Code"
+      }
+    },
+    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B51DD8CE2": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "Properties": {
+        "BatchSize": 100,
+        "EventSourceArn": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
+        },
+        "FunctionName": {
+          "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
+        },
+        "StartingPosition": "LATEST",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "recorduseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B/Resource"
+      }
+    },
+    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACABBFFC807": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "Properties": {
+        "BatchSize": 100,
+        "EventSourceArn": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
+        },
+        "FunctionName": {
+          "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
+        },
+        "StartingPosition": "LATEST",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "recorduseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACA/Resource"
+      }
+    },
+    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35047BB07E": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "Properties": {
+        "BatchSize": 100,
+        "EventSourceArn": {
+          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
+        },
+        "FunctionName": {
+          "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
+        },
+        "StartingPosition": "LATEST",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "recorduseractivity-e2etest"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOvQ6CQBCEn4X+WBFoLIVopzHwAGQ5FnL83Bn2gBjCu5uDxMbqm5niy4QQxhEEHi7sy6rze1XC+iS2VOUWZSdw4WLtcSgrLLSpqGV47rhPWlpltFA4wJqZnkRa650v0yv5cfVIm+CoQGayDFcHwREkk+zIJsgkDj2saa1/1ttM2uZmGiU98P1WunG+/3XbxK7MLTauCncSWj7NYQDnC8Rey0r546StGgiyg19X55TH9wAAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
+      "Type": "String"
+    },
+    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
+      "Type": "String"
+    }
+  },
+  "Outputs": {
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref": {
+      "Value": {
+        "Ref": "fetchuseractivitye2etestlambdaE00C3C26"
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref": {
+      "Value": {
+        "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
similarity index 55%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
index 220f5abc26b..1e3215c63d9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
@@ -1 +1 @@
-{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.0","stackType":"custom","metadata":{}}
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.1","stackType":"custom","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
new file mode 100644
index 00000000000..6548d697d67
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
@@ -0,0 +1,14 @@
+[
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref",
+    "OutputValue": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
new file mode 100644
index 00000000000..caa18323dc6
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
@@ -0,0 +1,372 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Resources": {
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
+    "activity1E902D9C": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "id",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "userId",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "timestamp",
+            "AttributeType": "S"
+          }
+        ],
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "byUserId",
+            "KeySchema": [
+              {
+                "AttributeName": "userId",
+                "KeyType": "HASH"
+              },
+              {
+                "AttributeName": "timestamp",
+                "KeyType": "RANGE"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "ReadCapacityUnits": 5,
+              "WriteCapacityUnits": 5
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "id",
+            "KeyType": "HASH"
+          },
+          {
+            "AttributeName": "userId",
+            "KeyType": "RANGE"
+          }
+        ],
+        "ProvisionedThroughput": {
+          "ReadCapacityUnits": 5,
+          "WriteCapacityUnits": 5
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_IMAGE"
+        },
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "activity",
+              "-",
+              "blade"
+            ]
+          ]
+        }
+      }
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "activity1E902D9C",
+          "Arn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "activity1E902D9C",
+          "StreamArn"
+        ]
+      }
+    },
+    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": {
+        "Ref": "activity1E902D9C"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
new file mode 100644
index 00000000000..1e3215c63d9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.1","stackType":"custom","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
similarity index 90%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
index d3faf56eb23..5118fac917e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
@@ -1,6 +1,16 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
     "bookmarksA4548304": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
@@ -49,40 +59,17 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/bookmarks/Resource"
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "bookmarks",
+              "-",
+              "blade"
+            ]
+          ]
+        }
       }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
@@ -351,4 +338,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt
new file mode 100644
index 00000000000..afc6ec23957
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.1","stackType":"root","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json
new file mode 100644
index 00000000000..2d9e7a35842
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json
@@ -0,0 +1,126 @@
+[
+  {
+    "OutputKey": "webClientId",
+    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
+  },
+  {
+    "OutputKey": "socialProviders",
+    "OutputValue": ""
+  },
+  {
+    "OutputKey": "usernameAttributes",
+    "OutputValue": "[\"phone_number\"]"
+  },
+  {
+    "OutputKey": "signupAttributes",
+    "OutputValue": "[\"email\",\"phone_number\"]"
+  },
+  {
+    "OutputKey": "oauthClientId",
+    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
+  },
+  {
+    "OutputKey": "allowUnauthenticatedIdentities",
+    "OutputValue": "false"
+  },
+  {
+    "OutputKey": "oauthCognitoDomain",
+    "OutputValue": ""
+  },
+  {
+    "OutputKey": "oauthScope",
+    "OutputValue": "[\"profile\",\"phone\",\"email\",\"openid\",\"aws.cognito.signin.user.admin\"]"
+  },
+  {
+    "OutputKey": "oauthRedirectSignOut",
+    "OutputValue": ""
+  },
+  {
+    "OutputKey": "awsAppsyncAdditionalAuthenticationTypes",
+    "OutputValue": "AMAZON_COGNITO_USER_POOLS,AWS_IAM"
+  },
+  {
+    "OutputKey": "mfaTypes",
+    "OutputValue": "[]"
+  },
+  {
+    "OutputKey": "mfaConfiguration",
+    "OutputValue": "OFF"
+  },
+  {
+    "OutputKey": "oauthResponseType",
+    "OutputValue": "code"
+  },
+  {
+    "OutputKey": "awsAppsyncApiKey",
+    "OutputValue": "da2-3ikaaaabp5gubimmave6av37ga"
+  },
+  {
+    "OutputKey": "awsAppsyncAuthenticationType",
+    "OutputValue": "API_KEY"
+  },
+  {
+    "OutputKey": "oauthRedirectSignIn",
+    "OutputValue": "https://example.com"
+  },
+  {
+    "OutputKey": "passwordPolicyMinLength",
+    "OutputValue": "8"
+  },
+  {
+    "OutputKey": "awsAppsyncApiEndpoint",
+    "OutputValue": "https://ugegaqplxndhddmmhzi2j4rj4u.appsync-api.us-east-1.amazonaws.com/graphql"
+  },
+  {
+    "OutputKey": "awsAppsyncApiId",
+    "OutputValue": "2264xbjvizfhfljloltcb4xr3e"
+  },
+  {
+    "OutputKey": "authRegion",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "amplifyApiModelSchemaS3Uri",
+    "OutputValue": "s3://amplify-d1skq8aomhb772-e2-amplifydataamplifycodege-g8qjz8miowur/model-schema.graphql"
+  },
+  {
+    "OutputKey": "groups",
+    "OutputValue": "[]"
+  },
+  {
+    "OutputKey": "definedFunctions",
+    "OutputValue": "[\"fetchuseractivity-e2etest\",\"recorduseractivity-e2etest\"]"
+  },
+  {
+    "OutputKey": "passwordlessOptions",
+    "OutputValue": ""
+  },
+  {
+    "OutputKey": "awsAppsyncRegion",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "deploymentType",
+    "OutputValue": "branch"
+  },
+  {
+    "OutputKey": "passwordPolicyRequirements",
+    "OutputValue": "[]"
+  },
+  {
+    "OutputKey": "region",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "userPoolId",
+    "OutputValue": "us-east-1_dgn42NPnC"
+  },
+  {
+    "OutputKey": "identityPoolId",
+    "OutputValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "OutputKey": "verificationMechanisms",
+    "OutputValue": "[\"email\"]"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json
new file mode 100644
index 00000000000..86b122cedb0
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json
@@ -0,0 +1,7 @@
+[
+  {
+    "ParameterKey": "BootstrapVersion",
+    "ParameterValue": "/cdk-bootstrap/hnb659fds/version",
+    "ResolvedValue": "29"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json
new file mode 100644
index 00000000000..4d90ccffb00
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json
@@ -0,0 +1,1188 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"root\",\"metadata\":{}}",
+  "Metadata": {
+    "AWS::Amplify::Platform": {
+      "version": "1",
+      "stackOutputs": [
+        "deploymentType",
+        "region"
+      ]
+    },
+    "AWS::Amplify::Auth": {
+      "version": "1",
+      "stackOutputs": [
+        "userPoolId",
+        "webClientId",
+        "identityPoolId",
+        "authRegion",
+        "allowUnauthenticatedIdentities",
+        "signupAttributes",
+        "usernameAttributes",
+        "verificationMechanisms",
+        "passwordPolicyMinLength",
+        "passwordPolicyRequirements",
+        "mfaConfiguration",
+        "mfaTypes",
+        "passwordlessOptions",
+        "socialProviders",
+        "oauthCognitoDomain",
+        "oauthScope",
+        "oauthRedirectSignIn",
+        "oauthRedirectSignOut",
+        "oauthResponseType",
+        "oauthClientId",
+        "groups"
+      ]
+    },
+    "AWS::Amplify::GraphQL": {
+      "version": "1",
+      "stackOutputs": [
+        "awsAppsyncApiId",
+        "awsAppsyncApiEndpoint",
+        "awsAppsyncAuthenticationType",
+        "awsAppsyncRegion",
+        "amplifyApiModelSchemaS3Uri",
+        "awsAppsyncApiKey",
+        "awsAppsyncAdditionalAuthenticationTypes"
+      ]
+    },
+    "AWS::Amplify::Function": {
+      "version": "1",
+      "stackOutputs": [
+        "definedFunctions"
+      ]
+    }
+  },
+  "Outputs": {
+    "deploymentType": {
+      "Value": "branch"
+    },
+    "region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    },
+    "userPoolId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "auth179371D7",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+        ]
+      }
+    },
+    "webClientId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "auth179371D7",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
+        ]
+      }
+    },
+    "identityPoolId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "auth179371D7",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+        ]
+      }
+    },
+    "authRegion": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    },
+    "allowUnauthenticatedIdentities": {
+      "Value": "false"
+    },
+    "signupAttributes": {
+      "Value": "[\"email\",\"phone_number\"]"
+    },
+    "usernameAttributes": {
+      "Value": "[\"phone_number\"]"
+    },
+    "verificationMechanisms": {
+      "Value": "[\"email\"]"
+    },
+    "passwordPolicyMinLength": {
+      "Value": "8"
+    },
+    "passwordPolicyRequirements": {
+      "Value": "[]"
+    },
+    "mfaConfiguration": {
+      "Value": "OFF"
+    },
+    "mfaTypes": {
+      "Value": "[]"
+    },
+    "passwordlessOptions": {
+      "Value": ""
+    },
+    "socialProviders": {
+      "Value": ""
+    },
+    "oauthCognitoDomain": {
+      "Value": ""
+    },
+    "oauthScope": {
+      "Value": "[\"profile\",\"phone\",\"email\",\"openid\",\"aws.cognito.signin.user.admin\"]"
+    },
+    "oauthRedirectSignIn": {
+      "Value": "https://example.com"
+    },
+    "oauthRedirectSignOut": {
+      "Value": ""
+    },
+    "oauthResponseType": {
+      "Value": "code"
+    },
+    "oauthClientId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "auth179371D7",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
+        ]
+      }
+    },
+    "groups": {
+      "Value": "[]"
+    },
+    "awsAppsyncApiId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "data7552DF31",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+        ]
+      }
+    },
+    "awsAppsyncApiEndpoint": {
+      "Value": {
+        "Fn::GetAtt": [
+          "data7552DF31",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl"
+        ]
+      }
+    },
+    "awsAppsyncAuthenticationType": {
+      "Value": "API_KEY"
+    },
+    "awsAppsyncRegion": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    },
+    "amplifyApiModelSchemaS3Uri": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "s3://",
+            {
+              "Fn::Select": [
+                0,
+                {
+                  "Fn::Split": [
+                    "/",
+                    {
+                      "Fn::Select": [
+                        5,
+                        {
+                          "Fn::Split": [
+                            ":",
+                            {
+                              "Fn::GetAtt": [
+                                "data7552DF31",
+                                "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn"
+                              ]
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            "/model-schema.graphql"
+          ]
+        ]
+      }
+    },
+    "awsAppsyncApiKey": {
+      "Value": {
+        "Fn::GetAtt": [
+          "data7552DF31",
+          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey"
+        ]
+      }
+    },
+    "awsAppsyncAdditionalAuthenticationTypes": {
+      "Value": "AMAZON_COGNITO_USER_POOLS,AWS_IAM"
+    },
+    "definedFunctions": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "[\"",
+            {
+              "Fn::GetAtt": [
+                "function1351588B",
+                "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref"
+              ]
+            },
+            "\",\"",
+            {
+              "Fn::GetAtt": [
+                "function1351588B",
+                "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref"
+              ]
+            },
+            "\"]"
+          ]
+        ]
+      }
+    }
+  },
+  "Resources": {
+    "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
+      }
+    },
+    "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "amplify:GetBranch",
+                "amplify:UpdateBranch"
+              ],
+              "Effect": "Allow",
+              "Resource": "arn:aws:amplify:*:*:apps/d1skq8aomhb772/branches/e2etest"
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1",
+        "Roles": [
+          {
+            "Ref": "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
+      }
+    },
+    "AmplifyBranchLinkerCustomResourceLambda582AC093": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "6ea036d9253c8571a595f8e39d788d63c132eafed252fbd584c992dc6663feae.zip"
+        },
+        "Handler": "index.handler",
+        "Role": {
+          "Fn::GetAtt": [
+            "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 10
+      },
+      "DependsOn": [
+        "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1",
+        "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/Resource",
+        "aws:asset:path": "asset.6ea036d9253c8571a595f8e39d788d63c132eafed252fbd584c992dc6663feae",
+        "aws:asset:is-bundled": true,
+        "aws:asset:property": "Code"
+      }
+    },
+    "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ],
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
+      }
+    },
+    "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "lambda:InvokeFunction",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "AmplifyBranchLinkerCustomResourceLambda582AC093",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "AmplifyBranchLinkerCustomResourceLambda582AC093",
+                          "Arn"
+                        ]
+                      },
+                      ":*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "lambda:GetFunction",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::GetAtt": [
+                  "AmplifyBranchLinkerCustomResourceLambda582AC093",
+                  "Arn"
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412",
+        "Roles": [
+          {
+            "Ref": "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
+      }
+    },
+    "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57.zip"
+        },
+        "Description": "AWS CDK resource provider framework - onEvent (amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider)",
+        "Environment": {
+          "Variables": {
+            "USER_ON_EVENT_FUNCTION_ARN": {
+              "Fn::GetAtt": [
+                "AmplifyBranchLinkerCustomResourceLambda582AC093",
+                "Arn"
+              ]
+            }
+          }
+        },
+        "Handler": "framework.onEvent",
+        "LoggingConfig": {
+          "ApplicationLogLevel": "FATAL",
+          "LogFormat": "JSON"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "Timeout": 900
+      },
+      "DependsOn": [
+        "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412",
+        "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
+        "aws:asset:path": "asset.07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57",
+        "aws:asset:is-bundled": false,
+        "aws:asset:property": "Code"
+      }
+    },
+    "AmplifyBranchLinkerCustomResource96E36FC1": {
+      "Type": "Custom::AmplifyBranchLinkerResource",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900",
+            "Arn"
+          ]
+        },
+        "appId": "d1skq8aomhb772",
+        "branchName": "e2etest"
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResource/Default"
+      }
+    },
+    "auth179371D7": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/4ade840b69d9728e3d12f22d1a01ab0323f486713a3015d1451d6f631487ca31.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth.NestedStack/auth.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authCD10F0D5.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "data7552DF31": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+            "Fn::GetAtt": [
+              "auth179371D7",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Fn::GetAtt": [
+              "auth179371D7",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Fn::GetAtt": [
+              "auth179371D7",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Fn::GetAtt": [
+              "auth179371D7",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+            ]
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/c4383513aa103986e3602ad7edcd2a810c5c8963857210f974eec9aec932ddb0.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data.NestedStack/data.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataD836B8FC.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "function1351588B": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+            "Fn::GetAtt": [
+              "storageactivityA346F297",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+            "Fn::GetAtt": [
+              "storageactivityA346F297",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+            "Fn::GetAtt": [
+              "storageactivityA346F297",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
+            "Fn::GetAtt": [
+              "data7552DF31",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
+            "Fn::GetAtt": [
+              "data7552DF31",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
+            ]
+          },
+          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
+            "Fn::GetAtt": [
+              "data7552DF31",
+              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
+            ]
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/998f4e16ca757850ea9693dda3b958dd39b0c197b47526137726706f8e346431.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function.NestedStack/function.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92function1DEFB26B.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "storageactivityA346F297": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/3b8f4ab2ff24cca9f51b69dc51e83199b76a68e4c5f60eb81bfe0e175192b182.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity.NestedStack/storageactivity.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityCC1C5F88.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "storagebookmarks210DAF62": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "d1skq8aomhb772"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "e2etest"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/0d947563b18f50accc548da0a038516a37798609704a114b1b1abcbce6932675.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
+        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storagebookmarksDA286ADD.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02PzU7DQAyEn6V3x5SkF440Ekeo0geI3I1bOT+7aO1thaK8O8oGEKdvrNGMPCWWhwr3O3po4bqhGOWC89nIDVBf/Ueyz2RAD23nkaZLR60PHfeK7xlvyTuT4EFowrkJI6+pzFMYxX2t56YW0KolVTbF1xWgFR6TG9iOpAxbPc711f+1/oplgRw5G93E38AltTC1kTWk6FjxFMNdOo5QZ6f5MfIz/3TetcA6AXt9upd7fH7Bw65XkSImbzIxNhu/AWzDJeQZAQAA"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Type": "AWS::SSM::Parameter::Value<String>",
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+    }
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5"
+                  ],
+                  {
+                    "Ref": "BootstrapVersion"
+                  }
+                ]
+              }
+            ]
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storageactivityEF3255CD-QQN18S0SITDH.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json
deleted file mode 100644
index fe51488c706..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.outputs.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
deleted file mode 100644
index fe51488c706..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storagebookmarks210DAF62-VUSO8KNEET17.parameters.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
index 0653c815185..aa07d690ed6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
@@ -692,19 +692,19 @@
         "Parameters": {
           "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
             "Fn::GetAtt": [
-              "storageactivityEF3255CD",
+              "storage0EC3F24A",
               "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
             ]
           },
           "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
             "Fn::GetAtt": [
-              "storageactivityEF3255CD",
+              "storage0EC3F24A",
               "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn"
             ]
           },
           "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
             "Fn::GetAtt": [
-              "storageactivityEF3255CD",
+              "storage0EC3F24A",
               "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef"
             ]
           },
@@ -774,7 +774,7 @@
         "aws:asset:property": "TemplateURL"
       }
     },
-    "storageactivityEF3255CD": {
+    "storage0EC3F24A": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Tags": [
@@ -824,56 +824,6 @@
         "aws:asset:property": "TemplateURL"
       }
     },
-    "storagebookmarks210DAF62": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/bb3ec2369678c897d14fcba7ccfffd1b1e19ec841f3277a078f65e8981c75abe.json"
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44storagebookmarks4D210E3A.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
index 4f6a85b2847..e69de29bb2d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
index 4b5c89a736f..e7c5f6cfaa1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
@@ -1,34 +1,34 @@
 [
   {
-    "OutputKey": "PartitionKeyName",
-    "OutputValue": "userId"
+    "OutputKey": "Name",
+    "OutputValue": "bookmarks-blade"
   },
   {
-    "OutputKey": "SortKeyName",
-    "OutputValue": "postId"
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
   },
   {
-    "OutputKey": "SortKeyType",
-    "OutputValue": "S"
+    "OutputKey": "StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
   },
   {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1"
+    "OutputKey": "PartitionKeyName",
+    "OutputValue": "userId"
   },
   {
-    "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
+    "OutputKey": "PartitionKeyType",
+    "OutputValue": "S"
   },
   {
-    "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-07T17:11:10.591"
+    "OutputKey": "SortKeyName",
+    "OutputValue": "postId"
   },
   {
-    "OutputKey": "PartitionKeyType",
+    "OutputKey": "SortKeyType",
     "OutputValue": "S"
   },
   {
-    "OutputKey": "Name",
-    "OutputValue": "bookmarks-main"
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
   }
-]
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
index 951a2ac0cf4..7fe1ed68a50 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
@@ -1,12 +1,16 @@
 [
   {
-    "ParameterKey": "partitionKeyType",
-    "ParameterValue": "S"
+    "ParameterKey": "tableName",
+    "ParameterValue": "bookmarks"
   },
   {
     "ParameterKey": "partitionKeyName",
     "ParameterValue": "userId"
   },
+  {
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
+  },
   {
     "ParameterKey": "env",
     "ParameterValue": "main"
@@ -18,9 +22,5 @@
   {
     "ParameterKey": "sortKeyType",
     "ParameterValue": "S"
-  },
-  {
-    "ParameterKey": "tableName",
-    "ParameterValue": "bookmarks"
   }
-]
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
index 976119728ee..a3e4723d6a1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "DDB Resource for AWS Amplify CLI",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -153,4 +153,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
index 52a7b73f7af..240159af730 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
@@ -356,20 +356,6 @@
         }
       }
     },
-    "storagebookmarks": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "bookmarks",
-          "partitionKeyName": "userId",
-          "partitionKeyType": "S",
-          "sortKeyName": "postId",
-          "sortKeyType": "S",
-          "env": "main"
-        }
-      }
-    },
     "UpdateRolesWithIDPFunction": {
       "DependsOn": [
         "AuthRole",
@@ -572,6 +558,20 @@
           }
         ]
       }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "main"
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt
new file mode 100644
index 00000000000..87d574fa42f
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt
@@ -0,0 +1 @@
+An auto-generated nested stack for the @function directive.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json
new file mode 100644
index 00000000000..0f773c546a1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json
@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
+    "ParameterValue": "blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json
new file mode 100644
index 00000000000..2893dd20e86
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json
@@ -0,0 +1,281 @@
+{
+  "Description": "An auto-generated nested stack for the @function directive.",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    }
+  },
+  "Resources": {
+    "FetchuseractivityLambdaDataSourceServiceRole6102CA71": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      }
+    },
+    "FetchuseractivityLambdaDataSourceServiceRoleDefaultPolicy91915AF7": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "lambda:InvokeFunction",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::If": [
+                    "HasEnvironmentParameter",
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-${env}",
+                        {
+                          "env": {
+                            "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity"
+                    }
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::If": [
+                          "HasEnvironmentParameter",
+                          {
+                            "Fn::Sub": [
+                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-${env}",
+                              {
+                                "env": {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity"
+                          }
+                        ]
+                      },
+                      ":*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "FetchuseractivityLambdaDataSourceServiceRoleDefaultPolicy91915AF7",
+        "Roles": [
+          {
+            "Ref": "FetchuseractivityLambdaDataSourceServiceRole6102CA71"
+          }
+        ]
+      }
+    },
+    "FetchuseractivityLambdaDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "LambdaConfig": {
+          "LambdaFunctionArn": {
+            "Fn::If": [
+              "HasEnvironmentParameter",
+              {
+                "Fn::Sub": [
+                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-${env}",
+                  {
+                    "env": {
+                      "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                    }
+                  }
+                ]
+              },
+              {
+                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity"
+              }
+            ]
+          }
+        },
+        "Name": "FetchuseractivityLambdaDataSource",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "FetchuseractivityLambdaDataSourceServiceRole6102CA71",
+            "Arn"
+          ]
+        },
+        "Type": "AWS_LAMBDA"
+      }
+    },
+    "InvokeFetchuseractivityLambdaDataSourceInvokeFetchuseractivityLambdaDataSourceAppSyncFunction05F09D4C": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "FetchuseractivityLambdaDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "InvokeFetchuseractivityLambdaDataSource",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/InvokeFetchuseractivityLambdaDataSource.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/InvokeFetchuseractivityLambdaDataSource.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "FetchuseractivityLambdaDataSource"
+      ]
+    },
+    "QueryfetchUserActivityResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "fetchUserActivity",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "InvokeFetchuseractivityLambdaDataSourceInvokeFetchuseractivityLambdaDataSourceAppSyncFunction05F09D4C",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": "## [Start] Stash resolver specific context.. **\n$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"fetchUserActivity\"))\n{}\n## [End] Stash resolver specific context.. **",
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.fetchUserActivity.res.vtl"
+            ]
+          ]
+        },
+        "TypeName": "Query"
+      }
+    },
+    "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryFetchUserActivityAuthFN",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.fetchUserActivity.auth.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    }
+  },
+  "Parameters": {
+    "referencetotransformerrootstackenv10C5A902Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+      "Type": "String"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json
new file mode 100644
index 00000000000..35cad8456e3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json
@@ -0,0 +1,28 @@
+[
+  {
+    "OutputKey": "GetAttCommentDataSourceName",
+    "OutputValue": "CommentTable",
+    "Description": "Your model DataSource name.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:CommentDataSource:Name"
+  },
+  {
+    "OutputKey": "GetAttCommentTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-37vodjk43jhz3mwuryjmdktahy-blade/stream/2026-03-17T15:14:05.236",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:CommentTable:StreamArn"
+  },
+  {
+    "OutputKey": "transformerrootstackCommentCommentDataSourceA0E54655Name",
+    "OutputValue": "CommentTable"
+  },
+  {
+    "OutputKey": "transformerrootstackCommentCommentTable5427FDE2Ref",
+    "OutputValue": "Comment-37vodjk43jhz3mwuryjmdktahy-blade"
+  },
+  {
+    "OutputKey": "GetAttCommentTableName",
+    "OutputValue": "Comment-37vodjk43jhz3mwuryjmdktahy-blade",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:CommentTable:Name"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json
new file mode 100644
index 00000000000..9c2ce20460a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json
@@ -0,0 +1,66 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
+    "ParameterValue": "el5tw63g3fdc3gbbstjp4r4j6y"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
+    "ParameterValue": "wdzyxfso6neadaza2qtk2mghhm"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
+    "ParameterValue": "2k4q3mg4hfbqbglueul424f74i"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
+    "ParameterValue": "3z32nwy4qfcivlkko7asumm3y4"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
+    "ParameterValue": "eoihadwr4rglppq5wsdbosfby4"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
+    "ParameterValue": "65l3h37jc5bi7ppqoq2ytmewqa"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
+    "ParameterValue": "gkrbngcxbnftvheqhs6zedhfm4"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
+    "ParameterValue": "blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json
new file mode 100644
index 00000000000..d04c4c40216
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json
@@ -0,0 +1,1195 @@
+{
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetotransformerrootstackenv10C5A902Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "ShouldUseServerSideEncryption": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnableServerSideEncryption"
+        },
+        "true"
+      ]
+    },
+    "ShouldUsePayPerRequestBilling": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBBillingMode"
+        },
+        "PAY_PER_REQUEST"
+      ]
+    },
+    "ShouldUsePointInTimeRecovery": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnablePointInTimeRecovery"
+        },
+        "true"
+      ]
+    }
+  },
+  "Resources": {
+    "CommentTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "id",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "postCommentsId",
+            "AttributeType": "S"
+          }
+        ],
+        "BillingMode": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            "PAY_PER_REQUEST",
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "gsi-Post.comments",
+            "KeySchema": [
+              {
+                "AttributeName": "postCommentsId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "Fn::If": [
+                "ShouldUsePayPerRequestBilling",
+                {
+                  "Ref": "AWS::NoValue"
+                },
+                {
+                  "ReadCapacityUnits": {
+                    "Ref": "DynamoDBModelTableReadIOPS"
+                  },
+                  "WriteCapacityUnits": {
+                    "Ref": "DynamoDBModelTableWriteIOPS"
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "id",
+            "KeyType": "HASH"
+          }
+        ],
+        "PointInTimeRecoverySpecification": {
+          "Fn::If": [
+            "ShouldUsePointInTimeRecovery",
+            {
+              "PointInTimeRecoveryEnabled": true
+            },
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "ProvisionedThroughput": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            {
+              "Ref": "AWS::NoValue"
+            },
+            {
+              "ReadCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "WriteCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
+            }
+          ]
+        },
+        "SSESpecification": {
+          "SSEEnabled": {
+            "Fn::If": [
+              "ShouldUseServerSideEncryption",
+              true,
+              false
+            ]
+          }
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_AND_OLD_IMAGES"
+        },
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "Comment-",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "-",
+              {
+                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+              }
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
+    },
+    "CommentIAMRoleD5EC5F51": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:BatchGetItem",
+                    "dynamodb:BatchWriteItem",
+                    "dynamodb:PutItem",
+                    "dynamodb:DeleteItem",
+                    "dynamodb:GetItem",
+                    "dynamodb:Scan",
+                    "dynamodb:Query",
+                    "dynamodb:UpdateItem",
+                    "dynamodb:ConditionCheckItem",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:GetRecords",
+                    "dynamodb:GetShardIterator"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Comment-",
+                                {
+                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+                                },
+                                "-",
+                                {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Comment-",
+                                {
+                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+                                },
+                                "-",
+                                {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "DynamoDBAccess"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "CommentIAMRole20388d-",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "-",
+              {
+                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+              }
+            ]
+          ]
+        }
+      }
+    },
+    "CommentIAMRoleDefaultPolicyA8D6F6B5": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "dynamodb:BatchGetItem",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator",
+                "dynamodb:Query",
+                "dynamodb:GetItem",
+                "dynamodb:Scan",
+                "dynamodb:ConditionCheckItem",
+                "dynamodb:BatchWriteItem",
+                "dynamodb:PutItem",
+                "dynamodb:UpdateItem",
+                "dynamodb:DeleteItem",
+                "dynamodb:DescribeTable"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "CommentTable",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "CommentTable",
+                          "Arn"
+                        ]
+                      },
+                      "/index/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "CommentIAMRoleDefaultPolicyA8D6F6B5",
+        "Roles": [
+          {
+            "Ref": "CommentIAMRoleD5EC5F51"
+          }
+        ]
+      }
+    },
+    "CommentDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DynamoDBConfig": {
+          "AwsRegion": {
+            "Ref": "AWS::Region"
+          },
+          "TableName": {
+            "Ref": "CommentTable"
+          }
+        },
+        "Name": "CommentTable",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "CommentIAMRoleD5EC5F51",
+            "Arn"
+          ]
+        },
+        "Type": "AMAZON_DYNAMODB"
+      },
+      "DependsOn": [
+        "CommentIAMRoleD5EC5F51"
+      ]
+    },
+    "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryGetCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getComment.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getComment.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "GetCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "getComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "CommentTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      }
+    },
+    "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryListCommentsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.listComments.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.listComments.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "ListCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "listComments",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "CommentTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      }
+    },
+    "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationCreateCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createComment.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createComment.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "CreateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "createComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "CommentTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateComment.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateComment.auth.1.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationUpdateCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateComment.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateComment.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "UpdateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "updateComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30",
+                "FunctionId"
+              ]
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "CommentTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeleteCommentauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteComment.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteComment.auth.1.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "CommentDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationDeleteCommentDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteComment.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteComment.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CommentDataSource"
+      ]
+    },
+    "DeleteCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "deleteComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A",
+                "FunctionId"
+              ]
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "CommentTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "SubscriptiononCreateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onCreateComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    },
+    "SubscriptiononUpdateCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onUpdateComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    },
+    "SubscriptiononDeleteCommentResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onDeleteComment",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    }
+  },
+  "Outputs": {
+    "GetAttCommentTableStreamArn": {
+      "Description": "Your DynamoDB table StreamArn.",
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentTable",
+          "StreamArn"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:CommentTable:StreamArn"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttCommentTableName": {
+      "Description": "Your DynamoDB table name.",
+      "Value": {
+        "Ref": "CommentTable"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:CommentTable:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttCommentDataSourceName": {
+      "Description": "Your model DataSource name.",
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentDataSource",
+          "Name"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:CommentDataSource:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "transformerrootstackCommentCommentDataSourceA0E54655Name": {
+      "Value": {
+        "Fn::GetAtt": [
+          "CommentDataSource",
+          "Name"
+        ]
+      }
+    },
+    "transformerrootstackCommentCommentTable5427FDE2Ref": {
+      "Value": {
+        "Ref": "CommentTable"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json
new file mode 100644
index 00000000000..2d1a6332797
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json
@@ -0,0 +1,42 @@
+[
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref",
+    "ParameterValue": "Topic-37vodjk43jhz3mwuryjmdktahy-blade"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef",
+    "ParameterValue": "Post-37vodjk43jhz3mwuryjmdktahy-blade"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref",
+    "ParameterValue": "Comment-37vodjk43jhz3mwuryjmdktahy-blade"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name",
+    "ParameterValue": "CommentTable"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name",
+    "ParameterValue": "PostTable"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName",
+    "ParameterValue": "TopicTable"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json
new file mode 100644
index 00000000000..952951a26a1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json
@@ -0,0 +1,422 @@
+{
+  "Resources": {
+    "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "Topicpostsauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Topic.posts.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "TopicPostsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Topic.posts.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Topic.posts.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
+    "TopicpostsResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "posts",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Topic"
+      }
+    },
+    "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "PostCommentsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Post.comments.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Post.comments.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
+    "PostcommentsResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "comments",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Post"
+      }
+    },
+    "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "PostTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Post.topic.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Post.topic.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
+    "PosttopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "topic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Post"
+      }
+    },
+    "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "CommentPostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Comment.post.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Comment.post.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
+    "CommentpostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "post",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Comment"
+      }
+    }
+  },
+  "Parameters": {
+    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
+      "Type": "String"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt
new file mode 100644
index 00000000000..293dec5639e
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt
@@ -0,0 +1 @@
+An auto-generated nested stack.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json
new file mode 100644
index 00000000000..5e9753d822a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json
@@ -0,0 +1,7 @@
+[
+  {
+    "OutputKey": "EmptyOutput",
+    "OutputValue": "",
+    "Description": "An empty output. You may delete this if you have at least one resource above."
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json
new file mode 100644
index 00000000000..23a129d21fe
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json
@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "S3DeploymentBucket",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "AppSyncApiId",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "S3DeploymentRootKey",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "AppSyncApiName",
+    "ParameterValue": "discussions"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json
new file mode 100644
index 00000000000..016991278d0
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json
@@ -0,0 +1,61 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "An auto-generated nested stack.",
+  "Metadata": {},
+  "Parameters": {
+    "AppSyncApiId": {
+      "Type": "String",
+      "Description": "The id of the AppSync API associated with this project."
+    },
+    "AppSyncApiName": {
+      "Type": "String",
+      "Description": "The name of the AppSync API",
+      "Default": "AppSyncSimpleTransform"
+    },
+    "env": {
+      "Type": "String",
+      "Description": "The environment name. e.g. Dev, Test, or Production",
+      "Default": "NONE"
+    },
+    "S3DeploymentBucket": {
+      "Type": "String",
+      "Description": "The S3 bucket containing all deployment assets for the project."
+    },
+    "S3DeploymentRootKey": {
+      "Type": "String",
+      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root\nof the deployment directory."
+    }
+  },
+  "Resources": {
+    "EmptyResource": {
+      "Type": "Custom::EmptyResource",
+      "Condition": "AlwaysFalse"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "env"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "AlwaysFalse": {
+      "Fn::Equals": [
+        "true",
+        "false"
+      ]
+    }
+  },
+  "Outputs": {
+    "EmptyOutput": {
+      "Description": "An empty output. You may delete this if you have at least one resource above.",
+      "Value": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json
new file mode 100644
index 00000000000..d20b6754c9a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json
@@ -0,0 +1,28 @@
+[
+  {
+    "OutputKey": "GetAttPostDataSourceName",
+    "OutputValue": "PostTable",
+    "Description": "Your model DataSource name.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:PostDataSource:Name"
+  },
+  {
+    "OutputKey": "GetAttPostTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-37vodjk43jhz3mwuryjmdktahy-blade/stream/2026-03-17T15:14:05.173",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:PostTable:StreamArn"
+  },
+  {
+    "OutputKey": "transformerrootstackPostPostDataSource6998E105Name",
+    "OutputValue": "PostTable"
+  },
+  {
+    "OutputKey": "GetAttPostTableName",
+    "OutputValue": "Post-37vodjk43jhz3mwuryjmdktahy-blade",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:PostTable:Name"
+  },
+  {
+    "OutputKey": "transformerrootstackPostPostTable34CAE87BRef",
+    "OutputValue": "Post-37vodjk43jhz3mwuryjmdktahy-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json
new file mode 100644
index 00000000000..9c2ce20460a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json
@@ -0,0 +1,66 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
+    "ParameterValue": "el5tw63g3fdc3gbbstjp4r4j6y"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
+    "ParameterValue": "wdzyxfso6neadaza2qtk2mghhm"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
+    "ParameterValue": "2k4q3mg4hfbqbglueul424f74i"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
+    "ParameterValue": "3z32nwy4qfcivlkko7asumm3y4"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
+    "ParameterValue": "eoihadwr4rglppq5wsdbosfby4"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
+    "ParameterValue": "65l3h37jc5bi7ppqoq2ytmewqa"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
+    "ParameterValue": "gkrbngcxbnftvheqhs6zedhfm4"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
+    "ParameterValue": "blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json
new file mode 100644
index 00000000000..bf1876efe04
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json
@@ -0,0 +1,1195 @@
+{
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetotransformerrootstackenv10C5A902Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "ShouldUseServerSideEncryption": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnableServerSideEncryption"
+        },
+        "true"
+      ]
+    },
+    "ShouldUsePayPerRequestBilling": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBBillingMode"
+        },
+        "PAY_PER_REQUEST"
+      ]
+    },
+    "ShouldUsePointInTimeRecovery": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnablePointInTimeRecovery"
+        },
+        "true"
+      ]
+    }
+  },
+  "Resources": {
+    "PostTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "id",
+            "AttributeType": "S"
+          },
+          {
+            "AttributeName": "topicPostsId",
+            "AttributeType": "S"
+          }
+        ],
+        "BillingMode": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            "PAY_PER_REQUEST",
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "GlobalSecondaryIndexes": [
+          {
+            "IndexName": "gsi-Topic.posts",
+            "KeySchema": [
+              {
+                "AttributeName": "topicPostsId",
+                "KeyType": "HASH"
+              }
+            ],
+            "Projection": {
+              "ProjectionType": "ALL"
+            },
+            "ProvisionedThroughput": {
+              "Fn::If": [
+                "ShouldUsePayPerRequestBilling",
+                {
+                  "Ref": "AWS::NoValue"
+                },
+                {
+                  "ReadCapacityUnits": {
+                    "Ref": "DynamoDBModelTableReadIOPS"
+                  },
+                  "WriteCapacityUnits": {
+                    "Ref": "DynamoDBModelTableWriteIOPS"
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "KeySchema": [
+          {
+            "AttributeName": "id",
+            "KeyType": "HASH"
+          }
+        ],
+        "PointInTimeRecoverySpecification": {
+          "Fn::If": [
+            "ShouldUsePointInTimeRecovery",
+            {
+              "PointInTimeRecoveryEnabled": true
+            },
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "ProvisionedThroughput": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            {
+              "Ref": "AWS::NoValue"
+            },
+            {
+              "ReadCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "WriteCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
+            }
+          ]
+        },
+        "SSESpecification": {
+          "SSEEnabled": {
+            "Fn::If": [
+              "ShouldUseServerSideEncryption",
+              true,
+              false
+            ]
+          }
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_AND_OLD_IMAGES"
+        },
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "Post-",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "-",
+              {
+                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+              }
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
+    },
+    "PostIAMRole83BF708F": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:BatchGetItem",
+                    "dynamodb:BatchWriteItem",
+                    "dynamodb:PutItem",
+                    "dynamodb:DeleteItem",
+                    "dynamodb:GetItem",
+                    "dynamodb:Scan",
+                    "dynamodb:Query",
+                    "dynamodb:UpdateItem",
+                    "dynamodb:ConditionCheckItem",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:GetRecords",
+                    "dynamodb:GetShardIterator"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Post-",
+                                {
+                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+                                },
+                                "-",
+                                {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Post-",
+                                {
+                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+                                },
+                                "-",
+                                {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "DynamoDBAccess"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "PostIAMRolebbce9b-",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "-",
+              {
+                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+              }
+            ]
+          ]
+        }
+      }
+    },
+    "PostIAMRoleDefaultPolicy04190CA0": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "dynamodb:BatchGetItem",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator",
+                "dynamodb:Query",
+                "dynamodb:GetItem",
+                "dynamodb:Scan",
+                "dynamodb:ConditionCheckItem",
+                "dynamodb:BatchWriteItem",
+                "dynamodb:PutItem",
+                "dynamodb:UpdateItem",
+                "dynamodb:DeleteItem",
+                "dynamodb:DescribeTable"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "PostTable",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "PostTable",
+                          "Arn"
+                        ]
+                      },
+                      "/index/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "PostIAMRoleDefaultPolicy04190CA0",
+        "Roles": [
+          {
+            "Ref": "PostIAMRole83BF708F"
+          }
+        ]
+      }
+    },
+    "PostDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DynamoDBConfig": {
+          "AwsRegion": {
+            "Ref": "AWS::Region"
+          },
+          "TableName": {
+            "Ref": "PostTable"
+          }
+        },
+        "Name": "PostTable",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "PostIAMRole83BF708F",
+            "Arn"
+          ]
+        },
+        "Type": "AMAZON_DYNAMODB"
+      },
+      "DependsOn": [
+        "PostIAMRole83BF708F"
+      ]
+    },
+    "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryGetPostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getPost.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getPost.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "GetPostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "getPost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "PostTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      }
+    },
+    "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryListPostsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.listPosts.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.listPosts.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "ListPostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "listPosts",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "PostTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      }
+    },
+    "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationCreatePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createPost.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createPost.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "CreatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "createPost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "PostTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdatePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updatePost.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updatePost.auth.1.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationUpdatePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updatePost.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updatePost.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "UpdatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "updatePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835",
+                "FunctionId"
+              ]
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "PostTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeletePostauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deletePost.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deletePost.auth.1.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "PostDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationDeletePostDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deletePost.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deletePost.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "PostDataSource"
+      ]
+    },
+    "DeletePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "deletePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7",
+                "FunctionId"
+              ]
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "PostTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "SubscriptiononCreatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onCreatePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    },
+    "SubscriptiononUpdatePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onUpdatePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    },
+    "SubscriptiononDeletePostResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onDeletePost",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            },
+            {
+              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    }
+  },
+  "Outputs": {
+    "GetAttPostTableStreamArn": {
+      "Description": "Your DynamoDB table StreamArn.",
+      "Value": {
+        "Fn::GetAtt": [
+          "PostTable",
+          "StreamArn"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:PostTable:StreamArn"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttPostTableName": {
+      "Description": "Your DynamoDB table name.",
+      "Value": {
+        "Ref": "PostTable"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:PostTable:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttPostDataSourceName": {
+      "Description": "Your model DataSource name.",
+      "Value": {
+        "Fn::GetAtt": [
+          "PostDataSource",
+          "Name"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:PostDataSource:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "transformerrootstackPostPostDataSource6998E105Name": {
+      "Value": {
+        "Fn::GetAtt": [
+          "PostDataSource",
+          "Name"
+        ]
+      }
+    },
+    "transformerrootstackPostPostTable34CAE87BRef": {
+      "Value": {
+        "Ref": "PostTable"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json
new file mode 100644
index 00000000000..862ce371ccf
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json
@@ -0,0 +1,56 @@
+[
+  {
+    "OutputKey": "GetAttTopicTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-37vodjk43jhz3mwuryjmdktahy-blade/stream/2026-03-17T15:13:17.105",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:TopicTable:StreamArn"
+  },
+  {
+    "OutputKey": "GetAttTopicTableName",
+    "OutputValue": "Topic-37vodjk43jhz3mwuryjmdktahy-blade",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:TopicTable:Name"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
+    "OutputValue": "65l3h37jc5bi7ppqoq2ytmewqa"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
+    "OutputValue": "gkrbngcxbnftvheqhs6zedhfm4"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
+    "OutputValue": "3z32nwy4qfcivlkko7asumm3y4"
+  },
+  {
+    "OutputKey": "GetAttTopicDataSourceName",
+    "OutputValue": "TopicTable",
+    "Description": "Your model DataSource name.",
+    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:TopicDataSource:Name"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicTopicTableFD91FB92Ref",
+    "OutputValue": "Topic-37vodjk43jhz3mwuryjmdktahy-blade"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicTopicDataSource63D2F34BName",
+    "OutputValue": "TopicTable"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
+    "OutputValue": "eoihadwr4rglppq5wsdbosfby4"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
+    "OutputValue": "el5tw63g3fdc3gbbstjp4r4j6y"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
+    "OutputValue": "2k4q3mg4hfbqbglueul424f74i"
+  },
+  {
+    "OutputKey": "transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
+    "OutputValue": "wdzyxfso6neadaza2qtk2mghhm"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json
new file mode 100644
index 00000000000..613fc953f7d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json
@@ -0,0 +1,42 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
+    "ParameterValue": "blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json
new file mode 100644
index 00000000000..df7d4fdb8a9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json
@@ -0,0 +1,1470 @@
+{
+  "Parameters": {
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "referencetotransformerrootstackenv10C5A902Ref": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+      "Type": "String"
+    },
+    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "ShouldUseServerSideEncryption": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnableServerSideEncryption"
+        },
+        "true"
+      ]
+    },
+    "ShouldUsePayPerRequestBilling": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBBillingMode"
+        },
+        "PAY_PER_REQUEST"
+      ]
+    },
+    "ShouldUsePointInTimeRecovery": {
+      "Fn::Equals": [
+        {
+          "Ref": "DynamoDBEnablePointInTimeRecovery"
+        },
+        "true"
+      ]
+    }
+  },
+  "Resources": {
+    "TopicTable": {
+      "Type": "AWS::DynamoDB::Table",
+      "Properties": {
+        "AttributeDefinitions": [
+          {
+            "AttributeName": "id",
+            "AttributeType": "S"
+          }
+        ],
+        "BillingMode": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            "PAY_PER_REQUEST",
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "KeySchema": [
+          {
+            "AttributeName": "id",
+            "KeyType": "HASH"
+          }
+        ],
+        "PointInTimeRecoverySpecification": {
+          "Fn::If": [
+            "ShouldUsePointInTimeRecovery",
+            {
+              "PointInTimeRecoveryEnabled": true
+            },
+            {
+              "Ref": "AWS::NoValue"
+            }
+          ]
+        },
+        "ProvisionedThroughput": {
+          "Fn::If": [
+            "ShouldUsePayPerRequestBilling",
+            {
+              "Ref": "AWS::NoValue"
+            },
+            {
+              "ReadCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "WriteCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
+            }
+          ]
+        },
+        "SSESpecification": {
+          "SSEEnabled": {
+            "Fn::If": [
+              "ShouldUseServerSideEncryption",
+              true,
+              false
+            ]
+          }
+        },
+        "StreamSpecification": {
+          "StreamViewType": "NEW_AND_OLD_IMAGES"
+        },
+        "TableName": {
+          "Fn::Join": [
+            "",
+            [
+              "Topic-",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "-",
+              {
+                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+              }
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete"
+    },
+    "TopicIAMRoleD9B4C845": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "appsync.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Statement": [
+                {
+                  "Action": [
+                    "dynamodb:BatchGetItem",
+                    "dynamodb:BatchWriteItem",
+                    "dynamodb:PutItem",
+                    "dynamodb:DeleteItem",
+                    "dynamodb:GetItem",
+                    "dynamodb:Scan",
+                    "dynamodb:Query",
+                    "dynamodb:UpdateItem",
+                    "dynamodb:ConditionCheckItem",
+                    "dynamodb:DescribeTable",
+                    "dynamodb:GetRecords",
+                    "dynamodb:GetShardIterator"
+                  ],
+                  "Effect": "Allow",
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Topic-",
+                                {
+                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+                                },
+                                "-",
+                                {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
+                        {
+                          "tablename": {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "Topic-",
+                                {
+                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+                                },
+                                "-",
+                                {
+                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+                                }
+                              ]
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "Version": "2012-10-17"
+            },
+            "PolicyName": "DynamoDBAccess"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "TopicIAMRole014e70-",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "-",
+              {
+                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
+              }
+            ]
+          ]
+        }
+      }
+    },
+    "TopicIAMRoleDefaultPolicy205E7C23": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "dynamodb:BatchGetItem",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator",
+                "dynamodb:Query",
+                "dynamodb:GetItem",
+                "dynamodb:Scan",
+                "dynamodb:ConditionCheckItem",
+                "dynamodb:BatchWriteItem",
+                "dynamodb:PutItem",
+                "dynamodb:UpdateItem",
+                "dynamodb:DeleteItem",
+                "dynamodb:DescribeTable"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "TopicTable",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Ref": "AWS::NoValue"
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "TopicIAMRoleDefaultPolicy205E7C23",
+        "Roles": [
+          {
+            "Ref": "TopicIAMRoleD9B4C845"
+          }
+        ]
+      }
+    },
+    "TopicDataSource": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DynamoDBConfig": {
+          "AwsRegion": {
+            "Ref": "AWS::Region"
+          },
+          "TableName": {
+            "Ref": "TopicTable"
+          }
+        },
+        "Name": "TopicTable",
+        "ServiceRoleArn": {
+          "Fn::GetAtt": [
+            "TopicIAMRoleD9B4C845",
+            "Arn"
+          ]
+        },
+        "Type": "AMAZON_DYNAMODB"
+      },
+      "DependsOn": [
+        "TopicIAMRoleD9B4C845"
+      ]
+    },
+    "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getTopic.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QuerygetTopicpostAuth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getTopic.postAuth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryGetTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getTopic.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.getTopic.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "GetTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "getTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "TopicTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      }
+    },
+    "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "QueryListTopicsDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.listTopics.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Query.listTopics.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "ListTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "listTopics",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "TopicTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Query"
+      }
+    },
+    "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateTopicinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createTopic.init.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationcreateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createTopic.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationCreateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createTopic.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.createTopic.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "CreateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "createTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "TopicTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateTopicinit0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateTopic.init.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationupdateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateTopic.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateTopic.auth.1.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationUpdateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateTopic.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.updateTopic.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "UpdateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "updateTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "TopicTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationdeleteTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteTopic.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteTopic.auth.1.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "TopicDataSource",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "MutationDeleteTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteTopic.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Mutation.deleteTopic.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "TopicDataSource"
+      ]
+    },
+    "DeleteTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "deleteTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
+              {
+                "Ref": "TopicTable"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Mutation"
+      }
+    },
+    "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptiononCreateTopicauth0Function",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Subscription.onCreateTopic.auth.1.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson({})"
+      }
+    },
+    "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "DataSourceName": {
+          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "SubscriptionOnCreateTopicDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Subscription.onCreateTopic.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
+              },
+              "/",
+              {
+                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
+              },
+              "/resolvers/Subscription.onCreateTopic.res.vtl"
+            ]
+          ]
+        }
+      }
+    },
+    "SubscriptiononCreateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onCreateTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    },
+    "SubscriptiononUpdateTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onUpdateTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    },
+    "SubscriptiononDeleteTopicResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+        },
+        "FieldName": "onDeleteTopic",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+                "FunctionId"
+              ]
+            },
+            {
+              "Fn::GetAtt": [
+                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Subscription"
+      }
+    }
+  },
+  "Outputs": {
+    "GetAttTopicTableStreamArn": {
+      "Description": "Your DynamoDB table StreamArn.",
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicTable",
+          "StreamArn"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:TopicTable:StreamArn"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttTopicTableName": {
+      "Description": "Your DynamoDB table name.",
+      "Value": {
+        "Ref": "TopicTable"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:TopicTable:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "GetAttTopicDataSourceName": {
+      "Description": "Your model DataSource name.",
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicDataSource",
+          "Name"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
+              },
+              "GetAtt:TopicDataSource:Name"
+            ]
+          ]
+        }
+      }
+    },
+    "transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+      "Value": {
+        "Fn::GetAtt": [
+          "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
+          "FunctionId"
+        ]
+      }
+    },
+    "transformerrootstackTopicTopicDataSource63D2F34BName": {
+      "Value": {
+        "Fn::GetAtt": [
+          "TopicDataSource",
+          "Name"
+        ]
+      }
+    },
+    "transformerrootstackTopicTopicTableFD91FB92Ref": {
+      "Value": {
+        "Ref": "TopicTable"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt
new file mode 100644
index 00000000000..0c9fe4d79b3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"api-AppSync","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json
new file mode 100644
index 00000000000..f742b0a76f1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json
@@ -0,0 +1,20 @@
+[
+  {
+    "OutputKey": "GraphQLAPIIdOutput",
+    "OutputValue": "37vodjk43jhz3mwuryjmdktahy",
+    "Description": "Your GraphQL API ID.",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7:GraphQLApiId"
+  },
+  {
+    "OutputKey": "GraphQLAPIEndpointOutput",
+    "OutputValue": "https://z5rkwijhofdwngjrtmese4mpmu.appsync-api.us-east-1.amazonaws.com/graphql",
+    "Description": "Your GraphQL API endpoint.",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7:GraphQLApiEndpoint"
+  },
+  {
+    "OutputKey": "GraphQLAPIKeyOutput",
+    "OutputValue": "da2-ydjxofoqk5huvpkfkxhrziqfwa",
+    "Description": "Your GraphQL API ID.",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7:GraphQLApiKey"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json
new file mode 100644
index 00000000000..4ef37b27214
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json
@@ -0,0 +1,38 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "S3DeploymentBucket",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "S3DeploymentRootKey",
+    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
+  },
+  {
+    "ParameterKey": "AppSyncApiName",
+    "ParameterValue": "discussions"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json
new file mode 100644
index 00000000000..a30cfdf0b8c
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json
@@ -0,0 +1,1066 @@
+{
+  "Parameters": {
+    "env": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "AppSyncApiName": {
+      "Type": "String",
+      "Default": "AppSyncSimpleTransform"
+    },
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "S3DeploymentBucket": {
+      "Type": "String",
+      "Description": "An S3 Bucket name where assets are deployed"
+    },
+    "S3DeploymentRootKey": {
+      "Type": "String",
+      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root of the deployment directory."
+    }
+  },
+  "Resources": {
+    "GraphQLAPI": {
+      "Type": "AWS::AppSync::GraphQLApi",
+      "Properties": {
+        "AuthenticationType": "API_KEY",
+        "Name": {
+          "Fn::Join": [
+            "",
+            [
+              {
+                "Ref": "AppSyncApiName"
+              },
+              "-",
+              {
+                "Ref": "env"
+              }
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPITransformerSchema3CB2AE18": {
+      "Type": "AWS::AppSync::GraphQLSchema",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "DefinitionS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/schema.graphql"
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPIDefaultApiKey215A6DD7": {
+      "Type": "AWS::AppSync::ApiKey",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "Expires": 1774365166
+      }
+    },
+    "GraphQLAPINONEDS95A13CF0": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "Name": "NONE_DS",
+        "Type": "NONE"
+      }
+    },
+    "Topic": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/Topic.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "Post": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            ]
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/Post.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "Comment": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            ]
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/Comment.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "FunctionDirectiveStack": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/FunctionDirectiveStack.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ConnectionStack": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
+            "Fn::GetAtt": [
+              "Post",
+              "Outputs.transformerrootstackPostPostDataSource6998E105Name"
+            ]
+          },
+          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
+            "Fn::GetAtt": [
+              "Post",
+              "Outputs.transformerrootstackPostPostTable34CAE87BRef"
+            ]
+          },
+          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
+            "Fn::GetAtt": [
+              "Comment",
+              "Outputs.transformerrootstackCommentCommentDataSourceA0E54655Name"
+            ]
+          },
+          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
+            "Fn::GetAtt": [
+              "Comment",
+              "Outputs.transformerrootstackCommentCommentTable5427FDE2Ref"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicTopicDataSource63D2F34BName"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicTopicTableFD91FB92Ref"
+            ]
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/ConnectionStack.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "Comment",
+        "GraphQLAPITransformerSchema3CB2AE18",
+        "Post",
+        "Topic"
+      ]
+    },
+    "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityIdDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.id.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.id.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityidResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "FieldName": "id",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityUserIdDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.userId.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.userId.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityuserIdResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "FieldName": "userId",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityActivityTypeDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.activityType.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.activityType.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityactivityTypeResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "FieldName": "activityType",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityTimestampDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.timestamp.req.vtl"
+            ]
+          ]
+        },
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.timestamp.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivitytimestampResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "FieldName": "timestamp",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "CustomResourcesjson": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "AppSyncApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "AppSyncApiName": {
+            "Ref": "AppSyncApiName"
+          },
+          "env": {
+            "Ref": "env"
+          },
+          "S3DeploymentBucket": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "S3DeploymentRootKey": {
+            "Ref": "S3DeploymentRootKey"
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "/",
+            [
+              "https://s3.amazonaws.com",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "stacks",
+              "CustomResources.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPI",
+        "GraphQLAPITransformerSchema3CB2AE18",
+        "Topic",
+        "Post",
+        "Comment",
+        "FunctionDirectiveStack",
+        "ConnectionStack"
+      ]
+    }
+  },
+  "Outputs": {
+    "GraphQLAPIKeyOutput": {
+      "Description": "Your GraphQL API ID.",
+      "Value": {
+        "Fn::GetAtt": [
+          "GraphQLAPIDefaultApiKey215A6DD7",
+          "ApiKey"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              "GraphQLApiKey"
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPIIdOutput": {
+      "Description": "Your GraphQL API ID.",
+      "Value": {
+        "Fn::GetAtt": [
+          "GraphQLAPI",
+          "ApiId"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              "GraphQLApiId"
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPIEndpointOutput": {
+      "Description": "Your GraphQL API endpoint.",
+      "Value": {
+        "Fn::GetAtt": [
+          "GraphQLAPI",
+          "GraphQLUrl"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              "GraphQLApiEndpoint"
+            ]
+          ]
+        }
+      }
+    }
+  },
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt
new file mode 100644
index 00000000000..8b558f82186
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"auth-Cognito","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json
new file mode 100644
index 00000000000..1edd34901b4
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json
@@ -0,0 +1,40 @@
+[
+  {
+    "OutputKey": "CreatedSNSRole",
+    "OutputValue": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade",
+    "Description": "role arn"
+  },
+  {
+    "OutputKey": "UserPoolId",
+    "OutputValue": "us-east-1_3t0fqaGQN",
+    "Description": "Id for the user pool"
+  },
+  {
+    "OutputKey": "AppClientIDWeb",
+    "OutputValue": "7t0bpmsnis3540umt8r65jcicc",
+    "Description": "The user pool app client id for web"
+  },
+  {
+    "OutputKey": "AppClientID",
+    "OutputValue": "7oh5id275ip4505msdvhrtv5vq",
+    "Description": "The user pool app client id"
+  },
+  {
+    "OutputKey": "IdentityPoolId",
+    "OutputValue": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
+    "Description": "Id for the identity pool"
+  },
+  {
+    "OutputKey": "UserPoolArn",
+    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_3t0fqaGQN",
+    "Description": "Arn for the user pool"
+  },
+  {
+    "OutputKey": "IdentityPoolName",
+    "OutputValue": "discussions22367c68_identitypool_22367c68__blade"
+  },
+  {
+    "OutputKey": "UserPoolName",
+    "OutputValue": "discussions22367c68_userpool_22367c68"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json
new file mode 100644
index 00000000000..d6c6bddb891
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json
@@ -0,0 +1,166 @@
+[
+  {
+    "ParameterKey": "usernameAttributes",
+    "ParameterValue": "phone_number"
+  },
+  {
+    "ParameterKey": "authRoleArn",
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
+  },
+  {
+    "ParameterKey": "autoVerifiedAttributes",
+    "ParameterValue": "email"
+  },
+  {
+    "ParameterKey": "allowUnauthenticatedIdentities",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "hostedUI",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "smsVerificationMessage",
+    "ParameterValue": "Your verification code is {####}"
+  },
+  {
+    "ParameterKey": "userpoolClientReadAttributes",
+    "ParameterValue": "email"
+  },
+  {
+    "ParameterKey": "breakCircularDependency",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "mfaTypes",
+    "ParameterValue": "SMS Text Message"
+  },
+  {
+    "ParameterKey": "emailVerificationSubject",
+    "ParameterValue": "Verification"
+  },
+  {
+    "ParameterKey": "sharedId",
+    "ParameterValue": "22367c68"
+  },
+  {
+    "ParameterKey": "useDefault",
+    "ParameterValue": "manual"
+  },
+  {
+    "ParameterKey": "userpoolClientGenerateSecret",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "mfaConfiguration",
+    "ParameterValue": "OFF"
+  },
+  {
+    "ParameterKey": "identityPoolName",
+    "ParameterValue": "discussions22367c68_identitypool_22367c68"
+  },
+  {
+    "ParameterKey": "thirdPartyAuth",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "userPoolGroupList",
+    "ParameterValue": ""
+  },
+  {
+    "ParameterKey": "authSelections",
+    "ParameterValue": "identityPoolAndUserPool"
+  },
+  {
+    "ParameterKey": "adminQueries",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "resourceNameTruncated",
+    "ParameterValue": "discus22367c68"
+  },
+  {
+    "ParameterKey": "userPoolGroups",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "smsAuthenticationMessage",
+    "ParameterValue": "Your authentication code is {####}"
+  },
+  {
+    "ParameterKey": "passwordPolicyMinLength",
+    "ParameterValue": "8"
+  },
+  {
+    "ParameterKey": "userPoolName",
+    "ParameterValue": "discussions22367c68_userpool_22367c68"
+  },
+  {
+    "ParameterKey": "userpoolClientWriteAttributes",
+    "ParameterValue": "email"
+  },
+  {
+    "ParameterKey": "dependsOn",
+    "ParameterValue": ""
+  },
+  {
+    "ParameterKey": "useEnabledMfas",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "usernameCaseSensitive",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "resourceName",
+    "ParameterValue": "discussions22367c6822367c68"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "triggers",
+    "ParameterValue": "{}"
+  },
+  {
+    "ParameterKey": "serviceName",
+    "ParameterValue": "Cognito"
+  },
+  {
+    "ParameterKey": "emailVerificationMessage",
+    "ParameterValue": "Here is your verification code {####}"
+  },
+  {
+    "ParameterKey": "userpoolClientRefreshTokenValidity",
+    "ParameterValue": "120"
+  },
+  {
+    "ParameterKey": "userpoolClientSetAttributes",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "unauthRoleArn",
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole"
+  },
+  {
+    "ParameterKey": "requiredAttributes",
+    "ParameterValue": "email,phone_number"
+  },
+  {
+    "ParameterKey": "passwordPolicyCharacters",
+    "ParameterValue": ""
+  },
+  {
+    "ParameterKey": "aliasAttributes",
+    "ParameterValue": ""
+  },
+  {
+    "ParameterKey": "userpoolClientLambdaRole",
+    "ParameterValue": "discus22367c68_userpoolclient_lambda_role"
+  },
+  {
+    "ParameterKey": "defaultPasswordPolicy",
+    "ParameterValue": "false"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json
new file mode 100644
index 00000000000..4e432156fb1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json
@@ -0,0 +1,272 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "identityPoolName": {
+      "Type": "String"
+    },
+    "allowUnauthenticatedIdentities": {
+      "Type": "String"
+    },
+    "resourceNameTruncated": {
+      "Type": "String"
+    },
+    "userPoolName": {
+      "Type": "String"
+    },
+    "autoVerifiedAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "mfaConfiguration": {
+      "Type": "String"
+    },
+    "mfaTypes": {
+      "Type": "CommaDelimitedList"
+    },
+    "smsAuthenticationMessage": {
+      "Type": "String"
+    },
+    "smsVerificationMessage": {
+      "Type": "String"
+    },
+    "emailVerificationSubject": {
+      "Type": "String"
+    },
+    "emailVerificationMessage": {
+      "Type": "String"
+    },
+    "defaultPasswordPolicy": {
+      "Type": "String"
+    },
+    "passwordPolicyMinLength": {
+      "Type": "String"
+    },
+    "passwordPolicyCharacters": {
+      "Type": "CommaDelimitedList"
+    },
+    "requiredAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "aliasAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userpoolClientGenerateSecret": {
+      "Type": "String"
+    },
+    "userpoolClientRefreshTokenValidity": {
+      "Type": "String"
+    },
+    "userpoolClientWriteAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userpoolClientReadAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userpoolClientLambdaRole": {
+      "Type": "String"
+    },
+    "userpoolClientSetAttributes": {
+      "Type": "String"
+    },
+    "sharedId": {
+      "Type": "String"
+    },
+    "resourceName": {
+      "Type": "String"
+    },
+    "authSelections": {
+      "Type": "String"
+    },
+    "useDefault": {
+      "Type": "String"
+    },
+    "thirdPartyAuth": {
+      "Type": "String"
+    },
+    "usernameAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userPoolGroups": {
+      "Type": "String"
+    },
+    "adminQueries": {
+      "Type": "String"
+    },
+    "triggers": {
+      "Type": "String"
+    },
+    "hostedUI": {
+      "Type": "String"
+    },
+    "userPoolGroupList": {
+      "Type": "CommaDelimitedList"
+    },
+    "serviceName": {
+      "Type": "String"
+    },
+    "usernameCaseSensitive": {
+      "Type": "String"
+    },
+    "useEnabledMfas": {
+      "Type": "String"
+    },
+    "authRoleArn": {
+      "Type": "String"
+    },
+    "unauthRoleArn": {
+      "Type": "String"
+    },
+    "breakCircularDependency": {
+      "Type": "String"
+    },
+    "dependsOn": {
+      "Type": "CommaDelimitedList"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "blade",
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "SNSRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Sid": "",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "cognito-idp.amazonaws.com"
+              },
+              "Action": [
+                "sts:AssumeRole"
+              ],
+              "Condition": {
+                "StringEquals": {
+                  "sts:ExternalId": "discus22367c68_role_external_id"
+                }
+              }
+            }
+          ]
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "sns:Publish"
+                  ],
+                  "Resource": "*"
+                }
+              ]
+            },
+            "PolicyName": "discus22367c68-sns-policy"
+          }
+        ],
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "sns22367c68",
+              {
+                "Fn::Select": [
+                  3,
+                  {
+                    "Fn::Split": [
+                      "-",
+                      "amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR"
+                    ]
+                  }
+                ]
+              },
+              "-",
+              "blade"
+            ]
+          ]
+        }
+      }
+    },
+    "UserPoolClientRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              },
+              "Action": "sts:AssumeRole"
+            }
+          ]
+        },
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              "upClientLambdaRole22367c68",
+              {
+                "Fn::Select": [
+                  3,
+                  {
+                    "Fn::Split": [
+                      "-",
+                      "amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR"
+                    ]
+                  }
+                ]
+              },
+              "-",
+              "blade"
+            ]
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "IdentityPoolId": {
+      "Description": "Id for the identity pool",
+      "Value": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d"
+    },
+    "IdentityPoolName": {
+      "Value": "discussions22367c68_identitypool_22367c68__blade"
+    },
+    "UserPoolId": {
+      "Description": "Id for the user pool",
+      "Value": "us-east-1_3t0fqaGQN"
+    },
+    "UserPoolArn": {
+      "Description": "Arn for the user pool",
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_3t0fqaGQN"
+    },
+    "UserPoolName": {
+      "Value": "discussions22367c68_userpool_22367c68"
+    },
+    "AppClientIDWeb": {
+      "Description": "The user pool app client id for web",
+      "Value": "7t0bpmsnis3540umt8r65jcicc"
+    },
+    "AppClientID": {
+      "Description": "The user pool app client id",
+      "Value": "7oh5id275ip4505msdvhrtv5vq"
+    },
+    "CreatedSNSRole": {
+      "Description": "role arn",
+      "Value": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt
new file mode 100644
index 00000000000..e0ba9d9ec0a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json
new file mode 100644
index 00000000000..e3823e218b2
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "OutputKey": "LambdaExecutionRoleArn",
+    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole0d8fb131-blade"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-blade"
+  },
+  {
+    "OutputKey": "Name",
+    "OutputValue": "fetchuseractivity-blade"
+  },
+  {
+    "OutputKey": "LambdaExecutionRole",
+    "OutputValue": "discussionsLambdaRole0d8fb131-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json
new file mode 100644
index 00000000000..a61e245ab6b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json
@@ -0,0 +1,30 @@
+[
+  {
+    "ParameterKey": "CloudWatchRule",
+    "ParameterValue": "NONE"
+  },
+  {
+    "ParameterKey": "storageactivityName",
+    "ParameterValue": "activity-blade"
+  },
+  {
+    "ParameterKey": "s3Key",
+    "ParameterValue": "amplify-builds/fetchuseractivity-663875517431786f5935-build.zip"
+  },
+  {
+    "ParameterKey": "deploymentBucketName",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "storageactivityStreamArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "storageactivityArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json
new file mode 100644
index 00000000000..800fb75ebc8
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json
@@ -0,0 +1,270 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Parameters": {
+    "CloudWatchRule": {
+      "Type": "String",
+      "Default": "NONE",
+      "Description": " Schedule Expression"
+    },
+    "deploymentBucketName": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "s3Key": {
+      "Type": "String"
+    },
+    "storageactivityName": {
+      "Type": "String",
+      "Default": "storageactivityName"
+    },
+    "storageactivityArn": {
+      "Type": "String",
+      "Default": "storageactivityArn"
+    },
+    "storageactivityStreamArn": {
+      "Type": "String",
+      "Default": "storageactivityStreamArn"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "LambdaFunction": {
+      "Type": "AWS::Lambda::Function",
+      "Metadata": {
+        "aws:asset:path": "./src",
+        "aws:asset:property": "Code"
+      },
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Ref": "deploymentBucketName"
+          },
+          "S3Key": {
+            "Ref": "s3Key"
+          }
+        },
+        "Handler": "index.handler",
+        "FunctionName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            "fetchuseractivity",
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "fetchuseractivity",
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "Environment": {
+          "Variables": {
+            "ENV": {
+              "Ref": "env"
+            },
+            "REGION": {
+              "Ref": "AWS::Region"
+            },
+            "STORAGE_ACTIVITY_NAME": {
+              "Ref": "storageactivityName"
+            },
+            "STORAGE_ACTIVITY_ARN": {
+              "Ref": "storageactivityArn"
+            },
+            "STORAGE_ACTIVITY_STREAMARN": {
+              "Ref": "storageactivityStreamArn"
+            }
+          }
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "LambdaExecutionRole",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Layers": [],
+        "Timeout": 25
+      }
+    },
+    "LambdaExecutionRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "RoleName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            "discussionsLambdaRole0d8fb131",
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "discussionsLambdaRole0d8fb131",
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              },
+              "Action": [
+                "sts:AssumeRole"
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "lambdaexecutionpolicy": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "lambda-execution-policy",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "logs:CreateLogGroup",
+                "logs:CreateLogStream",
+                "logs:PutLogEvents"
+              ],
+              "Resource": {
+                "Fn::Sub": [
+                  "arn:aws:logs:${region}:${account}:log-group:/aws/lambda/${lambda}:log-stream:*",
+                  {
+                    "region": {
+                      "Ref": "AWS::Region"
+                    },
+                    "account": {
+                      "Ref": "AWS::AccountId"
+                    },
+                    "lambda": {
+                      "Ref": "LambdaFunction"
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    },
+    "AmplifyResourcesPolicy": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "amplify-lambda-execution-policy",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "dynamodb:Get*",
+                "dynamodb:BatchGetItem",
+                "dynamodb:List*",
+                "dynamodb:Describe*",
+                "dynamodb:Scan",
+                "dynamodb:Query",
+                "dynamodb:PartiQLSelect"
+              ],
+              "Resource": [
+                {
+                  "Ref": "storageactivityArn"
+                },
+                {
+                  "Fn::Join": [
+                    "/",
+                    [
+                      {
+                        "Ref": "storageactivityArn"
+                      },
+                      "index/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "LambdaFunction"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "LambdaFunction",
+          "Arn"
+        ]
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    },
+    "LambdaExecutionRole": {
+      "Value": {
+        "Ref": "LambdaExecutionRole"
+      }
+    },
+    "LambdaExecutionRoleArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "LambdaExecutionRole",
+          "Arn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt
new file mode 100644
index 00000000000..e0ba9d9ec0a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json
new file mode 100644
index 00000000000..f801efe7e9d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "OutputKey": "LambdaExecutionRoleArn",
+    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole7674760b-blade"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-blade"
+  },
+  {
+    "OutputKey": "Name",
+    "OutputValue": "recorduseractivity-blade"
+  },
+  {
+    "OutputKey": "LambdaExecutionRole",
+    "OutputValue": "discussionsLambdaRole7674760b-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json
new file mode 100644
index 00000000000..0854d2bb6bd
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json
@@ -0,0 +1,38 @@
+[
+  {
+    "ParameterKey": "CloudWatchRule",
+    "ParameterValue": "NONE"
+  },
+  {
+    "ParameterKey": "storageactivityName",
+    "ParameterValue": "activity-blade"
+  },
+  {
+    "ParameterKey": "s3Key",
+    "ParameterValue": "amplify-builds/recorduseractivity-67683636486963333764-build.zip"
+  },
+  {
+    "ParameterKey": "deploymentBucketName",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "apidiscussionsGraphQLAPIEndpointOutput",
+    "ParameterValue": "https://z5rkwijhofdwngjrtmese4mpmu.appsync-api.us-east-1.amazonaws.com/graphql"
+  },
+  {
+    "ParameterKey": "apidiscussionsGraphQLAPIIdOutput",
+    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+  },
+  {
+    "ParameterKey": "storageactivityStreamArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "storageactivityArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json
new file mode 100644
index 00000000000..1d53e1280c5
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json
@@ -0,0 +1,455 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Parameters": {
+    "CloudWatchRule": {
+      "Type": "String",
+      "Default": "NONE",
+      "Description": " Schedule Expression"
+    },
+    "deploymentBucketName": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "s3Key": {
+      "Type": "String"
+    },
+    "apidiscussionsGraphQLAPIIdOutput": {
+      "Type": "String",
+      "Default": "apidiscussionsGraphQLAPIIdOutput"
+    },
+    "apidiscussionsGraphQLAPIEndpointOutput": {
+      "Type": "String",
+      "Default": "apidiscussionsGraphQLAPIEndpointOutput"
+    },
+    "storageactivityName": {
+      "Type": "String",
+      "Default": "storageactivityName"
+    },
+    "storageactivityArn": {
+      "Type": "String",
+      "Default": "storageactivityArn"
+    },
+    "storageactivityStreamArn": {
+      "Type": "String",
+      "Default": "storageactivityStreamArn"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "LambdaFunction": {
+      "Type": "AWS::Lambda::Function",
+      "Metadata": {
+        "aws:asset:path": "./src",
+        "aws:asset:property": "Code"
+      },
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Ref": "deploymentBucketName"
+          },
+          "S3Key": {
+            "Ref": "s3Key"
+          }
+        },
+        "Handler": "index.handler",
+        "FunctionName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            "recorduseractivity",
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "recorduseractivity",
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "Environment": {
+          "Variables": {
+            "ENV": {
+              "Ref": "env"
+            },
+            "REGION": {
+              "Ref": "AWS::Region"
+            },
+            "STORAGE_ACTIVITY_NAME": {
+              "Ref": "storageactivityName"
+            },
+            "STORAGE_ACTIVITY_ARN": {
+              "Ref": "storageactivityArn"
+            },
+            "STORAGE_ACTIVITY_STREAMARN": {
+              "Ref": "storageactivityStreamArn"
+            }
+          }
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "LambdaExecutionRole",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Layers": [],
+        "Timeout": 25
+      }
+    },
+    "LambdaExecutionRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "RoleName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            "discussionsLambdaRole7674760b",
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "discussionsLambdaRole7674760b",
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              },
+              "Action": [
+                "sts:AssumeRole"
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "lambdaexecutionpolicy": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "lambda-execution-policy",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "logs:CreateLogGroup",
+                "logs:CreateLogStream",
+                "logs:PutLogEvents"
+              ],
+              "Resource": {
+                "Fn::Sub": [
+                  "arn:aws:logs:${region}:${account}:log-group:/aws/lambda/${lambda}:log-stream:*",
+                  {
+                    "region": {
+                      "Ref": "AWS::Region"
+                    },
+                    "account": {
+                      "Ref": "AWS::AccountId"
+                    },
+                    "lambda": {
+                      "Ref": "LambdaFunction"
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    },
+    "AmplifyResourcesPolicy": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "amplify-lambda-execution-policy",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "dynamodb:Put*",
+                "dynamodb:Create*",
+                "dynamodb:BatchWriteItem",
+                "dynamodb:PartiQLInsert",
+                "dynamodb:Get*",
+                "dynamodb:BatchGetItem",
+                "dynamodb:List*",
+                "dynamodb:Describe*",
+                "dynamodb:Scan",
+                "dynamodb:Query",
+                "dynamodb:PartiQLSelect",
+                "dynamodb:Update*",
+                "dynamodb:RestoreTable*",
+                "dynamodb:PartiQLUpdate",
+                "dynamodb:Delete*",
+                "dynamodb:PartiQLDelete"
+              ],
+              "Resource": [
+                {
+                  "Ref": "storageactivityArn"
+                },
+                {
+                  "Fn::Join": [
+                    "/",
+                    [
+                      {
+                        "Ref": "storageactivityArn"
+                      },
+                      "index/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "LambdaTriggerPolicyTopic": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "amplify-lambda-execution-policy-Topic",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "dynamodb:DescribeStream",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator",
+                "dynamodb:ListStreams"
+              ],
+              "Resource": {
+                "Fn::ImportValue": {
+                  "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:TopicTable:StreamArn"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    "LambdaEventSourceMappingTopic": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "DependsOn": [
+        "LambdaTriggerPolicyTopic",
+        "LambdaExecutionRole"
+      ],
+      "Properties": {
+        "BatchSize": 100,
+        "Enabled": true,
+        "EventSourceArn": {
+          "Fn::ImportValue": {
+            "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:TopicTable:StreamArn"
+          }
+        },
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "LambdaFunction",
+            "Arn"
+          ]
+        },
+        "StartingPosition": "LATEST"
+      }
+    },
+    "LambdaTriggerPolicyPost": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "amplify-lambda-execution-policy-Post",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "dynamodb:DescribeStream",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator",
+                "dynamodb:ListStreams"
+              ],
+              "Resource": {
+                "Fn::ImportValue": {
+                  "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:PostTable:StreamArn"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    "LambdaEventSourceMappingPost": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "DependsOn": [
+        "LambdaTriggerPolicyPost",
+        "LambdaExecutionRole"
+      ],
+      "Properties": {
+        "BatchSize": 100,
+        "Enabled": true,
+        "EventSourceArn": {
+          "Fn::ImportValue": {
+            "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:PostTable:StreamArn"
+          }
+        },
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "LambdaFunction",
+            "Arn"
+          ]
+        },
+        "StartingPosition": "LATEST"
+      }
+    },
+    "LambdaTriggerPolicyComment": {
+      "DependsOn": [
+        "LambdaExecutionRole"
+      ],
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyName": "amplify-lambda-execution-policy-Comment",
+        "Roles": [
+          {
+            "Ref": "LambdaExecutionRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": [
+                "dynamodb:DescribeStream",
+                "dynamodb:GetRecords",
+                "dynamodb:GetShardIterator",
+                "dynamodb:ListStreams"
+              ],
+              "Resource": {
+                "Fn::ImportValue": {
+                  "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:CommentTable:StreamArn"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    "LambdaEventSourceMappingComment": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "DependsOn": [
+        "LambdaTriggerPolicyComment",
+        "LambdaExecutionRole"
+      ],
+      "Properties": {
+        "BatchSize": 100,
+        "Enabled": true,
+        "EventSourceArn": {
+          "Fn::ImportValue": {
+            "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:CommentTable:StreamArn"
+          }
+        },
+        "FunctionName": {
+          "Fn::GetAtt": [
+            "LambdaFunction",
+            "Arn"
+          ]
+        },
+        "StartingPosition": "LATEST"
+      }
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": {
+        "Ref": "LambdaFunction"
+      }
+    },
+    "Arn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "LambdaFunction",
+          "Arn"
+        ]
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    },
+    "LambdaExecutionRole": {
+      "Value": {
+        "Ref": "LambdaExecutionRole"
+      }
+    },
+    "LambdaExecutionRoleArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "LambdaExecutionRole",
+          "Arn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt
new file mode 100644
index 00000000000..85c7bf4fcc3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json
new file mode 100644
index 00000000000..983341e780e
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json
@@ -0,0 +1,34 @@
+[
+  {
+    "OutputKey": "PartitionKeyName",
+    "OutputValue": "id"
+  },
+  {
+    "OutputKey": "SortKeyName",
+    "OutputValue": "userId"
+  },
+  {
+    "OutputKey": "SortKeyType",
+    "OutputValue": "S"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
+  },
+  {
+    "OutputKey": "StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
+  },
+  {
+    "OutputKey": "PartitionKeyType",
+    "OutputValue": "S"
+  },
+  {
+    "OutputKey": "Name",
+    "OutputValue": "activity-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json
new file mode 100644
index 00000000000..c06bdde08ee
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "partitionKeyName",
+    "ParameterValue": "id"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "sortKeyName",
+    "ParameterValue": "userId"
+  },
+  {
+    "ParameterKey": "sortKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "tableName",
+    "ParameterValue": "activity"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json
new file mode 100644
index 00000000000..a4d2dfbadb7
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json
@@ -0,0 +1,64 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "blade",
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "MigrationPlaceholder": {
+      "Type": "AWS::CloudFormation::WaitConditionHandle",
+      "Properties": {}
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": "activity-blade"
+    },
+    "Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
+    },
+    "StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
+    },
+    "PartitionKeyName": {
+      "Value": "id"
+    },
+    "PartitionKeyType": {
+      "Value": "S"
+    },
+    "SortKeyName": {
+      "Value": "userId"
+    },
+    "SortKeyType": {
+      "Value": "S"
+    },
+    "Region": {
+      "Value": "us-east-1"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt
new file mode 100644
index 00000000000..85c7bf4fcc3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json
new file mode 100644
index 00000000000..59a4047a8af
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json
@@ -0,0 +1,34 @@
+[
+  {
+    "OutputKey": "PartitionKeyName",
+    "OutputValue": "userId"
+  },
+  {
+    "OutputKey": "SortKeyName",
+    "OutputValue": "postId"
+  },
+  {
+    "OutputKey": "SortKeyType",
+    "OutputValue": "S"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
+  },
+  {
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
+  },
+  {
+    "OutputKey": "StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
+  },
+  {
+    "OutputKey": "PartitionKeyType",
+    "OutputValue": "S"
+  },
+  {
+    "OutputKey": "Name",
+    "OutputValue": "bookmarks-blade"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json
new file mode 100644
index 00000000000..ba06f4fda11
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "partitionKeyName",
+    "ParameterValue": "userId"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "blade"
+  },
+  {
+    "ParameterKey": "sortKeyName",
+    "ParameterValue": "postId"
+  },
+  {
+    "ParameterKey": "sortKeyType",
+    "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "tableName",
+    "ParameterValue": "bookmarks"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json
new file mode 100644
index 00000000000..73597bf57f8
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json
@@ -0,0 +1,64 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "partitionKeyName": {
+      "Type": "String"
+    },
+    "partitionKeyType": {
+      "Type": "String"
+    },
+    "env": {
+      "Type": "String"
+    },
+    "sortKeyName": {
+      "Type": "String"
+    },
+    "sortKeyType": {
+      "Type": "String"
+    },
+    "tableName": {
+      "Type": "String"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "blade",
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "MigrationPlaceholder": {
+      "Type": "AWS::CloudFormation::WaitConditionHandle",
+      "Properties": {}
+    }
+  },
+  "Outputs": {
+    "Name": {
+      "Value": "bookmarks-blade"
+    },
+    "Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
+    },
+    "StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
+    },
+    "PartitionKeyName": {
+      "Value": "userId"
+    },
+    "PartitionKeyType": {
+      "Value": "S"
+    },
+    "SortKeyName": {
+      "Value": "postId"
+    },
+    "SortKeyType": {
+      "Value": "S"
+    },
+    "Region": {
+      "Value": "us-east-1"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt
new file mode 100644
index 00000000000..daf66c0bc85
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt
@@ -0,0 +1 @@
+Root Stack for AWS Amplify CLI
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json
new file mode 100644
index 00000000000..a27fb7bb5e7
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json
@@ -0,0 +1,42 @@
+[
+  {
+    "OutputKey": "AuthRoleName",
+    "OutputValue": "amplify-discussionsblade-blade-4edfd-authRole"
+  },
+  {
+    "OutputKey": "UnauthRoleArn",
+    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole"
+  },
+  {
+    "OutputKey": "AuthRoleArn",
+    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1",
+    "Description": "CloudFormation provider root stack Region",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-Region"
+  },
+  {
+    "OutputKey": "DeploymentBucketName",
+    "OutputValue": "amplify-discussionsblade-blade-4edfd-deployment",
+    "Description": "CloudFormation provider root stack deployment bucket name",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-DeploymentBucketName"
+  },
+  {
+    "OutputKey": "UnauthRoleName",
+    "OutputValue": "amplify-discussionsblade-blade-4edfd-unauthRole"
+  },
+  {
+    "OutputKey": "StackName",
+    "OutputValue": "amplify-discussionsblade-blade-4edfd",
+    "Description": "CloudFormation provider root stack ID",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-StackName"
+  },
+  {
+    "OutputKey": "StackId",
+    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussionsblade-blade-4edfd/2190d960-2213-11f1-a861-127cff1666cb",
+    "Description": "CloudFormation provider root stack name",
+    "ExportName": "amplify-discussionsblade-blade-4edfd-StackId"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json
new file mode 100644
index 00000000000..fb5c8cacb79
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json
@@ -0,0 +1,14 @@
+[
+  {
+    "ParameterKey": "AuthRoleName",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-authRole"
+  },
+  {
+    "ParameterKey": "DeploymentBucketName",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+  },
+  {
+    "ParameterKey": "UnauthRoleName",
+    "ParameterValue": "amplify-discussionsblade-blade-4edfd-unauthRole"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json
new file mode 100644
index 00000000000..fb0e76dd1dc
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json
@@ -0,0 +1,577 @@
+{
+  "Description": "Root Stack for AWS Amplify CLI",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "DeploymentBucketName": {
+      "Type": "String",
+      "Default": "DeploymentBucket",
+      "Description": "Name of the common deployment bucket provided by the parent stack"
+    },
+    "AuthRoleName": {
+      "Type": "String",
+      "Default": "AuthRoleName",
+      "Description": "Name of the common deployment bucket provided by the parent stack"
+    },
+    "UnauthRoleName": {
+      "Type": "String",
+      "Default": "UnAuthRoleName",
+      "Description": "Name of the common deployment bucket provided by the parent stack"
+    }
+  },
+  "Outputs": {
+    "Region": {
+      "Description": "CloudFormation provider root stack Region",
+      "Value": {
+        "Ref": "AWS::Region"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Sub": "${AWS::StackName}-Region"
+        }
+      }
+    },
+    "StackName": {
+      "Description": "CloudFormation provider root stack ID",
+      "Value": {
+        "Ref": "AWS::StackName"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Sub": "${AWS::StackName}-StackName"
+        }
+      }
+    },
+    "StackId": {
+      "Description": "CloudFormation provider root stack name",
+      "Value": {
+        "Ref": "AWS::StackId"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Sub": "${AWS::StackName}-StackId"
+        }
+      }
+    },
+    "AuthRoleArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "AuthRole",
+          "Arn"
+        ]
+      }
+    },
+    "UnauthRoleArn": {
+      "Value": {
+        "Fn::GetAtt": [
+          "UnauthRole",
+          "Arn"
+        ]
+      }
+    },
+    "DeploymentBucketName": {
+      "Description": "CloudFormation provider root stack deployment bucket name",
+      "Value": {
+        "Ref": "DeploymentBucketName"
+      },
+      "Export": {
+        "Name": {
+          "Fn::Sub": "${AWS::StackName}-DeploymentBucketName"
+        }
+      }
+    },
+    "AuthRoleName": {
+      "Value": {
+        "Ref": "AuthRole"
+      }
+    },
+    "UnauthRoleName": {
+      "Value": {
+        "Ref": "UnauthRole"
+      }
+    }
+  },
+  "Resources": {
+    "DeploymentBucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Ref": "DeploymentBucketName"
+        },
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "DeploymentBucketBlockHTTP": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "DeploymentBucketName"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:*",
+              "Effect": "Deny",
+              "Principal": "*",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "DeploymentBucketName"
+                      },
+                      "/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "DeploymentBucketName"
+                      }
+                    ]
+                  ]
+                }
+              ],
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": false
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    "AuthRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Sid": "",
+              "Effect": "Deny",
+              "Principal": {
+                "Federated": "cognito-identity.amazonaws.com"
+              },
+              "Action": "sts:AssumeRoleWithWebIdentity"
+            }
+          ]
+        },
+        "RoleName": {
+          "Ref": "AuthRoleName"
+        }
+      }
+    },
+    "UnauthRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Sid": "",
+              "Effect": "Deny",
+              "Principal": {
+                "Federated": "cognito-identity.amazonaws.com"
+              },
+              "Action": "sts:AssumeRoleWithWebIdentity"
+            }
+          ]
+        },
+        "RoleName": {
+          "Ref": "UnauthRoleName"
+        }
+      }
+    },
+    "apidiscussions": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "Parameters": {
+          "AppSyncApiName": "discussions",
+          "DynamoDBBillingMode": "PAY_PER_REQUEST",
+          "DynamoDBEnableServerSideEncryption": false,
+          "S3DeploymentBucket": "amplify-discussionsblade-blade-4edfd-deployment",
+          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
+          "env": "blade"
+        }
+      }
+    },
+    "authdiscussions22367c6822367c68": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
+        "Parameters": {
+          "identityPoolName": "discussions22367c68_identitypool_22367c68",
+          "allowUnauthenticatedIdentities": false,
+          "resourceNameTruncated": "discus22367c68",
+          "userPoolName": "discussions22367c68_userpool_22367c68",
+          "autoVerifiedAttributes": "email",
+          "mfaConfiguration": "OFF",
+          "mfaTypes": "SMS Text Message",
+          "smsAuthenticationMessage": "Your authentication code is {####}",
+          "smsVerificationMessage": "Your verification code is {####}",
+          "emailVerificationSubject": "Verification",
+          "emailVerificationMessage": "Here is your verification code {####}",
+          "defaultPasswordPolicy": false,
+          "passwordPolicyMinLength": 8,
+          "passwordPolicyCharacters": "",
+          "requiredAttributes": "email,phone_number",
+          "aliasAttributes": "",
+          "userpoolClientGenerateSecret": false,
+          "userpoolClientRefreshTokenValidity": "120",
+          "userpoolClientWriteAttributes": "email",
+          "userpoolClientReadAttributes": "email",
+          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+          "userpoolClientSetAttributes": false,
+          "sharedId": "22367c68",
+          "resourceName": "discussions22367c6822367c68",
+          "authSelections": "identityPoolAndUserPool",
+          "useDefault": "manual",
+          "thirdPartyAuth": false,
+          "usernameAttributes": "phone_number",
+          "userPoolGroups": false,
+          "adminQueries": false,
+          "triggers": "{}",
+          "hostedUI": false,
+          "userPoolGroupList": "",
+          "serviceName": "Cognito",
+          "usernameCaseSensitive": false,
+          "useEnabledMfas": true,
+          "authRoleArn": {
+            "Fn::GetAtt": [
+              "AuthRole",
+              "Arn"
+            ]
+          },
+          "unauthRoleArn": {
+            "Fn::GetAtt": [
+              "UnauthRole",
+              "Arn"
+            ]
+          },
+          "breakCircularDependency": true,
+          "dependsOn": "",
+          "env": "blade"
+        }
+      }
+    },
+    "functionfetchuseractivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "Parameters": {
+          "deploymentBucketName": "amplify-discussionsblade-blade-4edfd-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-663875517431786f5935-build.zip",
+          "storageactivityName": {
+            "Fn::GetAtt": [
+              "storageactivity",
+              "Outputs.Name"
+            ]
+          },
+          "storageactivityArn": {
+            "Fn::GetAtt": [
+              "storageactivity",
+              "Outputs.Arn"
+            ]
+          },
+          "storageactivityStreamArn": {
+            "Fn::GetAtt": [
+              "storageactivity",
+              "Outputs.StreamArn"
+            ]
+          },
+          "env": "blade"
+        }
+      }
+    },
+    "functionrecorduseractivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "Parameters": {
+          "deploymentBucketName": "amplify-discussionsblade-blade-4edfd-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-67683636486963333764-build.zip",
+          "apidiscussionsGraphQLAPIIdOutput": {
+            "Fn::GetAtt": [
+              "apidiscussions",
+              "Outputs.GraphQLAPIIdOutput"
+            ]
+          },
+          "apidiscussionsGraphQLAPIEndpointOutput": {
+            "Fn::GetAtt": [
+              "apidiscussions",
+              "Outputs.GraphQLAPIEndpointOutput"
+            ]
+          },
+          "storageactivityName": {
+            "Fn::GetAtt": [
+              "storageactivity",
+              "Outputs.Name"
+            ]
+          },
+          "storageactivityArn": {
+            "Fn::GetAtt": [
+              "storageactivity",
+              "Outputs.Arn"
+            ]
+          },
+          "storageactivityStreamArn": {
+            "Fn::GetAtt": [
+              "storageactivity",
+              "Outputs.StreamArn"
+            ]
+          },
+          "env": "blade"
+        }
+      }
+    },
+    "storageactivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "activity",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "blade"
+        }
+      }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "blade"
+        }
+      }
+    },
+    "UpdateRolesWithIDPFunction": {
+      "DependsOn": [
+        "AuthRole",
+        "UnauthRole",
+        "authdiscussions22367c6822367c68"
+      ],
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": {
+            "Fn::Join": [
+              "\n",
+              [
+                "const response = require('cfn-response');",
+                "const { IAMClient, GetRoleCommand, UpdateAssumeRolePolicyCommand } = require('@aws-sdk/client-iam');",
+                "exports.handler = function(event, context) {",
+                "    // Don't return promise, response.send() marks context as done internally",
+                "    const ignoredPromise = handleEvent(event, context)",
+                "};",
+                "async function handleEvent(event, context) {",
+                "    try {",
+                "        let authRoleName = event.ResourceProperties.authRoleName;",
+                "        let unauthRoleName = event.ResourceProperties.unauthRoleName;",
+                "        let idpId = event.ResourceProperties.idpId;",
+                "        let authParamsJson = {",
+                "            'Version': '2012-10-17',",
+                "            'Statement': [{",
+                "                'Effect': 'Allow',",
+                "                'Principal': {'Federated': 'cognito-identity.amazonaws.com'},",
+                "                'Action': 'sts:AssumeRoleWithWebIdentity',",
+                "                'Condition': {",
+                "                    'StringEquals': {'cognito-identity.amazonaws.com:aud': idpId},",
+                "                    'ForAnyValue:StringLike': {'cognito-identity.amazonaws.com:amr': 'authenticated'}",
+                "                }",
+                "            }]",
+                "        };",
+                "        let unauthParamsJson = {",
+                "            'Version': '2012-10-17',",
+                "            'Statement': [{",
+                "                'Effect': 'Allow',",
+                "                'Principal': {'Federated': 'cognito-identity.amazonaws.com'},",
+                "                'Action': 'sts:AssumeRoleWithWebIdentity',",
+                "                'Condition': {",
+                "                    'StringEquals': {'cognito-identity.amazonaws.com:aud': idpId},",
+                "                    'ForAnyValue:StringLike': {'cognito-identity.amazonaws.com:amr': 'unauthenticated'}",
+                "                }",
+                "            }]",
+                "        };",
+                "        if (event.RequestType === 'Delete') {",
+                "            try {",
+                "                delete authParamsJson.Statement[0].Condition;",
+                "                delete unauthParamsJson.Statement[0].Condition;",
+                "                authParamsJson.Statement[0].Effect = 'Deny'",
+                "                unauthParamsJson.Statement[0].Effect = 'Deny'",
+                "                let authParams = {PolicyDocument: JSON.stringify(authParamsJson), RoleName: authRoleName};",
+                "                let unauthParams = {PolicyDocument: JSON.stringify(unauthParamsJson), RoleName: unauthRoleName};",
+                "                const iam = new IAMClient({region: event.ResourceProperties.region});",
+                "                let res = await Promise.all([",
+                "                    iam.send(new GetRoleCommand({RoleName: authParams.RoleName})),",
+                "                    iam.send(new GetRoleCommand({RoleName: unauthParams.RoleName}))",
+                "                ]);",
+                "                res = await Promise.all([",
+                "                    iam.send(new UpdateAssumeRolePolicyCommand(authParams)),",
+                "                    iam.send(new UpdateAssumeRolePolicyCommand(unauthParams))",
+                "                ]);",
+                "                response.send(event, context, response.SUCCESS, {});",
+                "            } catch (err) {",
+                "                console.log(err.stack);",
+                "                response.send(event, context, response.SUCCESS, {Error: err});",
+                "            }",
+                "        } else if (event.RequestType === 'Update' || event.RequestType === 'Create') {",
+                "            const iam = new IAMClient({region: event.ResourceProperties.region});",
+                "            let authParams = {PolicyDocument: JSON.stringify(authParamsJson), RoleName: authRoleName};",
+                "            let unauthParams = {PolicyDocument: JSON.stringify(unauthParamsJson), RoleName: unauthRoleName};",
+                "            const res = await Promise.all([",
+                "                iam.send(new UpdateAssumeRolePolicyCommand(authParams)),",
+                "                iam.send(new UpdateAssumeRolePolicyCommand(unauthParams))",
+                "            ]);",
+                "            response.send(event, context, response.SUCCESS, {});",
+                "        }",
+                "    } catch (err) {",
+                "        console.log(err.stack);",
+                "        response.send(event, context, response.FAILED, {Error: err});",
+                "    }",
+                "};"
+              ]
+            ]
+          }
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs22.x",
+        "Timeout": 300,
+        "Role": {
+          "Fn::GetAtt": [
+            "UpdateRolesWithIDPFunctionRole",
+            "Arn"
+          ]
+        }
+      }
+    },
+    "UpdateRolesWithIDPFunctionOutputs": {
+      "Type": "Custom::LambdaCallout",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "UpdateRolesWithIDPFunction",
+            "Arn"
+          ]
+        },
+        "region": {
+          "Ref": "AWS::Region"
+        },
+        "idpId": {
+          "Fn::GetAtt": [
+            "authdiscussions22367c6822367c68",
+            "Outputs.IdentityPoolId"
+          ]
+        },
+        "authRoleName": {
+          "Ref": "AuthRole"
+        },
+        "unauthRoleName": {
+          "Ref": "UnauthRole"
+        }
+      }
+    },
+    "UpdateRolesWithIDPFunctionRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "RoleName": {
+          "Fn::Join": [
+            "",
+            [
+              {
+                "Ref": "AuthRole"
+              },
+              "-idp"
+            ]
+          ]
+        },
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              },
+              "Action": [
+                "sts:AssumeRole"
+              ]
+            }
+          ]
+        },
+        "Policies": [
+          {
+            "PolicyName": "UpdateRolesWithIDPFunctionPolicy",
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "logs:CreateLogGroup",
+                    "logs:CreateLogStream",
+                    "logs:PutLogEvents"
+                  ],
+                  "Resource": "arn:aws:logs:*:*:*"
+                },
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "iam:UpdateAssumeRolePolicy",
+                    "iam:GetRole"
+                  ],
+                  "Resource": {
+                    "Fn::GetAtt": [
+                      "AuthRole",
+                      "Arn"
+                    ]
+                  }
+                },
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "iam:UpdateAssumeRolePolicy",
+                    "iam:GetRole"
+                  ],
+                  "Resource": {
+                    "Fn::GetAtt": [
+                      "UnauthRole",
+                      "Arn"
+                    ]
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/migration-config.json b/amplify-migration-apps/discussions/migration-config.json
index 3ae400a0c55..32311eef879 100644
--- a/amplify-migration-apps/discussions/migration-config.json
+++ b/amplify-migration-apps/discussions/migration-config.json
@@ -30,6 +30,17 @@
               "sortKey": "timestamp"
             }
           ]
+        },
+        {
+          "name": "bookmarks",
+          "partitionKey": "userId",
+          "sortKey": "postId",
+          "gsi": [
+            {
+              "name": "byPost",
+              "partitionKey": "postId"
+            }
+          ]
         }
       ]
     },
diff --git a/amplify-migration-apps/snapshot.ts b/amplify-migration-apps/snapshot.ts
index 8c533ceb006..be48b273688 100644
--- a/amplify-migration-apps/snapshot.ts
+++ b/amplify-migration-apps/snapshot.ts
@@ -104,7 +104,7 @@ async function findGen1RootStack(appName: string, envName: string): Promise<stri
 }
 
 async function fetchTemplate(stackName: string): Promise<string> {
-  const response = await cfnClient.send(new GetTemplateCommand({ StackName: stackName }));
+  const response = await cfnClient.send(new GetTemplateCommand({ StackName: stackName, TemplateStage: 'Original' }));
   return response.TemplateBody!;
 }
 

From 5ef66e714c18d5c03e32f71e5bd06ec1619383b4 Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Wed, 18 Mar 2026 01:02:15 +0000
Subject: [PATCH 04/20] docs(discussions): add bookmarks table setup
 instructions to README

---
 amplify-migration-apps/discussions/README.md | 45 ++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/amplify-migration-apps/discussions/README.md b/amplify-migration-apps/discussions/README.md
index 4f92a3fc61a..7cf9042a97c 100644
--- a/amplify-migration-apps/discussions/README.md
+++ b/amplify-migration-apps/discussions/README.md
@@ -2,7 +2,7 @@
 
 ![](./images/app.png)
 
-A discussion application built featuring authentication, GraphQL API, Lambda functions, and DynamoDB storage.
+A discussion application built featuring authentication, GraphQL API, Lambda functions, and multiple DynamoDB storage tables (activity + bookmarks).
 
 > [!NOTICE]
 > Since amplify operations add files to your local directory, its better not to operate within this repo.
@@ -116,8 +116,9 @@ amplify add api
 
 ### Storage
 
-DynamoDB table for storing user activity logs with partition key, sort key,
-and global secondary index for querying by activity type.
+Two DynamoDB tables: `activity` for storing user activity logs, and `bookmarks` for storing user bookmarks on posts.
+
+#### Activity Table
 
 ```console
 amplify add storage
@@ -169,6 +170,42 @@ https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.Core
 ✔ Do you want to add a Lambda Trigger for your Table? (y/N) · no
 ```
 
+#### Bookmarks Table
+
+```console
+amplify add storage
+```
+
+```console
+? Select from one of the below mentioned services: NoSQL Database
+
+Welcome to the NoSQL DynamoDB database wizard
+This wizard asks you a series of questions to help determine how to set up your NoSQL database table.
+
+✔ Provide a friendly name · bookmarks
+✔ Provide table name · bookmarks
+
+You can now add columns to the table.
+
+✔ What would you like to name this column · userId
+✔ Choose the data type · string
+✔ Would you like to add another column? (Y/n) · yes
+✔ What would you like to name this column · postId
+✔ Choose the data type · string
+✔ Would you like to add another column? (Y/n) · no
+
+✔ Choose partition key for the table · userId
+✔ Do you want to add a sort key to your table? (Y/n) · yes
+✔ Choose sort key for the table · postId
+
+✔ Do you want to add global secondary indexes to your table? (Y/n) · yes
+✔ Provide the GSI name · byPost
+✔ Choose partition key for the GSI · postId
+✔ Do you want to add a sort key to your global secondary index? (Y/n) · no
+✔ Do you want to add more global secondary indexes to your table? (Y/n) · no
+✔ Do you want to add a Lambda Trigger for your Table? (y/N) · no
+```
+
 ### Function
 
 **Node.js Lambda function that retrieves user activity from DynamoDB storage.**
@@ -280,6 +317,8 @@ amplify push
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Storage  │ activity                    │ Create    │ awscloudformation │
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
+│ Storage  │ bookmarks                   │ Create    │ awscloudformation │
+├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Function │ fetchuseractivity           │ Create    │ awscloudformation │
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Function │ recorduseractivity          │ Create    │ awscloudformation │

From bc3ac527444f8a0ee2affe768ea56334854e125a Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Wed, 18 Mar 2026 01:06:59 +0000
Subject: [PATCH 05/20] fix(discussions): sanitize Amplify App ID in Gen2
 snapshot files

Replace raw app ID d1skq8aomhb772 with sanitized name 'discussions'
in all snapshot file contents and filenames.
---
 ...9371D7-19LVPI73QPSY7-holding.mappings.json |  52 ---
 ...46F297-1PHSGRJSW0US5-holding.mappings.json |  12 -
 ...10DAF62-AOPTK1NWQZNJ-holding.mappings.json |  12 -
 ...9371D7-19LVPI73QPSY7-holding.mappings.json |  52 +++
 ...9LVPI73QPSY7-holding.source.template.json} |  24 +-
 ...9LVPI73QPSY7-holding.target.template.json} |   0
 ...46F297-1PHSGRJSW0US5-holding.mappings.json |  12 +
 ...PHSGRJSW0US5-holding.source.template.json} |  14 +-
 ...PHSGRJSW0US5-holding.target.template.json} |   0
 ...10DAF62-AOPTK1NWQZNJ-holding.mappings.json |  12 +
 ...AOPTK1NWQZNJ-holding.source.template.json} |   2 +-
 ...AOPTK1NWQZNJ-holding.target.template.json} |   0
 ...-auth179371D7-19LVPI73QPSY7.mappings.json} |  10 +-
 ...9371D7-19LVPI73QPSY7.source.template.json} |   0
 ...9371D7-19LVPI73QPSY7.target.template.json} |  24 +-
 ...ivityA346F297-1PHSGRJSW0US5.mappings.json} |   2 +-
 ...46F297-1PHSGRJSW0US5.source.template.json} |   0
 ...46F297-1PHSGRJSW0US5.target.template.json} |  14 +-
 ...kmarks210DAF62-AOPTK1NWQZNJ.mappings.json} |   2 +-
 ...10DAF62-AOPTK1NWQZNJ.source.template.json} |   0
 ...10DAF62-AOPTK1NWQZNJ.target.template.json} |   2 +-
 ...uth179371D7-19LVPI73QPSY7.parameters.json} |   0
 ...-auth179371D7-19LVPI73QPSY7.template.json} |  24 +-
 ...ityA346F297-1PHSGRJSW0US5.parameters.json} |   0
 ...ivityA346F297-1PHSGRJSW0US5.template.json} |  14 +-
 ...arks210DAF62-AOPTK1NWQZNJ.parameters.json} |   0
 ...kmarks210DAF62-AOPTK1NWQZNJ.template.json} |   2 +-
 ...gerNestedStackA-1KJBI9SVOWO6G.outputs.json |   6 -
 ...NestedStackA-1KJBI9SVOWO6G.parameters.json |   6 -
 ...ommentNested-18DBZ8BQTMK8E.parameters.json |  46 ---
 ...edStackConne-1OWUZYB5XE48X.parameters.json |  46 ---
 ...ackNestedSta-1U3PX8KU9ZZ8H.parameters.json |  22 --
 ...tNestedStackR-QQ10UZAFYJQD.parameters.json |  46 ---
 ...picNestedStac-Y6NEQZHYFNZU.parameters.json |  46 ---
 ...92-auth179371D7-19LVPI73QPSY7.outputs.json |  22 --
 ...a92-data7552DF31-G2MUTCUFR08M.outputs.json |  30 --
 ...-data7552DF31-G2MUTCUFR08M.parameters.json |  38 ---
 ...function1351588B-H9TILALYT3XU.outputs.json |  10 -
 ...ction1351588B-H9TILALYT3XU.parameters.json |  26 --
 ...ctivityA346F297-1PHSGRJSW0US5.outputs.json |  14 -
 ...estedStackA-1KJBI9SVOWO6G.description.txt} |   0
 ...gerNestedStackA-1KJBI9SVOWO6G.outputs.json |   6 +
 ...NestedStackA-1KJBI9SVOWO6G.parameters.json |   6 +
 ...rNestedStackA-1KJBI9SVOWO6G.template.json} |  40 +--
 ...mmentNested-18DBZ8BQTMK8E.description.txt} |   0
 ...kCommentNested-18DBZ8BQTMK8E.outputs.json} |   6 +-
 ...ommentNested-18DBZ8BQTMK8E.parameters.json |  46 +++
 ...CommentNested-18DBZ8BQTMK8E.template.json} | 284 ++++++++---------
 ...dStackConne-1OWUZYB5XE48X.description.txt} |   0
 ...stedStackConne-1OWUZYB5XE48X.outputs.json} |   0
 ...edStackConne-1OWUZYB5XE48X.parameters.json |  46 +++
 ...tedStackConne-1OWUZYB5XE48X.template.json} | 128 ++++----
 ...ckNestedSta-1U3PX8KU9ZZ8H.description.txt} |   0
 ...StackNestedSta-1U3PX8KU9ZZ8H.outputs.json} |   0
 ...ackNestedSta-1U3PX8KU9ZZ8H.parameters.json |  22 ++
 ...tackNestedSta-1U3PX8KU9ZZ8H.template.json} |  42 +--
 ...NestedStackR-QQ10UZAFYJQD.description.txt} |   0
 ...ostNestedStackR-QQ10UZAFYJQD.outputs.json} |   6 +-
 ...tNestedStackR-QQ10UZAFYJQD.parameters.json |  46 +++
 ...stNestedStackR-QQ10UZAFYJQD.template.json} | 284 ++++++++---------
 ...icNestedStac-Y6NEQZHYFNZU.description.txt} |   0
 ...TopicNestedStac-Y6NEQZHYFNZU.outputs.json} |   6 +-
 ...picNestedStac-Y6NEQZHYFNZU.parameters.json |  46 +++
 ...opicNestedStac-Y6NEQZHYFNZU.template.json} | 284 ++++++++---------
 ...uth179371D7-19LVPI73QPSY7.description.txt} |   0
 ...92-auth179371D7-19LVPI73QPSY7.outputs.json |  22 ++
 ...uth179371D7-19LVPI73QPSY7.parameters.json} |   0
 ...-auth179371D7-19LVPI73QPSY7.template.json} |  24 +-
 ...data7552DF31-G2MUTCUFR08M.description.txt} |   0
 ...a92-data7552DF31-G2MUTCUFR08M.outputs.json |  30 ++
 ...-data7552DF31-G2MUTCUFR08M.parameters.json |  38 +++
 ...2-data7552DF31-G2MUTCUFR08M.template.json} | 298 +++++++++---------
 ...tion1351588B-H9TILALYT3XU.description.txt} |   0
 ...function1351588B-H9TILALYT3XU.outputs.json |  10 +
 ...ction1351588B-H9TILALYT3XU.parameters.json |  26 ++
 ...nction1351588B-H9TILALYT3XU.template.json} |  88 +++---
 ...ityA346F297-1PHSGRJSW0US5.description.txt} |   0
 ...ctivityA346F297-1PHSGRJSW0US5.outputs.json |  14 +
 ...ityA346F297-1PHSGRJSW0US5.parameters.json} |   0
 ...ivityA346F297-1PHSGRJSW0US5.template.json} |   8 +-
 ...arks210DAF62-AOPTK1NWQZNJ.description.txt} |   0
 ...okmarks210DAF62-AOPTK1NWQZNJ.outputs.json} |   0
 ...arks210DAF62-AOPTK1NWQZNJ.parameters.json} |   0
 ...kmarks210DAF62-AOPTK1NWQZNJ.template.json} |   2 +-
 ...e2etest-branch-75c4329a92.description.txt} |   0
 ...ns-e2etest-branch-75c4329a92.outputs.json} |   2 +-
 ...e2etest-branch-75c4329a92.parameters.json} |   0
 ...s-e2etest-branch-75c4329a92.template.json} | 120 +++----
 88 files changed, 1312 insertions(+), 1312 deletions(-)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json => refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json => refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json => refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json => refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json => refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json => refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json} (91%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json => refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json => refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json => refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json => update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json} (100%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json => _snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json => update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json => update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json} (91%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json => update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json} (100%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json => _snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json} (98%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt => amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json => amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt => amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json => amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json} (71%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json => amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt => amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json => amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json => amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json} (67%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt => amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json => amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json => amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json} (81%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt => amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json => amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json} (71%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json => amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt => amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json => amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json} (71%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json => amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt => amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json => amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json} (100%)
 rename amplify-migration-apps/discussions/{_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json => _snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt => amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json => amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json} (71%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt => amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json => amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json} (72%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt => amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json => amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json => amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json} (95%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt => amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json => amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json => amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json} (100%)
 rename amplify-migration-apps/discussions/{_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json => _snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt => amplify-discussions-e2etest-branch-75c4329a92.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json => amplify-discussions-e2etest-branch-75c4329a92.outputs.json} (96%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json => amplify-discussions-e2etest-branch-75c4329a92.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json => amplify-discussions-e2etest-branch-75c4329a92.template.json} (77%)

diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
deleted file mode 100644
index f8e3faad3b9..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
deleted file mode 100644
index 3ff6b77ff76..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
-      "LogicalResourceId": "activity1E902D9C"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding",
-      "LogicalResourceId": "activity1E902D9C"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
deleted file mode 100644
index 62daa29e7bc..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
-      "LogicalResourceId": "bookmarksA4548304"
-    },
-    "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding",
-      "LogicalResourceId": "bookmarksA4548304"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
new file mode 100644
index 00000000000..98c64afa020
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
@@ -0,0 +1,52 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
index c570fa01a43..3c0a2af31a7 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
@@ -27,7 +27,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -77,7 +77,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -98,7 +98,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
@@ -107,7 +107,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -379,20 +379,20 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
       "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
       "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
new file mode 100644
index 00000000000..35d2485bffa
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
+      "LogicalResourceId": "activity1E902D9C"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding",
+      "LogicalResourceId": "activity1E902D9C"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
index ec8ace2f02d..728e71a7f94 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -279,14 +279,14 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
new file mode 100644
index 00000000000..2338cb41f96
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
+      "LogicalResourceId": "bookmarksA4548304"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
index f5457481c3c..72870a2ec8e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
index 46fa61acd20..998dce0b3ad 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "UserPool"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
     }
   },
@@ -15,7 +15,7 @@
       "LogicalResourceId": "UserPoolClientWeb"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
     }
   },
@@ -25,7 +25,7 @@
       "LogicalResourceId": "UserPoolClient"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
     }
   },
@@ -35,7 +35,7 @@
       "LogicalResourceId": "IdentityPool"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
     }
   },
@@ -45,7 +45,7 @@
       "LogicalResourceId": "IdentityPoolRoleMap"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
       "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
index 36050371f8e..2a59df16523 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
@@ -27,7 +27,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -77,7 +77,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -98,7 +98,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
@@ -107,7 +107,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -526,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
       "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
       "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
index 135ff106702..dc149993830 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "DynamoDBTable"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
       "LogicalResourceId": "activity1E902D9C"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
similarity index 91%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
index e0a6302a937..412da87990f 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -347,14 +347,14 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
index bdf385c56a9..2cabe515564 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
@@ -5,7 +5,7 @@
       "LogicalResourceId": "DynamoDBTable"
     },
     "Destination": {
-      "StackName": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
+      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
       "LogicalResourceId": "bookmarksA4548304"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
index ccabe6404f7..4dd9e588f69 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
index d74377c775d..64c3a236423 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
@@ -27,7 +27,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -77,7 +77,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -98,7 +98,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
@@ -107,7 +107,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -526,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
       "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
       "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
similarity index 91%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
index 8fb7eb0f166..1c5d0c2adcd 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -347,14 +347,14 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
+      "Value": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
index 5118fac917e..8e4344a2ca2 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
deleted file mode 100644
index c4501138453..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
deleted file mode 100644
index 5e28a9c5893..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
deleted file mode 100644
index e9875388e2a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
deleted file mode 100644
index 727f83af600..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
-    "ParameterValue": "CommentTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
-    "ParameterValue": "TopicTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
-    "ParameterValue": "PostTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
deleted file mode 100644
index d516b01de8b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
deleted file mode 100644
index e9875388e2a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
deleted file mode 100644
index e9875388e2a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-d1skq8aomhb772-e2-TableManagerCustomProvid-120JeVoVZN43"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
deleted file mode 100644
index e4c2ee6c9b0..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "OutputValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "OutputValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "OutputValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref",
-    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
-    "OutputValue": "us-east-1_dgn42NPnC"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
deleted file mode 100644
index 3bf5957c40b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl",
-    "OutputValue": "https://ugegaqplxndhddmmhzi2j4rj4u.appsync-api.us-east-1.amazonaws.com/graphql"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn",
-    "OutputValue": "arn:aws:s3:::amplify-d1skq8aomhb772-e2-amplifydataamplifycodege-g8qjz8miowur"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey",
-    "OutputValue": "da2-3ikaaaabp5gubimmave6av37ga"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "OutputValue": "2264xbjvizfhfljloltcb4xr3e"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
deleted file mode 100644
index 09183bda5c7..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
-    "ParameterValue": "us-east-1_dgn42NPnC"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
deleted file mode 100644
index 9a397efba6e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref",
-    "OutputValue": "fetchuseractivity-e2etest"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref",
-    "OutputValue": "recorduseractivity-e2etest"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
deleted file mode 100644
index 528e60938a8..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref",
-    "ParameterValue": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "ParameterKey": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
deleted file mode 100644
index 6548d697d67..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref",
-    "OutputValue": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
new file mode 100644
index 00000000000..4d53c4efdb9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
@@ -0,0 +1,6 @@
+[
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
new file mode 100644
index 00000000000..693d35cd349
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
index 3747c4484f6..04665c3652a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
@@ -53,7 +53,7 @@
                       "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
                       {
                         "apiId": {
-                          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                         },
                         "envName": "NONE"
                       }
@@ -79,7 +79,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -100,7 +100,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
       }
     },
     "AmplifyManagedTableOnEventRoleB4E71DEA": {
@@ -156,7 +156,7 @@
                       "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
                       {
                         "apiId": {
-                          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                         },
                         "envName": "NONE"
                       }
@@ -182,7 +182,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -203,7 +203,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
       }
     },
     "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6": {
@@ -229,7 +229,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
       }
     },
     "TableManagerCustomProviderframeworkonEvent1DFC2ECC": {
@@ -241,7 +241,7 @@
           },
           "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
         },
-        "Description": "AmplifyManagedTable - onEvent (amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Description": "AmplifyManagedTable - onEvent (amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
         "Environment": {
           "Variables": {
             "WAITER_STATE_MACHINE_ARN": {
@@ -260,7 +260,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -286,7 +286,7 @@
         "AmplifyManagedTableOnEventRoleB4E71DEA"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
         "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -301,7 +301,7 @@
           },
           "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
         },
-        "Description": "AmplifyManagedTable - isComplete (amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Description": "AmplifyManagedTable - isComplete (amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
         "Handler": "amplify-table-manager-handler.isComplete",
         "Role": {
           "Fn::GetAtt": [
@@ -313,7 +313,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -338,7 +338,7 @@
         "AmplifyManagedTableIsCompleteRoleF825222C"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
         "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -362,7 +362,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -383,7 +383,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
       }
     },
     "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A": {
@@ -428,7 +428,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
       }
     },
     "AmplifyTableWaiterStateMachine060600BC": {
@@ -461,7 +461,7 @@
         "AmplifyTableWaiterStateMachineRole470BE899"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
       }
     },
     "CDKMetadata": {
@@ -470,7 +470,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNyw6CMBBFv4V9GRHYuBQTl8bAB5ChHUl5tAnTSkzTfzeArs65OYubQ14WkCW4cirVmE66g/AgdqQah3IUuHIbNM4QajuRuL3MzqedtPxs87AoJpw7hRDu3kinrdna36PgokVmcgzXDYILqLwcyVXIFEVNbP0iSey1cdhr0+9nvxCFsYpg4NM7z+B8gTIZWOt08cbpmaA++AUjkpGTzwAAAA=="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -742,12 +742,12 @@
     }
   },
   "Parameters": {
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn": {
       "Value": {
         "Fn::GetAtt": [
           "TableManagerCustomProviderframeworkonEvent1DFC2ECC",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
index 0a93dc270eb..8dd4987dab1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
@@ -1,10 +1,10 @@
 [
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
     "OutputValue": "CommentTable"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
     "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
   },
   {
@@ -20,7 +20,7 @@
     "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:CommentTable:Name"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
     "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
new file mode 100644
index 00000000000..24ac26e9862
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
index f2e653f6447..7f9175dd57e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Type": "String"
     }
   },
@@ -353,7 +353,7 @@
       "Type": "Custom::AmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
         },
         "tableName": {
           "Fn::Join": [
@@ -361,7 +361,7 @@
             [
               "Comment-",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "-NONE"
             ]
@@ -462,7 +462,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentTable/Default/Default"
       }
     },
     "CommentIAMRoleD5EC5F51": {
@@ -511,7 +511,7 @@
                               [
                                 "Comment-",
                                 {
-                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -530,7 +530,7 @@
                               [
                                 "Comment-",
                                 {
-                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -553,7 +553,7 @@
             [
               "CommentIAMRole20388d-",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "-NONE"
             ]
@@ -562,7 +562,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -583,14 +583,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentIAMRole/Resource"
       }
     },
     "CommentDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -636,17 +636,17 @@
         "CommentIAMRoleD5EC5F51"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentDataSource/Resource"
       }
     },
     "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetCommentauth0Function",
@@ -656,17 +656,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
       }
     },
     "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetCommentpostAuth0Function",
@@ -676,14 +676,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -704,14 +704,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
       }
     },
     "GetCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "getComment",
         "Kind": "PIPELINE",
@@ -743,7 +743,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -782,7 +782,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -794,11 +794,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -808,17 +808,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryGetCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryGetCommentResolver"
       }
     },
     "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistCommentsauth0Function",
@@ -828,17 +828,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistCommentspostAuth0Function",
@@ -848,14 +848,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -876,14 +876,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
       }
     },
     "ListCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "listComments",
         "Kind": "PIPELINE",
@@ -915,7 +915,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -954,7 +954,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -966,11 +966,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -980,17 +980,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryListCommentsResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryListCommentsResolver"
       }
     },
     "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentinit0Function",
@@ -1000,17 +1000,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
       }
     },
     "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentauth0Function",
@@ -1020,17 +1020,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentpostAuth0Function",
@@ -1040,14 +1040,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1068,14 +1068,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "CreateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "createComment",
         "Kind": "PIPELINE",
@@ -1113,7 +1113,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1152,7 +1152,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1164,11 +1164,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1178,17 +1178,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationCreateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationCreateCommentResolver"
       }
     },
     "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateCommentinit0Function",
@@ -1198,14 +1198,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
       }
     },
     "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1226,17 +1226,17 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateCommentpostAuth0Function",
@@ -1246,14 +1246,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1274,14 +1274,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "UpdateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "updateComment",
         "Kind": "PIPELINE",
@@ -1319,7 +1319,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1358,7 +1358,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1370,11 +1370,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1384,14 +1384,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationUpdateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationUpdateCommentResolver"
       }
     },
     "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1412,17 +1412,17 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteCommentpostAuth0Function",
@@ -1432,14 +1432,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1460,14 +1460,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
       }
     },
     "DeleteCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "deleteComment",
         "Kind": "PIPELINE",
@@ -1499,7 +1499,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1538,7 +1538,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1550,11 +1550,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1564,17 +1564,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationDeleteCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationDeleteCommentResolver"
       }
     },
     "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateCommentauth0Function",
@@ -1584,17 +1584,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateCommentpostAuth0Function",
@@ -1604,17 +1604,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateCommentDataResolverFn",
@@ -1626,14 +1626,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onCreateComment",
         "Kind": "PIPELINE",
@@ -1665,7 +1665,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1677,7 +1677,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1689,11 +1689,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1703,17 +1703,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
       }
     },
     "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateCommentauth0Function",
@@ -1723,17 +1723,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateCommentpostAuth0Function",
@@ -1743,17 +1743,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateCommentDataResolverFn",
@@ -1765,14 +1765,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onUpdateComment",
         "Kind": "PIPELINE",
@@ -1804,7 +1804,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1816,7 +1816,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1828,11 +1828,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1842,17 +1842,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
       }
     },
     "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteCommentauth0Function",
@@ -1862,17 +1862,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteCommentpostAuth0Function",
@@ -1882,17 +1882,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteCommentDataResolverFn",
@@ -1904,14 +1904,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onDeleteComment",
         "Kind": "PIPELINE",
@@ -1943,7 +1943,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1955,7 +1955,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1967,11 +1967,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1981,7 +1981,7 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
       }
     },
     "CDKMetadata": {
@@ -1990,7 +1990,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -2010,7 +2010,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "GetAtt:CommentTable:StreamArn"
             ]
@@ -2026,7 +2026,7 @@
           [
             "Comment-",
             {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
             },
             "-NONE"
           ]
@@ -2038,7 +2038,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "GetAtt:CommentTable:Name"
             ]
@@ -2046,7 +2046,7 @@
         }
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
       "Value": {
         "Fn::GetAtt": [
           "CommentDataSource",
@@ -2054,7 +2054,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
       "Value": {
         "Fn::GetAtt": [
           "CommentTable",
@@ -2062,7 +2062,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "CommentTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
new file mode 100644
index 00000000000..4c1cdd52826
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
+    "ParameterValue": "CommentTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
+    "ParameterValue": "TopicTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
+    "ParameterValue": "PostTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
similarity index 67%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
index 449667e0ee5..54a7724d79b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
@@ -4,10 +4,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Topicpostsauth0Function",
@@ -17,17 +17,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
       }
     },
     "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "TopicPostsDataResolverFn",
@@ -39,14 +39,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
       }
     },
     "TopicpostsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "posts",
         "Kind": "PIPELINE",
@@ -72,7 +72,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -88,7 +88,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
+                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
                               }
                             ]
                           }
@@ -108,7 +108,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -120,11 +120,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -134,17 +134,17 @@
         "TypeName": "Topic"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/topicPostsResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/topicPostsResolver"
       }
     },
     "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Postcommentsauth0Function",
@@ -154,17 +154,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
       }
     },
     "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "PostCommentsDataResolverFn",
@@ -176,14 +176,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
       }
     },
     "PostcommentsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "comments",
         "Kind": "PIPELINE",
@@ -209,7 +209,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -225,7 +225,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
+                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
                               }
                             ]
                           }
@@ -245,7 +245,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -257,11 +257,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -271,17 +271,17 @@
         "TypeName": "Post"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postCommentsResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postCommentsResolver"
       }
     },
     "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Posttopicauth0Function",
@@ -291,17 +291,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
       }
     },
     "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "PostTopicDataResolverFn",
@@ -313,14 +313,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
       }
     },
     "PosttopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "topic",
         "Kind": "PIPELINE",
@@ -346,7 +346,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -362,7 +362,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
+                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
                               }
                             ]
                           }
@@ -382,7 +382,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -394,11 +394,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -408,17 +408,17 @@
         "TypeName": "Post"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postTopicResolver"
       }
     },
     "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Commentpostauth0Function",
@@ -428,17 +428,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
       }
     },
     "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "CommentPostDataResolverFn",
@@ -450,14 +450,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
       }
     },
     "CommentpostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "post",
         "Kind": "PIPELINE",
@@ -483,7 +483,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -499,7 +499,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
+                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
                               }
                             ]
                           }
@@ -519,7 +519,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -531,11 +531,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -545,7 +545,7 @@
         "TypeName": "Comment"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/commentPostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/commentPostResolver"
       }
     },
     "CDKMetadata": {
@@ -554,7 +554,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMMQ6CQBBA0bPQLyMCjaWQWFrAAci4DGQAZwmzCzGEuxu0evnNTyHNM0gi3DS27RhP/IL9SeqprT3a0eCmza5Zg6rkFe4nRjMogh3JF6hkcJ71Ixb2spNHEOvZSemk4z4seIYpO6lI3bTSchzm96g99iz9YcS1BINe1jSB6w3yaFDmeAni+U1Q/f0C+wjzPacAAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -826,37 +826,37 @@
     }
   },
   "Parameters": {
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
new file mode 100644
index 00000000000..e191208479d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
similarity index 81%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
index 9375462cb15..cfcfd857d2e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
@@ -296,7 +296,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -317,7 +317,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/Resource"
       }
     },
     "FetchuseractivityE2etestLambdaDataSourceServiceRoleDefaultPolicyB52936FD": {
@@ -378,14 +378,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "FetchuseractivityE2etestLambdaDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "LambdaConfig": {
           "LambdaFunctionArn": {
@@ -413,14 +413,14 @@
         "Type": "AWS_LAMBDA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/Resource"
       }
     },
     "InvokeFetchuseractivityE2etestLambdaDataSourceInvokeFetchuseractivityE2etestLambdaDataSourceAppSyncFunction6E36199C": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -441,14 +441,14 @@
         "FetchuseractivityE2etestLambdaDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityE2etestLambdaDataSource/InvokeFetchuseractivityE2etestLambdaDataSource.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityE2etestLambdaDataSource/InvokeFetchuseractivityE2etestLambdaDataSource.AppSyncFunction"
       }
     },
     "QueryfetchUserActivityResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "fetchUserActivity",
         "Kind": "PIPELINE",
@@ -478,7 +478,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
               {
@@ -486,11 +486,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
             ]
@@ -502,17 +502,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
       }
     },
     "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QueryFetchUserActivityAuthFN",
@@ -522,7 +522,7 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
       }
     },
     "CDKMetadata": {
@@ -531,25 +531,25 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOsW7DMAxEvyW7zKZ2lo6Ni05FUdgfEDASbTCWqcCUEgSG/72Qgg6dHu/IO7CG+tDAfod3raybKs9nWL9JI7k+op1MO0gbxHHkIAbvelo9zmeH8JnEZvOISgavV32IhfWrLD8wYh/SYinn/6u/XBtk4DEtWJrbQTrS4G+0bIZxhrULvtwX/gTP9pHlc9qMNidUpajwnmG0gWOyE8X8z2aK2UccWcbNSHAEF3251Xt4fYPD7qLM1ZIk8kzQPfkL3nAzgQsBAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
   },
   "Parameters": {
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
index 54c02a04791..c133429195a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
@@ -1,6 +1,6 @@
 [
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
     "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
   },
   {
@@ -10,11 +10,11 @@
     "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:PostTable:StreamArn"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
     "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
     "OutputValue": "PostTable"
   },
   {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
new file mode 100644
index 00000000000..24ac26e9862
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
index 960f94dac0f..284360e1f9e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Type": "String"
     }
   },
@@ -353,7 +353,7 @@
       "Type": "Custom::AmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
         },
         "tableName": {
           "Fn::Join": [
@@ -361,7 +361,7 @@
             [
               "Post-",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "-NONE"
             ]
@@ -462,7 +462,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/PostTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/PostTable/Default/Default"
       }
     },
     "PostIAMRole83BF708F": {
@@ -511,7 +511,7 @@
                               [
                                 "Post-",
                                 {
-                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -530,7 +530,7 @@
                               [
                                 "Post-",
                                 {
-                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -553,7 +553,7 @@
             [
               "PostIAMRolebbce9b-",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "-NONE"
             ]
@@ -562,7 +562,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -583,14 +583,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/PostIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/PostIAMRole/Resource"
       }
     },
     "PostDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -636,17 +636,17 @@
         "PostIAMRole83BF708F"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/PostDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/PostDataSource/Resource"
       }
     },
     "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetPostauth0Function",
@@ -656,17 +656,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
       }
     },
     "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetPostpostAuth0Function",
@@ -676,14 +676,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -704,14 +704,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
       }
     },
     "GetPostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "getPost",
         "Kind": "PIPELINE",
@@ -743,7 +743,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -782,7 +782,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -794,11 +794,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -808,17 +808,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/queryGetPostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/queryGetPostResolver"
       }
     },
     "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistPostsauth0Function",
@@ -828,17 +828,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistPostspostAuth0Function",
@@ -848,14 +848,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -876,14 +876,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
       }
     },
     "ListPostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "listPosts",
         "Kind": "PIPELINE",
@@ -915,7 +915,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -954,7 +954,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -966,11 +966,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -980,17 +980,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/queryListPostsResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/queryListPostsResolver"
       }
     },
     "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostinit0Function",
@@ -1000,17 +1000,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
       }
     },
     "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostauth0Function",
@@ -1020,17 +1020,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
       }
     },
     "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostpostAuth0Function",
@@ -1040,14 +1040,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1068,14 +1068,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
       }
     },
     "CreatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "createPost",
         "Kind": "PIPELINE",
@@ -1113,7 +1113,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1152,7 +1152,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1164,11 +1164,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1178,17 +1178,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationCreatePostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationCreatePostResolver"
       }
     },
     "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdatePostinit0Function",
@@ -1198,14 +1198,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
       }
     },
     "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1226,17 +1226,17 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
       }
     },
     "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdatePostpostAuth0Function",
@@ -1246,14 +1246,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1274,14 +1274,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
       }
     },
     "UpdatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "updatePost",
         "Kind": "PIPELINE",
@@ -1319,7 +1319,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1358,7 +1358,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1370,11 +1370,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1384,14 +1384,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationUpdatePostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationUpdatePostResolver"
       }
     },
     "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1412,17 +1412,17 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
       }
     },
     "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeletePostpostAuth0Function",
@@ -1432,14 +1432,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1460,14 +1460,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
       }
     },
     "DeletePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "deletePost",
         "Kind": "PIPELINE",
@@ -1499,7 +1499,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1538,7 +1538,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1550,11 +1550,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1564,17 +1564,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationDeletePostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationDeletePostResolver"
       }
     },
     "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreatePostauth0Function",
@@ -1584,17 +1584,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreatePostpostAuth0Function",
@@ -1604,17 +1604,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreatePostDataResolverFn",
@@ -1626,14 +1626,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onCreatePost",
         "Kind": "PIPELINE",
@@ -1665,7 +1665,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1677,7 +1677,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1689,11 +1689,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1703,17 +1703,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnCreatePostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnCreatePostResolver"
       }
     },
     "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdatePostauth0Function",
@@ -1723,17 +1723,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdatePostpostAuth0Function",
@@ -1743,17 +1743,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdatePostDataResolverFn",
@@ -1765,14 +1765,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onUpdatePost",
         "Kind": "PIPELINE",
@@ -1804,7 +1804,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1816,7 +1816,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1828,11 +1828,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1842,17 +1842,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
       }
     },
     "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeletePostauth0Function",
@@ -1862,17 +1862,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeletePostpostAuth0Function",
@@ -1882,17 +1882,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeletePostDataResolverFn",
@@ -1904,14 +1904,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeletePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onDeletePost",
         "Kind": "PIPELINE",
@@ -1943,7 +1943,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1955,7 +1955,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1967,11 +1967,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1981,7 +1981,7 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnDeletePostResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnDeletePostResolver"
       }
     },
     "CDKMetadata": {
@@ -1990,7 +1990,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -2010,7 +2010,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "GetAtt:PostTable:StreamArn"
             ]
@@ -2026,7 +2026,7 @@
           [
             "Post-",
             {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
             },
             "-NONE"
           ]
@@ -2038,7 +2038,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "GetAtt:PostTable:Name"
             ]
@@ -2046,7 +2046,7 @@
         }
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
       "Value": {
         "Fn::GetAtt": [
           "PostDataSource",
@@ -2054,7 +2054,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "PostTable",
@@ -2062,7 +2062,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "PostTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
index e4c284ee979..0840da290e3 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
@@ -12,15 +12,15 @@
     "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:TopicTable:Name"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
     "OutputValue": "TopicTable"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
     "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
   },
   {
-    "OutputKey": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
     "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
new file mode 100644
index 00000000000..24ac26e9862
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
index 6c9ff437cd6..a3af2b16da1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Type": "String"
     }
   },
@@ -353,7 +353,7 @@
       "Type": "Custom::AmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
         },
         "tableName": {
           "Fn::Join": [
@@ -361,7 +361,7 @@
             [
               "Topic-",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "-NONE"
             ]
@@ -428,7 +428,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicTable/Default/Default"
       }
     },
     "TopicIAMRoleD9B4C845": {
@@ -477,7 +477,7 @@
                               [
                                 "Topic-",
                                 {
-                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -496,7 +496,7 @@
                               [
                                 "Topic-",
                                 {
-                                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -519,7 +519,7 @@
             [
               "TopicIAMRole014e70-",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "-NONE"
             ]
@@ -528,7 +528,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -549,14 +549,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicIAMRole/Resource"
       }
     },
     "TopicDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -602,17 +602,17 @@
         "TopicIAMRoleD9B4C845"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicDataSource/Resource"
       }
     },
     "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetTopicauth0Function",
@@ -622,17 +622,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
       }
     },
     "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetTopicpostAuth0Function",
@@ -642,14 +642,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -670,14 +670,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
       }
     },
     "GetTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "getTopic",
         "Kind": "PIPELINE",
@@ -709,7 +709,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -748,7 +748,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -760,11 +760,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -774,17 +774,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryGetTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryGetTopicResolver"
       }
     },
     "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistTopicsauth0Function",
@@ -794,17 +794,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistTopicspostAuth0Function",
@@ -814,14 +814,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -842,14 +842,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
       }
     },
     "ListTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "listTopics",
         "Kind": "PIPELINE",
@@ -881,7 +881,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -920,7 +920,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -932,11 +932,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -946,17 +946,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryListTopicsResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryListTopicsResolver"
       }
     },
     "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicinit0Function",
@@ -966,17 +966,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
       }
     },
     "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicauth0Function",
@@ -986,17 +986,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicpostAuth0Function",
@@ -1006,14 +1006,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1034,14 +1034,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "CreateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "createTopic",
         "Kind": "PIPELINE",
@@ -1079,7 +1079,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1118,7 +1118,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1130,11 +1130,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1144,17 +1144,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationCreateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationCreateTopicResolver"
       }
     },
     "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateTopicinit0Function",
@@ -1164,14 +1164,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
       }
     },
     "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1192,17 +1192,17 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateTopicpostAuth0Function",
@@ -1212,14 +1212,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1240,14 +1240,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "UpdateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "updateTopic",
         "Kind": "PIPELINE",
@@ -1285,7 +1285,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1324,7 +1324,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1336,11 +1336,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1350,14 +1350,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationUpdateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationUpdateTopicResolver"
       }
     },
     "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1378,17 +1378,17 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteTopicpostAuth0Function",
@@ -1398,14 +1398,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1426,14 +1426,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
       }
     },
     "DeleteTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "deleteTopic",
         "Kind": "PIPELINE",
@@ -1465,7 +1465,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1504,7 +1504,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1516,11 +1516,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1530,17 +1530,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationDeleteTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationDeleteTopicResolver"
       }
     },
     "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateTopicauth0Function",
@@ -1550,17 +1550,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateTopicpostAuth0Function",
@@ -1570,17 +1570,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateTopicDataResolverFn",
@@ -1592,14 +1592,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onCreateTopic",
         "Kind": "PIPELINE",
@@ -1631,7 +1631,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1643,7 +1643,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1655,11 +1655,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1669,17 +1669,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
       }
     },
     "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateTopicauth0Function",
@@ -1689,17 +1689,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateTopicpostAuth0Function",
@@ -1709,17 +1709,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateTopicDataResolverFn",
@@ -1731,14 +1731,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onUpdateTopic",
         "Kind": "PIPELINE",
@@ -1770,7 +1770,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1782,7 +1782,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1794,11 +1794,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1808,17 +1808,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
       }
     },
     "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteTopicauth0Function",
@@ -1828,17 +1828,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteTopicpostAuth0Function",
@@ -1848,17 +1848,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteTopicDataResolverFn",
@@ -1870,14 +1870,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         },
         "FieldName": "onDeleteTopic",
         "Kind": "PIPELINE",
@@ -1909,7 +1909,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1921,7 +1921,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1933,11 +1933,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1947,7 +1947,7 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
       }
     },
     "CDKMetadata": {
@@ -1956,7 +1956,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -1976,7 +1976,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "GetAtt:TopicTable:StreamArn"
             ]
@@ -1992,7 +1992,7 @@
           [
             "Topic-",
             {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
             },
             "-NONE"
           ]
@@ -2004,7 +2004,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
               },
               "GetAtt:TopicTable:Name"
             ]
@@ -2012,7 +2012,7 @@
         }
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
       "Value": {
         "Fn::GetAtt": [
           "TopicDataSource",
@@ -2020,7 +2020,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "TopicTable",
@@ -2028,7 +2028,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "TopicTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
new file mode 100644
index 00000000000..d31f9bab62b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "OutputValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "OutputValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "OutputValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref",
+    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
+    "OutputValue": "us-east-1_dgn42NPnC"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
index d74377c775d..64c3a236423 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
@@ -27,7 +27,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -77,7 +77,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -98,7 +98,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
@@ -107,7 +107,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -526,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
       "Value": "us-east-1_dgn42NPnC"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
       "Value": "32gd06g1ofsno77g3aj6a7aenm"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-d1skq8aomhb772-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
new file mode 100644
index 00000000000..66c05605928
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
@@ -0,0 +1,30 @@
+[
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl",
+    "OutputValue": "https://ugegaqplxndhddmmhzi2j4rj4u.appsync-api.us-east-1.amazonaws.com/graphql"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn",
+    "OutputValue": "arn:aws:s3:::amplify-discussions-e2-amplifydataamplifycodege-g8qjz8miowur"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey",
+    "OutputValue": "da2-3ikaaaabp5gubimmave6av37ga"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
+    "OutputValue": "2264xbjvizfhfljloltcb4xr3e"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
new file mode 100644
index 00000000000..f75e57d3891
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
@@ -0,0 +1,38 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
+    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
+    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
+    "ParameterValue": "us-east-1_dgn42NPnC"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
index 9ac079c4e15..f5a3111c24e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
@@ -12,7 +12,7 @@
                 "Ref": "AWS::Region"
               },
               "UserPoolId": {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
               }
             }
           },
@@ -25,7 +25,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -46,7 +46,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/Resource"
       }
     },
     "amplifyDataGraphQLAPITransformerSchemaFF50A789": {
@@ -63,7 +63,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/TransformerSchema"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/TransformerSchema"
       }
     },
     "amplifyDataGraphQLAPIDefaultApiKey1C8ED374": {
@@ -78,7 +78,7 @@
         "Expires": 1774388952
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/DefaultApiKey"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/DefaultApiKey"
       }
     },
     "amplifyDataGraphQLAPINONEDS684BF699": {
@@ -94,14 +94,14 @@
         "Type": "NONE"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
       }
     },
     "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
@@ -111,7 +111,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -154,8 +154,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManager045FD64D.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManager045FD64D.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -178,38 +178,38 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
           }
         },
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -255,8 +255,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicC2CFEE26.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicC2CFEE26.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -279,38 +279,38 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
           }
         },
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -356,8 +356,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostF0FC9DBC.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostF0FC9DBC.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -380,38 +380,38 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
           }
         },
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -457,8 +457,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentF8B0B0A5.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentF8B0B0A5.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -466,22 +466,22 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
@@ -491,7 +491,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -537,8 +537,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataFunctionDirectiveStack46497AEA.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataFunctionDirectiveStack46497AEA.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -546,68 +546,68 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
             "Fn::GetAtt": [
               "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
             "Fn::GetAtt": [
               "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
             "Fn::GetAtt": [
               "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
             "Fn::GetAtt": [
               "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
             "Fn::GetAtt": [
               "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
             "Fn::GetAtt": [
               "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
             ]
           }
         },
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -656,8 +656,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataConnectionStackC6E786F3.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataConnectionStackC6E786F3.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -689,7 +689,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityidResolver": {
@@ -734,7 +734,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -746,11 +746,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -763,7 +763,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityIdResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityIdResolver"
       }
     },
     "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4": {
@@ -794,7 +794,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityuserIdResolver": {
@@ -839,7 +839,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -851,11 +851,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -868,7 +868,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityUserIdResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityUserIdResolver"
       }
     },
     "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26": {
@@ -899,7 +899,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityactivityTypeResolver": {
@@ -944,7 +944,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -956,11 +956,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -973,7 +973,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityActivityTypeResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityActivityTypeResolver"
       }
     },
     "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D": {
@@ -1004,7 +1004,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
       }
     },
     "ActivitytimestampResolver": {
@@ -1049,7 +1049,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1061,11 +1061,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1078,7 +1078,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/activityTimestampResolver"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityTimestampResolver"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA": {
@@ -1114,7 +1114,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -1145,7 +1145,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548": {
@@ -1200,7 +1200,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketAutoDeleteObjectsCustomResource437F26F5": {
@@ -1222,7 +1222,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905": {
@@ -1237,7 +1237,7 @@
         "Description": "/opt/awscli/aws"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
         "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Content"
@@ -1279,7 +1279,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
@@ -1304,7 +1304,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
@@ -1343,7 +1343,7 @@
         "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
         "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
         "aws:asset:property": "Code"
       }
@@ -1380,7 +1380,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -1397,7 +1397,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
       }
     },
     "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B": {
@@ -1531,7 +1531,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21": {
@@ -1565,7 +1565,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -1587,7 +1587,7 @@
         "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
         "aws:asset:path": "asset.3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -1599,7 +1599,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -1626,7 +1626,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Resource"
       }
     },
     "modelIntrospectionSchemaBucketPolicy4DAB0D15": {
@@ -1715,7 +1715,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Policy/Resource"
       }
     },
     "modelIntrospectionSchemaBucketAutoDeleteObjectsCustomResourceFE57309F": {
@@ -1737,7 +1737,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "modelIntrospectionSchemaBucketDeploymentAwsCliLayer13C432F7": {
@@ -1752,7 +1752,7 @@
         "Description": "/opt/awscli/aws"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
         "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Content"
@@ -1788,15 +1788,15 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
       }
     },
     "AMPLIFYDATAGRAPHQLENDPOINTParameter1C2CBB16": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
+        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
         "Tags": {
-          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:app-id": "discussions",
           "amplify:branch-name": "e2etest",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
@@ -1810,15 +1810,15 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
       }
     },
     "AMPLIFYDATAMODELINTROSPECTIONSCHEMABUCKETNAMEParameter47BF4F44": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
         "Tags": {
-          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:app-id": "discussions",
           "amplify:branch-name": "e2etest",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
@@ -1829,15 +1829,15 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
       }
     },
     "AMPLIFYDATAMODELINTROSPECTIONSCHEMAKEYParameterB6AEAE8A": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
+        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
         "Tags": {
-          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:app-id": "discussions",
           "amplify:branch-name": "e2etest",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
@@ -1846,15 +1846,15 @@
         "Value": "modelIntrospectionSchema.json"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
       }
     },
     "AMPLIFYDATADEFAULTNAMEParameterE7C23CC4": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/d1skq8aomhb772/e2etest-branch-75c4329a92/AMPLIFY_DATA_DEFAULT_NAME",
+        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_DEFAULT_NAME",
         "Tags": {
-          "amplify:app-id": "d1skq8aomhb772",
+          "amplify:app-id": "discussions",
           "amplify:branch-name": "e2etest",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
@@ -1863,7 +1863,7 @@
         "Value": "amplifyData"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
       }
     },
     "CDKMetadata": {
@@ -1872,7 +1872,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSTW/bMAz9Lc1ZUbukl/XmOtgOK7osBnoZioCRGZeJPjxRTmoI/u+DrCxNt1OxE/lI8eFRjzM5u53Lmys48lTV+6mmjYyPyAHrKoDaixWy67xCAUdeR2hb7q2S8auH9uWXLlq6B0ZRbu1Y+fFQtHSBKvWCBlKhaOkb9uLRWVxAgCqTllv7Hn3prArkbOnslprOQwKpkXToA/pB8HwdgRkDyyIFUWOrXW/QBnnfqT2GxbmQXsuYq6PQnCbCnP2ME0OvZCd3k8svSMvyXI4tPrEWXXAL1Bjw+2aHKvBkEP81/XxSs3SaVP+mKeMPKMsDVYCAaemPCft3+HkQGsymBhnLrX2AHv0Tek5GVGQbjcGdfRLn5MK8QRAYGVdOj56O8W3JnA2C2chYBU+2WYIHgwH92P8DhkGMBlcBGrJN6uWbLDsOzpwv83QdY56Fr3USvYYjK02yOHKpadzjHf9fPEvvDlSjT3cyCOtqlDu+Psxu5KfP8vZqx0RT39lABuUqx9+1Jlu8PgMAAA=="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -1915,16 +1915,16 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
       "Type": "String"
     }
   },
@@ -2195,7 +2195,7 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -2203,7 +2203,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -2211,7 +2211,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929",
@@ -2219,7 +2219,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPIDefaultApiKey1C8ED374",
@@ -2227,27 +2227,27 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
         ]
       }
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
new file mode 100644
index 00000000000..310f5dc1406
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
@@ -0,0 +1,10 @@
+[
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref",
+    "OutputValue": "fetchuseractivity-e2etest"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref",
+    "OutputValue": "recorduseractivity-e2etest"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
new file mode 100644
index 00000000000..26d43ea91ff
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref",
+    "ParameterValue": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
similarity index 72%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
index 5f8b55fefd8..3c42861a3e5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
@@ -33,7 +33,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -54,7 +54,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/Resource"
       }
     },
     "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744": {
@@ -75,14 +75,14 @@
               "Effect": "Allow",
               "Resource": [
                 {
-                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
                 },
                 {
                   "Fn::Join": [
                     "",
                     [
                       {
-                        "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                        "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
                       },
                       "/index/*"
                     ]
@@ -101,7 +101,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "fetchuseractivitye2etestlambdaE00C3C26": {
@@ -122,13 +122,13 @@
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
             "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn"
             },
             "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
             },
             "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref"
             }
           }
         },
@@ -148,7 +148,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -174,7 +174,7 @@
         "fetchuseractivitye2etestlambdaServiceRole5FC09E26"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/Resource",
         "aws:asset:path": "asset.bf8313617a5ef1feb1d15c5f1c48fa145b413fc1ff7c4f8bb6548c4ccfee2ff5",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
@@ -212,7 +212,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -233,7 +233,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/Resource"
       }
     },
     "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762": {
@@ -263,14 +263,14 @@
               "Effect": "Allow",
               "Resource": [
                 {
-                  "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
                 },
                 {
                   "Fn::Join": [
                     "",
                     [
                       {
-                        "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+                        "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
                       },
                       "/index/*"
                     ]
@@ -291,7 +291,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
               }
             },
             {
@@ -302,7 +302,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
               }
             },
             {
@@ -313,7 +313,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
+                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
               }
             }
           ],
@@ -327,7 +327,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "recorduseractivitye2etestlambdaB6DEA24D": {
@@ -348,13 +348,13 @@
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
             "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn"
             },
             "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
             },
             "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref"
+              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref"
             }
           }
         },
@@ -374,7 +374,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -400,18 +400,18 @@
         "recorduseractivitye2etestlambdaServiceRoleC563F9C3"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/Resource",
         "aws:asset:path": "asset.d01b5f499fc09d13cdf4f24026ec6fef4895803e5403f632102094b02df2a465",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B51DD8CE2": {
+    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B51DD8CE2": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
         },
         "FunctionName": {
           "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
@@ -420,7 +420,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -441,15 +441,15 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B/Resource"
       }
     },
-    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACABBFFC807": {
+    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACABBFFC807": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
         },
         "FunctionName": {
           "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
@@ -458,7 +458,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -479,15 +479,15 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACA/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACA/Resource"
       }
     },
-    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35047BB07E": {
+    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35047BB07E": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
+          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
         },
         "FunctionName": {
           "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
@@ -496,7 +496,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -517,7 +517,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35/Resource"
       }
     },
     "CDKMetadata": {
@@ -526,7 +526,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOvQ6CQBCEn4X+WBFoLIVopzHwAGQ5FnL83Bn2gBjCu5uDxMbqm5niy4QQxhEEHi7sy6rze1XC+iS2VOUWZSdw4WLtcSgrLLSpqGV47rhPWlpltFA4wJqZnkRa650v0yv5cfVIm+CoQGayDFcHwREkk+zIJsgkDj2saa1/1ttM2uZmGiU98P1WunG+/3XbxK7MLTauCncSWj7NYQDnC8Rey0r546StGgiyg19X55TH9wAAAA=="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -798,32 +798,32 @@
     }
   },
   "Parameters": {
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
       "Type": "String"
     },
-    "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
+    "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref": {
       "Value": {
         "Ref": "fetchuseractivitye2etestlambdaE00C3C26"
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref": {
       "Value": {
         "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
       }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
new file mode 100644
index 00000000000..23d5592bf4c
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
@@ -0,0 +1,14 @@
+[
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref",
+    "OutputValue": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+  },
+  {
+    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
similarity index 95%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
index caa18323dc6..bfaacd5bf4e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -347,7 +347,7 @@
     }
   },
   "Outputs": {
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
       "Value": {
         "Fn::GetAtt": [
           "activity1E902D9C",
@@ -355,7 +355,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "activity1E902D9C",
@@ -363,7 +363,7 @@
         ]
       }
     },
-    "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
       "Value": {
         "Ref": "activity1E902D9C"
       }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
index 5118fac917e..8e4344a2ca2 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-d1skq8aomhb772-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.outputs.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.outputs.json
index 2d9e7a35842..6517188ff83 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.outputs.json
@@ -81,7 +81,7 @@
   },
   {
     "OutputKey": "amplifyApiModelSchemaS3Uri",
-    "OutputValue": "s3://amplify-d1skq8aomhb772-e2-amplifydataamplifycodege-g8qjz8miowur/model-schema.graphql"
+    "OutputValue": "s3://amplify-discussions-e2-amplifydataamplifycodege-g8qjz8miowur/model-schema.graphql"
   },
   {
     "OutputKey": "groups",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.template.json
similarity index 77%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.template.json
index 4d90ccffb00..86d1e6d99b7 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-d1skq8aomhb772-e2etest-branch-75c4329a92.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.template.json
@@ -66,7 +66,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
         ]
       }
     },
@@ -74,7 +74,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
         ]
       }
     },
@@ -82,7 +82,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
         ]
       }
     },
@@ -140,7 +140,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
         ]
       }
     },
@@ -151,7 +151,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
         ]
       }
     },
@@ -159,7 +159,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl"
         ]
       }
     },
@@ -192,7 +192,7 @@
                             {
                               "Fn::GetAtt": [
                                 "data7552DF31",
-                                "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn"
+                                "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn"
                               ]
                             }
                           ]
@@ -212,7 +212,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey"
+          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey"
         ]
       }
     },
@@ -228,14 +228,14 @@
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref"
+                "Outputs.amplifydiscussionse2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref"
               ]
             },
             "\",\"",
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref"
+                "Outputs.amplifydiscussionse2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref"
               ]
             },
             "\"]"
@@ -277,7 +277,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -294,7 +294,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1": {
@@ -308,7 +308,7 @@
                 "amplify:UpdateBranch"
               ],
               "Effect": "Allow",
-              "Resource": "arn:aws:amplify:*:*:apps/d1skq8aomhb772/branches/e2etest"
+              "Resource": "arn:aws:amplify:*:*:apps/discussions/branches/e2etest"
             }
           ],
           "Version": "2012-10-17"
@@ -321,7 +321,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceLambda582AC093": {
@@ -344,7 +344,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -366,7 +366,7 @@
         "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/Resource",
         "aws:asset:path": "asset.6ea036d9253c8571a595f8e39d788d63c132eafed252fbd584c992dc6663feae",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
@@ -404,7 +404,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -421,7 +421,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412": {
@@ -476,7 +476,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900": {
@@ -488,7 +488,7 @@
           },
           "S3Key": "07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57.zip"
         },
-        "Description": "AWS CDK resource provider framework - onEvent (amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider)",
+        "Description": "AWS CDK resource provider framework - onEvent (amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider)",
         "Environment": {
           "Variables": {
             "USER_ON_EVENT_FUNCTION_ARN": {
@@ -514,7 +514,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -536,7 +536,7 @@
         "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
         "aws:asset:path": "asset.07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -551,13 +551,13 @@
             "Arn"
           ]
         },
-        "appId": "d1skq8aomhb772",
+        "appId": "discussions",
         "branchName": "e2etest"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResource/Default"
       }
     },
     "auth179371D7": {
@@ -566,7 +566,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -605,8 +605,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/auth.NestedStack/auth.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92authCD10F0D5.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth.NestedStack/auth.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92authCD10F0D5.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -614,35 +614,35 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
             ]
           }
         },
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -681,8 +681,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/data.NestedStack/data.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92dataD836B8FC.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data.NestedStack/data.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataD836B8FC.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -690,47 +690,47 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Arn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971StreamArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivity5954B971Ref"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
             ]
           },
-          "referencetoamplifyd1skq8aomhb772e2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
+          "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8aomhb772e2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
+              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
             ]
           }
         },
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -769,8 +769,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/function.NestedStack/function.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92function1DEFB26B.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function.NestedStack/function.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92function1DEFB26B.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -780,7 +780,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -819,8 +819,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storageactivity.NestedStack/storageactivity.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storageactivityCC1C5F88.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity.NestedStack/storageactivity.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92storageactivityCC1C5F88.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -830,7 +830,7 @@
         "Tags": [
           {
             "Key": "amplify:app-id",
-            "Value": "d1skq8aomhb772"
+            "Value": "discussions"
           },
           {
             "Key": "amplify:branch-name",
@@ -869,8 +869,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
-        "aws:asset:path": "amplifyd1skq8aomhb772e2etestbranch75c4329a92storagebookmarksDA286ADD.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92storagebookmarksDA286ADD.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -880,7 +880,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02PzU7DQAyEn6V3x5SkF440Ekeo0geI3I1bOT+7aO1thaK8O8oGEKdvrNGMPCWWhwr3O3po4bqhGOWC89nIDVBf/Ueyz2RAD23nkaZLR60PHfeK7xlvyTuT4EFowrkJI6+pzFMYxX2t56YW0KolVTbF1xWgFR6TG9iOpAxbPc711f+1/oplgRw5G93E38AltTC1kTWk6FjxFMNdOo5QZ6f5MfIz/3TetcA6AXt9upd7fH7Bw65XkSImbzIxNhu/AWzDJeQZAQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-d1skq8aomhb772-e2etest-branch-75c4329a92/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }

From c1da85b984af69763245271ee9b11ce0ea852315 Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Fri, 20 Mar 2026 15:49:04 +0000
Subject: [PATCH 06/20] docs(discussions): add S3 avatars bucket to migration
 config

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 amplify-migration-apps/discussions/migration-config.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/amplify-migration-apps/discussions/migration-config.json b/amplify-migration-apps/discussions/migration-config.json
index 32311eef879..a61a2dffa6e 100644
--- a/amplify-migration-apps/discussions/migration-config.json
+++ b/amplify-migration-apps/discussions/migration-config.json
@@ -1,7 +1,7 @@
 {
   "app": {
     "name": "discussions",
-    "description": "Discussion app with phone authentication and DynamoDB activity logging",
+    "description": "Discussion app with phone authentication, DynamoDB activity logging, bookmarks, and S3 avatars",
     "framework": "none"
   },
   "categories": {
@@ -17,7 +17,12 @@
       "socialProviders": []
     },
     "storage": {
-      "type": "dynamodb",
+      "buckets": [
+        {
+          "name": "avatars",
+          "access": ["auth"]
+        }
+      ],
       "tables": [
         {
           "name": "activity",

From 2a28a87817fd81066f555308d75fcc076d13e9ee Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Fri, 20 Mar 2026 18:54:12 +0000
Subject: [PATCH 07/20] test(discussions): update snapshots with S3 avatars +
 bookmarks DDB

Re-deployed discussions app with 3 storage types (activity DDB,
bookmarks DDB, avatars S3) and captured fresh snapshots for all 4
stages. Per-table stacks refactor verified working for both DDB tables.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../amplify/auth/resource.ts                  |    2 +-
 .../amplify/backend.ts                        |   23 +-
 .../amplify/data/resource.ts                  |    8 +-
 .../amplify/storage/resource.ts               |   16 +
 .../_snapshot.post.generate/package.json      |    9 +-
 ...9371D7-19LVPI73QPSY7-holding.mappings.json |   52 -
 ...19LVPI73QPSY7-holding.target.template.json |  154 --
 ...46F297-1PHSGRJSW0US5-holding.mappings.json |   12 -
 ...10DAF62-AOPTK1NWQZNJ-holding.mappings.json |   12 -
 ...79371D7-2NLVKCUURH94-holding.mappings.json |   52 +
 ...2NLVKCUURH94-holding.source.template.json} |   36 +-
 ...-2NLVKCUURH94-holding.target.template.json |  222 ++
 ...346F297-URG4H1Y2NQLX-holding.mappings.json |   12 +
 ...URG4H1Y2NQLX-holding.source.template.json} |   16 +-
 ...URG4H1Y2NQLX-holding.target.template.json} |   33 +-
 ...10DAF62-6NUUN10S5348-holding.mappings.json |   12 +
 ...6NUUN10S5348-holding.source.template.json} |    4 +-
 ...6NUUN10S5348-holding.target.template.json} |   33 +-
 ...2-auth179371D7-19LVPI73QPSY7.mappings.json |   52 -
 ...tivityA346F297-1PHSGRJSW0US5.mappings.json |   12 -
 ...okmarks210DAF62-AOPTK1NWQZNJ.mappings.json |   12 -
 ...210DAF62-AOPTK1NWQZNJ.source.template.json |   64 -
 ...b3-auth179371D7-2NLVKCUURH94.mappings.json |   52 +
 ...79371D7-2NLVKCUURH94.source.template.json} |   36 +-
 ...79371D7-2NLVKCUURH94.target.template.json} |   72 +-
 ...ctivityA346F297-URG4H1Y2NQLX.mappings.json |   12 +
 ...346F297-URG4H1Y2NQLX.source.template.json} |   10 +-
 ...346F297-URG4H1Y2NQLX.target.template.json} |   18 +-
 ...okmarks210DAF62-6NUUN10S5348.mappings.json |   12 +
 ...10DAF62-6NUUN10S5348.source.template.json} |    8 +-
 ...10DAF62-6NUUN10S5348.target.template.json} |    6 +-
 ...2-auth179371D7-19LVPI73QPSY7.template.json |  545 ----
 ...auth179371D7-2NLVKCUURH94.parameters.json} |    0
 ...3-auth179371D7-2NLVKCUURH94.template.json} |  392 +--
 ...vityA346F297-URG4H1Y2NQLX.parameters.json} |    0
 ...tivityA346F297-URG4H1Y2NQLX.template.json} |   65 +-
 ...arks210DAF62-6NUUN10S5348.parameters.json} |    0
 ...kmarks210DAF62-6NUUN10S5348.template.json} |   53 +-
 ...16ec578c16e-1IQSRWBM9RZF3.parameters.json} |   20 +-
 ...8c16ec578c16e-1IQSRWBM9RZF3.template.json} |   72 +-
 ...ageactivity-197RFHHQU9L6N.parameters.json} |    2 +-
 ...orageactivity-197RFHHQU9L6N.template.json} |   12 +-
 ...gebookmarks-1V93G5ZM6SPOX.parameters.json} |    2 +-
 ...ragebookmarks-1V93G5ZM6SPOX.template.json} |   12 +-
 .../#current-cloud-backend/amplify-meta.json  |  289 +--
 .../build/cloudformation-template.json        |   12 +-
 .../api/discussions/build/parameters.json     |    2 +-
 .../api/discussions/build/stacks/Comment.json |   16 +-
 .../build/stacks/ConnectionStack.json         |    8 +-
 .../api/discussions/build/stacks/Post.json    |   16 +-
 .../api/discussions/build/stacks/Topic.json   |   16 +-
 ...c16ec578c16e-cloudformation-template.json} |   22 +-
 .../build/parameters.json                     |   14 +-
 .../cli-inputs.json                           |   14 +-
 .../build/cloudformation-template.json        |   12 +-
 ...c16ec578c16e-cloudformation-template.json} |   22 +-
 .../build/root-cloudformation-stack.json      |  143 +-
 ...huseractivity-cloudformation-template.json |    6 +-
 ...duseractivity-cloudformation-template.json |    6 +-
 .../build/root-cloudformation-stack.json      |  157 +-
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |  599 +++++
 .../backend-config.json                       |   11 +-
 ...huseractivity-cloudformation-template.json |    6 +-
 .../fetchuseractivity/src/package.json        |    4 -
 ...duseractivity-cloudformation-template.json |    6 +-
 .../recorduseractivity/src/package.json       |    4 -
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |  590 +++++
 .../storage/avatars/build/parameters.json     |   31 +
 .../storage/avatars/cli-inputs.json           |   14 +
 .../bookmarks/bookmarks/build/parameters.json |    7 -
 .../bookmarks/bookmarks/cli-inputs.json       |   22 -
 .../storage/bookmarks/cli-inputs.json         |    2 +-
 .../amplify/backend/amplify-meta.json         |  289 +--
 .../build/cloudformation-template.json        | 2035 ++++++++-------
 .../api/discussions/build/parameters.json     |    2 +-
 .../api/discussions/build/stacks/Comment.json |   16 +-
 .../build/stacks/ConnectionStack.json         |    8 +-
 .../api/discussions/build/stacks/Post.json    |   16 +-
 .../api/discussions/build/stacks/Topic.json   |   16 +-
 ...8c16ec578c16e-cloudformation-template.json |  533 ++++
 .../build/parameters.json                     |   14 +-
 .../cli-inputs.json                           |   14 +-
 .../build/cloudformation-template.json        |   12 +-
 ...c16ec578c16e-cloudformation-template.json} |   22 +-
 .../build/root-cloudformation-stack.json      |  143 +-
 ...huseractivity-cloudformation-template.json |    6 +-
 ...duseractivity-cloudformation-template.json |    6 +-
 .../build/root-cloudformation-stack.json      |  143 +-
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |  599 +++++
 .../amplify/backend/backend-config.json       |   11 +-
 ...huseractivity-cloudformation-template.json |    6 +-
 .../fetchuseractivity/src/package.json        |    4 -
 ...duseractivity-cloudformation-template.json |    6 +-
 .../recorduseractivity/src/package.json       |    4 -
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |  590 +++++
 .../storage/avatars/build/parameters.json     |   31 +
 .../backend/storage/avatars/cli-inputs.json   |   14 +
 .../bookmarks-cloudformation-template.json    |    2 +-
 .../backend/storage/bookmarks/cli-inputs.json |    2 +-
 .../amplify-dependent-resources-ref.d.ts      |   16 +-
 .../amplify/team-provider-info.json           |   31 +-
 .../_snapshot.pre.generate/package.json       |   11 +-
 ...gerNestedStackA-1KJBI9SVOWO6G.outputs.json |    6 -
 ...NestedStackA-1KJBI9SVOWO6G.parameters.json |    6 -
 ...ckCommentNested-18DBZ8BQTMK8E.outputs.json |   26 -
 ...ommentNested-18DBZ8BQTMK8E.parameters.json |   46 -
 ...edStackConne-1OWUZYB5XE48X.parameters.json |   46 -
 ...stedStackConne-1OWUZYB5XE48X.template.json |  863 -------
 ...ackNestedSta-1U3PX8KU9ZZ8H.parameters.json |   22 -
 ...StackNestedSta-1U3PX8KU9ZZ8H.template.json |  556 ----
 ...PostNestedStackR-QQ10UZAFYJQD.outputs.json |   26 -
 ...tNestedStackR-QQ10UZAFYJQD.parameters.json |   46 -
 ...kTopicNestedStac-Y6NEQZHYFNZU.outputs.json |   26 -
 ...picNestedStac-Y6NEQZHYFNZU.parameters.json |   46 -
 ...92-auth179371D7-19LVPI73QPSY7.outputs.json |   22 -
 ...a92-data7552DF31-G2MUTCUFR08M.outputs.json |   30 -
 ...-data7552DF31-G2MUTCUFR08M.parameters.json |   38 -
 ...92-data7552DF31-G2MUTCUFR08M.template.json | 2255 -----------------
 ...function1351588B-H9TILALYT3XU.outputs.json |   10 -
 ...ction1351588B-H9TILALYT3XU.parameters.json |   26 -
 ...unction1351588B-H9TILALYT3XU.template.json |  832 ------
 ...ctivityA346F297-1PHSGRJSW0US5.outputs.json |   14 -
 ...tivityA346F297-1PHSGRJSW0US5.template.json |  372 ---
 ...agerNestedStackA-XL6RWZM0VCUI.outputs.json |    6 -
 ...rNestedStackA-XL6RWZM0VCUI.parameters.json |    6 -
 ...gerNestedStackA-XL6RWZM0VCUI.template.json |  811 ------
 ...ckCommentNested-1B2YB5H2V3Y68.outputs.json |   26 -
 ...ommentNested-1B2YB5H2V3Y68.parameters.json |   46 -
 ...kCommentNested-1B2YB5H2V3Y68.template.json | 2023 ---------------
 ...tedStackConne-IBU39YZBPPIH.parameters.json |   46 -
 ...tackNestedSta-WLZNOFALEWKP.parameters.json |   22 -
 ...ostNestedStackR-1C18CMFRV9WU0.outputs.json |   26 -
 ...NestedStackR-1C18CMFRV9WU0.parameters.json |   46 -
 ...stNestedStackR-1C18CMFRV9WU0.template.json | 2023 ---------------
 ...icNestedStac-14BB4YDUL6TVP.description.txt |    0
 ...TopicNestedStac-14BB4YDUL6TVP.outputs.json |   26 -
 ...icNestedStac-14BB4YDUL6TVP.parameters.json |   46 -
 ...opicNestedStac-14BB4YDUL6TVP.template.json | 1997 ---------------
 ...-auth179371D7-DAPL7YOMHRB4.description.txt |    1 -
 ...c44-auth179371D7-DAPL7YOMHRB4.outputs.json |   22 -
 ...-auth179371D7-DAPL7YOMHRB4.parameters.json |    1 -
 ...4-data7552DF31-ZYDQP1ZT6K5.description.txt |    1 -
 ...dc44-data7552DF31-ZYDQP1ZT6K5.outputs.json |   30 -
 ...4-data7552DF31-ZYDQP1ZT6K5.parameters.json |   38 -
 ...tion1351588B-1SQELLES2WBK3.description.txt |    1 -
 ...unction1351588B-1SQELLES2WBK3.outputs.json |   10 -
 ...tion1351588B-1SQELLES2WBK3.parameters.json |   26 -
 ...-storage0EC3F24A-QQN18S0SITDH.outputs.json |   14 -
 ...orage0EC3F24A-QQN18S0SITDH.parameters.json |    1 -
 ...gen2main-branch-96dfd1dc44.description.txt |    1 -
 ...ns-gen2main-branch-96dfd1dc44.outputs.json |  126 -
 ...gen2main-branch-96dfd1dc44.parameters.json |    7 -
 ...s-gen2main-branch-96dfd1dc44.template.json | 1138 ---------
 ...NestedStackA-OQJNODUL69WQ.description.txt} |    0
 ...agerNestedStackA-OQJNODUL69WQ.outputs.json |    6 +
 ...rNestedStackA-OQJNODUL69WQ.parameters.json |    6 +
 ...erNestedStackA-OQJNODUL69WQ.template.json} |   42 +-
 ...ommentNested-RTBK7X4W3WZ5.description.txt} |    0
 ...ackCommentNested-RTBK7X4W3WZ5.outputs.json |   26 +
 ...CommentNested-RTBK7X4W3WZ5.parameters.json |   46 +
 ...kCommentNested-RTBK7X4W3WZ5.template.json} |  286 +--
 ...edStackConne-786MWSCGWATV.description.txt} |    0
 ...estedStackConne-786MWSCGWATV.outputs.json} |    0
 ...tedStackConne-786MWSCGWATV.parameters.json |   46 +
 ...stedStackConne-786MWSCGWATV.template.json} |  130 +-
 ...ckNestedSta-1DIRT0QDIWBFM.description.txt} |    0
 ...StackNestedSta-1DIRT0QDIWBFM.outputs.json} |    0
 ...ackNestedSta-1DIRT0QDIWBFM.parameters.json |   22 +
 ...tackNestedSta-1DIRT0QDIWBFM.template.json} |   82 +-
 ...estedStackR-1DFTLBBEXN9CL.description.txt} |    0
 ...ostNestedStackR-1DFTLBBEXN9CL.outputs.json |   26 +
 ...NestedStackR-1DFTLBBEXN9CL.parameters.json |   46 +
 ...tNestedStackR-1DFTLBBEXN9CL.template.json} |  286 +--
 ...icNestedStac-YH948UOUEKFY.description.txt} |    0
 ...kTopicNestedStac-YH948UOUEKFY.outputs.json |   26 +
 ...picNestedStac-YH948UOUEKFY.parameters.json |   46 +
 ...opicNestedStac-YH948UOUEKFY.template.json} |  286 +--
 ...auth179371D7-2NLVKCUURH94.description.txt} |    0
 ...3b3-auth179371D7-2NLVKCUURH94.outputs.json |   22 +
 ...auth179371D7-2NLVKCUURH94.parameters.json} |    0
 ...3-auth179371D7-2NLVKCUURH94.template.json} |   42 +-
 ...ata7552DF31-1UMPATHK2POAL.description.txt} |    0
 ...b3-data7552DF31-1UMPATHK2POAL.outputs.json |   30 +
 ...data7552DF31-1UMPATHK2POAL.parameters.json |   38 +
 ...-data7552DF31-1UMPATHK2POAL.template.json} |  322 +--
 ...ion1351588B-1M6WNJD1W2J5X.description.txt} |    0
 ...unction1351588B-1M6WNJD1W2J5X.outputs.json |   10 +
 ...tion1351588B-1M6WNJD1W2J5X.parameters.json |   26 +
 ...ction1351588B-1M6WNJD1W2J5X.template.json} |  170 +-
 ...rage0EC3F24A-TNJDP7TV84DW.description.txt} |    2 +-
 ...-storage0EC3F24A-TNJDP7TV84DW.outputs.json |    6 +
 ...orage0EC3F24A-TNJDP7TV84DW.parameters.json |    6 +
 ...storage0EC3F24A-TNJDP7TV84DW.template.json |  746 ++++++
 ...vityA346F297-URG4H1Y2NQLX.description.txt} |    0
 ...activityA346F297-URG4H1Y2NQLX.outputs.json |   14 +
 ...vityA346F297-URG4H1Y2NQLX.parameters.json} |    0
 ...tivityA346F297-URG4H1Y2NQLX.template.json} |   16 +-
 ...arks210DAF62-6NUUN10S5348.description.txt} |    0
 ...okmarks210DAF62-6NUUN10S5348.outputs.json} |    0
 ...arks210DAF62-6NUUN10S5348.parameters.json} |    0
 ...kmarks210DAF62-6NUUN10S5348.template.json} |   53 +-
 ...maintwo-branch-a0081fe3b3.description.txt} |    0
 ...en2maintwo-branch-a0081fe3b3.outputs.json} |   30 +-
 ...maintwo-branch-a0081fe3b3.parameters.json} |    0
 ...n2maintwo-branch-a0081fe3b3.template.json} |  236 +-
 ...1X77D-Comment-J7DYWK8LJ835.description.txt |    0
 ...IZZ1X77D-Comment-J7DYWK8LJ835.outputs.json |   28 -
 ...ZZ1X77D-Comment-J7DYWK8LJ835.template.json | 1195 ---------
 ...nnectionStack-80K87W31YMJP.description.txt |    0
 ...-ConnectionStack-80K87W31YMJP.outputs.json |    1 -
 ...nnectionStack-80K87W31YMJP.parameters.json |   42 -
 ...ConnectionStack-80K87W31YMJP.template.json |  422 ---
 ...rectiveStack-1B1A5238QSLAB.description.txt |    1 -
 ...nDirectiveStack-1B1A5238QSLAB.outputs.json |    1 -
 ...IZZ1X77D-Post-QYQEAFVTEYTH.description.txt |    0
 ...Q7EIZZ1X77D-Post-QYQEAFVTEYTH.outputs.json |   28 -
 ...7EIZZ1X77D-Post-QYQEAFVTEYTH.template.json | 1195 ---------
 ...Z1X77D-Topic-1A739L0D5ZWOL.description.txt |    0
 ...IZZ1X77D-Topic-1A739L0D5ZWOL.template.json | 1470 -----------
 ...pidiscussions-EQ7EIZZ1X77D.description.txt |    0
 ...0-apidiscussions-EQ7EIZZ1X77D.outputs.json |   20 -
 ...-apidiscussions-EQ7EIZZ1X77D.template.json | 1065 --------
 ...22367c6822367c68-XLSGP9AEXCHG.outputs.json |   40 -
 ...2367c6822367c68-XLSGP9AEXCHG.template.json |  533 ----
 ...duseractivity-UG5EXUFUZZTY.parameters.json |   38 -
 ...-storageactivity-MDZCD7YSRDN4.outputs.json |   34 -
 ...orageactivity-MDZCD7YSRDN4.parameters.json |   26 -
 ...ragebookmarks-19Q2XZYRDN4T.description.txt |    0
 ...ragebookmarks-19Q2XZYRDN4T.parameters.json |   26 -
 ...toragebookmarks-19Q2XZYRDN4T.template.json |  156 --
 ...ify-discussions-main-d5a80.parameters.json |   14 -
 ...plify-discussions-main-d5a80.template.json |  577 -----
 ...6SN-Comment-136Y5UD1LM95X.description.txt} |    0
 ...M866SN-Comment-136Y5UD1LM95X.outputs.json} |   12 +-
 ...6SN-Comment-136Y5UD1LM95X.parameters.json} |   20 +-
 ...866SN-Comment-136Y5UD1LM95X.template.json} |   16 +-
 ...nectionStack-RYPW32RBHMM8.description.txt} |    0
 ...ConnectionStack-RYPW32RBHMM8.outputs.json} |    0
 ...nectionStack-RYPW32RBHMM8.parameters.json} |   10 +-
 ...onnectionStack-RYPW32RBHMM8.template.json} |    8 +-
 ...sourcesjson-1DY9IV2DRTOM5.description.txt} |    0
 ...mResourcesjson-1DY9IV2DRTOM5.outputs.json} |    0
 ...sourcesjson-1DY9IV2DRTOM5.parameters.json} |    6 +-
 ...Resourcesjson-1DY9IV2DRTOM5.template.json} |    0
 ...irectiveStack-TN93GL5RGSP.description.txt} |    0
 ...onDirectiveStack-TN93GL5RGSP.outputs.json} |    0
 ...irectiveStack-TN93GL5RGSP.parameters.json} |    6 +-
 ...nDirectiveStack-TN93GL5RGSP.template.json} |    0
 ...UM866SN-Post-3HS6CAU8A7BV.description.txt} |    0
 ...VY6UM866SN-Post-3HS6CAU8A7BV.outputs.json} |   12 +-
 ...UM866SN-Post-3HS6CAU8A7BV.parameters.json} |   20 +-
 ...Y6UM866SN-Post-3HS6CAU8A7BV.template.json} |   16 +-
 ...M866SN-Topic-964U4TM6BHFI.description.txt} |    0
 ...Y6UM866SN-Topic-964U4TM6BHFI.outputs.json} |   26 +-
 ...M866SN-Topic-964U4TM6BHFI.parameters.json} |    6 +-
 ...6UM866SN-Topic-964U4TM6BHFI.template.json} |   16 +-
 ...pidiscussions-OIVY6UM866SN.description.txt |    1 +
 ...9-apidiscussions-OIVY6UM866SN.outputs.json |   20 +
 ...idiscussions-OIVY6UM866SN.parameters.json} |    4 +-
 ...apidiscussions-OIVY6UM866SN.template.json} |   12 +-
 ...16ec578c16e-1IQSRWBM9RZF3.description.txt} |    2 +-
 ...78c16ec578c16e-1IQSRWBM9RZF3.outputs.json} |   16 +-
 ...16ec578c16e-1IQSRWBM9RZF3.parameters.json} |   20 +-
 ...8c16ec578c16e-1IQSRWBM9RZF3.template.json} |   22 +-
 ...useractivity-P1L2V5FTFCQW.description.txt} |    2 +-
 ...tchuseractivity-P1L2V5FTFCQW.outputs.json} |    8 +-
 ...useractivity-P1L2V5FTFCQW.parameters.json} |   12 +-
 ...chuseractivity-P1L2V5FTFCQW.template.json} |    6 +-
 ...useractivity-7TS57MXKFC36.description.txt} |    2 +-
 ...orduseractivity-7TS57MXKFC36.outputs.json} |    8 +-
 ...useractivity-7TS57MXKFC36.parameters.json} |   16 +-
 ...rduseractivity-7TS57MXKFC36.template.json} |    6 +-
 ...ageactivity-197RFHHQU9L6N.description.txt} |    2 +-
 ...torageactivity-197RFHHQU9L6N.outputs.json} |    6 +-
 ...ageactivity-197RFHHQU9L6N.parameters.json} |    2 +-
 ...orageactivity-197RFHHQU9L6N.template.json} |    2 +-
 ...torageavatars-5MXLESJM1SP0.description.txt |    1 +
 ...9-storageavatars-5MXLESJM1SP0.outputs.json |   11 +
 ...torageavatars-5MXLESJM1SP0.parameters.json |   86 +
 ...-storageavatars-5MXLESJM1SP0.template.json |  599 +++++
 ...gebookmarks-1V93G5ZM6SPOX.description.txt} |    0
 ...oragebookmarks-1V93G5ZM6SPOX.outputs.json} |   30 +-
 ...gebookmarks-1V93G5ZM6SPOX.parameters.json} |   14 +-
 ...ragebookmarks-1V93G5ZM6SPOX.template.json} |    0
 ...discussions-maintwo-decb9.description.txt} |    0
 ...fy-discussions-maintwo-decb9.outputs.json} |   22 +-
 ...-discussions-maintwo-decb9.parameters.json |   14 +
 ...y-discussions-maintwo-decb9.template.json} |   87 +-
 ...irectiveStack-JUWBQLX2MIUS.description.txt |    1 -
 ...onDirectiveStack-JUWBQLX2MIUS.outputs.json |    1 -
 ...irectiveStack-JUWBQLX2MIUS.parameters.json |   22 -
 ...nDirectiveStack-JUWBQLX2MIUS.template.json |  281 --
 ...AYY7-Comment-1JNK5MYREU7SI.description.txt |    0
 ...AYY7-Comment-1JNK5MYREU7SI.parameters.json |   66 -
 ...nectionStack-1V0C4C1EXD8J9.description.txt |    0
 ...ConnectionStack-1V0C4C1EXD8J9.outputs.json |    1 -
 ...esourcesjson-1TP4VIYV7SW7T.description.txt |    1 -
 ...omResourcesjson-1TP4VIYV7SW7T.outputs.json |    7 -
 ...esourcesjson-1TP4VIYV7SW7T.parameters.json |   22 -
 ...mResourcesjson-1TP4VIYV7SW7T.template.json |   61 -
 ...PRDAYY7-Post-14Y25NP173QZR.description.txt |    0
 ...PRDAYY7-Post-14Y25NP173QZR.parameters.json |   66 -
 ...PRDAYY7-Topic-H46P3V70TYLP.description.txt |    0
 ...T4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json |   56 -
 ...PRDAYY7-Topic-H46P3V70TYLP.parameters.json |   42 -
 ...pidiscussions-IQT4EPRDAYY7.description.txt |    1 -
 ...d-apidiscussions-IQT4EPRDAYY7.outputs.json |   20 -
 ...pidiscussions-IQT4EPRDAYY7.parameters.json |   38 -
 ...67c6822367c68-AZ1ABOD9U7XR.description.txt |    1 -
 ...67c6822367c68-AZ1ABOD9U7XR.parameters.json |  166 --
 ...2367c6822367c68-AZ1ABOD9U7XR.template.json |  272 --
 ...huseractivity-62CQ5IY9UUX6.description.txt |    1 -
 ...etchuseractivity-62CQ5IY9UUX6.outputs.json |   22 -
 ...huseractivity-62CQ5IY9UUX6.parameters.json |   30 -
 ...tchuseractivity-62CQ5IY9UUX6.template.json |  270 --
 ...useractivity-18VPX4OJ3YT33.description.txt |    1 -
 ...orduseractivity-18VPX4OJ3YT33.outputs.json |   22 -
 ...rduseractivity-18VPX4OJ3YT33.template.json |  455 ----
 ...torageactivity-1OKZSX7N0DR6H.template.json |   64 -
 ...agebookmarks-1319IZBITHXQD.description.txt |    1 -
 ...toragebookmarks-1319IZBITHXQD.outputs.json |   34 -
 ...scussionsblade-blade-4edfd.description.txt |    1 -
 ...-discussionsblade-blade-4edfd.outputs.json |   42 -
 ...scussionsblade-blade-4edfd.parameters.json |   14 -
 yarn.lock                                     |   44 +-
 329 files changed, 9095 insertions(+), 27118 deletions(-)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json => refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json} (85%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json => refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json => refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json} (71%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json => refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json} (96%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json => refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json} (68%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json => refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json} (85%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json => refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json} (83%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json => refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json => refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json} (89%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json => _snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json} (91%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json => refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json} (96%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json => update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json} (100%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json => _snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json} (64%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json => update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json => update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json => update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json => update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json} (89%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json => _snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json => update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json} (82%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json => update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json => update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json} (93%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json => _snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json => update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/{discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json => discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json} (95%)
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/{backend/auth/discussions22367c6822367c68 => #current-cloud-backend/auth/discussionsc578c16ec578c16e}/build/parameters.json (78%)
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/{discussions22367c6822367c68 => discussionsc578c16ec578c16e}/cli-inputs.json (76%)
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/{backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json => #current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json} (95%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/cli-inputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/{#current-cloud-backend/auth/discussions22367c6822367c68 => backend/auth/discussionsc578c16ec578c16e}/build/parameters.json (78%)
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/{discussions22367c6822367c68 => discussionsc578c16ec578c16e}/cli-inputs.json (76%)
 rename amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/{#current-cloud-backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json => backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json} (95%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/cli-inputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt => amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json} (88%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt => amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt => amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.template.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json} (67%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt => amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.template.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json} (72%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt => amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt => amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json => amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json} (88%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.template.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json} (70%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.template.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json} (61%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt} (54%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92.description.txt => amplify-discussions-gen2maintwo-branch-a0081fe3b3.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92.outputs.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json} (62%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92.parameters.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-e2etest-branch-75c4329a92.template.json => amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json} (69%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.description.txt => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json} (62%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json} (99%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.description.txt => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.outputs.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.description.txt => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.outputs.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json} (70%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.description.txt => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.outputs.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json} (78%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.description.txt => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json} (61%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json} (99%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.description.txt => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.outputs.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json} (70%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json} (99%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.parameters.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json} (88%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json => amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.description.txt => amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt} (57%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json => amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json} (60%)
 rename amplify-migration-apps/discussions/{_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json => _snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json} (87%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json => _snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json} (95%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.description.txt => amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt} (57%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.outputs.json => amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json} (69%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.parameters.json => amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json} (61%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.template.json => amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json} (97%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.description.txt => amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt} (57%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.outputs.json => amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json => amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json} (61%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.template.json => amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.description.txt => amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt} (58%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json => amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json} (84%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json => amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json => amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json} (98%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt => amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json => amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json} (83%)
 rename amplify-migration-apps/discussions/{_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json => _snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json} (92%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json => _snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80.description.txt => amplify-discussions-maintwo-decb9.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-main-d5a80.outputs.json => amplify-discussions-maintwo-decb9.outputs.json} (55%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussionsblade-blade-4edfd.template.json => amplify-discussions-maintwo-decb9.template.json} (84%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json

diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts
index 8d4df714fde..74c8f81185f 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts
@@ -4,7 +4,7 @@ export const auth = defineAuth({
   loginWith: {
     email: {
       verificationEmailSubject: 'Verification',
-      verificationEmailBody: () => 'Here is your verification code {####}',
+      verificationEmailBody: () => 'Your verification code is {####}',
     },
   },
   userAttributes: {
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
index fea0a1a756e..b7df8c9f1cf 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
@@ -1,21 +1,23 @@
 import { auth } from './auth/resource';
 import { data } from './data/resource';
+import { storage } from './storage/resource';
 import { fetchuseractivity } from './storage/fetchuseractivity/resource';
 import { recorduseractivity } from './storage/recorduseractivity/resource';
+import { DynamoEventSource } from 'aws-cdk-lib/aws-lambda-event-sources';
+import { StartingPosition } from 'aws-cdk-lib/aws-lambda';
 import {
   Table,
   AttributeType,
   BillingMode,
   StreamViewType,
 } from 'aws-cdk-lib/aws-dynamodb';
-import { DynamoEventSource } from 'aws-cdk-lib/aws-lambda-event-sources';
-import { StartingPosition } from 'aws-cdk-lib/aws-lambda';
 import { defineBackend } from '@aws-amplify/backend';
 import { Duration } from 'aws-cdk-lib';
 
 const backend = defineBackend({
   auth,
   data,
+  storage,
   fetchuseractivity,
   recorduseractivity,
 });
@@ -28,7 +30,7 @@ const activity = new Table(storageActivityStack, 'activity', {
   stream: StreamViewType.NEW_IMAGE,
   sortKey: { name: 'userId', type: AttributeType.STRING },
 });
-// Add this property to the Table above post refactor: tableName: 'activity-main'
+// Add this property to the Table above post refactor: tableName: 'activity-maintwo'
 activity.addGlobalSecondaryIndex({
   indexName: 'byUserId',
   partitionKey: { name: 'userId', type: AttributeType.STRING },
@@ -45,7 +47,7 @@ const bookmarks = new Table(storageBookmarksStack, 'bookmarks', {
   stream: StreamViewType.NEW_IMAGE,
   sortKey: { name: 'postId', type: AttributeType.STRING },
 });
-// Add this property to the Table above post refactor: tableName: 'bookmarks-blade'
+// Add this property to the Table above post refactor: tableName: 'bookmarks-maintwo'
 bookmarks.addGlobalSecondaryIndex({
   indexName: 'byPost',
   partitionKey: { name: 'postId', type: AttributeType.STRING },
@@ -141,3 +143,16 @@ for (const model of ['Topic', 'Post', 'Comment']) {
     backend.recorduseractivity.resources.lambda.role!
   );
 }
+const s3Bucket = backend.storage.resources.cfnResources.cfnBucket;
+// Use this bucket name post refactor
+// s3Bucket.bucketName = 'discus-avatarsdecb9-maintwo';
+s3Bucket.bucketEncryption = {
+  serverSideEncryptionConfiguration: [
+    {
+      serverSideEncryptionByDefault: {
+        sseAlgorithm: 'AES256',
+      },
+      bucketKeyEnabled: false,
+    },
+  ],
+};
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts
index 2c105859a05..204ef3c9aef 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts
@@ -39,11 +39,11 @@ export const data = defineData({
   migratedAmplifyGen1DynamoDbTableMappings: [
     {
       //The "branchname" variable needs to be the same as your deployment branch if you want to reuse your Gen1 app tables
-      branchName: 'main',
+      branchName: 'maintwo',
       modelNameToTableNameMapping: {
-        Topic: 'Topic-ruiylk7rjnb4ziygno3jh4wrsq-main',
-        Post: 'Post-ruiylk7rjnb4ziygno3jh4wrsq-main',
-        Comment: 'Comment-ruiylk7rjnb4ziygno3jh4wrsq-main',
+        Topic: 'Topic-st35wex2drhe5piowtinjea47y-maintwo',
+        Post: 'Post-st35wex2drhe5piowtinjea47y-maintwo',
+        Comment: 'Comment-st35wex2drhe5piowtinjea47y-maintwo',
       },
     },
   ],
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts
new file mode 100644
index 00000000000..062e2dcc249
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts
@@ -0,0 +1,16 @@
+import { defineStorage } from '@aws-amplify/backend';
+
+const branchName = process.env.AWS_BRANCH ?? 'sandbox';
+
+export const storage = defineStorage({
+  name: `discus-avatarsdecb9-${branchName}`,
+  access: (allow) => ({
+    'public/*': [allow.authenticated.to(['write', 'read', 'delete'])],
+    'protected/{entity_id}/*': [
+      allow.authenticated.to(['write', 'read', 'delete']),
+    ],
+    'private/{entity_id}/*': [
+      allow.authenticated.to(['write', 'read', 'delete']),
+    ],
+  }),
+});
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/package.json b/amplify-migration-apps/discussions/_snapshot.post.generate/package.json
index b5b67a4accd..c99943e5d1a 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/package.json
@@ -1,20 +1,15 @@
 {
-  "name": "@amplify-migration-apps/discussions",
+  "name": "discussions",
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "installConfig": {
-    "hoistingLimits": "workspaces"
-  },
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
     "configure": "./configure.sh",
     "configure-schema": "./configure-schema.sh",
-    "configure-functions": "./configure-functions.sh",
-    "sanitize": "tsx ../sanitize.ts",
-    "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
+    "configure-functions": "./configure-functions.sh"
   },
   "devDependencies": {
     "@aws-amplify/backend": "^1.18.0",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
deleted file mode 100644
index 98c64afa020..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.mappings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
deleted file mode 100644
index 3dd5b4788c3..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.target.template.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Temporary holding stack for Gen2 migration",
-  "Resources": {
-    "amplifyAuthUserPool4BA7F805": {
-      "Type": "AWS::Cognito::UserPool",
-      "Properties": {
-        "AutoVerifiedAttributes": [
-          "email"
-        ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
-        "EmailVerificationSubject": "Verification",
-        "MfaConfiguration": "OFF",
-        "Policies": {
-          "PasswordPolicy": {
-            "MinimumLength": "8",
-            "RequireLowercase": false,
-            "RequireNumbers": false,
-            "RequireSymbols": false,
-            "RequireUppercase": false
-          }
-        },
-        "Schema": [
-          {
-            "Mutable": true,
-            "Name": "email",
-            "Required": true
-          },
-          {
-            "Mutable": true,
-            "Name": "phone_number",
-            "Required": true
-          }
-        ],
-        "SmsAuthenticationMessage": "Your authentication code is {####}",
-        "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
-        },
-        "SmsVerificationMessage": "Your verification code is {####}",
-        "UserAttributeUpdateSettings": {
-          "AttributesRequireVerificationBeforeUpdate": [
-            "email"
-          ]
-        },
-        "UserPoolName": {
-          "Fn::Join": [
-            "",
-            [
-              "discussions22367c68_userpool_22367c68",
-              "-",
-              "blade"
-            ]
-          ]
-        },
-        "UsernameAttributes": [
-          "phone_number"
-        ],
-        "UsernameConfiguration": {
-          "CaseSensitive": false
-        }
-      },
-      "DependsOn": []
-    },
-    "amplifyAuthUserPoolAppClient2626C6F8": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
-        "RefreshTokenValidity": "120",
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": "us-east-1_3t0fqaGQN"
-      },
-      "DependsOn": [
-        "amplifyAuthUserPool4BA7F805"
-      ]
-    },
-    "amplifyAuthUserPoolNativeAppClient79534448": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_client",
-        "GenerateSecret": "false",
-        "RefreshTokenValidity": "120",
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": "us-east-1_3t0fqaGQN"
-      },
-      "DependsOn": [
-        "amplifyAuthUserPool4BA7F805"
-      ]
-    },
-    "amplifyAuthIdentityPool3FDE84CC": {
-      "Type": "AWS::Cognito::IdentityPool",
-      "Properties": {
-        "AllowUnauthenticatedIdentities": "false",
-        "CognitoIdentityProviders": [
-          {
-            "ClientId": "7oh5id275ip4505msdvhrtv5vq",
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": "us-east-1_3t0fqaGQN"
-                }
-              ]
-            }
-          },
-          {
-            "ClientId": "7t0bpmsnis3540umt8r65jcicc",
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": "us-east-1_3t0fqaGQN"
-                }
-              ]
-            }
-          }
-        ],
-        "IdentityPoolName": {
-          "Fn::Join": [
-            "",
-            [
-              "discussions22367c68_identitypool_22367c68__",
-              "blade"
-            ]
-          ]
-        }
-      }
-    },
-    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
-      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
-      "Properties": {
-        "IdentityPoolId": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
-        "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
-        }
-      },
-      "DependsOn": [
-        "amplifyAuthIdentityPool3FDE84CC"
-      ]
-    }
-  },
-  "Outputs": {}
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
deleted file mode 100644
index 35d2485bffa..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
-      "LogicalResourceId": "activity1E902D9C"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding",
-      "LogicalResourceId": "activity1E902D9C"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
deleted file mode 100644
index 2338cb41f96..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
-      "LogicalResourceId": "bookmarksA4548304"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding",
-      "LogicalResourceId": "bookmarksA4548304"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json
new file mode 100644
index 00000000000..46430b97e81
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json
@@ -0,0 +1,52 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json
similarity index 85%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json
index 3c0a2af31a7..43ae73ed2f6 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -31,7 +31,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -81,7 +81,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,16 +98,16 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -379,20 +379,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
-      "Value": "us-east-1_dgn42NPnC"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+      "Value": "us-east-1_fU7jrxvo5"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
-      "Value": "32gd06g1ofsno77g3aj6a7aenm"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
+      "Value": "1c1vf5gnunutele7c45m171n11"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+      "Value": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json
new file mode 100644
index 00000000000..7f1bd16ebfa
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json
@@ -0,0 +1,222 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Temporary holding stack for Gen2 migration",
+  "Resources": {
+    "amplifyAuthUserPool4BA7F805": {
+      "Type": "AWS::Cognito::UserPool",
+      "Properties": {
+        "AccountRecoverySetting": {
+          "RecoveryMechanisms": [
+            {
+              "Name": "verified_email",
+              "Priority": 1
+            }
+          ]
+        },
+        "AdminCreateUserConfig": {
+          "AllowAdminCreateUserOnly": false
+        },
+        "AutoVerifiedAttributes": [
+          "email"
+        ],
+        "EmailVerificationMessage": "Your verification code is {####}",
+        "EmailVerificationSubject": "Verification",
+        "MfaConfiguration": "OFF",
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": 8,
+            "RequireLowercase": false,
+            "RequireNumbers": false,
+            "RequireSymbols": false,
+            "RequireUppercase": false,
+            "TemporaryPasswordValidityDays": 7
+          }
+        },
+        "Schema": [
+          {
+            "Mutable": true,
+            "Name": "email",
+            "Required": true
+          },
+          {
+            "Mutable": true,
+            "Name": "phone_number",
+            "Required": true
+          }
+        ],
+        "SmsVerificationMessage": "The verification code to your new account is {####}",
+        "UserAttributeUpdateSettings": {
+          "AttributesRequireVerificationBeforeUpdate": [
+            "email"
+          ]
+        },
+        "UserPoolTags": {
+          "amplify:app-id": "discussions",
+          "amplify:branch-name": "gen2-maintwo",
+          "amplify:deployment-type": "branch",
+          "amplify:friendly-name": "amplifyAuth",
+          "created-by": "amplify"
+        },
+        "UsernameAttributes": [
+          "phone_number"
+        ],
+        "UsernameConfiguration": {
+          "CaseSensitive": false
+        },
+        "VerificationMessageTemplate": {
+          "DefaultEmailOption": "CONFIRM_WITH_CODE",
+          "EmailMessage": "Your verification code is {####}",
+          "EmailSubject": "Verification",
+          "SmsMessage": "The verification code to your new account is {####}"
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/Resource"
+      }
+    },
+    "amplifyAuthUserPoolNativeAppClient79534448": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "AllowedOAuthFlowsUserPoolClient": false,
+        "AuthSessionValidity": 3,
+        "EnablePropagateAdditionalUserContextData": false,
+        "EnableTokenRevocation": true,
+        "GenerateSecret": false,
+        "RefreshTokenValidity": 172800,
+        "SupportedIdentityProviders": [
+          "COGNITO"
+        ],
+        "TokenValidityUnits": {
+          "RefreshToken": "minutes"
+        },
+        "UserPoolId": "us-east-1_fU7jrxvo5"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
+      }
+    },
+    "amplifyAuthUserPoolAppClient2626C6F8": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "AllowedOAuthFlows": [
+          "code"
+        ],
+        "AllowedOAuthFlowsUserPoolClient": true,
+        "AllowedOAuthScopes": [
+          "profile",
+          "phone",
+          "email",
+          "openid",
+          "aws.cognito.signin.user.admin"
+        ],
+        "CallbackURLs": [
+          "https://example.com"
+        ],
+        "ExplicitAuthFlows": [
+          "ALLOW_CUSTOM_AUTH",
+          "ALLOW_USER_SRP_AUTH",
+          "ALLOW_REFRESH_TOKEN_AUTH"
+        ],
+        "PreventUserExistenceErrors": "ENABLED",
+        "SupportedIdentityProviders": [
+          "COGNITO"
+        ],
+        "UserPoolId": "us-east-1_fU7jrxvo5"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPoolAppClient/Resource"
+      }
+    },
+    "amplifyAuthIdentityPool3FDE84CC": {
+      "Type": "AWS::Cognito::IdentityPool",
+      "Properties": {
+        "AllowUnauthenticatedIdentities": false,
+        "CognitoIdentityProviders": [
+          {
+            "ClientId": "1c1vf5gnunutele7c45m171n11",
+            "ProviderName": {
+              "Fn::Join": [
+                "",
+                [
+                  "cognito-idp.",
+                  {
+                    "Ref": "AWS::Region"
+                  },
+                  ".amazonaws.com/",
+                  "us-east-1_fU7jrxvo5"
+                ]
+              ]
+            }
+          }
+        ],
+        "IdentityPoolTags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyAuth"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "SupportedLoginProviders": {}
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPool"
+      }
+    },
+    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
+      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+      "Properties": {
+        "IdentityPoolId": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546",
+        "RoleMappings": {
+          "UserPoolWebClientRoleMapping": {
+            "AmbiguousRoleResolution": "AuthenticatedRole",
+            "IdentityProvider": {
+              "Fn::Join": [
+                "",
+                [
+                  "cognito-idp.",
+                  {
+                    "Ref": "AWS::Region"
+                  },
+                  ".amazonaws.com/",
+                  "us-east-1_fU7jrxvo5",
+                  ":",
+                  "1c1vf5gnunutele7c45m171n11"
+                ]
+              ]
+            },
+            "Type": "Token"
+          }
+        },
+        "Roles": {
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+        }
+      },
+      "DependsOn": [
+        "amplifyAuthIdentityPool3FDE84CC",
+        "amplifyAuthUserPoolAppClient2626C6F8"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPoolRoleAttachment"
+      }
+    }
+  },
+  "Outputs": {}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json
new file mode 100644
index 00000000000..4c1d39978d1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX",
+      "LogicalResourceId": "activity1E902D9C"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding",
+      "LogicalResourceId": "activity1E902D9C"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json
index 728e71a7f94..5cf80db5525 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json
@@ -4,10 +4,10 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -279,14 +279,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
     },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
     },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
+      "Value": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json
index 32eb1abed6f..f9df1a6b8a3 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json
@@ -58,16 +58,29 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "activity",
-              "-",
-              "blade"
-            ]
-          ]
-        }
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/activity/Resource"
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json
new file mode 100644
index 00000000000..8443e9b9f56
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348",
+      "LogicalResourceId": "bookmarksA4548304"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json
index 72870a2ec8e..ce308cd186a 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json
@@ -4,10 +4,10 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json
index 2c1f80cb718..31bfb38947e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json
@@ -50,16 +50,29 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "bookmarks",
-              "-",
-              "blade"
-            ]
-          ]
-        }
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/bookmarks/Resource"
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
deleted file mode 100644
index 998dce0b3ad..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.mappings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG",
-      "LogicalResourceId": "UserPool"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG",
-      "LogicalResourceId": "UserPoolClientWeb"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG",
-      "LogicalResourceId": "UserPoolClient"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG",
-      "LogicalResourceId": "IdentityPool"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG",
-      "LogicalResourceId": "IdentityPoolRoleMap"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
deleted file mode 100644
index dc149993830..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4",
-      "LogicalResourceId": "DynamoDBTable"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5",
-      "LogicalResourceId": "activity1E902D9C"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
deleted file mode 100644
index 2cabe515564..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T",
-      "LogicalResourceId": "DynamoDBTable"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ",
-      "LogicalResourceId": "bookmarksA4548304"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
deleted file mode 100644
index 049bbe9a8e8..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.source.template.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "Description": "DDB Resource for AWS Amplify CLI",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Parameters": {
-    "partitionKeyName": {
-      "Type": "String"
-    },
-    "partitionKeyType": {
-      "Type": "String"
-    },
-    "env": {
-      "Type": "String"
-    },
-    "sortKeyName": {
-      "Type": "String"
-    },
-    "sortKeyType": {
-      "Type": "String"
-    },
-    "tableName": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        "main",
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "MigrationPlaceholder": {
-      "Type": "AWS::CloudFormation::WaitConditionHandle",
-      "Properties": {}
-    }
-  },
-  "Outputs": {
-    "Name": {
-      "Value": "bookmarks-blade"
-    },
-    "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
-    },
-    "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
-    },
-    "PartitionKeyName": {
-      "Value": "userId"
-    },
-    "PartitionKeyType": {
-      "Value": "S"
-    },
-    "SortKeyName": {
-      "Value": "postId"
-    },
-    "SortKeyType": {
-      "Value": "S"
-    },
-    "Region": {
-      "Value": "us-east-1"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json
new file mode 100644
index 00000000000..65fb4f021fb
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json
@@ -0,0 +1,52 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
+      "LogicalResourceId": "UserPool"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
+      "LogicalResourceId": "UserPoolClientWeb"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
+      "LogicalResourceId": "UserPoolClient"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
+      "LogicalResourceId": "IdentityPool"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
+      "LogicalResourceId": "IdentityPoolRoleMap"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json
similarity index 85%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json
index 8d216ad870f..189af1d96d9 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -129,7 +129,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "main",
+        "maintwo",
         "NONE"
       ]
     }
@@ -152,7 +152,7 @@
               ],
               "Condition": {
                 "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
                 }
               }
             }
@@ -172,27 +172,27 @@
                 }
               ]
             },
-            "PolicyName": "discus22367c68-sns-policy"
+            "PolicyName": "discusc578c16e-sns-policy"
           }
         ],
         "RoleName": {
           "Fn::Join": [
             "",
             [
-              "sns22367c68",
+              "snsc578c16e",
               {
                 "Fn::Select": [
                   3,
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG"
+                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
                     ]
                   }
                 ]
               },
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -217,20 +217,20 @@
           "Fn::Join": [
             "",
             [
-              "upClientLambdaRole22367c68",
+              "upClientLambdaRolec578c16e",
               {
                 "Fn::Select": [
                   3,
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG"
+                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
                     ]
                   }
                 ]
               },
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -240,33 +240,33 @@
   "Outputs": {
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
-      "Value": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f"
+      "Value": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e"
     },
     "IdentityPoolName": {
-      "Value": "discussions22367c68_identitypool_22367c68__main"
+      "Value": "discussionsc578c16e_identitypool_c578c16e__maintwo"
     },
     "UserPoolId": {
       "Description": "Id for the user pool",
-      "Value": "us-east-1_Zs9EZpCYX"
+      "Value": "us-east-1_RCPurfiEw"
     },
     "UserPoolArn": {
       "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_Zs9EZpCYX"
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw"
     },
     "UserPoolName": {
-      "Value": "discussions22367c68_userpool_22367c68"
+      "Value": "discussionsc578c16e_userpool_c578c16e"
     },
     "AppClientIDWeb": {
       "Description": "The user pool app client id for web",
-      "Value": "ptm2eqjiee7l3e202lstfjd3r"
+      "Value": "2kictuhtu6967eqd0qhtsv5roh"
     },
     "AppClientID": {
       "Description": "The user pool app client id",
-      "Value": "75sq8s16g37d0as1148og20p3i"
+      "Value": "35iqavrc56jmhttprdv2frl8qf"
     },
     "CreatedSNSRole": {
       "Description": "role arn",
-      "Value": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main"
+      "Value": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json
index 2a59df16523..1a217b319ca 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.__to__.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -31,7 +31,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -81,7 +81,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,16 +98,16 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -117,7 +117,7 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationMessage": "Your verification code is {####}",
         "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
@@ -143,8 +143,8 @@
         ],
         "SmsAuthenticationMessage": "Your authentication code is {####}",
         "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main"
+          "ExternalId": "discusc578c16e_role_external_id",
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
         },
         "SmsVerificationMessage": "Your verification code is {####}",
         "UserAttributeUpdateSettings": {
@@ -156,9 +156,9 @@
           "Fn::Join": [
             "",
             [
-              "discussions22367c68_userpool_22367c68",
+              "discussionsc578c16e_userpool_c578c16e",
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         },
@@ -174,12 +174,12 @@
     "amplifyAuthUserPoolAppClient2626C6F8": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
+        "ClientName": "discusc578c16e_app_clientWeb",
         "RefreshTokenValidity": "120",
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_Zs9EZpCYX"
+        "UserPoolId": "us-east-1_RCPurfiEw"
       },
       "DependsOn": [
         "amplifyAuthUserPool4BA7F805"
@@ -188,13 +188,13 @@
     "amplifyAuthUserPoolNativeAppClient79534448": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_client",
+        "ClientName": "discusc578c16e_app_client",
         "GenerateSecret": "false",
         "RefreshTokenValidity": "120",
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_Zs9EZpCYX"
+        "UserPoolId": "us-east-1_RCPurfiEw"
       },
       "DependsOn": [
         "amplifyAuthUserPool4BA7F805"
@@ -206,7 +206,7 @@
         "AllowUnauthenticatedIdentities": "false",
         "CognitoIdentityProviders": [
           {
-            "ClientId": "75sq8s16g37d0as1148og20p3i",
+            "ClientId": "35iqavrc56jmhttprdv2frl8qf",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -214,13 +214,13 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_Zs9EZpCYX"
+                  "client": "us-east-1_RCPurfiEw"
                 }
               ]
             }
           },
           {
-            "ClientId": "ptm2eqjiee7l3e202lstfjd3r",
+            "ClientId": "2kictuhtu6967eqd0qhtsv5roh",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -228,7 +228,7 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_Zs9EZpCYX"
+                  "client": "us-east-1_RCPurfiEw"
                 }
               ]
             }
@@ -238,8 +238,8 @@
           "Fn::Join": [
             "",
             [
-              "discussions22367c68_identitypool_22367c68__",
-              "main"
+              "discussionsc578c16e_identitypool_c578c16e__",
+              "maintwo"
             ]
           ]
         }
@@ -248,10 +248,10 @@
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f",
+        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
         }
       },
       "DependsOn": [
@@ -526,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
-      "Value": "us-east-1_dgn42NPnC"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+      "Value": "us-east-1_fU7jrxvo5"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
-      "Value": "32gd06g1ofsno77g3aj6a7aenm"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
+      "Value": "1c1vf5gnunutele7c45m171n11"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+      "Value": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json
new file mode 100644
index 00000000000..98d462430b6
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N",
+      "LogicalResourceId": "DynamoDBTable"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX",
+      "LogicalResourceId": "activity1E902D9C"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json
index 93866f1ecab..9528be37699 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "main",
+        "maintwo",
         "NONE"
       ]
     }
@@ -37,13 +37,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "activity-main"
+      "Value": "activity-maintwo"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
     },
     "PartitionKeyName": {
       "Value": "id"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json
index 412da87990f..382f1636160 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.__to__.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json
@@ -4,10 +4,10 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -73,7 +73,7 @@
             [
               "activity",
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -347,14 +347,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
     },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
     },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
+      "Value": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json
new file mode 100644
index 00000000000..69854e9745d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX",
+      "LogicalResourceId": "DynamoDBTable"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json
similarity index 91%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json
index 73597bf57f8..9c180c57b36 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "blade",
+        "maintwo",
         "NONE"
       ]
     }
@@ -37,13 +37,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "bookmarks-blade"
+      "Value": "bookmarks-maintwo"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305"
     },
     "PartitionKeyName": {
       "Value": "userId"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json
index 8e4344a2ca2..1be22696e35 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json
@@ -4,10 +4,10 @@
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -65,7 +65,7 @@
             [
               "bookmarks",
               "-",
-              "blade"
+              "maintwo"
             ]
           ]
         }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
deleted file mode 100644
index 64c3a236423..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
+++ /dev/null
@@ -1,545 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
-  "Resources": {
-    "amplifyAuthauthenticatedUserRoleD8DA3689": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRoleWithWebIdentity",
-              "Condition": {
-                "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-                },
-                "ForAnyValue:StringLike": {
-                  "cognito-identity.amazonaws.com:amr": "authenticated"
-                }
-              },
-              "Effect": "Allow",
-              "Principal": {
-                "Federated": "cognito-identity.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyAuth"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
-      }
-    },
-    "amplifyAuthunauthenticatedUserRole2B524D9E": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRoleWithWebIdentity",
-              "Condition": {
-                "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-                },
-                "ForAnyValue:StringLike": {
-                  "cognito-identity.amazonaws.com:amr": "unauthenticated"
-                }
-              },
-              "Effect": "Allow",
-              "Principal": {
-                "Federated": "cognito-identity.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyAuth"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    },
-    "amplifyAuthUserPool4BA7F805": {
-      "Type": "AWS::Cognito::UserPool",
-      "Properties": {
-        "AutoVerifiedAttributes": [
-          "email"
-        ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
-        "EmailVerificationSubject": "Verification",
-        "MfaConfiguration": "OFF",
-        "Policies": {
-          "PasswordPolicy": {
-            "MinimumLength": "8",
-            "RequireLowercase": false,
-            "RequireNumbers": false,
-            "RequireSymbols": false,
-            "RequireUppercase": false
-          }
-        },
-        "Schema": [
-          {
-            "Mutable": true,
-            "Name": "email",
-            "Required": true
-          },
-          {
-            "Mutable": true,
-            "Name": "phone_number",
-            "Required": true
-          }
-        ],
-        "SmsAuthenticationMessage": "Your authentication code is {####}",
-        "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
-        },
-        "SmsVerificationMessage": "Your verification code is {####}",
-        "UserAttributeUpdateSettings": {
-          "AttributesRequireVerificationBeforeUpdate": [
-            "email"
-          ]
-        },
-        "UserPoolName": {
-          "Fn::Join": [
-            "",
-            [
-              "discussions22367c68_userpool_22367c68",
-              "-",
-              "blade"
-            ]
-          ]
-        },
-        "UsernameAttributes": [
-          "phone_number"
-        ],
-        "UsernameConfiguration": {
-          "CaseSensitive": false
-        }
-      },
-      "DependsOn": []
-    },
-    "amplifyAuthUserPoolAppClient2626C6F8": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
-        "RefreshTokenValidity": "120",
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": "us-east-1_3t0fqaGQN"
-      },
-      "DependsOn": [
-        "amplifyAuthUserPool4BA7F805"
-      ]
-    },
-    "amplifyAuthUserPoolNativeAppClient79534448": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_client",
-        "GenerateSecret": "false",
-        "RefreshTokenValidity": "120",
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": "us-east-1_3t0fqaGQN"
-      },
-      "DependsOn": [
-        "amplifyAuthUserPool4BA7F805"
-      ]
-    },
-    "amplifyAuthIdentityPool3FDE84CC": {
-      "Type": "AWS::Cognito::IdentityPool",
-      "Properties": {
-        "AllowUnauthenticatedIdentities": "false",
-        "CognitoIdentityProviders": [
-          {
-            "ClientId": "7oh5id275ip4505msdvhrtv5vq",
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": "us-east-1_3t0fqaGQN"
-                }
-              ]
-            }
-          },
-          {
-            "ClientId": "7t0bpmsnis3540umt8r65jcicc",
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": "us-east-1_3t0fqaGQN"
-                }
-              ]
-            }
-          }
-        ],
-        "IdentityPoolName": {
-          "Fn::Join": [
-            "",
-            [
-              "discussions22367c68_identitypool_22367c68__",
-              "blade"
-            ]
-          ]
-        }
-      }
-    },
-    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
-      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
-      "Properties": {
-        "IdentityPoolId": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
-        "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
-        }
-      },
-      "DependsOn": [
-        "amplifyAuthIdentityPool3FDE84CC"
-      ]
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
-      "Value": "us-east-1_dgn42NPnC"
-    },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
-      "Value": "32gd06g1ofsno77g3aj6a7aenm"
-    },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-    },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-    },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
similarity index 64%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
index 64c3a236423..eeb1f83c17b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
@@ -1,6 +1,183 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
   "Resources": {
+    "amplifyAuthUserPool4BA7F805": {
+      "Type": "AWS::Cognito::UserPool",
+      "Properties": {
+        "AccountRecoverySetting": {
+          "RecoveryMechanisms": [
+            {
+              "Name": "verified_email",
+              "Priority": 1
+            }
+          ]
+        },
+        "AdminCreateUserConfig": {
+          "AllowAdminCreateUserOnly": false
+        },
+        "AutoVerifiedAttributes": [
+          "email"
+        ],
+        "EmailVerificationMessage": "Your verification code is {####}",
+        "EmailVerificationSubject": "Verification",
+        "MfaConfiguration": "OFF",
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": 8,
+            "RequireLowercase": false,
+            "RequireNumbers": false,
+            "RequireSymbols": false,
+            "RequireUppercase": false,
+            "TemporaryPasswordValidityDays": 7
+          }
+        },
+        "Schema": [
+          {
+            "Mutable": true,
+            "Name": "email",
+            "Required": true
+          },
+          {
+            "Mutable": true,
+            "Name": "phone_number",
+            "Required": true
+          }
+        ],
+        "SmsVerificationMessage": "The verification code to your new account is {####}",
+        "UserAttributeUpdateSettings": {
+          "AttributesRequireVerificationBeforeUpdate": [
+            "email"
+          ]
+        },
+        "UserPoolTags": {
+          "amplify:app-id": "discussions",
+          "amplify:branch-name": "gen2-maintwo",
+          "amplify:deployment-type": "branch",
+          "amplify:friendly-name": "amplifyAuth",
+          "created-by": "amplify"
+        },
+        "UsernameAttributes": [
+          "phone_number"
+        ],
+        "UsernameConfiguration": {
+          "CaseSensitive": false
+        },
+        "VerificationMessageTemplate": {
+          "DefaultEmailOption": "CONFIRM_WITH_CODE",
+          "EmailMessage": "Your verification code is {####}",
+          "EmailSubject": "Verification",
+          "SmsMessage": "The verification code to your new account is {####}"
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/Resource"
+      }
+    },
+    "amplifyAuthUserPoolNativeAppClient79534448": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "AllowedOAuthFlowsUserPoolClient": false,
+        "AuthSessionValidity": 3,
+        "EnablePropagateAdditionalUserContextData": false,
+        "EnableTokenRevocation": true,
+        "GenerateSecret": false,
+        "RefreshTokenValidity": 172800,
+        "SupportedIdentityProviders": [
+          "COGNITO"
+        ],
+        "TokenValidityUnits": {
+          "RefreshToken": "minutes"
+        },
+        "UserPoolId": "us-east-1_fU7jrxvo5"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
+      }
+    },
+    "amplifyAuthUserPoolAppClient2626C6F8": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "AllowedOAuthFlows": [
+          "code"
+        ],
+        "AllowedOAuthFlowsUserPoolClient": true,
+        "AllowedOAuthScopes": [
+          "profile",
+          "phone",
+          "email",
+          "openid",
+          "aws.cognito.signin.user.admin"
+        ],
+        "CallbackURLs": [
+          "https://example.com"
+        ],
+        "ExplicitAuthFlows": [
+          "ALLOW_CUSTOM_AUTH",
+          "ALLOW_USER_SRP_AUTH",
+          "ALLOW_REFRESH_TOKEN_AUTH"
+        ],
+        "PreventUserExistenceErrors": "ENABLED",
+        "SupportedIdentityProviders": [
+          "COGNITO"
+        ],
+        "UserPoolId": "us-east-1_fU7jrxvo5"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPoolAppClient/Resource"
+      }
+    },
+    "amplifyAuthIdentityPool3FDE84CC": {
+      "Type": "AWS::Cognito::IdentityPool",
+      "Properties": {
+        "AllowUnauthenticatedIdentities": false,
+        "CognitoIdentityProviders": [
+          {
+            "ClientId": "1c1vf5gnunutele7c45m171n11",
+            "ProviderName": {
+              "Fn::Join": [
+                "",
+                [
+                  "cognito-idp.",
+                  {
+                    "Ref": "AWS::Region"
+                  },
+                  ".amazonaws.com/",
+                  "us-east-1_fU7jrxvo5"
+                ]
+              ]
+            }
+          }
+        ],
+        "IdentityPoolTags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "amplifyAuth"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "SupportedLoginProviders": {}
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPool"
+      }
+    },
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
       "Type": "AWS::IAM::Role",
       "Properties": {
@@ -10,7 +187,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -31,7 +208,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +225,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +237,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -81,7 +258,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,165 +275,56 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQ6CMBBEv4V7WRG5eDScvBiD8Wxqu+pC2SZ0lZim/26IQTnNzJuZEspqA0Wmx5Ab2+WOrhAPGATtSbTplB7DJRp/ZxIP8RxwOHrvVH3jn59N7QhZltWf7C2ykLzn8zI33uFORJtHjyxJke4hTnAaTppSUuwtQhtWr7KA9RaqrA1E+fBkoR6h+eoHlS9vBs4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    },
-    "amplifyAuthUserPool4BA7F805": {
-      "Type": "AWS::Cognito::UserPool",
-      "Properties": {
-        "AutoVerifiedAttributes": [
-          "email"
-        ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
-        "EmailVerificationSubject": "Verification",
-        "MfaConfiguration": "OFF",
-        "Policies": {
-          "PasswordPolicy": {
-            "MinimumLength": "8",
-            "RequireLowercase": false,
-            "RequireNumbers": false,
-            "RequireSymbols": false,
-            "RequireUppercase": false
-          }
-        },
-        "Schema": [
-          {
-            "Mutable": true,
-            "Name": "email",
-            "Required": true
-          },
-          {
-            "Mutable": true,
-            "Name": "phone_number",
-            "Required": true
-          }
-        ],
-        "SmsAuthenticationMessage": "Your authentication code is {####}",
-        "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
-        },
-        "SmsVerificationMessage": "Your verification code is {####}",
-        "UserAttributeUpdateSettings": {
-          "AttributesRequireVerificationBeforeUpdate": [
-            "email"
-          ]
-        },
-        "UserPoolName": {
-          "Fn::Join": [
-            "",
-            [
-              "discussions22367c68_userpool_22367c68",
-              "-",
-              "blade"
-            ]
-          ]
-        },
-        "UsernameAttributes": [
-          "phone_number"
-        ],
-        "UsernameConfiguration": {
-          "CaseSensitive": false
-        }
-      },
-      "DependsOn": []
-    },
-    "amplifyAuthUserPoolAppClient2626C6F8": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
-        "RefreshTokenValidity": "120",
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": "us-east-1_3t0fqaGQN"
-      },
-      "DependsOn": [
-        "amplifyAuthUserPool4BA7F805"
-      ]
-    },
-    "amplifyAuthUserPoolNativeAppClient79534448": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_client",
-        "GenerateSecret": "false",
-        "RefreshTokenValidity": "120",
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": "us-east-1_3t0fqaGQN"
-      },
-      "DependsOn": [
-        "amplifyAuthUserPool4BA7F805"
-      ]
-    },
-    "amplifyAuthIdentityPool3FDE84CC": {
-      "Type": "AWS::Cognito::IdentityPool",
+    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
+      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "AllowUnauthenticatedIdentities": "false",
-        "CognitoIdentityProviders": [
-          {
-            "ClientId": "7oh5id275ip4505msdvhrtv5vq",
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
+        "IdentityPoolId": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546",
+        "RoleMappings": {
+          "UserPoolWebClientRoleMapping": {
+            "AmbiguousRoleResolution": "AuthenticatedRole",
+            "IdentityProvider": {
+              "Fn::Join": [
+                "",
+                [
+                  "cognito-idp.",
+                  {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_3t0fqaGQN"
-                }
+                  ".amazonaws.com/",
+                  "us-east-1_fU7jrxvo5",
+                  ":",
+                  "1c1vf5gnunutele7c45m171n11"
+                ]
               ]
-            }
-          },
-          {
-            "ClientId": "7t0bpmsnis3540umt8r65jcicc",
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": "us-east-1_3t0fqaGQN"
-                }
-              ]
-            }
+            },
+            "Type": "Token"
           }
-        ],
-        "IdentityPoolName": {
-          "Fn::Join": [
-            "",
-            [
-              "discussions22367c68_identitypool_22367c68__",
-              "blade"
-            ]
-          ]
+        },
+        "Roles": {
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
         }
+      },
+      "DependsOn": [
+        "amplifyAuthIdentityPool3FDE84CC",
+        "amplifyAuthUserPoolAppClient2626C6F8"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPoolRoleAttachment"
       }
     },
-    "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
-      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "IdentityPoolId": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
-        "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
-        }
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
-      "DependsOn": [
-        "amplifyAuthIdentityPool3FDE84CC"
-      ]
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
@@ -526,20 +594,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
-      "Value": "us-east-1_dgn42NPnC"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+      "Value": "us-east-1_fU7jrxvo5"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref": {
-      "Value": "32gd06g1ofsno77g3aj6a7aenm"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
+      "Value": "1c1vf5gnunutele7c45m171n11"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Value": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+      "Value": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
     },
-    "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Value": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
index 1c5d0c2adcd..559d4521407 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
@@ -1,16 +1,6 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    },
     "activity1E902D9C": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
@@ -67,17 +57,40 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "activity",
-              "-",
-              "blade"
-            ]
-          ]
-        }
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/activity/Resource"
       }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
@@ -347,14 +360,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
     },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
     },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
+      "Value": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
index 4dd9e588f69..002324e944a 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.__to__.amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
@@ -1,16 +1,6 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    },
     "bookmarksA4548304": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
@@ -59,17 +49,40 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "bookmarks",
-              "-",
-              "main"
-            ]
-          ]
-        }
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/bookmarks/Resource"
       }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
index 81a9d17476d..9f2b0c0d239 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "authRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
   },
   {
     "ParameterKey": "autoVerifiedAttributes",
@@ -41,7 +41,7 @@
   },
   {
     "ParameterKey": "sharedId",
-    "ParameterValue": "22367c68"
+    "ParameterValue": "c578c16e"
   },
   {
     "ParameterKey": "useDefault",
@@ -57,7 +57,7 @@
   },
   {
     "ParameterKey": "identityPoolName",
-    "ParameterValue": "discussions22367c68_identitypool_22367c68"
+    "ParameterValue": "discussionsc578c16e_identitypool_c578c16e"
   },
   {
     "ParameterKey": "thirdPartyAuth",
@@ -77,7 +77,7 @@
   },
   {
     "ParameterKey": "resourceNameTruncated",
-    "ParameterValue": "discus22367c68"
+    "ParameterValue": "discusc578c16e"
   },
   {
     "ParameterKey": "userPoolGroups",
@@ -93,7 +93,7 @@
   },
   {
     "ParameterKey": "userPoolName",
-    "ParameterValue": "discussions22367c68_userpool_22367c68"
+    "ParameterValue": "discussionsc578c16e_userpool_c578c16e"
   },
   {
     "ParameterKey": "userpoolClientWriteAttributes",
@@ -113,11 +113,11 @@
   },
   {
     "ParameterKey": "resourceName",
-    "ParameterValue": "discussions22367c6822367c68"
+    "ParameterValue": "discussionsc578c16ec578c16e"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "triggers",
@@ -129,7 +129,7 @@
   },
   {
     "ParameterKey": "emailVerificationMessage",
-    "ParameterValue": "Here is your verification code {####}"
+    "ParameterValue": "Your verification code is {####}"
   },
   {
     "ParameterKey": "userpoolClientRefreshTokenValidity",
@@ -141,7 +141,7 @@
   },
   {
     "ParameterKey": "unauthRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole"
   },
   {
     "ParameterKey": "requiredAttributes",
@@ -157,7 +157,7 @@
   },
   {
     "ParameterKey": "userpoolClientLambdaRole",
-    "ParameterValue": "discus22367c68_userpoolclient_lambda_role"
+    "ParameterValue": "discusc578c16e_userpoolclient_lambda_role"
   },
   {
     "ParameterKey": "defaultPasswordPolicy",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
similarity index 82%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
index b9cb6fb96d4..55a46e16d05 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -129,7 +129,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "main",
+        "maintwo",
         "NONE"
       ]
     }
@@ -152,7 +152,7 @@
               ],
               "Condition": {
                 "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
                 }
               }
             }
@@ -172,27 +172,27 @@
                 }
               ]
             },
-            "PolicyName": "discus22367c68-sns-policy"
+            "PolicyName": "discusc578c16e-sns-policy"
           }
         ],
         "RoleName": {
           "Fn::Join": [
             "",
             [
-              "sns22367c68",
+              "snsc578c16e",
               {
                 "Fn::Select": [
                   3,
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG"
+                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
                     ]
                   }
                 ]
               },
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -204,7 +204,7 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationMessage": "Your verification code is {####}",
         "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
@@ -230,8 +230,8 @@
         ],
         "SmsAuthenticationMessage": "Your authentication code is {####}",
         "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main"
+          "ExternalId": "discusc578c16e_role_external_id",
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
         },
         "SmsVerificationMessage": "Your verification code is {####}",
         "UserAttributeUpdateSettings": {
@@ -243,9 +243,9 @@
           "Fn::Join": [
             "",
             [
-              "discussions22367c68_userpool_22367c68",
+              "discussionsc578c16e_userpool_c578c16e",
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         },
@@ -261,12 +261,12 @@
     "UserPoolClientWeb": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
+        "ClientName": "discusc578c16e_app_clientWeb",
         "RefreshTokenValidity": "120",
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_Zs9EZpCYX"
+        "UserPoolId": "us-east-1_RCPurfiEw"
       },
       "DependsOn": [
         "UserPool"
@@ -275,13 +275,13 @@
     "UserPoolClient": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_client",
+        "ClientName": "discusc578c16e_app_client",
         "GenerateSecret": "false",
         "RefreshTokenValidity": "120",
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_Zs9EZpCYX"
+        "UserPoolId": "us-east-1_RCPurfiEw"
       },
       "DependsOn": [
         "UserPool"
@@ -306,20 +306,20 @@
           "Fn::Join": [
             "",
             [
-              "upClientLambdaRole22367c68",
+              "upClientLambdaRolec578c16e",
               {
                 "Fn::Select": [
                   3,
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG"
+                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
                     ]
                   }
                 ]
               },
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -331,7 +331,7 @@
         "AllowUnauthenticatedIdentities": "false",
         "CognitoIdentityProviders": [
           {
-            "ClientId": "75sq8s16g37d0as1148og20p3i",
+            "ClientId": "35iqavrc56jmhttprdv2frl8qf",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -339,13 +339,13 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_Zs9EZpCYX"
+                  "client": "us-east-1_RCPurfiEw"
                 }
               ]
             }
           },
           {
-            "ClientId": "ptm2eqjiee7l3e202lstfjd3r",
+            "ClientId": "2kictuhtu6967eqd0qhtsv5roh",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -353,7 +353,7 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_Zs9EZpCYX"
+                  "client": "us-east-1_RCPurfiEw"
                 }
               ]
             }
@@ -363,8 +363,8 @@
           "Fn::Join": [
             "",
             [
-              "discussions22367c68_identitypool_22367c68__",
-              "main"
+              "discussionsc578c16e_identitypool_c578c16e__",
+              "maintwo"
             ]
           ]
         }
@@ -373,10 +373,10 @@
     "IdentityPoolRoleMap": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f",
+        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
         }
       },
       "DependsOn": [
@@ -387,33 +387,33 @@
   "Outputs": {
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
-      "Value": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f"
+      "Value": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e"
     },
     "IdentityPoolName": {
-      "Value": "discussions22367c68_identitypool_22367c68__main"
+      "Value": "discussionsc578c16e_identitypool_c578c16e__maintwo"
     },
     "UserPoolId": {
       "Description": "Id for the user pool",
-      "Value": "us-east-1_Zs9EZpCYX"
+      "Value": "us-east-1_RCPurfiEw"
     },
     "UserPoolArn": {
       "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_Zs9EZpCYX"
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw"
     },
     "UserPoolName": {
-      "Value": "discussions22367c68_userpool_22367c68"
+      "Value": "discussionsc578c16e_userpool_c578c16e"
     },
     "AppClientIDWeb": {
       "Description": "The user pool app client id for web",
-      "Value": "ptm2eqjiee7l3e202lstfjd3r"
+      "Value": "2kictuhtu6967eqd0qhtsv5roh"
     },
     "AppClientID": {
       "Description": "The user pool app client id",
-      "Value": "75sq8s16g37d0as1148og20p3i"
+      "Value": "35iqavrc56jmhttprdv2frl8qf"
     },
     "CreatedSNSRole": {
       "Description": "role arn",
-      "Value": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main"
+      "Value": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
index d4a8a1d9363..029f443974a 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
similarity index 93%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
index a0269d3ac88..29704b7c908 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "main",
+        "maintwo",
         "NONE"
       ]
     }
@@ -92,7 +92,7 @@
             [
               "activity",
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -105,13 +105,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "activity-main"
+      "Value": "activity-maintwo"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
     },
     "PartitionKeyName": {
       "Value": "id"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
index ba06f4fda11..357002d677e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "blade"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
index 9b64da5ced9..3af46614f09 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "DDB Resource for AWS Amplify CLI",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "main",
+        "maintwo",
         "NONE"
       ]
     }
@@ -84,7 +84,7 @@
             [
               "bookmarks",
               "-",
-              "main"
+              "maintwo"
             ]
           ]
         }
@@ -97,13 +97,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "bookmarks-blade"
+      "Value": "bookmarks-maintwo"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305"
     },
     "PartitionKeyName": {
       "Value": "userId"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
index ac02d5dbee5..afa06ddc5a9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
@@ -1,213 +1,214 @@
 {
   "providers": {
     "awscloudformation": {
-      "AuthRoleName": "amplify-discussions-main-d5a80-authRole",
-      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole",
+      "AuthRoleName": "amplify-discussions-maintwo-decb9-authRole",
+      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole",
       "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-      "UnauthRoleName": "amplify-discussions-main-d5a80-unauthRole",
-      "StackName": "amplify-discussions-main-d5a80",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-d5a80/2bc587e0-1a44-11f1-8b6b-0affd4d11c2d",
+      "DeploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+      "UnauthRoleName": "amplify-discussions-maintwo-decb9-unauthRole",
+      "StackName": "amplify-discussions-maintwo-decb9",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
       "AmplifyAppId": "discussions"
     }
   },
-  "auth": {
-    "discussions22367c6822367c68": {
-      "service": "Cognito",
-      "providerPlugin": "awscloudformation",
-      "dependsOn": [],
-      "customAuth": false,
-      "frontendAuthConfig": {
-        "socialProviders": [],
-        "usernameAttributes": [
-          "PHONE_NUMBER"
-        ],
-        "signupAttributes": [
-          "EMAIL",
-          "PHONE_NUMBER"
-        ],
-        "passwordProtectionSettings": {
-          "passwordPolicyMinLength": 8,
-          "passwordPolicyCharacters": []
-        },
-        "mfaConfiguration": "OFF",
-        "mfaTypes": [
-          "SMS"
-        ],
-        "verificationMechanisms": [
-          "EMAIL"
-        ]
-      },
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
-        "logicalId": "authdiscussions22367c6822367c68"
-      },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "output": {
-        "CreatedSNSRole": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main",
-        "UserPoolId": "us-east-1_Zs9EZpCYX",
-        "AppClientIDWeb": "ptm2eqjiee7l3e202lstfjd3r",
-        "AppClientID": "75sq8s16g37d0as1148og20p3i",
-        "IdentityPoolId": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f",
-        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_Zs9EZpCYX",
-        "IdentityPoolName": "discussions22367c68_identitypool_22367c68__main",
-        "UserPoolName": "discussions22367c68_userpool_22367c68"
-      },
-      "lastPushDirHash": "ZvxYrY5jFkJyUy3eyrP7RoSop4Y="
-    }
-  },
   "api": {
     "discussions": {
-      "service": "AppSync",
-      "providerPlugin": "awscloudformation",
       "dependsOn": [],
       "output": {
         "authConfig": {
+          "additionalAuthenticationProviders": [],
           "defaultAuthentication": {
-            "authenticationType": "API_KEY",
             "apiKeyConfig": {
               "apiKeyExpirationDays": 7
-            }
-          },
-          "additionalAuthenticationProviders": []
+            },
+            "authenticationType": "API_KEY"
+          }
         },
-        "GraphQLAPIIdOutput": "ruiylk7rjnb4ziygno3jh4wrsq",
-        "GraphQLAPIEndpointOutput": "https://ouxhkkyjibe47illvcmepix6ru.appsync-api.us-east-1.amazonaws.com/graphql",
+        "GraphQLAPIIdOutput": "st35wex2drhe5piowtinjea47y",
+        "GraphQLAPIEndpointOutput": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql",
         "GraphQLAPIKeyOutput": "da2-fakeapikey00000000000000"
       },
+      "providerPlugin": "awscloudformation",
+      "service": "AppSync",
+      "lastPushTimeStamp": "2026-03-20T18:02:07.524Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "logicalId": "apidiscussions"
-      },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "lastPushDirHash": "f67ZKOJM4WJlPWXfx5EsRQOT4UA="
+      }
     }
   },
-  "storage": {
-    "activity": {
-      "service": "DynamoDB",
-      "providerPlugin": "awscloudformation",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "logicalId": "storageactivity"
-      },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "output": {
-        "PartitionKeyName": "id",
-        "SortKeyName": "userId",
-        "SortKeyType": "S",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591",
-        "PartitionKeyType": "S",
-        "Name": "activity-main"
+  "auth": {
+    "discussionsc578c16ec578c16e": {
+      "customAuth": false,
+      "dependsOn": [],
+      "frontendAuthConfig": {
+        "mfaConfiguration": "OFF",
+        "mfaTypes": [
+          "SMS"
+        ],
+        "passwordProtectionSettings": {
+          "passwordPolicyMinLength": 8,
+          "passwordPolicyCharacters": []
+        },
+        "signupAttributes": [
+          "EMAIL",
+          "PHONE_NUMBER"
+        ],
+        "socialProviders": [],
+        "usernameAttributes": [
+          "PHONE_NUMBER"
+        ],
+        "verificationMechanisms": [
+          "EMAIL"
+        ]
       },
-      "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
-    },
-    "bookmarks": {
       "providerPlugin": "awscloudformation",
-      "service": "DynamoDB",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
-        "logicalId": "storagebookmarks"
-      },
-      "lastPushTimeStamp": "2026-03-17T15:42:17.113Z",
+      "service": "Cognito",
       "output": {
-        "PartitionKeyName": "userId",
-        "SortKeyName": "postId",
-        "SortKeyType": "S",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107",
-        "PartitionKeyType": "S",
-        "Name": "bookmarks-blade"
+        "CreatedSNSRole": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo",
+        "UserPoolId": "us-east-1_RCPurfiEw",
+        "AppClientIDWeb": "2kictuhtu6967eqd0qhtsv5roh",
+        "AppClientID": "35iqavrc56jmhttprdv2frl8qf",
+        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
+        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw",
+        "IdentityPoolName": "discussionsc578c16e_identitypool_c578c16e__maintwo",
+        "UserPoolName": "discussionsc578c16e_userpool_c578c16e"
       },
-      "lastPushDirHash": "UcosRNORY7WR8bi+QNNLl+eX+Eo="
+      "lastPushTimeStamp": "2026-03-20T18:02:07.525Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "logicalId": "authdiscussionsc578c16ec578c16e"
+      }
     }
   },
   "function": {
     "fetchuseractivity": {
       "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda",
       "dependsOn": [
         {
-          "category": "storage",
-          "resourceName": "activity",
           "attributes": [
             "Name",
             "Arn",
             "StreamArn"
-          ]
+          ],
+          "category": "storage",
+          "resourceName": "activity"
         }
       ],
-      "lastBuildTimeStamp": "2026-03-07T17:10:44.841Z",
-      "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-03-07T17:10:50.407Z",
-      "distZipFilename": "fetchuseractivity-6e6d76524e6255314269-build.zip",
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-        "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip"
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-maintwo",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-maintwo",
+        "Name": "fetchuseractivity-maintwo",
+        "LambdaExecutionRole": "discussionsLambdaRole44bd86bc-maintwo"
       },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.527Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "logicalId": "functionfetchuseractivity"
       },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole0d8fb131-main",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-main",
-        "Name": "fetchuseractivity-main",
-        "LambdaExecutionRole": "discussionsLambdaRole0d8fb131-main"
-      },
-      "lastPushDirHash": "CCqZ3/vYa1JDk4/MxnxlXZTZKG0="
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+        "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
+      }
     },
     "recorduseractivity": {
       "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda",
       "dependsOn": [
         {
-          "category": "api",
-          "resourceName": "discussions",
           "attributes": [
             "GraphQLAPIIdOutput",
             "GraphQLAPIEndpointOutput"
-          ]
+          ],
+          "category": "api",
+          "resourceName": "discussions"
         },
         {
-          "category": "storage",
-          "resourceName": "activity",
           "attributes": [
             "Name",
             "Arn",
             "StreamArn"
-          ]
+          ],
+          "category": "storage",
+          "resourceName": "activity"
         }
       ],
-      "lastBuildTimeStamp": "2026-03-07T17:10:52.805Z",
-      "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-03-07T17:10:58.024Z",
-      "distZipFilename": "recorduseractivity-4969755347686f776962-build.zip",
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-        "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip"
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-maintwo",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-maintwo",
+        "Name": "recorduseractivity-maintwo",
+        "LambdaExecutionRole": "discussionsLambdaRole62a425ae-maintwo"
       },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.529Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "logicalId": "functionrecorduseractivity"
       },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+        "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
+      }
+    }
+  },
+  "storage": {
+    "activity": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB",
       "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole7674760b-main",
+        "PartitionKeyName": "id",
+        "SortKeyName": "userId",
+        "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-main",
-        "Name": "recorduseractivity-main",
-        "LambdaExecutionRole": "discussionsLambdaRole7674760b-main"
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748",
+        "PartitionKeyType": "S",
+        "Name": "activity-maintwo"
+      },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.531Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "logicalId": "storageactivity"
+      }
+    },
+    "avatars": {
+      "dependsOn": [],
+      "providerPlugin": "awscloudformation",
+      "service": "S3",
+      "output": {
+        "BucketName": "discus-avatarsdecb9-maintwo",
+        "Region": "us-east-1"
+      },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.533Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "logicalId": "storageavatars"
+      }
+    },
+    "bookmarks": {
+      "service": "DynamoDB",
+      "providerPlugin": "awscloudformation",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "logicalId": "storagebookmarks"
+      },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.857Z",
+      "output": {
+        "PartitionKeyName": "userId",
+        "SortKeyName": "postId",
+        "SortKeyType": "S",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305",
+        "PartitionKeyType": "S",
+        "Name": "bookmarks-maintwo"
       },
-      "lastPushDirHash": "oiEx6GaCR5Xqn9AkM8N+qHVANXw="
+      "lastPushDirHash": "wMsU0GvHfV+624G1E8Mx7jnsGwo="
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json
index 545cd8480fd..e702f6821aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1773508259
+        "Expires": 1770321021
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json
index 85fe81669da..4f42071a5ad 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json
@@ -2,6 +2,6 @@
     "AppSyncApiName": "discussions",
     "DynamoDBBillingMode": "PAY_PER_REQUEST",
     "DynamoDBEnableServerSideEncryption": false,
-    "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
+    "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
     "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json
index 555e8d77192..3af2c09b2f6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json
index fc750c366eb..660f4be4274 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -289,7 +289,7 @@
               {
                 "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -378,7 +378,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json
index c9369d72715..1340edb7eec 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json
index 233b2a28467..206fa8ec0f5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json
@@ -503,7 +503,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -604,7 +604,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -771,7 +771,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -959,7 +959,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1111,7 +1111,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1232,7 +1232,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1278,7 +1278,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1324,7 +1324,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
similarity index 95%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index c305475136f..50d85ddc94f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -154,7 +154,7 @@
               ],
               "Condition": {
                 "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
                 }
               }
             }
@@ -174,18 +174,18 @@
                 }
               ]
             },
-            "PolicyName": "discus22367c68-sns-policy"
+            "PolicyName": "discusc578c16e-sns-policy"
           }
         ],
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discus22367c68_sns-role",
+            "discusc578c16e_sns-role",
             {
               "Fn::Join": [
                 "",
                 [
-                  "sns22367c68",
+                  "snsc578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -252,7 +252,7 @@
           "Ref": "smsAuthenticationMessage"
         },
         "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
+          "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": {
             "Fn::GetAtt": [
               "SNSRole",
@@ -304,7 +304,7 @@
     "UserPoolClientWeb": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
+        "ClientName": "discusc578c16e_app_clientWeb",
         "RefreshTokenValidity": {
           "Ref": "userpoolClientRefreshTokenValidity"
         },
@@ -322,7 +322,7 @@
     "UserPoolClient": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_client",
+        "ClientName": "discusc578c16e_app_client",
         "GenerateSecret": {
           "Ref": "userpoolClientGenerateSecret"
         },
@@ -365,7 +365,7 @@
               "Fn::Join": [
                 "",
                 [
-                  "upClientLambdaRole22367c68",
+                  "upClientLambdaRolec578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -437,12 +437,12 @@
         "IdentityPoolName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussions22367c68_identitypool_22367c68",
+            "discussionsc578c16e_identitypool_c578c16e",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussions22367c68_identitypool_22367c68__",
+                  "discussionsc578c16e_identitypool_c578c16e__",
                   {
                     "Ref": "env"
                   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
similarity index 78%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index bee8cd0d32d..550944a39ff 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -1,8 +1,8 @@
 {
-  "identityPoolName": "discussions22367c68_identitypool_22367c68",
+  "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
   "allowUnauthenticatedIdentities": false,
-  "resourceNameTruncated": "discus22367c68",
-  "userPoolName": "discussions22367c68_userpool_22367c68",
+  "resourceNameTruncated": "discusc578c16e",
+  "userPoolName": "discussionsc578c16e_userpool_c578c16e",
   "autoVerifiedAttributes": [
     "email"
   ],
@@ -13,7 +13,7 @@
   "smsAuthenticationMessage": "Your authentication code is {####}",
   "smsVerificationMessage": "Your verification code is {####}",
   "emailVerificationSubject": "Verification",
-  "emailVerificationMessage": "Here is your verification code {####}",
+  "emailVerificationMessage": "Your verification code is {####}",
   "defaultPasswordPolicy": false,
   "passwordPolicyMinLength": 8,
   "passwordPolicyCharacters": [],
@@ -30,10 +30,10 @@
   "userpoolClientReadAttributes": [
     "email"
   ],
-  "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+  "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
   "userpoolClientSetAttributes": false,
-  "sharedId": "22367c68",
-  "resourceName": "discussions22367c6822367c68",
+  "sharedId": "c578c16e",
+  "resourceName": "discussionsc578c16ec578c16e",
   "authSelections": "identityPoolAndUserPool",
   "useDefault": "manual",
   "thirdPartyAuth": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
similarity index 76%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/cli-inputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index 6cd53a84bd2..a065fe386cc 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -1,10 +1,10 @@
 {
   "version": "1",
   "cognitoConfig": {
-    "identityPoolName": "discussions22367c68_identitypool_22367c68",
+    "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
     "allowUnauthenticatedIdentities": false,
-    "resourceNameTruncated": "discus22367c68",
-    "userPoolName": "discussions22367c68_userpool_22367c68",
+    "resourceNameTruncated": "discusc578c16e",
+    "userPoolName": "discussionsc578c16e_userpool_c578c16e",
     "autoVerifiedAttributes": [
       "email"
     ],
@@ -15,7 +15,7 @@
     "smsAuthenticationMessage": "Your authentication code is {####}",
     "smsVerificationMessage": "Your verification code is {####}",
     "emailVerificationSubject": "Verification",
-    "emailVerificationMessage": "Here is your verification code {####}",
+    "emailVerificationMessage": "Your verification code is {####}",
     "defaultPasswordPolicy": false,
     "passwordPolicyMinLength": 8,
     "passwordPolicyCharacters": [],
@@ -32,10 +32,10 @@
     "userpoolClientReadAttributes": [
       "email"
     ],
-    "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+    "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
     "userpoolClientSetAttributes": false,
-    "sharedId": "22367c68",
-    "resourceName": "discussions22367c6822367c68",
+    "sharedId": "c578c16e",
+    "resourceName": "discussionsc578c16ec578c16e",
     "authSelections": "identityPoolAndUserPool",
     "useDefault": "manual",
     "thirdPartyAuth": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
index 545cd8480fd..e702f6821aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1773508259
+        "Expires": 1770321021
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
similarity index 95%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index c305475136f..50d85ddc94f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -154,7 +154,7 @@
               ],
               "Condition": {
                 "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
                 }
               }
             }
@@ -174,18 +174,18 @@
                 }
               ]
             },
-            "PolicyName": "discus22367c68-sns-policy"
+            "PolicyName": "discusc578c16e-sns-policy"
           }
         ],
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discus22367c68_sns-role",
+            "discusc578c16e_sns-role",
             {
               "Fn::Join": [
                 "",
                 [
-                  "sns22367c68",
+                  "snsc578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -252,7 +252,7 @@
           "Ref": "smsAuthenticationMessage"
         },
         "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
+          "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": {
             "Fn::GetAtt": [
               "SNSRole",
@@ -304,7 +304,7 @@
     "UserPoolClientWeb": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
+        "ClientName": "discusc578c16e_app_clientWeb",
         "RefreshTokenValidity": {
           "Ref": "userpoolClientRefreshTokenValidity"
         },
@@ -322,7 +322,7 @@
     "UserPoolClient": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_client",
+        "ClientName": "discusc578c16e_app_client",
         "GenerateSecret": {
           "Ref": "userpoolClientGenerateSecret"
         },
@@ -365,7 +365,7 @@
               "Fn::Join": [
                 "",
                 [
-                  "upClientLambdaRole22367c68",
+                  "upClientLambdaRolec578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -437,12 +437,12 @@
         "IdentityPoolName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussions22367c68_identitypool_22367c68",
+            "discussionsc578c16e_identitypool_c578c16e",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussions22367c68_identitypool_22367c68__",
+                  "discussionsc578c16e_identitypool_c578c16e__",
                   {
                     "Ref": "env"
                   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 3c701beabac..30ad934f79d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -199,22 +199,36 @@
         }
       }
     },
-    "authdiscussions22367c6822367c68": {
+    "apidiscussions": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "Parameters": {
+          "AppSyncApiName": "discussions",
+          "DynamoDBBillingMode": "PAY_PER_REQUEST",
+          "DynamoDBEnableServerSideEncryption": false,
+          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
+          "env": "maintwo"
+        }
+      }
+    },
+    "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
-          "identityPoolName": "discussions22367c68_identitypool_22367c68",
+          "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
-          "resourceNameTruncated": "discus22367c68",
-          "userPoolName": "discussions22367c68_userpool_22367c68",
+          "resourceNameTruncated": "discusc578c16e",
+          "userPoolName": "discussionsc578c16e_userpool_c578c16e",
           "autoVerifiedAttributes": "email",
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Here is your verification code {####}",
+          "emailVerificationMessage": "Your verification code is {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
@@ -224,10 +238,10 @@
           "userpoolClientRefreshTokenValidity": "120",
           "userpoolClientWriteAttributes": "email",
           "userpoolClientReadAttributes": "email",
-          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+          "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
           "userpoolClientSetAttributes": false,
-          "sharedId": "22367c68",
-          "resourceName": "discussions22367c6822367c68",
+          "sharedId": "c578c16e",
+          "resourceName": "discussionsc578c16ec578c16e",
           "authSelections": "identityPoolAndUserPool",
           "useDefault": "manual",
           "thirdPartyAuth": false,
@@ -254,45 +268,17 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "main"
-        }
-      }
-    },
-    "apidiscussions": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
-        "Parameters": {
-          "AppSyncApiName": "discussions",
-          "DynamoDBBillingMode": "PAY_PER_REQUEST",
-          "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "main"
-        }
-      }
-    },
-    "storageactivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "activity",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
               "storageactivity",
@@ -311,17 +297,17 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
               "apidiscussions",
@@ -352,7 +338,68 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageactivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "activity",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageavatars": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "Parameters": {
+          "bucketName": "discus-avatars",
+          "selectedGuestPermissions": "",
+          "selectedAuthenticatedPermissions": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject",
+          "unauthRoleName": {
+            "Ref": "UnauthRoleName"
+          },
+          "authRoleName": {
+            "Ref": "AuthRoleName"
+          },
+          "s3PrivatePolicy": "Private_policy_bf41454d",
+          "s3ProtectedPolicy": "Protected_policy_bf41454d",
+          "s3PublicPolicy": "Public_policy_bf41454d",
+          "s3ReadPolicy": "read_policy_bf41454d",
+          "s3UploadsPolicy": "Uploads_policy_bf41454d",
+          "authPolicyName": "s3_amplify_bf41454d",
+          "unauthPolicyName": "s3_amplify_bf41454d",
+          "AuthenticatedAllowList": "ALLOW",
+          "GuestAllowList": "DISALLOW",
+          "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+          "s3PermissionsGuestPublic": "DISALLOW",
+          "s3PermissionsGuestUploads": "DISALLOW",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "maintwo"
         }
       }
     },
@@ -360,7 +407,7 @@
       "DependsOn": [
         "AuthRole",
         "UnauthRole",
-        "authdiscussions22367c6822367c68"
+        "authdiscussionsc578c16ec578c16e"
       ],
       "Type": "AWS::Lambda::Function",
       "Properties": {
@@ -470,7 +517,7 @@
         },
         "idpId": {
           "Fn::GetAtt": [
-            "authdiscussions22367c6822367c68",
+            "authdiscussionsc578c16ec578c16e",
             "Outputs.IdentityPoolId"
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index cff69443a2b..9297a858679 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -110,12 +110,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole0d8fb131",
+            "discussionsLambdaRole44bd86bc",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole0d8fb131",
+                  "discussionsLambdaRole44bd86bc",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 1b1d6a91237..0a05f67e87a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -118,12 +118,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole7674760b",
+            "discussionsLambdaRole62a425ae",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole7674760b",
+                  "discussionsLambdaRole62a425ae",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index d020db31af2..30ad934f79d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -199,22 +199,36 @@
         }
       }
     },
-    "authdiscussions22367c6822367c68": {
+    "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
-          "identityPoolName": "discussions22367c68_identitypool_22367c68",
+          "AppSyncApiName": "discussions",
+          "DynamoDBBillingMode": "PAY_PER_REQUEST",
+          "DynamoDBEnableServerSideEncryption": false,
+          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
+          "env": "maintwo"
+        }
+      }
+    },
+    "authdiscussionsc578c16ec578c16e": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "Parameters": {
+          "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
-          "resourceNameTruncated": "discus22367c68",
-          "userPoolName": "discussions22367c68_userpool_22367c68",
+          "resourceNameTruncated": "discusc578c16e",
+          "userPoolName": "discussionsc578c16e_userpool_c578c16e",
           "autoVerifiedAttributes": "email",
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Here is your verification code {####}",
+          "emailVerificationMessage": "Your verification code is {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
@@ -224,10 +238,10 @@
           "userpoolClientRefreshTokenValidity": "120",
           "userpoolClientWriteAttributes": "email",
           "userpoolClientReadAttributes": "email",
-          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+          "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
           "userpoolClientSetAttributes": false,
-          "sharedId": "22367c68",
-          "resourceName": "discussions22367c6822367c68",
+          "sharedId": "c578c16e",
+          "resourceName": "discussionsc578c16ec578c16e",
           "authSelections": "identityPoolAndUserPool",
           "useDefault": "manual",
           "thirdPartyAuth": false,
@@ -254,45 +268,17 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "main"
-        }
-      }
-    },
-    "apidiscussions": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
-        "Parameters": {
-          "AppSyncApiName": "discussions",
-          "DynamoDBBillingMode": "PAY_PER_REQUEST",
-          "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "main"
-        }
-      }
-    },
-    "storageactivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "activity",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
               "storageactivity",
@@ -311,17 +297,17 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
               "apidiscussions",
@@ -352,7 +338,68 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageactivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "activity",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageavatars": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "Parameters": {
+          "bucketName": "discus-avatars",
+          "selectedGuestPermissions": "",
+          "selectedAuthenticatedPermissions": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject",
+          "unauthRoleName": {
+            "Ref": "UnauthRoleName"
+          },
+          "authRoleName": {
+            "Ref": "AuthRoleName"
+          },
+          "s3PrivatePolicy": "Private_policy_bf41454d",
+          "s3ProtectedPolicy": "Protected_policy_bf41454d",
+          "s3PublicPolicy": "Public_policy_bf41454d",
+          "s3ReadPolicy": "read_policy_bf41454d",
+          "s3UploadsPolicy": "Uploads_policy_bf41454d",
+          "authPolicyName": "s3_amplify_bf41454d",
+          "unauthPolicyName": "s3_amplify_bf41454d",
+          "AuthenticatedAllowList": "ALLOW",
+          "GuestAllowList": "DISALLOW",
+          "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+          "s3PermissionsGuestPublic": "DISALLOW",
+          "s3PermissionsGuestUploads": "DISALLOW",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "maintwo"
         }
       }
     },
@@ -360,7 +407,7 @@
       "DependsOn": [
         "AuthRole",
         "UnauthRole",
-        "authdiscussions22367c6822367c68"
+        "authdiscussionsc578c16ec578c16e"
       ],
       "Type": "AWS::Lambda::Function",
       "Properties": {
@@ -470,7 +517,7 @@
         },
         "idpId": {
           "Fn::GetAtt": [
-            "authdiscussions22367c6822367c68",
+            "authdiscussionsc578c16ec578c16e",
             "Outputs.IdentityPoolId"
           ]
         },
@@ -558,20 +605,6 @@
           }
         ]
       }
-    },
-    "storagebookmarks": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "bookmarks",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
-        }
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
index a2cf77e20fa..ca188b6e7fb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
new file mode 100644
index 00000000000..49679c245fc
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
@@ -0,0 +1,599 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedProtected"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPrivate"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AuthenticatedAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "GuestAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": {
+        "Ref": "S3Bucket"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  },
+  "Resources": {
+    "S3Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "bucketName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "bucketName"
+                  },
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPublic"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PublicPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedProtected"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3ProtectedPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPrivate"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PrivatePolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedUploads"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3UploadsPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "AuthReadAndList"
+    },
+    "S3GuestReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "unauthRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "GuestReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json
index d030749556a..49fe6deb7c4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/backend-config.json
@@ -18,7 +18,7 @@
     }
   },
   "auth": {
-    "discussions22367c6822367c68": {
+    "discussionsc578c16ec578c16e": {
       "customAuth": false,
       "dependsOn": [],
       "frontendAuthConfig": {
@@ -126,6 +126,15 @@
     "activity": {
       "providerPlugin": "awscloudformation",
       "service": "DynamoDB"
+    },
+    "avatars": {
+      "dependsOn": [],
+      "providerPlugin": "awscloudformation",
+      "service": "S3"
+    },
+    "bookmarks": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index cff69443a2b..9297a858679 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -110,12 +110,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole0d8fb131",
+            "discussionsLambdaRole44bd86bc",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole0d8fb131",
+                  "discussionsLambdaRole44bd86bc",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/src/package.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/src/package.json
index 9c932a8d90b..4adb03a1ee0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/src/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/src/package.json
@@ -6,9 +6,5 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.92"
-  },
-  "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.936.0",
-    "@aws-sdk/lib-dynamodb": "^3.936.0"
   }
 }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 1b1d6a91237..0a05f67e87a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -118,12 +118,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole7674760b",
+            "discussionsLambdaRole62a425ae",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole7674760b",
+                  "discussionsLambdaRole62a425ae",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/src/package.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/src/package.json
index 4b0d757e73f..88d7e9d4aca 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/src/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/src/package.json
@@ -6,9 +6,5 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.92"
-  },
-  "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.936.0",
-    "@aws-sdk/lib-dynamodb": "^3.936.0"
   }
 }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json
index a2cf77e20fa..ca188b6e7fb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json
new file mode 100644
index 00000000000..981b2eb9f8e
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json
@@ -0,0 +1,590 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedProtected"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPrivate"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AuthenticatedAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "GuestAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": {
+        "Ref": "S3Bucket"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  },
+  "Resources": {
+    "S3Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "bucketName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "bucketName"
+                  },
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPublic"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PublicPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedProtected"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3ProtectedPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPrivate"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PrivatePolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedUploads"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3UploadsPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "AuthReadAndList"
+    },
+    "S3GuestReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "unauthRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "GuestReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/parameters.json
new file mode 100644
index 00000000000..ebe758a7829
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/parameters.json
@@ -0,0 +1,31 @@
+{
+  "bucketName": "discus-avatars",
+  "selectedGuestPermissions": [],
+  "selectedAuthenticatedPermissions": [
+    "s3:PutObject",
+    "s3:GetObject",
+    "s3:ListBucket",
+    "s3:DeleteObject"
+  ],
+  "unauthRoleName": {
+    "Ref": "UnauthRoleName"
+  },
+  "authRoleName": {
+    "Ref": "AuthRoleName"
+  },
+  "s3PrivatePolicy": "Private_policy_bf41454d",
+  "s3ProtectedPolicy": "Protected_policy_bf41454d",
+  "s3PublicPolicy": "Public_policy_bf41454d",
+  "s3ReadPolicy": "read_policy_bf41454d",
+  "s3UploadsPolicy": "Uploads_policy_bf41454d",
+  "authPolicyName": "s3_amplify_bf41454d",
+  "unauthPolicyName": "s3_amplify_bf41454d",
+  "AuthenticatedAllowList": "ALLOW",
+  "GuestAllowList": "DISALLOW",
+  "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+  "s3PermissionsGuestPublic": "DISALLOW",
+  "s3PermissionsGuestUploads": "DISALLOW"
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/cli-inputs.json
new file mode 100644
index 00000000000..9126ffc1e88
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/cli-inputs.json
@@ -0,0 +1,14 @@
+{
+  "resourceName": "avatars",
+  "policyUUID": "bf41454d",
+  "bucketName": "discus-avatars",
+  "storageAccess": "auth",
+  "guestAccess": [],
+  "authAccess": [
+    "CREATE_AND_UPDATE",
+    "READ",
+    "DELETE"
+  ],
+  "triggerFunction": "NONE",
+  "groupAccess": {}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json
deleted file mode 100644
index ec5a22f98a9..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/parameters.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "tableName": "bookmarks",
-  "partitionKeyName": "userId",
-  "partitionKeyType": "S",
-  "sortKeyName": "postId",
-  "sortKeyType": "S"
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json
deleted file mode 100644
index 4eff10ee1dd..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/cli-inputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "resourceName": "bookmarks",
-  "tableName": "bookmarks",
-  "partitionKey": {
-    "fieldName": "userId",
-    "fieldType": "string"
-  },
-  "sortKey": {
-    "fieldName": "postId",
-    "fieldType": "string"
-  },
-  "gsi": [
-    {
-      "name": "byPost",
-      "partitionKey": {
-        "fieldName": "postId",
-        "fieldType": "string"
-      }
-    }
-  ],
-  "triggerFunctions": []
-}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
index 4eff10ee1dd..3a1bf18a43c 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
@@ -19,4 +19,4 @@
     }
   ],
   "triggerFunctions": []
-}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
index ac02d5dbee5..afa06ddc5a9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
@@ -1,213 +1,214 @@
 {
   "providers": {
     "awscloudformation": {
-      "AuthRoleName": "amplify-discussions-main-d5a80-authRole",
-      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole",
+      "AuthRoleName": "amplify-discussions-maintwo-decb9-authRole",
+      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole",
       "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-      "UnauthRoleName": "amplify-discussions-main-d5a80-unauthRole",
-      "StackName": "amplify-discussions-main-d5a80",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-d5a80/2bc587e0-1a44-11f1-8b6b-0affd4d11c2d",
+      "DeploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+      "UnauthRoleName": "amplify-discussions-maintwo-decb9-unauthRole",
+      "StackName": "amplify-discussions-maintwo-decb9",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
       "AmplifyAppId": "discussions"
     }
   },
-  "auth": {
-    "discussions22367c6822367c68": {
-      "service": "Cognito",
-      "providerPlugin": "awscloudformation",
-      "dependsOn": [],
-      "customAuth": false,
-      "frontendAuthConfig": {
-        "socialProviders": [],
-        "usernameAttributes": [
-          "PHONE_NUMBER"
-        ],
-        "signupAttributes": [
-          "EMAIL",
-          "PHONE_NUMBER"
-        ],
-        "passwordProtectionSettings": {
-          "passwordPolicyMinLength": 8,
-          "passwordPolicyCharacters": []
-        },
-        "mfaConfiguration": "OFF",
-        "mfaTypes": [
-          "SMS"
-        ],
-        "verificationMechanisms": [
-          "EMAIL"
-        ]
-      },
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
-        "logicalId": "authdiscussions22367c6822367c68"
-      },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "output": {
-        "CreatedSNSRole": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main",
-        "UserPoolId": "us-east-1_Zs9EZpCYX",
-        "AppClientIDWeb": "ptm2eqjiee7l3e202lstfjd3r",
-        "AppClientID": "75sq8s16g37d0as1148og20p3i",
-        "IdentityPoolId": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f",
-        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_Zs9EZpCYX",
-        "IdentityPoolName": "discussions22367c68_identitypool_22367c68__main",
-        "UserPoolName": "discussions22367c68_userpool_22367c68"
-      },
-      "lastPushDirHash": "ZvxYrY5jFkJyUy3eyrP7RoSop4Y="
-    }
-  },
   "api": {
     "discussions": {
-      "service": "AppSync",
-      "providerPlugin": "awscloudformation",
       "dependsOn": [],
       "output": {
         "authConfig": {
+          "additionalAuthenticationProviders": [],
           "defaultAuthentication": {
-            "authenticationType": "API_KEY",
             "apiKeyConfig": {
               "apiKeyExpirationDays": 7
-            }
-          },
-          "additionalAuthenticationProviders": []
+            },
+            "authenticationType": "API_KEY"
+          }
         },
-        "GraphQLAPIIdOutput": "ruiylk7rjnb4ziygno3jh4wrsq",
-        "GraphQLAPIEndpointOutput": "https://ouxhkkyjibe47illvcmepix6ru.appsync-api.us-east-1.amazonaws.com/graphql",
+        "GraphQLAPIIdOutput": "st35wex2drhe5piowtinjea47y",
+        "GraphQLAPIEndpointOutput": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql",
         "GraphQLAPIKeyOutput": "da2-fakeapikey00000000000000"
       },
+      "providerPlugin": "awscloudformation",
+      "service": "AppSync",
+      "lastPushTimeStamp": "2026-03-20T18:02:07.524Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "logicalId": "apidiscussions"
-      },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "lastPushDirHash": "f67ZKOJM4WJlPWXfx5EsRQOT4UA="
+      }
     }
   },
-  "storage": {
-    "activity": {
-      "service": "DynamoDB",
-      "providerPlugin": "awscloudformation",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "logicalId": "storageactivity"
-      },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "output": {
-        "PartitionKeyName": "id",
-        "SortKeyName": "userId",
-        "SortKeyType": "S",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591",
-        "PartitionKeyType": "S",
-        "Name": "activity-main"
+  "auth": {
+    "discussionsc578c16ec578c16e": {
+      "customAuth": false,
+      "dependsOn": [],
+      "frontendAuthConfig": {
+        "mfaConfiguration": "OFF",
+        "mfaTypes": [
+          "SMS"
+        ],
+        "passwordProtectionSettings": {
+          "passwordPolicyMinLength": 8,
+          "passwordPolicyCharacters": []
+        },
+        "signupAttributes": [
+          "EMAIL",
+          "PHONE_NUMBER"
+        ],
+        "socialProviders": [],
+        "usernameAttributes": [
+          "PHONE_NUMBER"
+        ],
+        "verificationMechanisms": [
+          "EMAIL"
+        ]
       },
-      "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
-    },
-    "bookmarks": {
       "providerPlugin": "awscloudformation",
-      "service": "DynamoDB",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
-        "logicalId": "storagebookmarks"
-      },
-      "lastPushTimeStamp": "2026-03-17T15:42:17.113Z",
+      "service": "Cognito",
       "output": {
-        "PartitionKeyName": "userId",
-        "SortKeyName": "postId",
-        "SortKeyType": "S",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107",
-        "PartitionKeyType": "S",
-        "Name": "bookmarks-blade"
+        "CreatedSNSRole": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo",
+        "UserPoolId": "us-east-1_RCPurfiEw",
+        "AppClientIDWeb": "2kictuhtu6967eqd0qhtsv5roh",
+        "AppClientID": "35iqavrc56jmhttprdv2frl8qf",
+        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
+        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw",
+        "IdentityPoolName": "discussionsc578c16e_identitypool_c578c16e__maintwo",
+        "UserPoolName": "discussionsc578c16e_userpool_c578c16e"
       },
-      "lastPushDirHash": "UcosRNORY7WR8bi+QNNLl+eX+Eo="
+      "lastPushTimeStamp": "2026-03-20T18:02:07.525Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "logicalId": "authdiscussionsc578c16ec578c16e"
+      }
     }
   },
   "function": {
     "fetchuseractivity": {
       "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda",
       "dependsOn": [
         {
-          "category": "storage",
-          "resourceName": "activity",
           "attributes": [
             "Name",
             "Arn",
             "StreamArn"
-          ]
+          ],
+          "category": "storage",
+          "resourceName": "activity"
         }
       ],
-      "lastBuildTimeStamp": "2026-03-07T17:10:44.841Z",
-      "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-03-07T17:10:50.407Z",
-      "distZipFilename": "fetchuseractivity-6e6d76524e6255314269-build.zip",
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-        "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip"
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-maintwo",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-maintwo",
+        "Name": "fetchuseractivity-maintwo",
+        "LambdaExecutionRole": "discussionsLambdaRole44bd86bc-maintwo"
       },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.527Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "logicalId": "functionfetchuseractivity"
       },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
-      "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole0d8fb131-main",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-main",
-        "Name": "fetchuseractivity-main",
-        "LambdaExecutionRole": "discussionsLambdaRole0d8fb131-main"
-      },
-      "lastPushDirHash": "CCqZ3/vYa1JDk4/MxnxlXZTZKG0="
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+        "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
+      }
     },
     "recorduseractivity": {
       "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda",
       "dependsOn": [
         {
-          "category": "api",
-          "resourceName": "discussions",
           "attributes": [
             "GraphQLAPIIdOutput",
             "GraphQLAPIEndpointOutput"
-          ]
+          ],
+          "category": "api",
+          "resourceName": "discussions"
         },
         {
-          "category": "storage",
-          "resourceName": "activity",
           "attributes": [
             "Name",
             "Arn",
             "StreamArn"
-          ]
+          ],
+          "category": "storage",
+          "resourceName": "activity"
         }
       ],
-      "lastBuildTimeStamp": "2026-03-07T17:10:52.805Z",
-      "lastBuildType": "PROD",
-      "lastPackageTimeStamp": "2026-03-07T17:10:58.024Z",
-      "distZipFilename": "recorduseractivity-4969755347686f776962-build.zip",
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-        "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip"
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-maintwo",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-maintwo",
+        "Name": "recorduseractivity-maintwo",
+        "LambdaExecutionRole": "discussionsLambdaRole62a425ae-maintwo"
       },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.529Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "logicalId": "functionrecorduseractivity"
       },
-      "lastPushTimeStamp": "2026-03-07T17:15:23.263Z",
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+        "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
+      }
+    }
+  },
+  "storage": {
+    "activity": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB",
       "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole7674760b-main",
+        "PartitionKeyName": "id",
+        "SortKeyName": "userId",
+        "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-main",
-        "Name": "recorduseractivity-main",
-        "LambdaExecutionRole": "discussionsLambdaRole7674760b-main"
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748",
+        "PartitionKeyType": "S",
+        "Name": "activity-maintwo"
+      },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.531Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "logicalId": "storageactivity"
+      }
+    },
+    "avatars": {
+      "dependsOn": [],
+      "providerPlugin": "awscloudformation",
+      "service": "S3",
+      "output": {
+        "BucketName": "discus-avatarsdecb9-maintwo",
+        "Region": "us-east-1"
+      },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.533Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "logicalId": "storageavatars"
+      }
+    },
+    "bookmarks": {
+      "service": "DynamoDB",
+      "providerPlugin": "awscloudformation",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "logicalId": "storagebookmarks"
+      },
+      "lastPushTimeStamp": "2026-03-20T18:02:07.857Z",
+      "output": {
+        "PartitionKeyName": "userId",
+        "SortKeyName": "postId",
+        "SortKeyType": "S",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305",
+        "PartitionKeyType": "S",
+        "Name": "bookmarks-maintwo"
       },
-      "lastPushDirHash": "oiEx6GaCR5Xqn9AkM8N+qHVANXw="
+      "lastPushDirHash": "wMsU0GvHfV+624G1E8Mx7jnsGwo="
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json
index 545cd8480fd..d7d234fc6ab 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json
@@ -1,1066 +1,1065 @@
 {
-  "Parameters": {
-    "env": {
-      "Type": "String",
-      "Default": "NONE"
-    },
-    "AppSyncApiName": {
-      "Type": "String",
-      "Default": "AppSyncSimpleTransform"
-    },
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "S3DeploymentBucket": {
-      "Type": "String",
-      "Description": "An S3 Bucket name where assets are deployed"
-    },
-    "S3DeploymentRootKey": {
-      "Type": "String",
-      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root of the deployment directory."
-    }
-  },
-  "Resources": {
-    "GraphQLAPI": {
-      "Type": "AWS::AppSync::GraphQLApi",
-      "Properties": {
-        "AuthenticationType": "API_KEY",
-        "Name": {
-          "Fn::Join": [
-            "",
-            [
-              {
-                "Ref": "AppSyncApiName"
-              },
-              "-",
-              {
-                "Ref": "env"
-              }
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPITransformerSchema3CB2AE18": {
-      "Type": "AWS::AppSync::GraphQLSchema",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
+    "Parameters": {
+        "env": {
+            "Type": "String",
+            "Default": "NONE"
         },
-        "DefinitionS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/schema.graphql"
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPIDefaultApiKey215A6DD7": {
-      "Type": "AWS::AppSync::ApiKey",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
+        "AppSyncApiName": {
+            "Type": "String",
+            "Default": "AppSyncSimpleTransform"
         },
-        "Expires": 1773508259
-      }
-    },
-    "GraphQLAPINONEDS95A13CF0": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
+        "DynamoDBModelTableReadIOPS": {
+            "Type": "Number",
+            "Default": 5,
+            "Description": "The number of read IOPS the table should support."
         },
-        "Name": "NONE_DS",
-        "Type": "NONE"
-      }
-    },
-    "Topic": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-            "Fn::GetAtt": [
-              "GraphQLAPINONEDS95A13CF0",
-              "Name"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          }
+        "DynamoDBModelTableWriteIOPS": {
+            "Type": "Number",
+            "Default": 5,
+            "Description": "The number of write IOPS the table should support."
         },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/Topic.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "Post": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            ]
-          }
+        "DynamoDBBillingMode": {
+            "Type": "String",
+            "Default": "PAY_PER_REQUEST",
+            "AllowedValues": [
+                "PAY_PER_REQUEST",
+                "PROVISIONED"
+            ],
+            "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
         },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/Post.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "Comment": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            ]
-          }
+        "DynamoDBEnablePointInTimeRecovery": {
+            "Type": "String",
+            "Default": "false",
+            "AllowedValues": [
+                "true",
+                "false"
+            ],
+            "Description": "Whether to enable Point in Time Recovery on the table."
         },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/Comment.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "FunctionDirectiveStack": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-            "Fn::GetAtt": [
-              "GraphQLAPINONEDS95A13CF0",
-              "Name"
-            ]
-          }
+        "DynamoDBEnableServerSideEncryption": {
+            "Type": "String",
+            "Default": "true",
+            "AllowedValues": [
+                "true",
+                "false"
+            ],
+            "Description": "Enable server side encryption powered by KMS."
         },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/FunctionDirectiveStack.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ConnectionStack": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-            "Fn::GetAtt": [
-              "GraphQLAPINONEDS95A13CF0",
-              "Name"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
-            "Fn::GetAtt": [
-              "Post",
-              "Outputs.transformerrootstackPostPostDataSource6998E105Name"
-            ]
-          },
-          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
-            "Fn::GetAtt": [
-              "Post",
-              "Outputs.transformerrootstackPostPostTable34CAE87BRef"
-            ]
-          },
-          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
-            "Fn::GetAtt": [
-              "Comment",
-              "Outputs.transformerrootstackCommentCommentDataSourceA0E54655Name"
-            ]
-          },
-          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
-            "Fn::GetAtt": [
-              "Comment",
-              "Outputs.transformerrootstackCommentCommentTable5427FDE2Ref"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicTopicDataSource63D2F34BName"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicTopicTableFD91FB92Ref"
-            ]
-          }
+        "S3DeploymentBucket": {
+            "Type": "String",
+            "Description": "An S3 Bucket name where assets are deployed"
         },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/ConnectionStack.json"
-            ]
-          ]
+        "S3DeploymentRootKey": {
+            "Type": "String",
+            "Description": "An S3 key relative to the S3DeploymentBucket that points to the root of the deployment directory."
         }
-      },
-      "DependsOn": [
-        "Comment",
-        "GraphQLAPITransformerSchema3CB2AE18",
-        "Post",
-        "Topic"
-      ]
     },
-    "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
+    "Resources": {
+        "GraphQLAPI": {
+            "Type": "AWS::AppSync::GraphQLApi",
+            "Properties": {
+                "AuthenticationType": "API_KEY",
+                "Name": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            {
+                                "Ref": "AppSyncApiName"
+                            },
+                            "-",
+                            {
+                                "Ref": "env"
+                            }
+                        ]
+                    ]
+                }
+            }
         },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityIdDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.id.req.vtl"
-            ]
-          ]
+        "GraphQLAPITransformerSchema3CB2AE18": {
+            "Type": "AWS::AppSync::GraphQLSchema",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "DefinitionS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/schema.graphql"
+                        ]
+                    ]
+                }
+            }
         },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.id.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityidResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
+        "GraphQLAPIDefaultApiKey215A6DD7": {
+            "Type": "AWS::AppSync::ApiKey",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "Expires": 1774634455
+            }
         },
-        "FieldName": "id",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830",
-                "FunctionId"
-              ]
+        "GraphQLAPINONEDS95A13CF0": {
+            "Type": "AWS::AppSync::DataSource",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "Name": "NONE_DS",
+                "Type": "NONE"
             }
-          ]
         },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+        "Topic": {
+            "Type": "AWS::CloudFormation::Stack",
+            "Properties": {
+                "Parameters": {
+                    "DynamoDBModelTableReadIOPS": {
+                        "Ref": "DynamoDBModelTableReadIOPS"
+                    },
+                    "DynamoDBModelTableWriteIOPS": {
+                        "Ref": "DynamoDBModelTableWriteIOPS"
+                    },
+                    "DynamoDBBillingMode": {
+                        "Ref": "DynamoDBBillingMode"
+                    },
+                    "DynamoDBEnablePointInTimeRecovery": {
+                        "Ref": "DynamoDBEnablePointInTimeRecovery"
+                    },
+                    "DynamoDBEnableServerSideEncryption": {
+                        "Ref": "DynamoDBEnableServerSideEncryption"
+                    },
+                    "referencetotransformerrootstackenv10C5A902Ref": {
+                        "Ref": "env"
+                    },
+                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPI",
+                            "ApiId"
+                        ]
+                    },
+                    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPINONEDS95A13CF0",
+                            "Name"
+                        ]
+                    },
+                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+                        "Ref": "S3DeploymentBucket"
+                    },
+                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+                        "Ref": "S3DeploymentRootKey"
+                    }
+                },
+                "TemplateURL": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "https://s3.",
+                            {
+                                "Ref": "AWS::Region"
+                            },
+                            ".",
+                            {
+                                "Ref": "AWS::URLSuffix"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/stacks/Topic.json"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
         },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityUserIdDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.userId.req.vtl"
+        "Post": {
+            "Type": "AWS::CloudFormation::Stack",
+            "Properties": {
+                "Parameters": {
+                    "DynamoDBModelTableReadIOPS": {
+                        "Ref": "DynamoDBModelTableReadIOPS"
+                    },
+                    "DynamoDBModelTableWriteIOPS": {
+                        "Ref": "DynamoDBModelTableWriteIOPS"
+                    },
+                    "DynamoDBBillingMode": {
+                        "Ref": "DynamoDBBillingMode"
+                    },
+                    "DynamoDBEnablePointInTimeRecovery": {
+                        "Ref": "DynamoDBEnablePointInTimeRecovery"
+                    },
+                    "DynamoDBEnableServerSideEncryption": {
+                        "Ref": "DynamoDBEnableServerSideEncryption"
+                    },
+                    "referencetotransformerrootstackenv10C5A902Ref": {
+                        "Ref": "env"
+                    },
+                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPI",
+                            "ApiId"
+                        ]
+                    },
+                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+                        "Ref": "S3DeploymentBucket"
+                    },
+                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+                        "Ref": "S3DeploymentRootKey"
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+                        ]
+                    }
+                },
+                "TemplateURL": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "https://s3.",
+                            {
+                                "Ref": "AWS::Region"
+                            },
+                            ".",
+                            {
+                                "Ref": "AWS::URLSuffix"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/stacks/Post.json"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
         },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.userId.res.vtl"
+        "Comment": {
+            "Type": "AWS::CloudFormation::Stack",
+            "Properties": {
+                "Parameters": {
+                    "DynamoDBModelTableReadIOPS": {
+                        "Ref": "DynamoDBModelTableReadIOPS"
+                    },
+                    "DynamoDBModelTableWriteIOPS": {
+                        "Ref": "DynamoDBModelTableWriteIOPS"
+                    },
+                    "DynamoDBBillingMode": {
+                        "Ref": "DynamoDBBillingMode"
+                    },
+                    "DynamoDBEnablePointInTimeRecovery": {
+                        "Ref": "DynamoDBEnablePointInTimeRecovery"
+                    },
+                    "DynamoDBEnableServerSideEncryption": {
+                        "Ref": "DynamoDBEnableServerSideEncryption"
+                    },
+                    "referencetotransformerrootstackenv10C5A902Ref": {
+                        "Ref": "env"
+                    },
+                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPI",
+                            "ApiId"
+                        ]
+                    },
+                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+                        "Ref": "S3DeploymentBucket"
+                    },
+                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+                        "Ref": "S3DeploymentRootKey"
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+                        ]
+                    }
+                },
+                "TemplateURL": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "https://s3.",
+                            {
+                                "Ref": "AWS::Region"
+                            },
+                            ".",
+                            {
+                                "Ref": "AWS::URLSuffix"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/stacks/Comment.json"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityuserIdResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
         },
-        "FieldName": "userId",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+        "FunctionDirectiveStack": {
+            "Type": "AWS::CloudFormation::Stack",
+            "Properties": {
+                "Parameters": {
+                    "referencetotransformerrootstackenv10C5A902Ref": {
+                        "Ref": "env"
+                    },
+                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPI",
+                            "ApiId"
+                        ]
+                    },
+                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+                        "Ref": "S3DeploymentBucket"
+                    },
+                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+                        "Ref": "S3DeploymentRootKey"
+                    },
+                    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPINONEDS95A13CF0",
+                            "Name"
+                        ]
+                    }
+                },
+                "TemplateURL": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "https://s3.",
+                            {
+                                "Ref": "AWS::Region"
+                            },
+                            ".",
+                            {
+                                "Ref": "AWS::URLSuffix"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/stacks/FunctionDirectiveStack.json"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
         },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
+        "ConnectionStack": {
+            "Type": "AWS::CloudFormation::Stack",
+            "Properties": {
+                "Parameters": {
+                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPI",
+                            "ApiId"
+                        ]
+                    },
+                    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPINONEDS95A13CF0",
+                            "Name"
+                        ]
+                    },
+                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+                        "Ref": "S3DeploymentBucket"
+                    },
+                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+                        "Ref": "S3DeploymentRootKey"
+                    },
+                    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
+                        "Fn::GetAtt": [
+                            "Post",
+                            "Outputs.transformerrootstackPostPostDataSource6998E105Name"
+                        ]
+                    },
+                    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
+                        "Fn::GetAtt": [
+                            "Post",
+                            "Outputs.transformerrootstackPostPostTable34CAE87BRef"
+                        ]
+                    },
+                    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
+                        "Fn::GetAtt": [
+                            "Comment",
+                            "Outputs.transformerrootstackCommentCommentDataSourceA0E54655Name"
+                        ]
+                    },
+                    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
+                        "Fn::GetAtt": [
+                            "Comment",
+                            "Outputs.transformerrootstackCommentCommentTable5427FDE2Ref"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicTopicDataSource63D2F34BName"
+                        ]
+                    },
+                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
+                        "Fn::GetAtt": [
+                            "Topic",
+                            "Outputs.transformerrootstackTopicTopicTableFD91FB92Ref"
+                        ]
+                    }
+                },
+                "TemplateURL": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "https://s3.",
+                            {
+                                "Ref": "AWS::Region"
+                            },
+                            ".",
+                            {
+                                "Ref": "AWS::URLSuffix"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/stacks/ConnectionStack.json"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "Comment",
+                "GraphQLAPITransformerSchema3CB2AE18",
+                "Post",
+                "Topic"
+            ]
         },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
+        "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830": {
+            "Type": "AWS::AppSync::FunctionConfiguration",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "DataSourceName": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPINONEDS95A13CF0",
+                        "Name"
+                    ]
+                },
+                "FunctionVersion": "2018-05-29",
+                "Name": "ActivityIdDataResolverFn",
+                "RequestMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.id.req.vtl"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.id.res.vtl"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
+            ]
         },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityActivityTypeDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.activityType.req.vtl"
+        "ActivityidResolver": {
+            "Type": "AWS::AppSync::Resolver",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "FieldName": "id",
+                "Kind": "PIPELINE",
+                "PipelineConfig": {
+                    "Functions": [
+                        {
+                            "Fn::GetAtt": [
+                                "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830",
+                                "FunctionId"
+                            ]
+                        }
+                    ]
+                },
+                "RequestMappingTemplate": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+                            {
+                                "Fn::GetAtt": [
+                                    "GraphQLAPI",
+                                    "ApiId"
+                                ]
+                            },
+                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+                "TypeName": "Activity"
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
         },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.activityType.res.vtl"
+        "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF": {
+            "Type": "AWS::AppSync::FunctionConfiguration",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "DataSourceName": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPINONEDS95A13CF0",
+                        "Name"
+                    ]
+                },
+                "FunctionVersion": "2018-05-29",
+                "Name": "ActivityUserIdDataResolverFn",
+                "RequestMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.userId.req.vtl"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.userId.res.vtl"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityactivityTypeResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
         },
-        "FieldName": "activityType",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E",
-                "FunctionId"
-              ]
-            }
-          ]
+        "ActivityuserIdResolver": {
+            "Type": "AWS::AppSync::Resolver",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "FieldName": "userId",
+                "Kind": "PIPELINE",
+                "PipelineConfig": {
+                    "Functions": [
+                        {
+                            "Fn::GetAtt": [
+                                "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF",
+                                "FunctionId"
+                            ]
+                        }
+                    ]
+                },
+                "RequestMappingTemplate": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+                            {
+                                "Fn::GetAtt": [
+                                    "GraphQLAPI",
+                                    "ApiId"
+                                ]
+                            },
+                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+                "TypeName": "Activity"
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
+            ]
         },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+        "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E": {
+            "Type": "AWS::AppSync::FunctionConfiguration",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "DataSourceName": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPINONEDS95A13CF0",
+                        "Name"
+                    ]
+                },
+                "FunctionVersion": "2018-05-29",
+                "Name": "ActivityActivityTypeDataResolverFn",
+                "RequestMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.activityType.req.vtl"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.activityType.res.vtl"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
         },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
+        "ActivityactivityTypeResolver": {
+            "Type": "AWS::AppSync::Resolver",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "FieldName": "activityType",
+                "Kind": "PIPELINE",
+                "PipelineConfig": {
+                    "Functions": [
+                        {
+                            "Fn::GetAtt": [
+                                "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E",
+                                "FunctionId"
+                            ]
+                        }
+                    ]
+                },
+                "RequestMappingTemplate": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+                            {
+                                "Fn::GetAtt": [
+                                    "GraphQLAPI",
+                                    "ApiId"
+                                ]
+                            },
+                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+                "TypeName": "Activity"
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
+            ]
         },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
+        "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380": {
+            "Type": "AWS::AppSync::FunctionConfiguration",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "DataSourceName": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPINONEDS95A13CF0",
+                        "Name"
+                    ]
+                },
+                "FunctionVersion": "2018-05-29",
+                "Name": "ActivityTimestampDataResolverFn",
+                "RequestMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.timestamp.req.vtl"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplateS3Location": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "s3://",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            "/",
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "/resolvers/Activity.timestamp.res.vtl"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
+            ]
         },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityTimestampDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.timestamp.req.vtl"
+        "ActivitytimestampResolver": {
+            "Type": "AWS::AppSync::Resolver",
+            "Properties": {
+                "ApiId": {
+                    "Fn::GetAtt": [
+                        "GraphQLAPI",
+                        "ApiId"
+                    ]
+                },
+                "FieldName": "timestamp",
+                "Kind": "PIPELINE",
+                "PipelineConfig": {
+                    "Functions": [
+                        {
+                            "Fn::GetAtt": [
+                                "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380",
+                                "FunctionId"
+                            ]
+                        }
+                    ]
+                },
+                "RequestMappingTemplate": {
+                    "Fn::Join": [
+                        "",
+                        [
+                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+                            {
+                                "Fn::GetAtt": [
+                                    "GraphQLAPI",
+                                    "ApiId"
+                                ]
+                            },
+                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+                        ]
+                    ]
+                },
+                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+                "TypeName": "Activity"
+            },
+            "DependsOn": [
+                "GraphQLAPITransformerSchema3CB2AE18"
             ]
-          ]
         },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.timestamp.res.vtl"
+        "CustomResourcesjson": {
+            "Type": "AWS::CloudFormation::Stack",
+            "Properties": {
+                "Parameters": {
+                    "AppSyncApiId": {
+                        "Fn::GetAtt": [
+                            "GraphQLAPI",
+                            "ApiId"
+                        ]
+                    },
+                    "AppSyncApiName": {
+                        "Ref": "AppSyncApiName"
+                    },
+                    "env": {
+                        "Ref": "env"
+                    },
+                    "S3DeploymentBucket": {
+                        "Ref": "S3DeploymentBucket"
+                    },
+                    "S3DeploymentRootKey": {
+                        "Ref": "S3DeploymentRootKey"
+                    }
+                },
+                "TemplateURL": {
+                    "Fn::Join": [
+                        "/",
+                        [
+                            "https://s3.amazonaws.com",
+                            {
+                                "Ref": "S3DeploymentBucket"
+                            },
+                            {
+                                "Ref": "S3DeploymentRootKey"
+                            },
+                            "stacks",
+                            "CustomResources.json"
+                        ]
+                    ]
+                }
+            },
+            "DependsOn": [
+                "GraphQLAPI",
+                "GraphQLAPITransformerSchema3CB2AE18",
+                "Topic",
+                "Post",
+                "Comment",
+                "FunctionDirectiveStack",
+                "ConnectionStack"
             ]
-          ]
         }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
     },
-    "ActivitytimestampResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "FieldName": "timestamp",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380",
-                "FunctionId"
-              ]
+    "Outputs": {
+        "GraphQLAPIKeyOutput": {
+            "Description": "Your GraphQL API ID.",
+            "Value": {
+                "Fn::GetAtt": [
+                    "GraphQLAPIDefaultApiKey215A6DD7",
+                    "ApiKey"
+                ]
+            },
+            "Export": {
+                "Name": {
+                    "Fn::Join": [
+                        ":",
+                        [
+                            {
+                                "Ref": "AWS::StackName"
+                            },
+                            "GraphQLApiKey"
+                        ]
+                    ]
+                }
             }
-          ]
         },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
+        "GraphQLAPIIdOutput": {
+            "Description": "Your GraphQL API ID.",
+            "Value": {
                 "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
+                    "GraphQLAPI",
+                    "ApiId"
                 ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "CustomResourcesjson": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "AppSyncApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "AppSyncApiName": {
-            "Ref": "AppSyncApiName"
-          },
-          "env": {
-            "Ref": "env"
-          },
-          "S3DeploymentBucket": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "S3DeploymentRootKey": {
-            "Ref": "S3DeploymentRootKey"
-          }
+            },
+            "Export": {
+                "Name": {
+                    "Fn::Join": [
+                        ":",
+                        [
+                            {
+                                "Ref": "AWS::StackName"
+                            },
+                            "GraphQLApiId"
+                        ]
+                    ]
+                }
+            }
         },
-        "TemplateURL": {
-          "Fn::Join": [
-            "/",
-            [
-              "https://s3.amazonaws.com",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "stacks",
-              "CustomResources.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPI",
-        "GraphQLAPITransformerSchema3CB2AE18",
-        "Topic",
-        "Post",
-        "Comment",
-        "FunctionDirectiveStack",
-        "ConnectionStack"
-      ]
-    }
-  },
-  "Outputs": {
-    "GraphQLAPIKeyOutput": {
-      "Description": "Your GraphQL API ID.",
-      "Value": {
-        "Fn::GetAtt": [
-          "GraphQLAPIDefaultApiKey215A6DD7",
-          "ApiKey"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "AWS::StackName"
-              },
-              "GraphQLApiKey"
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPIIdOutput": {
-      "Description": "Your GraphQL API ID.",
-      "Value": {
-        "Fn::GetAtt": [
-          "GraphQLAPI",
-          "ApiId"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "AWS::StackName"
-              },
-              "GraphQLApiId"
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPIEndpointOutput": {
-      "Description": "Your GraphQL API endpoint.",
-      "Value": {
-        "Fn::GetAtt": [
-          "GraphQLAPI",
-          "GraphQLUrl"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "AWS::StackName"
-              },
-              "GraphQLApiEndpoint"
-            ]
-          ]
+        "GraphQLAPIEndpointOutput": {
+            "Description": "Your GraphQL API endpoint.",
+            "Value": {
+                "Fn::GetAtt": [
+                    "GraphQLAPI",
+                    "GraphQLUrl"
+                ]
+            },
+            "Export": {
+                "Name": {
+                    "Fn::Join": [
+                        ":",
+                        [
+                            {
+                                "Ref": "AWS::StackName"
+                            },
+                            "GraphQLApiEndpoint"
+                        ]
+                    ]
+                }
+            }
         }
-      }
     }
-  },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json
index 85fe81669da..4f42071a5ad 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json
@@ -2,6 +2,6 @@
     "AppSyncApiName": "discussions",
     "DynamoDBBillingMode": "PAY_PER_REQUEST",
     "DynamoDBEnableServerSideEncryption": false,
-    "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
+    "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
     "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json
index 555e8d77192..287bb629899 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json
index fc750c366eb..b790f8bd3e0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -289,7 +289,7 @@
               {
                 "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -378,7 +378,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json
index c9369d72715..78e0e838e59 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json
index 233b2a28467..46248478a7e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json
@@ -503,7 +503,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -604,7 +604,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -771,7 +771,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -959,7 +959,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1111,7 +1111,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1232,7 +1232,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1278,7 +1278,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1324,7 +1324,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
new file mode 100644
index 00000000000..c4e7e7b7bd6
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -0,0 +1,533 @@
+{
+  "Description": "Amplify Cognito Stack for AWS Amplify CLI",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "identityPoolName": {
+      "Type": "String"
+    },
+    "allowUnauthenticatedIdentities": {
+      "Type": "String"
+    },
+    "resourceNameTruncated": {
+      "Type": "String"
+    },
+    "userPoolName": {
+      "Type": "String"
+    },
+    "autoVerifiedAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "mfaConfiguration": {
+      "Type": "String"
+    },
+    "mfaTypes": {
+      "Type": "CommaDelimitedList"
+    },
+    "smsAuthenticationMessage": {
+      "Type": "String"
+    },
+    "smsVerificationMessage": {
+      "Type": "String"
+    },
+    "emailVerificationSubject": {
+      "Type": "String"
+    },
+    "emailVerificationMessage": {
+      "Type": "String"
+    },
+    "defaultPasswordPolicy": {
+      "Type": "String"
+    },
+    "passwordPolicyMinLength": {
+      "Type": "String"
+    },
+    "passwordPolicyCharacters": {
+      "Type": "CommaDelimitedList"
+    },
+    "requiredAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "aliasAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userpoolClientGenerateSecret": {
+      "Type": "String"
+    },
+    "userpoolClientRefreshTokenValidity": {
+      "Type": "String"
+    },
+    "userpoolClientWriteAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userpoolClientReadAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userpoolClientLambdaRole": {
+      "Type": "String"
+    },
+    "userpoolClientSetAttributes": {
+      "Type": "String"
+    },
+    "sharedId": {
+      "Type": "String"
+    },
+    "resourceName": {
+      "Type": "String"
+    },
+    "authSelections": {
+      "Type": "String"
+    },
+    "useDefault": {
+      "Type": "String"
+    },
+    "thirdPartyAuth": {
+      "Type": "String"
+    },
+    "usernameAttributes": {
+      "Type": "CommaDelimitedList"
+    },
+    "userPoolGroups": {
+      "Type": "String"
+    },
+    "adminQueries": {
+      "Type": "String"
+    },
+    "triggers": {
+      "Type": "String"
+    },
+    "hostedUI": {
+      "Type": "String"
+    },
+    "userPoolGroupList": {
+      "Type": "CommaDelimitedList"
+    },
+    "serviceName": {
+      "Type": "String"
+    },
+    "usernameCaseSensitive": {
+      "Type": "String"
+    },
+    "useEnabledMfas": {
+      "Type": "String"
+    },
+    "authRoleArn": {
+      "Type": "String"
+    },
+    "unauthRoleArn": {
+      "Type": "String"
+    },
+    "breakCircularDependency": {
+      "Type": "String"
+    },
+    "dependsOn": {
+      "Type": "CommaDelimitedList"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    }
+  },
+  "Resources": {
+    "SNSRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Sid": "",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "cognito-idp.amazonaws.com"
+              },
+              "Action": [
+                "sts:AssumeRole"
+              ],
+              "Condition": {
+                "StringEquals": {
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
+                }
+              }
+            }
+          ]
+        },
+        "Policies": [
+          {
+            "PolicyDocument": {
+              "Version": "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": [
+                    "sns:Publish"
+                  ],
+                  "Resource": "*"
+                }
+              ]
+            },
+            "PolicyName": "discusc578c16e-sns-policy"
+          }
+        ],
+        "RoleName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            "discusc578c16e_sns-role",
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "snsc578c16e",
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "UserPool": {
+      "Type": "AWS::Cognito::UserPool",
+      "Properties": {
+        "AutoVerifiedAttributes": [
+          "email"
+        ],
+        "EmailVerificationMessage": {
+          "Ref": "emailVerificationMessage"
+        },
+        "EmailVerificationSubject": {
+          "Ref": "emailVerificationSubject"
+        },
+        "MfaConfiguration": {
+          "Ref": "mfaConfiguration"
+        },
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": {
+              "Ref": "passwordPolicyMinLength"
+            },
+            "RequireLowercase": false,
+            "RequireNumbers": false,
+            "RequireSymbols": false,
+            "RequireUppercase": false
+          }
+        },
+        "Schema": [
+          {
+            "Mutable": true,
+            "Name": "email",
+            "Required": true
+          },
+          {
+            "Mutable": true,
+            "Name": "phone_number",
+            "Required": true
+          }
+        ],
+        "SmsAuthenticationMessage": {
+          "Ref": "smsAuthenticationMessage"
+        },
+        "SmsConfiguration": {
+          "ExternalId": "discusc578c16e_role_external_id",
+          "SnsCallerArn": {
+            "Fn::GetAtt": [
+              "SNSRole",
+              "Arn"
+            ]
+          }
+        },
+        "SmsVerificationMessage": {
+          "Ref": "smsVerificationMessage"
+        },
+        "UserAttributeUpdateSettings": {
+          "AttributesRequireVerificationBeforeUpdate": [
+            "email"
+          ]
+        },
+        "UserPoolName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "userPoolName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "userPoolName"
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "UsernameAttributes": {
+          "Ref": "usernameAttributes"
+        },
+        "UsernameConfiguration": {
+          "CaseSensitive": false
+        }
+      },
+      "DependsOn": [
+        "SNSRole"
+      ]
+    },
+    "UserPoolClientWeb": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discusc578c16e_app_clientWeb",
+        "RefreshTokenValidity": {
+          "Ref": "userpoolClientRefreshTokenValidity"
+        },
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": {
+          "Ref": "UserPool"
+        }
+      },
+      "DependsOn": [
+        "UserPool"
+      ]
+    },
+    "UserPoolClient": {
+      "Type": "AWS::Cognito::UserPoolClient",
+      "Properties": {
+        "ClientName": "discusc578c16e_app_client",
+        "GenerateSecret": {
+          "Ref": "userpoolClientGenerateSecret"
+        },
+        "RefreshTokenValidity": {
+          "Ref": "userpoolClientRefreshTokenValidity"
+        },
+        "TokenValidityUnits": {
+          "RefreshToken": "days"
+        },
+        "UserPoolId": {
+          "Ref": "UserPool"
+        }
+      },
+      "DependsOn": [
+        "UserPool"
+      ]
+    },
+    "UserPoolClientRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              },
+              "Action": "sts:AssumeRole"
+            }
+          ]
+        },
+        "RoleName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "userpoolClientLambdaRole"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "upClientLambdaRolec578c16e",
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "IdentityPool": {
+      "Type": "AWS::Cognito::IdentityPool",
+      "Properties": {
+        "AllowUnauthenticatedIdentities": {
+          "Ref": "allowUnauthenticatedIdentities"
+        },
+        "CognitoIdentityProviders": [
+          {
+            "ClientId": {
+              "Ref": "UserPoolClient"
+            },
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": {
+                    "Ref": "UserPool"
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "ClientId": {
+              "Ref": "UserPoolClientWeb"
+            },
+            "ProviderName": {
+              "Fn::Sub": [
+                "cognito-idp.${region}.amazonaws.com/${client}",
+                {
+                  "region": {
+                    "Ref": "AWS::Region"
+                  },
+                  "client": {
+                    "Ref": "UserPool"
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "IdentityPoolName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            "discussionsc578c16e_identitypool_c578c16e",
+            {
+              "Fn::Join": [
+                "",
+                [
+                  "discussionsc578c16e_identitypool_c578c16e__",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "IdentityPoolRoleMap": {
+      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
+      "Properties": {
+        "IdentityPoolId": {
+          "Ref": "IdentityPool"
+        },
+        "Roles": {
+          "unauthenticated": {
+            "Ref": "unauthRoleArn"
+          },
+          "authenticated": {
+            "Ref": "authRoleArn"
+          }
+        }
+      },
+      "DependsOn": [
+        "IdentityPool"
+      ]
+    }
+  },
+  "Outputs": {
+    "IdentityPoolId": {
+      "Description": "Id for the identity pool",
+      "Value": {
+        "Ref": "IdentityPool"
+      }
+    },
+    "IdentityPoolName": {
+      "Value": {
+        "Fn::GetAtt": [
+          "IdentityPool",
+          "Name"
+        ]
+      }
+    },
+    "UserPoolId": {
+      "Description": "Id for the user pool",
+      "Value": {
+        "Ref": "UserPool"
+      }
+    },
+    "UserPoolArn": {
+      "Description": "Arn for the user pool",
+      "Value": {
+        "Fn::GetAtt": [
+          "UserPool",
+          "Arn"
+        ]
+      }
+    },
+    "UserPoolName": {
+      "Value": {
+        "Ref": "userPoolName"
+      }
+    },
+    "AppClientIDWeb": {
+      "Description": "The user pool app client id for web",
+      "Value": {
+        "Ref": "UserPoolClientWeb"
+      }
+    },
+    "AppClientID": {
+      "Description": "The user pool app client id",
+      "Value": {
+        "Ref": "UserPoolClient"
+      }
+    },
+    "CreatedSNSRole": {
+      "Description": "role arn",
+      "Value": {
+        "Fn::GetAtt": [
+          "SNSRole",
+          "Arn"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
similarity index 78%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/build/parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index bee8cd0d32d..550944a39ff 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussions22367c6822367c68/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -1,8 +1,8 @@
 {
-  "identityPoolName": "discussions22367c68_identitypool_22367c68",
+  "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
   "allowUnauthenticatedIdentities": false,
-  "resourceNameTruncated": "discus22367c68",
-  "userPoolName": "discussions22367c68_userpool_22367c68",
+  "resourceNameTruncated": "discusc578c16e",
+  "userPoolName": "discussionsc578c16e_userpool_c578c16e",
   "autoVerifiedAttributes": [
     "email"
   ],
@@ -13,7 +13,7 @@
   "smsAuthenticationMessage": "Your authentication code is {####}",
   "smsVerificationMessage": "Your verification code is {####}",
   "emailVerificationSubject": "Verification",
-  "emailVerificationMessage": "Here is your verification code {####}",
+  "emailVerificationMessage": "Your verification code is {####}",
   "defaultPasswordPolicy": false,
   "passwordPolicyMinLength": 8,
   "passwordPolicyCharacters": [],
@@ -30,10 +30,10 @@
   "userpoolClientReadAttributes": [
     "email"
   ],
-  "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+  "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
   "userpoolClientSetAttributes": false,
-  "sharedId": "22367c68",
-  "resourceName": "discussions22367c6822367c68",
+  "sharedId": "c578c16e",
+  "resourceName": "discussionsc578c16ec578c16e",
   "authSelections": "identityPoolAndUserPool",
   "useDefault": "manual",
   "thirdPartyAuth": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
similarity index 76%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/cli-inputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index 6cd53a84bd2..a065fe386cc 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -1,10 +1,10 @@
 {
   "version": "1",
   "cognitoConfig": {
-    "identityPoolName": "discussions22367c68_identitypool_22367c68",
+    "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
     "allowUnauthenticatedIdentities": false,
-    "resourceNameTruncated": "discus22367c68",
-    "userPoolName": "discussions22367c68_userpool_22367c68",
+    "resourceNameTruncated": "discusc578c16e",
+    "userPoolName": "discussionsc578c16e_userpool_c578c16e",
     "autoVerifiedAttributes": [
       "email"
     ],
@@ -15,7 +15,7 @@
     "smsAuthenticationMessage": "Your authentication code is {####}",
     "smsVerificationMessage": "Your verification code is {####}",
     "emailVerificationSubject": "Verification",
-    "emailVerificationMessage": "Here is your verification code {####}",
+    "emailVerificationMessage": "Your verification code is {####}",
     "defaultPasswordPolicy": false,
     "passwordPolicyMinLength": 8,
     "passwordPolicyCharacters": [],
@@ -32,10 +32,10 @@
     "userpoolClientReadAttributes": [
       "email"
     ],
-    "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+    "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
     "userpoolClientSetAttributes": false,
-    "sharedId": "22367c68",
-    "resourceName": "discussions22367c6822367c68",
+    "sharedId": "c578c16e",
+    "resourceName": "discussionsc578c16ec578c16e",
     "authSelections": "identityPoolAndUserPool",
     "useDefault": "manual",
     "thirdPartyAuth": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
index 545cd8480fd..e702f6821aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1773508259
+        "Expires": 1770321021
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
similarity index 95%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index c305475136f..50d85ddc94f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -154,7 +154,7 @@
               ],
               "Condition": {
                 "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
                 }
               }
             }
@@ -174,18 +174,18 @@
                 }
               ]
             },
-            "PolicyName": "discus22367c68-sns-policy"
+            "PolicyName": "discusc578c16e-sns-policy"
           }
         ],
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discus22367c68_sns-role",
+            "discusc578c16e_sns-role",
             {
               "Fn::Join": [
                 "",
                 [
-                  "sns22367c68",
+                  "snsc578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -252,7 +252,7 @@
           "Ref": "smsAuthenticationMessage"
         },
         "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
+          "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": {
             "Fn::GetAtt": [
               "SNSRole",
@@ -304,7 +304,7 @@
     "UserPoolClientWeb": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
+        "ClientName": "discusc578c16e_app_clientWeb",
         "RefreshTokenValidity": {
           "Ref": "userpoolClientRefreshTokenValidity"
         },
@@ -322,7 +322,7 @@
     "UserPoolClient": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_client",
+        "ClientName": "discusc578c16e_app_client",
         "GenerateSecret": {
           "Ref": "userpoolClientGenerateSecret"
         },
@@ -365,7 +365,7 @@
               "Fn::Join": [
                 "",
                 [
-                  "upClientLambdaRole22367c68",
+                  "upClientLambdaRolec578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -437,12 +437,12 @@
         "IdentityPoolName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussions22367c68_identitypool_22367c68",
+            "discussionsc578c16e_identitypool_c578c16e",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussions22367c68_identitypool_22367c68__",
+                  "discussionsc578c16e_identitypool_c578c16e__",
                   {
                     "Ref": "env"
                   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 3c701beabac..30ad934f79d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -199,22 +199,36 @@
         }
       }
     },
-    "authdiscussions22367c6822367c68": {
+    "apidiscussions": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "Parameters": {
+          "AppSyncApiName": "discussions",
+          "DynamoDBBillingMode": "PAY_PER_REQUEST",
+          "DynamoDBEnableServerSideEncryption": false,
+          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
+          "env": "maintwo"
+        }
+      }
+    },
+    "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
-          "identityPoolName": "discussions22367c68_identitypool_22367c68",
+          "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
-          "resourceNameTruncated": "discus22367c68",
-          "userPoolName": "discussions22367c68_userpool_22367c68",
+          "resourceNameTruncated": "discusc578c16e",
+          "userPoolName": "discussionsc578c16e_userpool_c578c16e",
           "autoVerifiedAttributes": "email",
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Here is your verification code {####}",
+          "emailVerificationMessage": "Your verification code is {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
@@ -224,10 +238,10 @@
           "userpoolClientRefreshTokenValidity": "120",
           "userpoolClientWriteAttributes": "email",
           "userpoolClientReadAttributes": "email",
-          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+          "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
           "userpoolClientSetAttributes": false,
-          "sharedId": "22367c68",
-          "resourceName": "discussions22367c6822367c68",
+          "sharedId": "c578c16e",
+          "resourceName": "discussionsc578c16ec578c16e",
           "authSelections": "identityPoolAndUserPool",
           "useDefault": "manual",
           "thirdPartyAuth": false,
@@ -254,45 +268,17 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "main"
-        }
-      }
-    },
-    "apidiscussions": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
-        "Parameters": {
-          "AppSyncApiName": "discussions",
-          "DynamoDBBillingMode": "PAY_PER_REQUEST",
-          "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "main"
-        }
-      }
-    },
-    "storageactivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "activity",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
               "storageactivity",
@@ -311,17 +297,17 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
               "apidiscussions",
@@ -352,7 +338,68 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageactivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "activity",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageavatars": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "Parameters": {
+          "bucketName": "discus-avatars",
+          "selectedGuestPermissions": "",
+          "selectedAuthenticatedPermissions": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject",
+          "unauthRoleName": {
+            "Ref": "UnauthRoleName"
+          },
+          "authRoleName": {
+            "Ref": "AuthRoleName"
+          },
+          "s3PrivatePolicy": "Private_policy_bf41454d",
+          "s3ProtectedPolicy": "Protected_policy_bf41454d",
+          "s3PublicPolicy": "Public_policy_bf41454d",
+          "s3ReadPolicy": "read_policy_bf41454d",
+          "s3UploadsPolicy": "Uploads_policy_bf41454d",
+          "authPolicyName": "s3_amplify_bf41454d",
+          "unauthPolicyName": "s3_amplify_bf41454d",
+          "AuthenticatedAllowList": "ALLOW",
+          "GuestAllowList": "DISALLOW",
+          "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+          "s3PermissionsGuestPublic": "DISALLOW",
+          "s3PermissionsGuestUploads": "DISALLOW",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "maintwo"
         }
       }
     },
@@ -360,7 +407,7 @@
       "DependsOn": [
         "AuthRole",
         "UnauthRole",
-        "authdiscussions22367c6822367c68"
+        "authdiscussionsc578c16ec578c16e"
       ],
       "Type": "AWS::Lambda::Function",
       "Properties": {
@@ -470,7 +517,7 @@
         },
         "idpId": {
           "Fn::GetAtt": [
-            "authdiscussions22367c6822367c68",
+            "authdiscussionsc578c16ec578c16e",
             "Outputs.IdentityPoolId"
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index cff69443a2b..9297a858679 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -110,12 +110,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole0d8fb131",
+            "discussionsLambdaRole44bd86bc",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole0d8fb131",
+                  "discussionsLambdaRole44bd86bc",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 1b1d6a91237..0a05f67e87a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -118,12 +118,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole7674760b",
+            "discussionsLambdaRole62a425ae",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole7674760b",
+                  "discussionsLambdaRole62a425ae",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
index 3c701beabac..30ad934f79d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
@@ -199,22 +199,36 @@
         }
       }
     },
-    "authdiscussions22367c6822367c68": {
+    "apidiscussions": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "Parameters": {
+          "AppSyncApiName": "discussions",
+          "DynamoDBBillingMode": "PAY_PER_REQUEST",
+          "DynamoDBEnableServerSideEncryption": false,
+          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
+          "env": "maintwo"
+        }
+      }
+    },
+    "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
-          "identityPoolName": "discussions22367c68_identitypool_22367c68",
+          "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
-          "resourceNameTruncated": "discus22367c68",
-          "userPoolName": "discussions22367c68_userpool_22367c68",
+          "resourceNameTruncated": "discusc578c16e",
+          "userPoolName": "discussionsc578c16e_userpool_c578c16e",
           "autoVerifiedAttributes": "email",
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Here is your verification code {####}",
+          "emailVerificationMessage": "Your verification code is {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
@@ -224,10 +238,10 @@
           "userpoolClientRefreshTokenValidity": "120",
           "userpoolClientWriteAttributes": "email",
           "userpoolClientReadAttributes": "email",
-          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+          "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
           "userpoolClientSetAttributes": false,
-          "sharedId": "22367c68",
-          "resourceName": "discussions22367c6822367c68",
+          "sharedId": "c578c16e",
+          "resourceName": "discussionsc578c16ec578c16e",
           "authSelections": "identityPoolAndUserPool",
           "useDefault": "manual",
           "thirdPartyAuth": false,
@@ -254,45 +268,17 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "main"
-        }
-      }
-    },
-    "apidiscussions": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
-        "Parameters": {
-          "AppSyncApiName": "discussions",
-          "DynamoDBBillingMode": "PAY_PER_REQUEST",
-          "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "main"
-        }
-      }
-    },
-    "storageactivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "activity",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
               "storageactivity",
@@ -311,17 +297,17 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
               "apidiscussions",
@@ -352,7 +338,68 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "main"
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageactivity": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "activity",
+          "partitionKeyName": "id",
+          "partitionKeyType": "S",
+          "sortKeyName": "userId",
+          "sortKeyType": "S",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageavatars": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "Parameters": {
+          "bucketName": "discus-avatars",
+          "selectedGuestPermissions": "",
+          "selectedAuthenticatedPermissions": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject",
+          "unauthRoleName": {
+            "Ref": "UnauthRoleName"
+          },
+          "authRoleName": {
+            "Ref": "AuthRoleName"
+          },
+          "s3PrivatePolicy": "Private_policy_bf41454d",
+          "s3ProtectedPolicy": "Protected_policy_bf41454d",
+          "s3PublicPolicy": "Public_policy_bf41454d",
+          "s3ReadPolicy": "read_policy_bf41454d",
+          "s3UploadsPolicy": "Uploads_policy_bf41454d",
+          "authPolicyName": "s3_amplify_bf41454d",
+          "unauthPolicyName": "s3_amplify_bf41454d",
+          "AuthenticatedAllowList": "ALLOW",
+          "GuestAllowList": "DISALLOW",
+          "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+          "s3PermissionsGuestPublic": "DISALLOW",
+          "s3PermissionsGuestUploads": "DISALLOW",
+          "env": "maintwo"
+        }
+      }
+    },
+    "storagebookmarks": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "Parameters": {
+          "tableName": "bookmarks",
+          "partitionKeyName": "userId",
+          "partitionKeyType": "S",
+          "sortKeyName": "postId",
+          "sortKeyType": "S",
+          "env": "maintwo"
         }
       }
     },
@@ -360,7 +407,7 @@
       "DependsOn": [
         "AuthRole",
         "UnauthRole",
-        "authdiscussions22367c6822367c68"
+        "authdiscussionsc578c16ec578c16e"
       ],
       "Type": "AWS::Lambda::Function",
       "Properties": {
@@ -470,7 +517,7 @@
         },
         "idpId": {
           "Fn::GetAtt": [
-            "authdiscussions22367c6822367c68",
+            "authdiscussionsc578c16ec578c16e",
             "Outputs.IdentityPoolId"
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
index a2cf77e20fa..ca188b6e7fb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
new file mode 100644
index 00000000000..49679c245fc
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
@@ -0,0 +1,599 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedProtected"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPrivate"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AuthenticatedAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "GuestAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": {
+        "Ref": "S3Bucket"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  },
+  "Resources": {
+    "S3Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "bucketName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "bucketName"
+                  },
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPublic"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PublicPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedProtected"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3ProtectedPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPrivate"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PrivatePolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedUploads"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3UploadsPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "AuthReadAndList"
+    },
+    "S3GuestReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "unauthRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "GuestReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/backend-config.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/backend-config.json
index d030749556a..49fe6deb7c4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/backend-config.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/backend-config.json
@@ -18,7 +18,7 @@
     }
   },
   "auth": {
-    "discussions22367c6822367c68": {
+    "discussionsc578c16ec578c16e": {
       "customAuth": false,
       "dependsOn": [],
       "frontendAuthConfig": {
@@ -126,6 +126,15 @@
     "activity": {
       "providerPlugin": "awscloudformation",
       "service": "DynamoDB"
+    },
+    "avatars": {
+      "dependsOn": [],
+      "providerPlugin": "awscloudformation",
+      "service": "S3"
+    },
+    "bookmarks": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index cff69443a2b..9297a858679 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -110,12 +110,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole0d8fb131",
+            "discussionsLambdaRole44bd86bc",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole0d8fb131",
+                  "discussionsLambdaRole44bd86bc",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/src/package.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/src/package.json
index 9c932a8d90b..4adb03a1ee0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/src/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/src/package.json
@@ -6,9 +6,5 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.92"
-  },
-  "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.936.0",
-    "@aws-sdk/lib-dynamodb": "^3.936.0"
   }
 }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 1b1d6a91237..0a05f67e87a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -118,12 +118,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole7674760b",
+            "discussionsLambdaRole62a425ae",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole7674760b",
+                  "discussionsLambdaRole62a425ae",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/src/package.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/src/package.json
index 4b0d757e73f..88d7e9d4aca 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/src/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/src/package.json
@@ -6,9 +6,5 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.92"
-  },
-  "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.936.0",
-    "@aws-sdk/lib-dynamodb": "^3.936.0"
   }
 }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json
index a2cf77e20fa..8d569a36f15 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "DDB Resource for AWS Amplify CLI",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json
new file mode 100644
index 00000000000..d8a77c21716
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json
@@ -0,0 +1,590 @@
+{
+  "Description": "S3 Resource for AWS Amplify CLI",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedProtected"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPrivate"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AuthenticatedAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "GuestAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": {
+        "Ref": "S3Bucket"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  },
+  "Resources": {
+    "S3Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "bucketName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "bucketName"
+                  },
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPublic"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PublicPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedProtected"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3ProtectedPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPrivate"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PrivatePolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedUploads"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3UploadsPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "AuthReadAndList"
+    },
+    "S3GuestReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "unauthRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "GuestReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/parameters.json
new file mode 100644
index 00000000000..ebe758a7829
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/parameters.json
@@ -0,0 +1,31 @@
+{
+  "bucketName": "discus-avatars",
+  "selectedGuestPermissions": [],
+  "selectedAuthenticatedPermissions": [
+    "s3:PutObject",
+    "s3:GetObject",
+    "s3:ListBucket",
+    "s3:DeleteObject"
+  ],
+  "unauthRoleName": {
+    "Ref": "UnauthRoleName"
+  },
+  "authRoleName": {
+    "Ref": "AuthRoleName"
+  },
+  "s3PrivatePolicy": "Private_policy_bf41454d",
+  "s3ProtectedPolicy": "Protected_policy_bf41454d",
+  "s3PublicPolicy": "Public_policy_bf41454d",
+  "s3ReadPolicy": "read_policy_bf41454d",
+  "s3UploadsPolicy": "Uploads_policy_bf41454d",
+  "authPolicyName": "s3_amplify_bf41454d",
+  "unauthPolicyName": "s3_amplify_bf41454d",
+  "AuthenticatedAllowList": "ALLOW",
+  "GuestAllowList": "DISALLOW",
+  "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+  "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+  "s3PermissionsGuestPublic": "DISALLOW",
+  "s3PermissionsGuestUploads": "DISALLOW"
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/cli-inputs.json
new file mode 100644
index 00000000000..9126ffc1e88
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/cli-inputs.json
@@ -0,0 +1,14 @@
+{
+  "resourceName": "avatars",
+  "policyUUID": "bf41454d",
+  "bucketName": "discus-avatars",
+  "storageAccess": "auth",
+  "guestAccess": [],
+  "authAccess": [
+    "CREATE_AND_UPDATE",
+    "READ",
+    "DELETE"
+  ],
+  "triggerFunction": "NONE",
+  "groupAccess": {}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
index a3e4723d6a1..f19e532fe34 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/build/bookmarks-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "DDB Resource for AWS Amplify CLI",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
index 4eff10ee1dd..3a1bf18a43c 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
@@ -19,4 +19,4 @@
     }
   ],
   "triggerFunctions": []
-}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts
index 2be656f7cc6..51ec22deece 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/types/amplify-dependent-resources-ref.d.ts
@@ -7,7 +7,7 @@ export type AmplifyDependentResourcesAttributes = {
     }
   },
   "auth": {
-    "discussions22367c6822367c68": {
+    "discussionsc578c16ec578c16e": {
       "AppClientID": "string",
       "AppClientIDWeb": "string",
       "CreatedSNSRole": "string",
@@ -44,6 +44,20 @@ export type AmplifyDependentResourcesAttributes = {
       "SortKeyName": "string",
       "SortKeyType": "string",
       "StreamArn": "string"
+    },
+    "avatars": {
+      "BucketName": "string",
+      "Region": "string"
+    },
+    "bookmarks": {
+      "Arn": "string",
+      "Name": "string",
+      "PartitionKeyName": "string",
+      "PartitionKeyType": "string",
+      "Region": "string",
+      "SortKeyName": "string",
+      "SortKeyType": "string",
+      "StreamArn": "string"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
index 1d5e6f66713..14344daa3c0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
@@ -1,35 +1,38 @@
 {
-  "main": {
+  "maintwo": {
     "awscloudformation": {
-      "AuthRoleName": "amplify-discussions-main-d5a80-authRole",
-      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole",
+      "AuthRoleName": "amplify-discussions-maintwo-decb9-authRole",
+      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole",
       "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-      "UnauthRoleName": "amplify-discussions-main-d5a80-unauthRole",
-      "StackName": "amplify-discussions-main-d5a80",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-d5a80/2bc587e0-1a44-11f1-8b6b-0affd4d11c2d",
+      "DeploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+      "UnauthRoleName": "amplify-discussions-maintwo-decb9-unauthRole",
+      "StackName": "amplify-discussions-maintwo-decb9",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
       "AmplifyAppId": "discussions"
     },
     "categories": {
       "auth": {
-        "discussions22367c6822367c68": {}
+        "discussionsc578c16ec578c16e": {}
       },
       "function": {
         "fetchuseractivity": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip"
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
         },
         "recorduseractivity": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip"
-        }
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
+        },
+        "activity": {},
+        "discussions": {}
       },
       "api": {
         "discussions": {}
       },
       "storage": {
         "activity": {},
+        "avatars": {},
         "bookmarks": {}
       }
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json
index 1f4874f0128..1d3628a1639 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json
@@ -1,25 +1,22 @@
 {
-  "name": "@amplify-migration-apps/discussions",
+  "name": "discussions",
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "installConfig": {
-    "hoistingLimits": "workspaces"
-  },
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
     "configure": "./configure.sh",
     "configure-schema": "./configure-schema.sh",
-    "configure-functions": "./configure-functions.sh",
-    "sanitize": "tsx ../sanitize.ts",
-    "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
+    "configure-functions": "./configure-functions.sh"
   },
   "devDependencies": {
     "vite": "^7.2.2"
   },
   "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.936.0",
+    "@aws-sdk/lib-dynamodb": "^3.936.0",
     "aws-amplify": "^6.15.8"
   }
 }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
deleted file mode 100644
index 4d53c4efdb9..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.outputs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
deleted file mode 100644
index 693d35cd349..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.parameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
deleted file mode 100644
index 8dd4987dab1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
-    "OutputValue": "CommentTable"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
-  },
-  {
-    "OutputKey": "GetAttCommentTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:CommentTable:StreamArn"
-  },
-  {
-    "OutputKey": "GetAttCommentTableName",
-    "OutputValue": "Comment-2264xbjvizfhfljloltcb4xr3e-NONE",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:CommentTable:Name"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
deleted file mode 100644
index 24ac26e9862..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
deleted file mode 100644
index 4c1cdd52826..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName",
-    "ParameterValue": "CommentTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
-    "ParameterValue": "TopicTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
-    "ParameterValue": "PostTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
deleted file mode 100644
index 54a7724d79b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.template.json
+++ /dev/null
@@ -1,863 +0,0 @@
-{
-  "Resources": {
-    "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "Topicpostsauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
-      }
-    },
-    "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "TopicPostsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0452137320035df37094760b82b5149298b81accf971d76ad38ee60f3b29d5e7.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/49e7a1f2fb4c809b82bed6b0242a2a3bcfa2c5276ebd2539ff330fee36f8fe18.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
-      }
-    },
-    "TopicpostsResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "FieldName": "posts",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Topic"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/topicPostsResolver"
-      }
-    },
-    "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "Postcommentsauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
-      }
-    },
-    "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "PostCommentsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/444a200bade4d50fad7f149c350401ee16cad72a4c043f9e9734f522754f11ef.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/49e7a1f2fb4c809b82bed6b0242a2a3bcfa2c5276ebd2539ff330fee36f8fe18.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
-      }
-    },
-    "PostcommentsResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "FieldName": "comments",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Post"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postCommentsResolver"
-      }
-    },
-    "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "Posttopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
-      }
-    },
-    "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "PostTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/da20b1b19b27f9de5414e30169ea8b7e9b7d0576828fa460b512ecff6b3130ec.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dcb70e4856bc9a423e02b8b9e9c2ab3f71479784572d4c04a02d1f5b61a9f9ac.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "PosttopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "FieldName": "topic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Post"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/postTopicResolver"
-      }
-    },
-    "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "Commentpostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/98d57dc1efb9e47547e4d43b376202499240f34e43676c88c84fab62008b2bf5.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
-      }
-    },
-    "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "CommentPostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d9b82f67424a0a70dc059a69c4a0bbc6fd4c387ca5ad9f1b396a96a8c7c10b62.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dcb70e4856bc9a423e02b8b9e9c2ab3f71479784572d4c04a02d1f5b61a9f9ac.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "CommentpostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "FieldName": "post",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Comment"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/commentPostResolver"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMMQ6CQBBA0bPQLyMCjaWQWFrAAci4DGQAZwmzCzGEuxu0evnNTyHNM0gi3DS27RhP/IL9SeqprT3a0eCmza5Zg6rkFe4nRjMogh3JF6hkcJ71Ixb2spNHEOvZSemk4z4seIYpO6lI3bTSchzm96g99iz9YcS1BINe1jSB6w3yaFDmeAni+U1Q/f0C+wjzPacAAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Parameters": {
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
-      "Type": "String"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
deleted file mode 100644
index e191208479d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
deleted file mode 100644
index cfcfd857d2e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.template.json
+++ /dev/null
@@ -1,556 +0,0 @@
-{
-  "Description": "An auto-generated nested stack for the @function directive.",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            "NONE",
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Resources": {
-    "FetchuseractivityE2etestLambdaDataSourceServiceRole258F8F8C": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/Resource"
-      }
-    },
-    "FetchuseractivityE2etestLambdaDataSourceServiceRoleDefaultPolicyB52936FD": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "lambda:InvokeFunction",
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::If": [
-                    "HasEnvironmentParameter",
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest",
-                        {}
-                      ]
-                    },
-                    {
-                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest"
-                    }
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::If": [
-                          "HasEnvironmentParameter",
-                          {
-                            "Fn::Sub": [
-                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest",
-                              {}
-                            ]
-                          },
-                          {
-                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest"
-                          }
-                        ]
-                      },
-                      ":*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "FetchuseractivityE2etestLambdaDataSourceServiceRoleDefaultPolicyB52936FD",
-        "Roles": [
-          {
-            "Ref": "FetchuseractivityE2etestLambdaDataSourceServiceRole258F8F8C"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
-      }
-    },
-    "FetchuseractivityE2etestLambdaDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "LambdaConfig": {
-          "LambdaFunctionArn": {
-            "Fn::If": [
-              "HasEnvironmentParameter",
-              {
-                "Fn::Sub": [
-                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest",
-                  {}
-                ]
-              },
-              {
-                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-e2etest"
-              }
-            ]
-          }
-        },
-        "Name": "FetchuseractivityE2etestLambdaDataSource",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "FetchuseractivityE2etestLambdaDataSourceServiceRole258F8F8C",
-            "Arn"
-          ]
-        },
-        "Type": "AWS_LAMBDA"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/FetchuseractivityE2etestLambdaDataSource/Resource"
-      }
-    },
-    "InvokeFetchuseractivityE2etestLambdaDataSourceInvokeFetchuseractivityE2etestLambdaDataSourceAppSyncFunction6E36199C": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "FetchuseractivityE2etestLambdaDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "InvokeFetchuseractivityE2etestLambdaDataSource",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/27a049a8fa587376b8d043aea1b8951aa5394d883829a3fb11c88ce812329e9a.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a20e304512b1fde77dc16ed9d5e0ed03817afcab629ce87ef11c99877b7b1e30.vtl"
-        }
-      },
-      "DependsOn": [
-        "FetchuseractivityE2etestLambdaDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityE2etestLambdaDataSource/InvokeFetchuseractivityE2etestLambdaDataSource.AppSyncFunction"
-      }
-    },
-    "QueryfetchUserActivityResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "FieldName": "fetchUserActivity",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "InvokeFetchuseractivityE2etestLambdaDataSourceInvokeFetchuseractivityE2etestLambdaDataSourceAppSyncFunction6E36199C",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "## [Start] Stash resolver specific context.. **\n$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"fetchUserActivity\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:aws:sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/387d5992f5fc03d05de27289457dcc374a84c42a889acb504aff1031047dde00.vtl"
-        },
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
-      }
-    },
-    "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryFetchUserActivityAuthFN",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOsW7DMAxEvyW7zKZ2lo6Ni05FUdgfEDASbTCWqcCUEgSG/72Qgg6dHu/IO7CG+tDAfod3raybKs9nWL9JI7k+op1MO0gbxHHkIAbvelo9zmeH8JnEZvOISgavV32IhfWrLD8wYh/SYinn/6u/XBtk4DEtWJrbQTrS4G+0bIZxhrULvtwX/gTP9pHlc9qMNidUpajwnmG0gWOyE8X8z2aK2UccWcbNSHAEF3251Xt4fYPD7qLM1ZIk8kzQPfkL3nAzgQsBAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Parameters": {
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-      "Type": "String"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
deleted file mode 100644
index c133429195a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE"
-  },
-  {
-    "OutputKey": "GetAttPostTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:PostTable:StreamArn"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName",
-    "OutputValue": "PostTable"
-  },
-  {
-    "OutputKey": "GetAttPostTableName",
-    "OutputValue": "Post-2264xbjvizfhfljloltcb4xr3e-NONE",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:PostTable:Name"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
deleted file mode 100644
index 24ac26e9862..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
deleted file mode 100644
index 0840da290e3..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttTopicTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:TopicTable:StreamArn"
-  },
-  {
-    "OutputKey": "GetAttTopicTableName",
-    "OutputValue": "Topic-2264xbjvizfhfljloltcb4xr3e-NONE",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "2264xbjvizfhfljloltcb4xr3e:GetAtt:TopicTable:Name"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name",
-    "OutputValue": "TopicTable"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
deleted file mode 100644
index 24ac26e9862..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-e2-TableManagerCustomProvid-120JeVoVZN43"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "ParameterValue": "2264xbjvizfhfljloltcb4xr3e"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
deleted file mode 100644
index d31f9bab62b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.outputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "OutputValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "OutputValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "OutputValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref",
-    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
-    "OutputValue": "us-east-1_dgn42NPnC"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
deleted file mode 100644
index 66c05605928..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.outputs.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl",
-    "OutputValue": "https://ugegaqplxndhddmmhzi2j4rj4u.appsync-api.us-east-1.amazonaws.com/graphql"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn",
-    "OutputValue": "arn:aws:s3:::amplify-discussions-e2-amplifydataamplifycodege-g8qjz8miowur"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey",
-    "OutputValue": "da2-3ikaaaabp5gubimmave6av37ga"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId",
-    "OutputValue": "2264xbjvizfhfljloltcb4xr3e"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
deleted file mode 100644
index f75e57d3891..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref",
-    "ParameterValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthunauthenticate-MHvGYssZoqQG"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref",
-    "ParameterValue": "amplify-discussions-e2-amplifyAuthauthenticatedU-Dq4Oodlb3x5d"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref",
-    "ParameterValue": "us-east-1_dgn42NPnC"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
deleted file mode 100644
index f5a3111c24e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.template.json
+++ /dev/null
@@ -1,2255 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"api-AppSync\",\"metadata\":{\"dataSources\":\"dynamodb\",\"authorizationModes\":\"amazon_cognito_identity_pools,amazon_cognito_user_pools,api_key,aws_iam\",\"customOperations\":\"queries\"}}",
-  "Resources": {
-    "amplifyDataGraphQLAPI42A6FA33": {
-      "Type": "AWS::AppSync::GraphQLApi",
-      "Properties": {
-        "AdditionalAuthenticationProviders": [
-          {
-            "AuthenticationType": "AMAZON_COGNITO_USER_POOLS",
-            "UserPoolConfig": {
-              "AwsRegion": {
-                "Ref": "AWS::Region"
-              },
-              "UserPoolId": {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
-              }
-            }
-          },
-          {
-            "AuthenticationType": "AWS_IAM"
-          }
-        ],
-        "AuthenticationType": "API_KEY",
-        "Name": "amplifyData",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/Resource"
-      }
-    },
-    "amplifyDataGraphQLAPITransformerSchemaFF50A789": {
-      "Type": "AWS::AppSync::GraphQLSchema",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "DefinitionS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9199994c2fc1278c43c8dc8f4f5b81dec0666ee6dbb2bcbc8080f8aa8161eb18.graphql"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/TransformerSchema"
-      }
-    },
-    "amplifyDataGraphQLAPIDefaultApiKey1C8ED374": {
-      "Type": "AWS::AppSync::ApiKey",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "Expires": 1774388952
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/DefaultApiKey"
-      }
-    },
-    "amplifyDataGraphQLAPINONEDS684BF699": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "Name": "NONE_DS",
-        "Type": "NONE"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
-      }
-    },
-    "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPI42A6FA33",
-              "ApiId"
-            ]
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/7f6f71c1468eb8f31ff0be89060d711b4484a0142cbd9129aab40593b23951c2.json"
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManager045FD64D.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "amplifyDataTopicNestedStackTopicNestedStackResource252EB182": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
-            "Fn::GetAtt": [
-              "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPI42A6FA33",
-              "ApiId"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPINONEDS684BF699",
-              "Name"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/8cde071152fa4a75f448531303124a6794c4e537fcd354d7af6a33781c570e3e.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicC2CFEE26.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
-            "Fn::GetAtt": [
-              "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPI42A6FA33",
-              "ApiId"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPINONEDS684BF699",
-              "Name"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/dd685c6a6b5ff170b54aa73b26ff6f51dba21261affde8ec634951bd2a33314b.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostF0FC9DBC.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
-            "Fn::GetAtt": [
-              "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPI42A6FA33",
-              "ApiId"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPINONEDS684BF699",
-              "Name"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/5a08b98fa6bc1baaa4008a64326eadd79628adae379bafe9c662242cac4768e9.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentF8B0B0A5.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "amplifyDataFunctionDirectiveStackNestedStackFunctionDirectiveStackNestedStackResource1246A302": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPI42A6FA33",
-              "ApiId"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPINONEDS684BF699",
-              "Name"
-            ]
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/b3a27056a8fad1527a236b694bd74e13885a6e74ce217d007a6f4db8c31646d8.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataFunctionDirectiveStack46497AEA.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "amplifyDataConnectionStackNestedStackConnectionStackNestedStackResourceAB0F312B": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPI42A6FA33",
-              "ApiId"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
-            "Fn::GetAtt": [
-              "amplifyDataGraphQLAPINONEDS684BF699",
-              "Name"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
-            "Fn::GetAtt": [
-              "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
-            "Fn::GetAtt": [
-              "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-            "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
-            "Fn::GetAtt": [
-              "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
-            "Fn::GetAtt": [
-              "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
-            "Fn::GetAtt": [
-              "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name"
-            ]
-          },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
-            "Fn::GetAtt": [
-              "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn"
-            ]
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/4e15e8ab0c7fbbf6de4689a693f67b66b10ff79991eb568bcdf7482185e8a709.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789",
-        "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-        "amplifyDataTopicNestedStackTopicNestedStackResource252EB182"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataConnectionStackC6E786F3.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "amplifyDataActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunctionA4906098": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPINONEDS684BF699",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityIdDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b99568f372e3dffae86aabe466815f3e987cdb1b01a7b4bba0c044556f46fca1.vtl"
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ActivityidResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "FieldName": "id",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "amplifyDataActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunctionA4906098",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "amplifyDataGraphQLAPI42A6FA33",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityIdResolver"
-      }
-    },
-    "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPINONEDS684BF699",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityUserIdDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b53de7a6facbe87f6af1986109f92af3b546c8741e3201a920e1bbb4402997a4.vtl"
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ActivityuserIdResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "FieldName": "userId",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "amplifyDataGraphQLAPI42A6FA33",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityUserIdResolver"
-      }
-    },
-    "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPINONEDS684BF699",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityActivityTypeDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8564d5899569ca37f23c0c2ab60b42e9624b0374ea9ed0dd34b3836f24a7d6ef.vtl"
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ActivityactivityTypeResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "FieldName": "activityType",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "amplifyDataGraphQLAPI42A6FA33",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityActivityTypeResolver"
-      }
-    },
-    "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPINONEDS684BF699",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityTimestampDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/830fd5a473c43e78ac02d7ec373d9543ca16c5b96b72acdde27ccd8277dec3f2.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9ef1ff70f2fb1662ee5d5fef0e6ca25043179817bdfc6515940c3bb3124e50fa.vtl"
-        }
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ActivitytimestampResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "ApiId"
-          ]
-        },
-        "FieldName": "timestamp",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "amplifyDataGraphQLAPI42A6FA33",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "amplifyDataGraphQLAPITransformerSchemaFF50A789"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/activityTimestampResolver"
-      }
-    },
-    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA": {
-      "Type": "AWS::S3::Bucket",
-      "Properties": {
-        "CorsConfiguration": {
-          "CorsRules": [
-            {
-              "AllowedHeaders": [
-                "*"
-              ],
-              "AllowedMethods": [
-                "GET",
-                "HEAD"
-              ],
-              "AllowedOrigins": [
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "https://",
-                      {
-                        "Ref": "AWS::Region"
-                      },
-                      ".console.aws.amazon.com/amplify"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "aws-cdk:auto-delete-objects",
-            "Value": "true"
-          },
-          {
-            "Key": "aws-cdk:cr-owned:6650decd",
-            "Value": "true"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
-      }
-    },
-    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548": {
-      "Type": "AWS::S3::BucketPolicy",
-      "Properties": {
-        "Bucket": {
-          "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
-        },
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "s3:PutBucketPolicy",
-                "s3:GetBucket*",
-                "s3:List*",
-                "s3:DeleteObject*"
-              ],
-              "Effect": "Allow",
-              "Principal": {
-                "AWS": {
-                  "Fn::GetAtt": [
-                    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
-                    "Arn"
-                  ]
-                }
-              },
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
-                          "Arn"
-                        ]
-                      },
-                      "/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
-      }
-    },
-    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketAutoDeleteObjectsCustomResource437F26F5": {
-      "Type": "Custom::S3AutoDeleteObjects",
-      "Properties": {
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
-            "Arn"
-          ]
-        },
-        "BucketName": {
-          "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
-        }
-      },
-      "DependsOn": [
-        "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
-      }
-    },
-    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905": {
-      "Type": "AWS::Lambda::LayerVersion",
-      "Properties": {
-        "Content": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip"
-        },
-        "Description": "/opt/awscli/aws"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
-        "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
-        "aws:asset:is-bundled": false,
-        "aws:asset:property": "Content"
-      }
-    },
-    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929": {
-      "Type": "Custom::CDKBucketDeployment",
-      "Properties": {
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21",
-            "Arn"
-          ]
-        },
-        "SourceBucketNames": [
-          {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          }
-        ],
-        "SourceObjectKeys": [
-          "37e4ecf3800c81b25de6b1bdb0f9126a435db3b9d3881b1a6de9545ff9e8ee91.zip"
-        ],
-        "SourceMarkers": [
-          {}
-        ],
-        "DestinationBucketName": {
-          "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
-        },
-        "WaitForDistributionInvalidation": true,
-        "Prune": true,
-        "OutputObjectKeys": true,
-        "DestinationBucketArn": {
-          "Fn::GetAtt": [
-            "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
-            "Arn"
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
-      }
-    },
-    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ]
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
-      }
-    },
-    "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip"
-        },
-        "Timeout": 900,
-        "MemorySize": 128,
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Description": {
-          "Fn::Join": [
-            "",
-            [
-              "Lambda function for auto-deleting objects in ",
-              {
-                "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA"
-              },
-              " S3 bucket."
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
-        "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
-        "aws:asset:property": "Code"
-      }
-    },
-    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
-      }
-    },
-    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "s3:GetObject*",
-                "s3:GetBucket*",
-                "s3:List*"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "arn:",
-                      {
-                        "Ref": "AWS::Partition"
-                      },
-                      ":s3:::",
-                      {
-                        "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-                      }
-                    ]
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "arn:",
-                      {
-                        "Ref": "AWS::Partition"
-                      },
-                      ":s3:::",
-                      {
-                        "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-                      },
-                      "/*"
-                    ]
-                  ]
-                }
-              ]
-            },
-            {
-              "Action": [
-                "s3:GetObject*",
-                "s3:GetBucket*",
-                "s3:List*",
-                "s3:DeleteObject*",
-                "s3:PutObject",
-                "s3:PutObjectLegalHold",
-                "s3:PutObjectRetention",
-                "s3:PutObjectTagging",
-                "s3:PutObjectVersionTagging",
-                "s3:Abort*"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA",
-                          "Arn"
-                        ]
-                      },
-                      "/*"
-                    ]
-                  ]
-                }
-              ]
-            },
-            {
-              "Action": [
-                "s3:GetObject*",
-                "s3:GetBucket*",
-                "s3:List*",
-                "s3:DeleteObject*",
-                "s3:PutObject",
-                "s3:PutObjectLegalHold",
-                "s3:PutObjectRetention",
-                "s3:PutObjectTagging",
-                "s3:PutObjectVersionTagging",
-                "s3:Abort*"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "modelIntrospectionSchemaBucketF566B665",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "modelIntrospectionSchemaBucketF566B665",
-                          "Arn"
-                        ]
-                      },
-                      "/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B",
-        "Roles": [
-          {
-            "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
-      }
-    },
-    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9.zip"
-        },
-        "Environment": {
-          "Variables": {
-            "AWS_CA_BUNDLE": "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
-          }
-        },
-        "Handler": "index.handler",
-        "Layers": [
-          {
-            "Ref": "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905"
-          }
-        ],
-        "MemorySize": 1536,
-        "Role": {
-          "Fn::GetAtt": [
-            "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2",
-            "Arn"
-          ]
-        },
-        "Runtime": "python3.13",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 900
-      },
-      "DependsOn": [
-        "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B",
-        "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
-        "aws:asset:path": "asset.3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9",
-        "aws:asset:is-bundled": false,
-        "aws:asset:property": "Code"
-      }
-    },
-    "modelIntrospectionSchemaBucketF566B665": {
-      "Type": "AWS::S3::Bucket",
-      "Properties": {
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "aws-cdk:auto-delete-objects",
-            "Value": "true"
-          },
-          {
-            "Key": "aws-cdk:cr-owned:b3bc092a",
-            "Value": "true"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Resource"
-      }
-    },
-    "modelIntrospectionSchemaBucketPolicy4DAB0D15": {
-      "Type": "AWS::S3::BucketPolicy",
-      "Properties": {
-        "Bucket": {
-          "Ref": "modelIntrospectionSchemaBucketF566B665"
-        },
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "s3:*",
-              "Condition": {
-                "Bool": {
-                  "aws:SecureTransport": "false"
-                }
-              },
-              "Effect": "Deny",
-              "Principal": {
-                "AWS": "*"
-              },
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "modelIntrospectionSchemaBucketF566B665",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "modelIntrospectionSchemaBucketF566B665",
-                          "Arn"
-                        ]
-                      },
-                      "/*"
-                    ]
-                  ]
-                }
-              ]
-            },
-            {
-              "Action": [
-                "s3:PutBucketPolicy",
-                "s3:GetBucket*",
-                "s3:List*",
-                "s3:DeleteObject*"
-              ],
-              "Effect": "Allow",
-              "Principal": {
-                "AWS": {
-                  "Fn::GetAtt": [
-                    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
-                    "Arn"
-                  ]
-                }
-              },
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "modelIntrospectionSchemaBucketF566B665",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "modelIntrospectionSchemaBucketF566B665",
-                          "Arn"
-                        ]
-                      },
-                      "/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/Policy/Resource"
-      }
-    },
-    "modelIntrospectionSchemaBucketAutoDeleteObjectsCustomResourceFE57309F": {
-      "Type": "Custom::S3AutoDeleteObjects",
-      "Properties": {
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
-            "Arn"
-          ]
-        },
-        "BucketName": {
-          "Ref": "modelIntrospectionSchemaBucketF566B665"
-        }
-      },
-      "DependsOn": [
-        "modelIntrospectionSchemaBucketPolicy4DAB0D15"
-      ],
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
-      }
-    },
-    "modelIntrospectionSchemaBucketDeploymentAwsCliLayer13C432F7": {
-      "Type": "AWS::Lambda::LayerVersion",
-      "Properties": {
-        "Content": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip"
-        },
-        "Description": "/opt/awscli/aws"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
-        "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
-        "aws:asset:is-bundled": false,
-        "aws:asset:property": "Content"
-      }
-    },
-    "modelIntrospectionSchemaBucketDeploymentCustomResource1536MiB104B97EC": {
-      "Type": "Custom::CDKBucketDeployment",
-      "Properties": {
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21",
-            "Arn"
-          ]
-        },
-        "SourceBucketNames": [
-          {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          }
-        ],
-        "SourceObjectKeys": [
-          "df198b893678487bb17a3e38f72236bb108e7549e60e05070d2dc0c226d763c2.zip"
-        ],
-        "SourceMarkers": [
-          {}
-        ],
-        "DestinationBucketName": {
-          "Ref": "modelIntrospectionSchemaBucketF566B665"
-        },
-        "WaitForDistributionInvalidation": true,
-        "Prune": true,
-        "OutputObjectKeys": true
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
-      }
-    },
-    "AMPLIFYDATAGRAPHQLENDPOINTParameter1C2CBB16": {
-      "Type": "AWS::SSM::Parameter",
-      "Properties": {
-        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
-        "Tags": {
-          "amplify:app-id": "discussions",
-          "amplify:branch-name": "e2etest",
-          "amplify:deployment-type": "branch",
-          "created-by": "amplify"
-        },
-        "Type": "String",
-        "Value": {
-          "Fn::GetAtt": [
-            "amplifyDataGraphQLAPI42A6FA33",
-            "GraphQLUrl"
-          ]
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
-      }
-    },
-    "AMPLIFYDATAMODELINTROSPECTIONSCHEMABUCKETNAMEParameter47BF4F44": {
-      "Type": "AWS::SSM::Parameter",
-      "Properties": {
-        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
-        "Tags": {
-          "amplify:app-id": "discussions",
-          "amplify:branch-name": "e2etest",
-          "amplify:deployment-type": "branch",
-          "created-by": "amplify"
-        },
-        "Type": "String",
-        "Value": {
-          "Ref": "modelIntrospectionSchemaBucketF566B665"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
-      }
-    },
-    "AMPLIFYDATAMODELINTROSPECTIONSCHEMAKEYParameterB6AEAE8A": {
-      "Type": "AWS::SSM::Parameter",
-      "Properties": {
-        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
-        "Tags": {
-          "amplify:app-id": "discussions",
-          "amplify:branch-name": "e2etest",
-          "amplify:deployment-type": "branch",
-          "created-by": "amplify"
-        },
-        "Type": "String",
-        "Value": "modelIntrospectionSchema.json"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
-      }
-    },
-    "AMPLIFYDATADEFAULTNAMEParameterE7C23CC4": {
-      "Type": "AWS::SSM::Parameter",
-      "Properties": {
-        "Name": "/amplify/resource_reference/discussions/e2etest-branch-75c4329a92/AMPLIFY_DATA_DEFAULT_NAME",
-        "Tags": {
-          "amplify:app-id": "discussions",
-          "amplify:branch-name": "e2etest",
-          "amplify:deployment-type": "branch",
-          "created-by": "amplify"
-        },
-        "Type": "String",
-        "Value": "amplifyData"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSTW/bMAz9Lc1ZUbukl/XmOtgOK7osBnoZioCRGZeJPjxRTmoI/u+DrCxNt1OxE/lI8eFRjzM5u53Lmys48lTV+6mmjYyPyAHrKoDaixWy67xCAUdeR2hb7q2S8auH9uWXLlq6B0ZRbu1Y+fFQtHSBKvWCBlKhaOkb9uLRWVxAgCqTllv7Hn3prArkbOnslprOQwKpkXToA/pB8HwdgRkDyyIFUWOrXW/QBnnfqT2GxbmQXsuYq6PQnCbCnP2ME0OvZCd3k8svSMvyXI4tPrEWXXAL1Bjw+2aHKvBkEP81/XxSs3SaVP+mKeMPKMsDVYCAaemPCft3+HkQGsymBhnLrX2AHv0Tek5GVGQbjcGdfRLn5MK8QRAYGVdOj56O8W3JnA2C2chYBU+2WYIHgwH92P8DhkGMBlcBGrJN6uWbLDsOzpwv83QdY56Fr3USvYYjK02yOHKpadzjHf9fPEvvDlSjT3cyCOtqlDu+Psxu5KfP8vZqx0RT39lABuUqx9+1Jlu8PgMAAA=="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataGraphQLAPI42A6FA33",
-          "ApiId"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataGraphQLAPI42A6FA33",
-          "GraphQLUrl"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929",
-          "DestinationBucketArn"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataGraphQLAPIDefaultApiKey1C8ED374",
-          "ApiKey"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
deleted file mode 100644
index 310f5dc1406..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.outputs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref",
-    "OutputValue": "fetchuseractivity-e2etest"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref",
-    "OutputValue": "recorduseractivity-e2etest"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
deleted file mode 100644
index 26d43ea91ff..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref",
-    "ParameterValue": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.817"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.433"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-2264xbjvizfhfljloltcb4xr3e-NONE/stream/2026-03-17T21:51:35.688"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
deleted file mode 100644
index 3c42861a3e5..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.template.json
+++ /dev/null
@@ -1,832 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.17.0\",\"stackType\":\"function-Lambda\",\"metadata\":{}}",
-  "Resources": {
-    "fetchuseractivitye2etestlambdaServiceRole5FC09E26": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "fetchuseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/Resource"
-      }
-    },
-    "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "dynamodb:Get*",
-                "dynamodb:BatchGetItem",
-                "dynamodb:List*",
-                "dynamodb:Describe*",
-                "dynamodb:Scan",
-                "dynamodb:Query",
-                "dynamodb:PartiQLSelect"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
-                      },
-                      "/index/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744",
-        "Roles": [
-          {
-            "Ref": "fetchuseractivitye2etestlambdaServiceRole5FC09E26"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
-      }
-    },
-    "fetchuseractivitye2etestlambdaE00C3C26": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Architectures": [
-          "x86_64"
-        ],
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "bf8313617a5ef1feb1d15c5f1c48fa145b413fc1ff7c4f8bb6548c4ccfee2ff5.zip"
-        },
-        "Environment": {
-          "Variables": {
-            "ENV": "e2etest",
-            "REGION": "us-east-1",
-            "AMPLIFY_SSM_ENV_CONFIG": "{}",
-            "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn"
-            },
-            "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
-            },
-            "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref"
-            }
-          }
-        },
-        "EphemeralStorage": {
-          "Size": 512
-        },
-        "FunctionName": "fetchuseractivity-e2etest",
-        "Handler": "index.handler",
-        "MemorySize": 128,
-        "Role": {
-          "Fn::GetAtt": [
-            "fetchuseractivitye2etestlambdaServiceRole5FC09E26",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "fetchuseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 25
-      },
-      "DependsOn": [
-        "fetchuseractivitye2etestlambdaServiceRoleDefaultPolicy0A195744",
-        "fetchuseractivitye2etestlambdaServiceRole5FC09E26"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/fetchuseractivity-e2etest-lambda/Resource",
-        "aws:asset:path": "asset.bf8313617a5ef1feb1d15c5f1c48fa145b413fc1ff7c4f8bb6548c4ccfee2ff5",
-        "aws:asset:is-bundled": true,
-        "aws:asset:property": "Code"
-      }
-    },
-    "recorduseractivitye2etestlambdaServiceRoleC563F9C3": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/Resource"
-      }
-    },
-    "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "dynamodb:Put*",
-                "dynamodb:Create*",
-                "dynamodb:BatchWriteItem",
-                "dynamodb:PartiQLInsert",
-                "dynamodb:Get*",
-                "dynamodb:BatchGetItem",
-                "dynamodb:List*",
-                "dynamodb:Describe*",
-                "dynamodb:Scan",
-                "dynamodb:Query",
-                "dynamodb:PartiQLSelect",
-                "dynamodb:Update*",
-                "dynamodb:RestoreTable*",
-                "dynamodb:PartiQLUpdate",
-                "dynamodb:Delete*",
-                "dynamodb:PartiQLDelete"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
-                      },
-                      "/index/*"
-                    ]
-                  ]
-                }
-              ]
-            },
-            {
-              "Action": "dynamodb:ListStreams",
-              "Effect": "Allow",
-              "Resource": "*"
-            },
-            {
-              "Action": [
-                "dynamodb:DescribeStream",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator"
-              ],
-              "Effect": "Allow",
-              "Resource": {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
-              }
-            },
-            {
-              "Action": [
-                "dynamodb:DescribeStream",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator"
-              ],
-              "Effect": "Allow",
-              "Resource": {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
-              }
-            },
-            {
-              "Action": [
-                "dynamodb:DescribeStream",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator"
-              ],
-              "Effect": "Allow",
-              "Resource": {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762",
-        "Roles": [
-          {
-            "Ref": "recorduseractivitye2etestlambdaServiceRoleC563F9C3"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/ServiceRole/DefaultPolicy/Resource"
-      }
-    },
-    "recorduseractivitye2etestlambdaB6DEA24D": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Architectures": [
-          "x86_64"
-        ],
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "d01b5f499fc09d13cdf4f24026ec6fef4895803e5403f632102094b02df2a465.zip"
-        },
-        "Environment": {
-          "Variables": {
-            "ENV": "e2etest",
-            "REGION": "us-east-1",
-            "AMPLIFY_SSM_ENV_CONFIG": "{}",
-            "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn"
-            },
-            "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
-            },
-            "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref"
-            }
-          }
-        },
-        "EphemeralStorage": {
-          "Size": 512
-        },
-        "FunctionName": "recorduseractivity-e2etest",
-        "Handler": "index.handler",
-        "MemorySize": 128,
-        "Role": {
-          "Fn::GetAtt": [
-            "recorduseractivitye2etestlambdaServiceRoleC563F9C3",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 25
-      },
-      "DependsOn": [
-        "recorduseractivitye2etestlambdaServiceRoleDefaultPolicyD1490762",
-        "recorduseractivitye2etestlambdaServiceRoleC563F9C3"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/Resource",
-        "aws:asset:path": "asset.d01b5f499fc09d13cdf4f24026ec6fef4895803e5403f632102094b02df2a465",
-        "aws:asset:is-bundled": true,
-        "aws:asset:property": "Code"
-      }
-    },
-    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B51DD8CE2": {
-      "Type": "AWS::Lambda::EventSourceMapping",
-      "Properties": {
-        "BatchSize": 100,
-        "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004"
-        },
-        "FunctionName": {
-          "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
-        },
-        "StartingPosition": "LATEST",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicCustomTableTopicTable1EAB724B/Resource"
-      }
-    },
-    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACABBFFC807": {
-      "Type": "AWS::Lambda::EventSourceMapping",
-      "Properties": {
-        "BatchSize": 100,
-        "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332"
-        },
-        "FunctionName": {
-          "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
-        },
-        "StartingPosition": "LATEST",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostCustomTablePostTableC1427ACA/Resource"
-      }
-    },
-    "recorduseractivitye2etestlambdaDynamoDBEventSourceamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35047BB07E": {
-      "Type": "AWS::Lambda::EventSourceMapping",
-      "Properties": {
-        "BatchSize": 100,
-        "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9"
-        },
-        "FunctionName": {
-          "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
-        },
-        "StartingPosition": "LATEST",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "e2etest"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-e2etest"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/recorduseractivity-e2etest-lambda/DynamoDBEventSource:amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCustomTableCommentTable076F8D35/Resource"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOvQ6CQBCEn4X+WBFoLIVopzHwAGQ5FnL83Bn2gBjCu5uDxMbqm5niy4QQxhEEHi7sy6rze1XC+iS2VOUWZSdw4WLtcSgrLLSpqGV47rhPWlpltFA4wJqZnkRa650v0yv5cfVIm+CoQGayDFcHwREkk+zIJsgkDj2saa1/1ttM2uZmGiU98P1WunG+/3XbxK7MLTauCncSWj7NYQDnC8Rey0r546StGgiyg19X55TH9wAAAA=="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Parameters": {
-    "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
-      "Type": "String"
-    }
-  },
-  "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref": {
-      "Value": {
-        "Ref": "fetchuseractivitye2etestlambdaE00C3C26"
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref": {
-      "Value": {
-        "Ref": "recorduseractivitye2etestlambdaB6DEA24D"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
deleted file mode 100644
index 23d5592bf4c..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.outputs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref",
-    "OutputValue": "amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH"
-  },
-  {
-    "OutputKey": "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5-activity1E902D9C-UFM7OQZO5TSH/stream/2026-03-17T21:49:33.701"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
deleted file mode 100644
index bfaacd5bf4e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.template.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
-  "Resources": {
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    },
-    "activity1E902D9C": {
-      "Type": "AWS::DynamoDB::Table",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "id",
-            "AttributeType": "S"
-          },
-          {
-            "AttributeName": "userId",
-            "AttributeType": "S"
-          },
-          {
-            "AttributeName": "timestamp",
-            "AttributeType": "S"
-          }
-        ],
-        "GlobalSecondaryIndexes": [
-          {
-            "IndexName": "byUserId",
-            "KeySchema": [
-              {
-                "AttributeName": "userId",
-                "KeyType": "HASH"
-              },
-              {
-                "AttributeName": "timestamp",
-                "KeyType": "RANGE"
-              }
-            ],
-            "Projection": {
-              "ProjectionType": "ALL"
-            },
-            "ProvisionedThroughput": {
-              "ReadCapacityUnits": 5,
-              "WriteCapacityUnits": 5
-            }
-          }
-        ],
-        "KeySchema": [
-          {
-            "AttributeName": "id",
-            "KeyType": "HASH"
-          },
-          {
-            "AttributeName": "userId",
-            "KeyType": "RANGE"
-          }
-        ],
-        "ProvisionedThroughput": {
-          "ReadCapacityUnits": 5,
-          "WriteCapacityUnits": 5
-        },
-        "StreamSpecification": {
-          "StreamViewType": "NEW_IMAGE"
-        },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "activity",
-              "-",
-              "blade"
-            ]
-          ]
-        }
-      }
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "activity1E902D9C",
-          "Arn"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "activity1E902D9C",
-          "StreamArn"
-        ]
-      }
-    },
-    "amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
-      "Value": {
-        "Ref": "activity1E902D9C"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.outputs.json
deleted file mode 100644
index 130e278539c..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.outputs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventCD1BABC0Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen-TableManagerCustomProvid-dYxhpxyNz9my"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.parameters.json
deleted file mode 100644
index b9a143f3dd3..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.parameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "ParameterValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.template.json
deleted file mode 100644
index 4071ff6be65..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.template.json
+++ /dev/null
@@ -1,811 +0,0 @@
-{
-  "Resources": {
-    "AmplifyManagedTableIsCompleteRoleF825222C": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:CreateTable",
-                    "dynamodb:UpdateTable",
-                    "dynamodb:DeleteTable",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:DescribeContinuousBackups",
-                    "dynamodb:DescribeTimeToLive",
-                    "dynamodb:UpdateContinuousBackups",
-                    "dynamodb:UpdateTimeToLive",
-                    "dynamodb:TagResource",
-                    "dynamodb:UntagResource",
-                    "dynamodb:ListTagsOfResource"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
-                        {
-                          "apiId": {
-                            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-                          },
-                          "envName": "NONE"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
-                        {
-                          "tableName": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
-                        {
-                          "tableName": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
-                        {
-                          "tableName": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "Action": "lambda:ListTags",
-                  "Effect": "Allow",
-                  "Resource": {
-                    "Fn::Sub": [
-                      "arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:*TableManager*",
-                      {}
-                    ]
-                  }
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "CreateUpdateDeleteTablesPolicy"
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
-      }
-    },
-    "AmplifyManagedTableOnEventRoleB4E71DEA": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:CreateTable",
-                    "dynamodb:UpdateTable",
-                    "dynamodb:DeleteTable",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:DescribeContinuousBackups",
-                    "dynamodb:DescribeTimeToLive",
-                    "dynamodb:UpdateContinuousBackups",
-                    "dynamodb:UpdateTimeToLive",
-                    "dynamodb:TagResource",
-                    "dynamodb:UntagResource",
-                    "dynamodb:ListTagsOfResource"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
-                        {
-                          "apiId": {
-                            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-                          },
-                          "envName": "NONE"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
-                        {
-                          "tableName": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
-                        {
-                          "tableName": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
-                        {
-                          "tableName": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "Action": "lambda:ListTags",
-                  "Effect": "Allow",
-                  "Resource": {
-                    "Fn::Sub": [
-                      "arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:*TableManager*",
-                      {}
-                    ]
-                  }
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "CreateUpdateDeleteTablesPolicy"
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
-      }
-    },
-    "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "states:StartExecution",
-              "Effect": "Allow",
-              "Resource": {
-                "Ref": "AmplifyTableWaiterStateMachine060600BC"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6",
-        "Roles": [
-          {
-            "Ref": "AmplifyManagedTableOnEventRoleB4E71DEA"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
-      }
-    },
-    "TableManagerCustomProviderframeworkonEvent1DFC2ECC": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
-        },
-        "Description": "AmplifyManagedTable - onEvent (amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
-        "Environment": {
-          "Variables": {
-            "WAITER_STATE_MACHINE_ARN": {
-              "Ref": "AmplifyTableWaiterStateMachine060600BC"
-            }
-          }
-        },
-        "Handler": "amplify-table-manager-handler.onEvent",
-        "Role": {
-          "Fn::GetAtt": [
-            "AmplifyManagedTableOnEventRoleB4E71DEA",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs24.x",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 840
-      },
-      "DependsOn": [
-        "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6",
-        "AmplifyManagedTableOnEventRoleB4E71DEA"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
-        "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
-        "aws:asset:is-bundled": false,
-        "aws:asset:property": "Code"
-      }
-    },
-    "TableManagerCustomProviderframeworkisComplete2E51021B": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
-        },
-        "Description": "AmplifyManagedTable - isComplete (amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
-        "Handler": "amplify-table-manager-handler.isComplete",
-        "Role": {
-          "Fn::GetAtt": [
-            "AmplifyManagedTableIsCompleteRoleF825222C",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs24.x",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 840
-      },
-      "DependsOn": [
-        "AmplifyManagedTableIsCompleteRoleF825222C"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
-        "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
-        "aws:asset:is-bundled": false,
-        "aws:asset:property": "Code"
-      }
-    },
-    "AmplifyTableWaiterStateMachineRole470BE899": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "states.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
-      }
-    },
-    "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "lambda:InvokeFunction",
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "TableManagerCustomProviderframeworkisComplete2E51021B",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "TableManagerCustomProviderframeworkisComplete2E51021B",
-                          "Arn"
-                        ]
-                      },
-                      ":*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A",
-        "Roles": [
-          {
-            "Ref": "AmplifyTableWaiterStateMachineRole470BE899"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
-      }
-    },
-    "AmplifyTableWaiterStateMachine060600BC": {
-      "Type": "AWS::StepFunctions::StateMachine",
-      "Properties": {
-        "DefinitionString": {
-          "Fn::Join": [
-            "",
-            [
-              "{\"StartAt\":\"framework-isComplete-task\",\"States\":{\"framework-isComplete-task\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"States.ALL\"],\"IntervalSeconds\":10,\"MaxAttempts\":360,\"BackoffRate\":1}],\"Type\":\"Task\",\"Resource\":\"",
-              {
-                "Fn::GetAtt": [
-                  "TableManagerCustomProviderframeworkisComplete2E51021B",
-                  "Arn"
-                ]
-              },
-              "\"}}}"
-            ]
-          ]
-        },
-        "RoleArn": {
-          "Fn::GetAtt": [
-            "AmplifyTableWaiterStateMachineRole470BE899",
-            "Arn"
-          ]
-        }
-      },
-      "DependsOn": [
-        "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A",
-        "AmplifyTableWaiterStateMachineRole470BE899"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNyw6CMBBFv4V9GXm4cCsmLo2BDyBDGclAaROmSEzDvxtAV+fcnMXNIDunkES4SKzbITbcQHiQeGorj3pQuEgdGEcIpTOkbi+78+kM6882D1uVwbFpEcJ9ttqzs1v7+6okr1GEvMB1g5IcilkP5AsUWlVJ4uZJk9pr5bFj2+1nv7Aq61qCXk7vLIP0AknUC3M8zdbzSFAe/ALgt1g4zwAAAA=="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Parameters": {
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
-      "Type": "String"
-    }
-  },
-  "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventCD1BABC0Arn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "TableManagerCustomProviderframeworkonEvent1DFC2ECC",
-          "Arn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.outputs.json
deleted file mode 100644
index 73ce7ca9c60..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttCommentTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.739",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "ybf4m7gbureqbeiizzl6s4rztq:GetAtt:CommentTable:StreamArn"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.739"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name",
-    "OutputValue": "CommentTable"
-  },
-  {
-    "OutputKey": "GetAttCommentTableName",
-    "OutputValue": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "ybf4m7gbureqbeiizzl6s4rztq:GetAtt:CommentTable:Name"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.parameters.json
deleted file mode 100644
index cb30f39905b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen-TableManagerCustomProvid-dYxhpxyNz9my"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "ParameterValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "ParameterValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.template.json
deleted file mode 100644
index 3b46ba82e8c..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.template.json
+++ /dev/null
@@ -1,2023 +0,0 @@
-{
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            "NONE",
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "ShouldUsePayPerRequestBilling": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBBillingMode"
-        },
-        "PAY_PER_REQUEST"
-      ]
-    },
-    "ShouldUsePointInTimeRecovery": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnablePointInTimeRecovery"
-        },
-        "true"
-      ]
-    },
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Resources": {
-    "CommentTable": {
-      "Type": "Custom::ImportedAmplifyDynamoDBTable",
-      "Properties": {
-        "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3"
-        },
-        "tableName": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main",
-        "attributeDefinitions": [
-          {
-            "attributeName": "id",
-            "attributeType": "S"
-          },
-          {
-            "attributeName": "postCommentsId",
-            "attributeType": "S"
-          }
-        ],
-        "keySchema": [
-          {
-            "attributeName": "id",
-            "keyType": "HASH"
-          }
-        ],
-        "globalSecondaryIndexes": [
-          {
-            "indexName": "gsi-Post.comments",
-            "keySchema": [
-              {
-                "attributeName": "postCommentsId",
-                "keyType": "HASH"
-              }
-            ],
-            "projection": {
-              "projectionType": "ALL"
-            },
-            "provisionedThroughput": {
-              "readCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "writeCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          }
-        ],
-        "provisionedThroughput": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            {
-              "Ref": "AWS::NoValue"
-            },
-            {
-              "ReadCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "WriteCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          ]
-        },
-        "sseSpecification": {
-          "sseEnabled": false
-        },
-        "streamSpecification": {
-          "streamViewType": "NEW_AND_OLD_IMAGES"
-        },
-        "deletionProtectionEnabled": true,
-        "allowDestructiveGraphqlSchemaUpdates": true,
-        "replaceTableUponGsiUpdate": false,
-        "isImported": true,
-        "pointInTimeRecoverySpecification": {
-          "Fn::If": [
-            "ShouldUsePointInTimeRecovery",
-            {
-              "PointInTimeRecoveryEnabled": true
-            },
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "billingMode": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            "PAY_PER_REQUEST",
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/CommentTable/Default/Default"
-      }
-    },
-    "CommentIAMRoleD5EC5F51": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:BatchGetItem",
-                    "dynamodb:BatchWriteItem",
-                    "dynamodb:PutItem",
-                    "dynamodb:DeleteItem",
-                    "dynamodb:GetItem",
-                    "dynamodb:Scan",
-                    "dynamodb:Query",
-                    "dynamodb:UpdateItem",
-                    "dynamodb:ConditionCheckItem",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:GetRecords",
-                    "dynamodb:GetShardIterator"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
-                        {
-                          "tablename": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
-                        {
-                          "tablename": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "DynamoDBAccess"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "CommentIAMRole20388d-",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "-NONE"
-            ]
-          ]
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/CommentIAMRole/Resource"
-      }
-    },
-    "CommentDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DynamoDBConfig": {
-          "AwsRegion": {
-            "Ref": "AWS::Region"
-          },
-          "TableName": {
-            "Fn::Select": [
-              1,
-              {
-                "Fn::Split": [
-                  "/",
-                  {
-                    "Fn::Select": [
-                      5,
-                      {
-                        "Fn::Split": [
-                          ":",
-                          {
-                            "Fn::GetAtt": [
-                              "CommentTable",
-                              "TableArn"
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            ]
-          }
-        },
-        "Name": "CommentTable",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "CommentIAMRoleD5EC5F51",
-            "Arn"
-          ]
-        },
-        "Type": "AMAZON_DYNAMODB"
-      },
-      "DependsOn": [
-        "CommentIAMRoleD5EC5F51"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/CommentDataSource/Resource"
-      }
-    },
-    "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryGetCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/08f4d557693d96c1a4efba0f9dc91330e4b19772fd5477c156468843e3d9cb5e.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c6a2d29f01c6091bd1d9afe16e5849d456c96f17c3b215938c8067399532719.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "GetCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "getComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "CommentTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/queryGetCommentResolver"
-      }
-    },
-    "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerylistCommentsauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
-      }
-    },
-    "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerylistCommentspostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
-      }
-    },
-    "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryListCommentsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ListCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "listComments",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "CommentTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/queryListCommentsResolver"
-      }
-    },
-    "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateCommentinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a183ddccbd956316c38ef97177b8f088ef0826f62023323f5ae6053d348ccffc.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
-      }
-    },
-    "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d637c1fb7301003b8a5ada269338cf2e8df6cc0dc412ef13acc6158d680b6d3e.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationCreateCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c01fe250817e3727b22216dee7e6c75fbb7c9166595000655c6879d0b33b582d.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "CreateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "createComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "CommentTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/mutationCreateCommentResolver"
-      }
-    },
-    "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateCommentinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06db846fd14e6fc371f22b12b5545ba8e2dbfeda85d8c8d586c71c282166657b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
-      }
-    },
-    "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f92efd98b1034df0e2497fe31a97de6975de554b8a22e0677d05d6efcafa59.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationUpdateCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/474bf0776ec2164a13191d1a0a9e057154931e4918fea5086f49850d02a5371b.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "UpdateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "updateComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "CommentTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/mutationUpdateCommentResolver"
-      }
-    },
-    "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeleteCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e3416b4d47414f29c21e59a70e83bddb959ef0625854ed7fb0ca376573e99069.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeleteCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationDeleteCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f7907d1209a2c9953a0c053df402c634e359546d70c7cc5c2e8e21ea734880f.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "DeleteCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "deleteComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "CommentTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/mutationDeleteCommentResolver"
-      }
-    },
-    "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreateCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreateCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnCreateCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononCreateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onCreateComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
-      }
-    },
-    "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononUpdateCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononUpdateCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnUpdateCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononUpdateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onUpdateComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
-      }
-    },
-    "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononDeleteCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononDeleteCommentpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnDeleteCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononDeleteCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onDeleteComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34LV0h11Xqh63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyF/3cF2gzfJrOuy3tcwfZAouUrRdqZo+AsjDqQUFygCO68+sClJQoqWTJFEw/CHDT9nvMl5cnfGIbgavrHu6YBCxuMAUxn6hx16mg2Oo9zZwnRc9WN9RMXqefI/nRLbpUQRuPFtirg2+v3cXynORvZnFCEVeF/CyB4OyXakS4F5cT+TjknNuq4UW8/tbDg4gou8XPMcdm+w3VzE+ywmVj8QlI/8AXh83Gc2AQAA"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Outputs": {
-    "GetAttCommentTableStreamArn": {
-      "Description": "Your DynamoDB table StreamArn.",
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentTable",
-          "TableStreamArn"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "GetAtt:CommentTable:StreamArn"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttCommentTableName": {
-      "Description": "Your DynamoDB table name.",
-      "Value": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main",
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "GetAtt:CommentTable:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name": {
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentDataSource",
-          "Name"
-        ]
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentTable",
-          "TableArn"
-        ]
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableStreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentTable",
-          "TableStreamArn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.parameters.json
deleted file mode 100644
index 6a44c7673ff..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name",
-    "ParameterValue": "PostTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name",
-    "ParameterValue": "TopicTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "ParameterValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name",
-    "ParameterValue": "CommentTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "ParameterValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.parameters.json
deleted file mode 100644
index 2ee415a0e01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "ParameterValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "ParameterValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.outputs.json
deleted file mode 100644
index 9ff5cf6c987..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.057"
-  },
-  {
-    "OutputKey": "GetAttPostTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.057",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "ybf4m7gbureqbeiizzl6s4rztq:GetAtt:PostTable:StreamArn"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name",
-    "OutputValue": "PostTable"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "OutputKey": "GetAttPostTableName",
-    "OutputValue": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "ybf4m7gbureqbeiizzl6s4rztq:GetAtt:PostTable:Name"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.parameters.json
deleted file mode 100644
index cb30f39905b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen-TableManagerCustomProvid-dYxhpxyNz9my"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "ParameterValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "ParameterValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.template.json
deleted file mode 100644
index 6b2a1f43715..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.template.json
+++ /dev/null
@@ -1,2023 +0,0 @@
-{
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            "NONE",
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "ShouldUsePayPerRequestBilling": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBBillingMode"
-        },
-        "PAY_PER_REQUEST"
-      ]
-    },
-    "ShouldUsePointInTimeRecovery": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnablePointInTimeRecovery"
-        },
-        "true"
-      ]
-    },
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Resources": {
-    "PostTable": {
-      "Type": "Custom::ImportedAmplifyDynamoDBTable",
-      "Properties": {
-        "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3"
-        },
-        "tableName": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main",
-        "attributeDefinitions": [
-          {
-            "attributeName": "id",
-            "attributeType": "S"
-          },
-          {
-            "attributeName": "topicPostsId",
-            "attributeType": "S"
-          }
-        ],
-        "keySchema": [
-          {
-            "attributeName": "id",
-            "keyType": "HASH"
-          }
-        ],
-        "globalSecondaryIndexes": [
-          {
-            "indexName": "gsi-Topic.posts",
-            "keySchema": [
-              {
-                "attributeName": "topicPostsId",
-                "keyType": "HASH"
-              }
-            ],
-            "projection": {
-              "projectionType": "ALL"
-            },
-            "provisionedThroughput": {
-              "readCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "writeCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          }
-        ],
-        "provisionedThroughput": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            {
-              "Ref": "AWS::NoValue"
-            },
-            {
-              "ReadCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "WriteCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          ]
-        },
-        "sseSpecification": {
-          "sseEnabled": false
-        },
-        "streamSpecification": {
-          "streamViewType": "NEW_AND_OLD_IMAGES"
-        },
-        "deletionProtectionEnabled": true,
-        "allowDestructiveGraphqlSchemaUpdates": true,
-        "replaceTableUponGsiUpdate": false,
-        "isImported": true,
-        "pointInTimeRecoverySpecification": {
-          "Fn::If": [
-            "ShouldUsePointInTimeRecovery",
-            {
-              "PointInTimeRecoveryEnabled": true
-            },
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "billingMode": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            "PAY_PER_REQUEST",
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/PostTable/Default/Default"
-      }
-    },
-    "PostIAMRole83BF708F": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:BatchGetItem",
-                    "dynamodb:BatchWriteItem",
-                    "dynamodb:PutItem",
-                    "dynamodb:DeleteItem",
-                    "dynamodb:GetItem",
-                    "dynamodb:Scan",
-                    "dynamodb:Query",
-                    "dynamodb:UpdateItem",
-                    "dynamodb:ConditionCheckItem",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:GetRecords",
-                    "dynamodb:GetShardIterator"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
-                        {
-                          "tablename": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
-                        {
-                          "tablename": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "DynamoDBAccess"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "PostIAMRolebbce9b-",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "-NONE"
-            ]
-          ]
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/PostIAMRole/Resource"
-      }
-    },
-    "PostDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DynamoDBConfig": {
-          "AwsRegion": {
-            "Ref": "AWS::Region"
-          },
-          "TableName": {
-            "Fn::Select": [
-              1,
-              {
-                "Fn::Split": [
-                  "/",
-                  {
-                    "Fn::Select": [
-                      5,
-                      {
-                        "Fn::Split": [
-                          ":",
-                          {
-                            "Fn::GetAtt": [
-                              "PostTable",
-                              "TableArn"
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            ]
-          }
-        },
-        "Name": "PostTable",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "PostIAMRole83BF708F",
-            "Arn"
-          ]
-        },
-        "Type": "AMAZON_DYNAMODB"
-      },
-      "DependsOn": [
-        "PostIAMRole83BF708F"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/PostDataSource/Resource"
-      }
-    },
-    "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetPostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
-      }
-    },
-    "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetPostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryGetPostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/08f4d557693d96c1a4efba0f9dc91330e4b19772fd5477c156468843e3d9cb5e.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c6a2d29f01c6091bd1d9afe16e5849d456c96f17c3b215938c8067399532719.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "GetPostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "getPost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "PostTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/queryGetPostResolver"
-      }
-    },
-    "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerylistPostsauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
-      }
-    },
-    "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerylistPostspostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
-      }
-    },
-    "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryListPostsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ListPostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "listPosts",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "PostTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/queryListPostsResolver"
-      }
-    },
-    "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreatePostinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a183ddccbd956316c38ef97177b8f088ef0826f62023323f5ae6053d348ccffc.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
-      }
-    },
-    "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreatePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d637c1fb7301003b8a5ada269338cf2e8df6cc0dc412ef13acc6158d680b6d3e.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreatePostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationCreatePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d9c0ce2470c3063dc011dd1d638ec0a40507568b27b44b56eaf9b85a94b5f506.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "CreatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "createPost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "PostTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/mutationCreatePostResolver"
-      }
-    },
-    "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdatePostinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06db846fd14e6fc371f22b12b5545ba8e2dbfeda85d8c8d586c71c282166657b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
-      }
-    },
-    "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdatePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f92efd98b1034df0e2497fe31a97de6975de554b8a22e0677d05d6efcafa59.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdatePostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationUpdatePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/474bf0776ec2164a13191d1a0a9e057154931e4918fea5086f49850d02a5371b.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "UpdatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "updatePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "PostTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/mutationUpdatePostResolver"
-      }
-    },
-    "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeletePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e3416b4d47414f29c21e59a70e83bddb959ef0625854ed7fb0ca376573e99069.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeletePostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationDeletePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f7907d1209a2c9953a0c053df402c634e359546d70c7cc5c2e8e21ea734880f.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "DeletePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "deletePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "PostTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/mutationDeletePostResolver"
-      }
-    },
-    "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreatePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreatePostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnCreatePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononCreatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onCreatePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/subscriptionOnCreatePostResolver"
-      }
-    },
-    "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononUpdatePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononUpdatePostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnUpdatePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononUpdatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onUpdatePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
-      }
-    },
-    "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononDeletePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononDeletePostpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnDeletePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononDeletePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onDeletePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/subscriptionOnDeletePostResolver"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34LV0h11Xqh63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyF/3cF2gzfJrOuy3tcwfZAouUrRdqZo+AsjDqQUFygCO68+sClJQoqWTJFEw/CHDT9nvMl5cnfGIbgavrHu6YBCxuMAUxn6hx16mg2Oo9zZwnRc9WN9RMXqefI/nRLbpUQRuPFtirg2+v3cXynORvZnFCEVeF/CyB4OyXakS4F5cT+TjknNuq4UW8/tbDg4gou8XPMcdm+w3VzE+ywmVj8QlI/8AXh83Gc2AQAA"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Outputs": {
-    "GetAttPostTableStreamArn": {
-      "Description": "Your DynamoDB table StreamArn.",
-      "Value": {
-        "Fn::GetAtt": [
-          "PostTable",
-          "TableStreamArn"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "GetAtt:PostTable:StreamArn"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttPostTableName": {
-      "Description": "Your DynamoDB table name.",
-      "Value": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main",
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "GetAtt:PostTable:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name": {
-      "Value": {
-        "Fn::GetAtt": [
-          "PostDataSource",
-          "Name"
-        ]
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "PostTable",
-          "TableArn"
-        ]
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableStreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "PostTable",
-          "TableStreamArn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.outputs.json
deleted file mode 100644
index 43b2829c2d5..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "OutputKey": "GetAttTopicTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:11:31.408",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "ybf4m7gbureqbeiizzl6s4rztq:GetAtt:TopicTable:StreamArn"
-  },
-  {
-    "OutputKey": "GetAttTopicTableName",
-    "OutputValue": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "ybf4m7gbureqbeiizzl6s4rztq:GetAtt:TopicTable:Name"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:11:31.408"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name",
-    "OutputValue": "TopicTable"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.parameters.json
deleted file mode 100644
index cb30f39905b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen-TableManagerCustomProvid-dYxhpxyNz9my"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "ParameterValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "ParameterValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.template.json
deleted file mode 100644
index 28d6fb7bfe2..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataTopicNestedStackTopicNestedStac-14BB4YDUL6TVP.template.json
+++ /dev/null
@@ -1,1997 +0,0 @@
-{
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-      "Type": "String"
-    },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            "NONE",
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "ShouldUsePayPerRequestBilling": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBBillingMode"
-        },
-        "PAY_PER_REQUEST"
-      ]
-    },
-    "ShouldUsePointInTimeRecovery": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnablePointInTimeRecovery"
-        },
-        "true"
-      ]
-    },
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Resources": {
-    "TopicTable": {
-      "Type": "Custom::ImportedAmplifyDynamoDBTable",
-      "Properties": {
-        "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3"
-        },
-        "tableName": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main",
-        "attributeDefinitions": [
-          {
-            "attributeName": "id",
-            "attributeType": "S"
-          }
-        ],
-        "keySchema": [
-          {
-            "attributeName": "id",
-            "keyType": "HASH"
-          }
-        ],
-        "provisionedThroughput": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            {
-              "Ref": "AWS::NoValue"
-            },
-            {
-              "ReadCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "WriteCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          ]
-        },
-        "sseSpecification": {
-          "sseEnabled": false
-        },
-        "streamSpecification": {
-          "streamViewType": "NEW_AND_OLD_IMAGES"
-        },
-        "deletionProtectionEnabled": true,
-        "allowDestructiveGraphqlSchemaUpdates": true,
-        "replaceTableUponGsiUpdate": false,
-        "isImported": true,
-        "pointInTimeRecoverySpecification": {
-          "Fn::If": [
-            "ShouldUsePointInTimeRecovery",
-            {
-              "PointInTimeRecoveryEnabled": true
-            },
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "billingMode": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            "PAY_PER_REQUEST",
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/TopicTable/Default/Default"
-      }
-    },
-    "TopicIAMRoleD9B4C845": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:BatchGetItem",
-                    "dynamodb:BatchWriteItem",
-                    "dynamodb:PutItem",
-                    "dynamodb:DeleteItem",
-                    "dynamodb:GetItem",
-                    "dynamodb:Scan",
-                    "dynamodb:Query",
-                    "dynamodb:UpdateItem",
-                    "dynamodb:ConditionCheckItem",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:GetRecords",
-                    "dynamodb:GetShardIterator"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
-                        {
-                          "tablename": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
-                        {
-                          "tablename": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "DynamoDBAccess"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "TopicIAMRole014e70-",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "-NONE"
-            ]
-          ]
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "amplify:friendly-name",
-            "Value": "amplifyData"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/TopicIAMRole/Resource"
-      }
-    },
-    "TopicDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DynamoDBConfig": {
-          "AwsRegion": {
-            "Ref": "AWS::Region"
-          },
-          "TableName": {
-            "Fn::Select": [
-              1,
-              {
-                "Fn::Split": [
-                  "/",
-                  {
-                    "Fn::Select": [
-                      5,
-                      {
-                        "Fn::Split": [
-                          ":",
-                          {
-                            "Fn::GetAtt": [
-                              "TopicTable",
-                              "TableArn"
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              }
-            ]
-          }
-        },
-        "Name": "TopicTable",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "TopicIAMRoleD9B4C845",
-            "Arn"
-          ]
-        },
-        "Type": "AMAZON_DYNAMODB"
-      },
-      "DependsOn": [
-        "TopicIAMRoleD9B4C845"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/TopicDataSource/Resource"
-      }
-    },
-    "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryGetTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/08f4d557693d96c1a4efba0f9dc91330e4b19772fd5477c156468843e3d9cb5e.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c6a2d29f01c6091bd1d9afe16e5849d456c96f17c3b215938c8067399532719.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "GetTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "getTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "TopicTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/queryGetTopicResolver"
-      }
-    },
-    "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerylistTopicsauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0224a3e5097427da3f4460b5d6d2b86ad4195c9cb8da7bc13e7187eead1c3ae3.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
-      }
-    },
-    "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerylistTopicspostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
-      }
-    },
-    "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryListTopicsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9fcbe070ecd3023c5bf5b966fa9584757db9762eef123bad0820bd87591b2174.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cc01911d0269d4080ea57505dc445dfc315ef7ad85d3d9d4ea1357858bff451d.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
-      }
-    },
-    "ListTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "listTopics",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "TopicTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/queryListTopicsResolver"
-      }
-    },
-    "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateTopicinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a183ddccbd956316c38ef97177b8f088ef0826f62023323f5ae6053d348ccffc.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
-      }
-    },
-    "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d637c1fb7301003b8a5ada269338cf2e8df6cc0dc412ef13acc6158d680b6d3e.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationCreateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ca0a2092670d57f0d8f4bf761892a704a1e6511c2f50757265b4b4ff9b33cdf2.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "CreateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "createTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "TopicTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/mutationCreateTopicResolver"
-      }
-    },
-    "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateTopicinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/06db846fd14e6fc371f22b12b5545ba8e2dbfeda85d8c8d586c71c282166657b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
-      }
-    },
-    "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f92efd98b1034df0e2497fe31a97de6975de554b8a22e0677d05d6efcafa59.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationUpdateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/474bf0776ec2164a13191d1a0a9e057154931e4918fea5086f49850d02a5371b.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "UpdateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "updateTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "TopicTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/mutationUpdateTopicResolver"
-      }
-    },
-    "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeleteTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1f5fed297da9c32ae3af922bf3a38ccf23b956078887d16891ec06c20c64722c.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e3416b4d47414f29c21e59a70e83bddb959ef0625854ed7fb0ca376573e99069.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeleteTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationDeleteTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f7907d1209a2c9953a0c053df402c634e359546d70c7cc5c2e8e21ea734880f.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f4a52b72209a9dfa197b5e7367a5c378c5bb86de6e29ddd9e48b49a3fe54b249.vtl"
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "DeleteTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "deleteTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Fn::Select": [
-                  1,
-                  {
-                    "Fn::Split": [
-                      "/",
-                      {
-                        "Fn::Select": [
-                          5,
-                          {
-                            "Fn::Split": [
-                              ":",
-                              {
-                                "Fn::GetAtt": [
-                                  "TopicTable",
-                                  "TableArn"
-                                ]
-                              }
-                            ]
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/mutationDeleteTopicResolver"
-      }
-    },
-    "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreateTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnCreateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononCreateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onCreateTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
-      }
-    },
-    "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononUpdateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononUpdateTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnUpdateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononUpdateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onUpdateTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
-      }
-    },
-    "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononDeleteTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e6da5a6e993df8b5fdc91086b71eb53e72a3a97c98836ef9c9257776f36c452b.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononDeleteTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c1721bcd774e27c514d3454b5be4f9bdd094c0161b57ddf053d618e3b0086a77.vtl"
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
-      }
-    },
-    "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnDeleteTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe3c43ada4b9d681a5e2312663ef7a73386424d73b73e51f8e2e9d4b50f7c502.vtl"
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e0cff47fb007f0bbf2a4e43ca256d6aa7ec109821769fd79fa7c5e83f0e7f9fc.vtl"
-        }
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
-      }
-    },
-    "SubscriptiononDeleteTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        },
-        "FieldName": "onDeleteTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
-              {
-                "Ref": "AWS::Partition"
-              },
-              ":sts::",
-              {
-                "Ref": "AWS::AccountId"
-              },
-              ":assumed-role/",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-              },
-              "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34LV0h11Xqh63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyF/3cF2gzfJrOuy3tcwfZAouUrRdqZo+AsjDqQUFygCO68+sClJQoqWTJFEw/CHDT9nvMl5cnfGIbgavrHu6YBCxuMAUxn6hx16mg2Oo9zZwnRc9WN9RMXqefI/nRLbpUQRuPFtirg2+v3cXynORvZnFCEVeF/CyB4OyXakS4F5cT+TjknNuq4UW8/tbDg4gou8XPMcdm+w3VzE+ywmVj8QlI/8AXh83Gc2AQAA"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Outputs": {
-    "GetAttTopicTableStreamArn": {
-      "Description": "Your DynamoDB table StreamArn.",
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicTable",
-          "TableStreamArn"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "GetAtt:TopicTable:StreamArn"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttTopicTableName": {
-      "Description": "Your DynamoDB table name.",
-      "Value": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main",
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-              },
-              "GetAtt:TopicTable:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name": {
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicDataSource",
-          "Name"
-        ]
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicTable",
-          "TableArn"
-        ]
-      }
-    },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableStreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicTable",
-          "TableStreamArn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.description.txt
deleted file mode 100644
index 813452072ac..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.11.1","stackType":"auth-Cognito","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.outputs.json
deleted file mode 100644
index 9ba62b7fbc0..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.outputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref",
-    "OutputValue": "6bdqt8vavvh3efopgb031lc3jg"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "OutputValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "OutputValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef",
-    "OutputValue": "us-east-1_olNpwuJIL"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "OutputValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.parameters.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.description.txt
deleted file mode 100644
index e0c9e600428..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.0","stackType":"api-AppSync","metadata":{"dataSources":"dynamodb","authorizationModes":"amazon_cognito_identity_pools,amazon_cognito_user_pools,api_key,aws_iam","customOperations":"queries"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.outputs.json
deleted file mode 100644
index b2658c9c297..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.outputs.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.739"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId",
-    "OutputValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:11:31.408"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB9A562357DestinationBucketArn",
-    "OutputValue": "arn:aws:s3:::amplify-discussions-gen-amplifydataamplifycodege-70w7fxnnrgih"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPIDefaultApiKey45C980F7ApiKey",
-    "OutputValue": "da2-yslmzsohhjaglniwd4jvge3zgy"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.057"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AGraphQLUrl",
-    "OutputValue": "https://dk2la6sztbftdftqag7huqrhya.appsync-api.us-east-1.amazonaws.com/graphql"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.parameters.json
deleted file mode 100644
index 1476967681e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthauthenticatedU-cOJdlmnFCZS8"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef",
-    "ParameterValue": "amplify-discussions-gen-amplifyAuthunauthenticate-LUKlk2oThU8X"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref",
-    "ParameterValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef",
-    "ParameterValue": "us-east-1_olNpwuJIL"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.description.txt
deleted file mode 100644
index 6cad6da1b61..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.17.0","stackType":"function-Lambda","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.outputs.json
deleted file mode 100644
index f3a3f84c46e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.outputs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44functionrecorduseractivitygen2mainlambda298FCA5FRef",
-    "OutputValue": "recorduseractivity-gen2-main"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44functionfetchuseractivitygen2mainlambdaB595A82ARef",
-    "OutputValue": "fetchuseractivity-gen2-main"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.parameters.json
deleted file mode 100644
index 33da8a996eb..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydh04enr95FF1192",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.739"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS/stream/2026-03-07T18:02:23.205"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydh04enrtcsd0C187242",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:11:31.408"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussions42CE1AA5",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.057"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef",
-    "ParameterValue": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json
deleted file mode 100644
index 155d3743da5..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.outputs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef",
-    "OutputValue": "amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH-activity1E902D9C-TT6R2GXJ05FS/stream/2026-03-07T18:02:23.205"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.parameters.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.description.txt
deleted file mode 100644
index b40731368ef..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.0","stackType":"root","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.outputs.json
deleted file mode 100644
index 99e339369ae..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.outputs.json
+++ /dev/null
@@ -1,126 +0,0 @@
-[
-  {
-    "OutputKey": "webClientId",
-    "OutputValue": "6bdqt8vavvh3efopgb031lc3jg"
-  },
-  {
-    "OutputKey": "socialProviders",
-    "OutputValue": ""
-  },
-  {
-    "OutputKey": "usernameAttributes",
-    "OutputValue": "[\"phone_number\"]"
-  },
-  {
-    "OutputKey": "signupAttributes",
-    "OutputValue": "[\"email\",\"phone_number\"]"
-  },
-  {
-    "OutputKey": "oauthClientId",
-    "OutputValue": "6bdqt8vavvh3efopgb031lc3jg"
-  },
-  {
-    "OutputKey": "allowUnauthenticatedIdentities",
-    "OutputValue": "false"
-  },
-  {
-    "OutputKey": "oauthCognitoDomain",
-    "OutputValue": ""
-  },
-  {
-    "OutputKey": "oauthScope",
-    "OutputValue": "[\"profile\",\"phone\",\"email\",\"openid\",\"aws.cognito.signin.user.admin\"]"
-  },
-  {
-    "OutputKey": "oauthRedirectSignOut",
-    "OutputValue": ""
-  },
-  {
-    "OutputKey": "awsAppsyncAdditionalAuthenticationTypes",
-    "OutputValue": "AMAZON_COGNITO_USER_POOLS,AWS_IAM"
-  },
-  {
-    "OutputKey": "mfaTypes",
-    "OutputValue": "[]"
-  },
-  {
-    "OutputKey": "mfaConfiguration",
-    "OutputValue": "OFF"
-  },
-  {
-    "OutputKey": "oauthResponseType",
-    "OutputValue": "code"
-  },
-  {
-    "OutputKey": "awsAppsyncApiKey",
-    "OutputValue": "da2-yslmzsohhjaglniwd4jvge3zgy"
-  },
-  {
-    "OutputKey": "awsAppsyncAuthenticationType",
-    "OutputValue": "API_KEY"
-  },
-  {
-    "OutputKey": "oauthRedirectSignIn",
-    "OutputValue": "https://example.com"
-  },
-  {
-    "OutputKey": "passwordPolicyMinLength",
-    "OutputValue": "8"
-  },
-  {
-    "OutputKey": "awsAppsyncApiEndpoint",
-    "OutputValue": "https://dk2la6sztbftdftqag7huqrhya.appsync-api.us-east-1.amazonaws.com/graphql"
-  },
-  {
-    "OutputKey": "awsAppsyncApiId",
-    "OutputValue": "ybf4m7gbureqbeiizzl6s4rztq"
-  },
-  {
-    "OutputKey": "authRegion",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "amplifyApiModelSchemaS3Uri",
-    "OutputValue": "s3://amplify-discussions-gen-amplifydataamplifycodege-70w7fxnnrgih/model-schema.graphql"
-  },
-  {
-    "OutputKey": "groups",
-    "OutputValue": "[]"
-  },
-  {
-    "OutputKey": "definedFunctions",
-    "OutputValue": "[\"fetchuseractivity-gen2-main\",\"recorduseractivity-gen2-main\"]"
-  },
-  {
-    "OutputKey": "passwordlessOptions",
-    "OutputValue": ""
-  },
-  {
-    "OutputKey": "awsAppsyncRegion",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "deploymentType",
-    "OutputValue": "branch"
-  },
-  {
-    "OutputKey": "passwordPolicyRequirements",
-    "OutputValue": "[]"
-  },
-  {
-    "OutputKey": "region",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "userPoolId",
-    "OutputValue": "us-east-1_olNpwuJIL"
-  },
-  {
-    "OutputKey": "identityPoolId",
-    "OutputValue": "us-east-1:84e99afb-f5e8-4fa4-bc21-875242ea6689"
-  },
-  {
-    "OutputKey": "verificationMechanisms",
-    "OutputValue": "[\"email\"]"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.parameters.json
deleted file mode 100644
index 74596fb6f32..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.parameters.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "ParameterKey": "BootstrapVersion",
-    "ParameterValue": "/cdk-bootstrap/hnb659fds/version",
-    "ResolvedValue": "30"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
deleted file mode 100644
index aa07d690ed6..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44.template.json
+++ /dev/null
@@ -1,1138 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"root\",\"metadata\":{}}",
-  "Metadata": {
-    "AWS::Amplify::Platform": {
-      "version": "1",
-      "stackOutputs": [
-        "deploymentType",
-        "region"
-      ]
-    },
-    "AWS::Amplify::Auth": {
-      "version": "1",
-      "stackOutputs": [
-        "userPoolId",
-        "webClientId",
-        "identityPoolId",
-        "authRegion",
-        "allowUnauthenticatedIdentities",
-        "signupAttributes",
-        "usernameAttributes",
-        "verificationMechanisms",
-        "passwordPolicyMinLength",
-        "passwordPolicyRequirements",
-        "mfaConfiguration",
-        "mfaTypes",
-        "passwordlessOptions",
-        "socialProviders",
-        "oauthCognitoDomain",
-        "oauthScope",
-        "oauthRedirectSignIn",
-        "oauthRedirectSignOut",
-        "oauthResponseType",
-        "oauthClientId",
-        "groups"
-      ]
-    },
-    "AWS::Amplify::GraphQL": {
-      "version": "1",
-      "stackOutputs": [
-        "awsAppsyncApiId",
-        "awsAppsyncApiEndpoint",
-        "awsAppsyncAuthenticationType",
-        "awsAppsyncRegion",
-        "amplifyApiModelSchemaS3Uri",
-        "awsAppsyncApiKey",
-        "awsAppsyncAdditionalAuthenticationTypes"
-      ]
-    },
-    "AWS::Amplify::Function": {
-      "version": "1",
-      "stackOutputs": [
-        "definedFunctions"
-      ]
-    }
-  },
-  "Outputs": {
-    "deploymentType": {
-      "Value": "branch"
-    },
-    "region": {
-      "Value": {
-        "Ref": "AWS::Region"
-      }
-    },
-    "userPoolId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "auth179371D7",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef"
-        ]
-      }
-    },
-    "webClientId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "auth179371D7",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref"
-        ]
-      }
-    },
-    "identityPoolId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "auth179371D7",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-        ]
-      }
-    },
-    "authRegion": {
-      "Value": {
-        "Ref": "AWS::Region"
-      }
-    },
-    "allowUnauthenticatedIdentities": {
-      "Value": "false"
-    },
-    "signupAttributes": {
-      "Value": "[\"email\",\"phone_number\"]"
-    },
-    "usernameAttributes": {
-      "Value": "[\"phone_number\"]"
-    },
-    "verificationMechanisms": {
-      "Value": "[\"email\"]"
-    },
-    "passwordPolicyMinLength": {
-      "Value": "8"
-    },
-    "passwordPolicyRequirements": {
-      "Value": "[]"
-    },
-    "mfaConfiguration": {
-      "Value": "OFF"
-    },
-    "mfaTypes": {
-      "Value": "[]"
-    },
-    "passwordlessOptions": {
-      "Value": ""
-    },
-    "socialProviders": {
-      "Value": ""
-    },
-    "oauthCognitoDomain": {
-      "Value": ""
-    },
-    "oauthScope": {
-      "Value": "[\"profile\",\"phone\",\"email\",\"openid\",\"aws.cognito.signin.user.admin\"]"
-    },
-    "oauthRedirectSignIn": {
-      "Value": "https://example.com"
-    },
-    "oauthRedirectSignOut": {
-      "Value": ""
-    },
-    "oauthResponseType": {
-      "Value": "code"
-    },
-    "oauthClientId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "auth179371D7",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref"
-        ]
-      }
-    },
-    "groups": {
-      "Value": "[]"
-    },
-    "awsAppsyncApiId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "data7552DF31",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
-        ]
-      }
-    },
-    "awsAppsyncApiEndpoint": {
-      "Value": {
-        "Fn::GetAtt": [
-          "data7552DF31",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AGraphQLUrl"
-        ]
-      }
-    },
-    "awsAppsyncAuthenticationType": {
-      "Value": "API_KEY"
-    },
-    "awsAppsyncRegion": {
-      "Value": {
-        "Ref": "AWS::Region"
-      }
-    },
-    "amplifyApiModelSchemaS3Uri": {
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "s3://",
-            {
-              "Fn::Select": [
-                0,
-                {
-                  "Fn::Split": [
-                    "/",
-                    {
-                      "Fn::Select": [
-                        5,
-                        {
-                          "Fn::Split": [
-                            ":",
-                            {
-                              "Fn::GetAtt": [
-                                "data7552DF31",
-                                "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB9A562357DestinationBucketArn"
-                              ]
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            },
-            "/model-schema.graphql"
-          ]
-        ]
-      }
-    },
-    "awsAppsyncApiKey": {
-      "Value": {
-        "Fn::GetAtt": [
-          "data7552DF31",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPIDefaultApiKey45C980F7ApiKey"
-        ]
-      }
-    },
-    "awsAppsyncAdditionalAuthenticationTypes": {
-      "Value": "AMAZON_COGNITO_USER_POOLS,AWS_IAM"
-    },
-    "definedFunctions": {
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "[\"",
-            {
-              "Fn::GetAtt": [
-                "function1351588B",
-                "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44functionfetchuseractivitygen2mainlambdaB595A82ARef"
-              ]
-            },
-            "\",\"",
-            {
-              "Fn::GetAtt": [
-                "function1351588B",
-                "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44functionrecorduseractivitygen2mainlambda298FCA5FRef"
-              ]
-            },
-            "\"]"
-          ]
-        ]
-      }
-    }
-  },
-  "Resources": {
-    "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
-      }
-    },
-    "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "amplify:GetBranch",
-                "amplify:UpdateBranch"
-              ],
-              "Effect": "Allow",
-              "Resource": "arn:aws:amplify:*:*:apps/discussions/branches/gen2-main"
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1",
-        "Roles": [
-          {
-            "Ref": "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
-      }
-    },
-    "AmplifyBranchLinkerCustomResourceLambda582AC093": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "79932156d8d106bc281ade4d58c51834eea98cc31252cfadaec1082aae5909aa.zip"
-        },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 10
-      },
-      "DependsOn": [
-        "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1",
-        "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceLambda/Resource",
-        "aws:asset:path": "asset.79932156d8d106bc281ade4d58c51834eea98cc31252cfadaec1082aae5909aa",
-        "aws:asset:is-bundled": true,
-        "aws:asset:property": "Code"
-      }
-    },
-    "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
-                },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ],
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
-      }
-    },
-    "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "lambda:InvokeFunction",
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "AmplifyBranchLinkerCustomResourceLambda582AC093",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "AmplifyBranchLinkerCustomResourceLambda582AC093",
-                          "Arn"
-                        ]
-                      },
-                      ":*"
-                    ]
-                  ]
-                }
-              ]
-            },
-            {
-              "Action": "lambda:GetFunction",
-              "Effect": "Allow",
-              "Resource": {
-                "Fn::GetAtt": [
-                  "AmplifyBranchLinkerCustomResourceLambda582AC093",
-                  "Arn"
-                ]
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412",
-        "Roles": [
-          {
-            "Ref": "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
-          }
-        ]
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
-      }
-    },
-    "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-          },
-          "S3Key": "07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57.zip"
-        },
-        "Description": "AWS CDK resource provider framework - onEvent (amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceProvider)",
-        "Environment": {
-          "Variables": {
-            "USER_ON_EVENT_FUNCTION_ARN": {
-              "Fn::GetAtt": [
-                "AmplifyBranchLinkerCustomResourceLambda582AC093",
-                "Arn"
-              ]
-            }
-          }
-        },
-        "Handler": "framework.onEvent",
-        "LoggingConfig": {
-          "ApplicationLogLevel": "FATAL",
-          "LogFormat": "JSON"
-        },
-        "Role": {
-          "Fn::GetAtt": [
-            "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "Timeout": 900
-      },
-      "DependsOn": [
-        "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412",
-        "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
-      ],
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
-        "aws:asset:path": "asset.07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57",
-        "aws:asset:is-bundled": false,
-        "aws:asset:property": "Code"
-      }
-    },
-    "AmplifyBranchLinkerCustomResource96E36FC1": {
-      "Type": "Custom::AmplifyBranchLinkerResource",
-      "Properties": {
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900",
-            "Arn"
-          ]
-        },
-        "appId": "discussions",
-        "branchName": "gen2-main"
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/AmplifyBranchLinker/CustomResource/Default"
-      }
-    },
-    "auth179371D7": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/8bc0ef56f8bf36f9d00b22f3aeae8b0be9265d5e39e28e800ca5127971293972.json"
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth.NestedStack/auth.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44authD29A8D7D.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "data7552DF31": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef": {
-            "Fn::GetAtt": [
-              "auth179371D7",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-            "Fn::GetAtt": [
-              "auth179371D7",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-            "Fn::GetAtt": [
-              "auth179371D7",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-            "Fn::GetAtt": [
-              "auth179371D7",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
-            ]
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/4d777a330fd2308d47de4035167a82de3f9b3340a6db0c9342a125c685378f4f.json"
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data.NestedStack/data.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataE4B13460.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "function1351588B": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
-            "Fn::GetAtt": [
-              "storage0EC3F24A",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
-            "Fn::GetAtt": [
-              "storage0EC3F24A",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
-            "Fn::GetAtt": [
-              "storage0EC3F24A",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydh04enrtcsd0C187242": {
-            "Fn::GetAtt": [
-              "data7552DF31",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableStreamArn"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussions42CE1AA5": {
-            "Fn::GetAtt": [
-              "data7552DF31",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableStreamArn"
-            ]
-          },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydh04enr95FF1192": {
-            "Fn::GetAtt": [
-              "data7552DF31",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableStreamArn"
-            ]
-          }
-        },
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/118b1e45bfdd330a60d76b74112292ac0387f5172f90e71c6d78509fd4bba37d.json"
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function.NestedStack/function.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44function530255F7.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "storage0EC3F24A": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Tags": [
-          {
-            "Key": "amplify:app-id",
-            "Value": "discussions"
-          },
-          {
-            "Key": "amplify:branch-name",
-            "Value": "gen2-main"
-          },
-          {
-            "Key": "amplify:deployment-type",
-            "Value": "branch"
-          },
-          {
-            "Key": "created-by",
-            "Value": "amplify"
-          }
-        ],
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-              },
-              "/ee7ec2369678c897d14fcba7ccfffd1b1e19ec841f3277a078f65e8981c75abe.json"
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage.NestedStack/storage.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44storageEADE27C3.nested.template.json",
-        "aws:asset:property": "TemplateURL"
-      }
-    },
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02PzWrDQAyEnyV3WU2cHHptDD22wXkAo6yVIP/slpU2oRi/e/C6LT19I4YZNCWWhx1uN/TQwrV9McgFp7OR66G6+s9kX8mAHtpMA42XlhofWu4UPzLek3cmwYPQiFMdBl5SmacwiPtezlXNoPuGVNkU3xaA7vGYXM92JGVY63Gqrv6v9VfMM+TI2egm/gYuqYWxiawhRceKpxju0nKEKjv1j5Gf+afzrhmWCdjpy70scfeK202nIkVM3mRkrFc+AUTtSG0ZAQAA"
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    }
-  },
-  "Conditions": {
-    "CDKMetadataAvailable": {
-      "Fn::Or": [
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "af-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-northeast-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-south-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-3"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ap-southeast-4"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "ca-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "cn-northwest-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-central-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-north-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-south-2"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Or": [
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "eu-west-3"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "il-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-central-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "me-south-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "sa-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-1"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-east-2"
-              ]
-            },
-            {
-              "Fn::Equals": [
-                {
-                  "Ref": "AWS::Region"
-                },
-                "us-west-1"
-              ]
-            }
-          ]
-        },
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "AWS::Region"
-            },
-            "us-west-2"
-          ]
-        }
-      ]
-    }
-  },
-  "Parameters": {
-    "BootstrapVersion": {
-      "Type": "AWS::SSM::Parameter::Value<String>",
-      "Default": "/cdk-bootstrap/hnb659fds/version",
-      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
-    }
-  },
-  "Rules": {
-    "CheckBootstrapVersion": {
-      "Assertions": [
-        {
-          "Assert": {
-            "Fn::Not": [
-              {
-                "Fn::Contains": [
-                  [
-                    "1",
-                    "2",
-                    "3",
-                    "4",
-                    "5"
-                  ],
-                  {
-                    "Ref": "BootstrapVersion"
-                  }
-                ]
-              }
-            ]
-          },
-          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
-        }
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json
new file mode 100644
index 00000000000..f034308b8ef
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json
@@ -0,0 +1,6 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json
new file mode 100644
index 00000000000..9c722b649d4
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json
index 04665c3652a..f9c9aad3aef 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataAmplifyTableManagerNestedStackA-1KJBI9SVOWO6G.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json
@@ -53,7 +53,7 @@
                       "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
                       {
                         "apiId": {
-                          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                         },
                         "envName": "NONE"
                       }
@@ -83,7 +83,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -100,7 +100,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
       }
     },
     "AmplifyManagedTableOnEventRoleB4E71DEA": {
@@ -156,7 +156,7 @@
                       "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
                       {
                         "apiId": {
-                          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                         },
                         "envName": "NONE"
                       }
@@ -186,7 +186,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -203,7 +203,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
       }
     },
     "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6": {
@@ -229,7 +229,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
       }
     },
     "TableManagerCustomProviderframeworkonEvent1DFC2ECC": {
@@ -241,7 +241,7 @@
           },
           "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
         },
-        "Description": "AmplifyManagedTable - onEvent (amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Description": "AmplifyManagedTable - onEvent (amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
         "Environment": {
           "Variables": {
             "WAITER_STATE_MACHINE_ARN": {
@@ -264,7 +264,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -286,7 +286,7 @@
         "AmplifyManagedTableOnEventRoleB4E71DEA"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
         "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -301,7 +301,7 @@
           },
           "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
         },
-        "Description": "AmplifyManagedTable - isComplete (amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Description": "AmplifyManagedTable - isComplete (amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
         "Handler": "amplify-table-manager-handler.isComplete",
         "Role": {
           "Fn::GetAtt": [
@@ -317,7 +317,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -338,7 +338,7 @@
         "AmplifyManagedTableIsCompleteRoleF825222C"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
         "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -366,7 +366,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -383,7 +383,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
       }
     },
     "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A": {
@@ -428,7 +428,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
       }
     },
     "AmplifyTableWaiterStateMachine060600BC": {
@@ -461,16 +461,16 @@
         "AmplifyTableWaiterStateMachineRole470BE899"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNyw6CMBBFv4V9GRHYuBQTl8bAB5ChHUl5tAnTSkzTfzeArs65OYubQ14WkCW4cirVmE66g/AgdqQah3IUuHIbNM4QajuRuL3MzqedtPxs87AoJpw7hRDu3kinrdna36PgokVmcgzXDYILqLwcyVXIFEVNbP0iSey1cdhr0+9nvxCFsYpg4NM7z+B8gTIZWOt08cbpmaA++AUjkpGTzwAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNQQ6CMBBFz8K+jAgs3IqJS2PgAGRoR1IobcIUiWl6dwPo6r2ft/g55GUJWYIrp1KNqdEdhAexJ9V4lKPAldugcYJQO0Pi9rI7n85o+dnmYVEYnDqFEO6LlV47u7W/R8FFi8zkGa4bBBdQLXIkXyFTFDWxW2ZJYq+Nx17bfj/7hSisUwQDn955DucLZMnAWqfzYr2eCOqDX96JKODPAAAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -742,12 +742,12 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent0133C472Arn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn": {
       "Value": {
         "Fn::GetAtt": [
           "TableManagerCustomProviderframeworkonEvent1DFC2ECC",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json
new file mode 100644
index 00000000000..2715cda9474
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "GetAttCommentTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:CommentTable:StreamArn"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619"
+  },
+  {
+    "OutputKey": "GetAttCommentTableName",
+    "OutputValue": "Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:CommentTable:Name"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName",
+    "OutputValue": "CommentTable"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json
new file mode 100644
index 00000000000..6f1a0e80991
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json
index 7f9175dd57e..9e30da1fe26 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataCommentNestedStackCommentNested-18DBZ8BQTMK8E.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Type": "String"
     }
   },
@@ -353,7 +353,7 @@
       "Type": "Custom::AmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6"
         },
         "tableName": {
           "Fn::Join": [
@@ -361,7 +361,7 @@
             [
               "Comment-",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "-NONE"
             ]
@@ -462,7 +462,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CommentTable/Default/Default"
       }
     },
     "CommentIAMRoleD5EC5F51": {
@@ -511,7 +511,7 @@
                               [
                                 "Comment-",
                                 {
-                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -530,7 +530,7 @@
                               [
                                 "Comment-",
                                 {
-                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -553,7 +553,7 @@
             [
               "CommentIAMRole20388d-",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "-NONE"
             ]
@@ -566,7 +566,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -583,14 +583,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CommentIAMRole/Resource"
       }
     },
     "CommentDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -636,17 +636,17 @@
         "CommentIAMRoleD5EC5F51"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CommentDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CommentDataSource/Resource"
       }
     },
     "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetCommentauth0Function",
@@ -656,17 +656,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
       }
     },
     "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetCommentpostAuth0Function",
@@ -676,14 +676,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -704,14 +704,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
       }
     },
     "GetCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "getComment",
         "Kind": "PIPELINE",
@@ -743,7 +743,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -782,7 +782,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -794,11 +794,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -808,17 +808,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryGetCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/queryGetCommentResolver"
       }
     },
     "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistCommentsauth0Function",
@@ -828,17 +828,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistCommentspostAuth0Function",
@@ -848,14 +848,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -876,14 +876,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
       }
     },
     "ListCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "listComments",
         "Kind": "PIPELINE",
@@ -915,7 +915,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -954,7 +954,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -966,11 +966,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -980,17 +980,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/queryListCommentsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/queryListCommentsResolver"
       }
     },
     "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentinit0Function",
@@ -1000,17 +1000,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
       }
     },
     "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentauth0Function",
@@ -1020,17 +1020,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentpostAuth0Function",
@@ -1040,14 +1040,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1068,14 +1068,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "CreateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "createComment",
         "Kind": "PIPELINE",
@@ -1113,7 +1113,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1152,7 +1152,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1164,11 +1164,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1178,17 +1178,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationCreateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/mutationCreateCommentResolver"
       }
     },
     "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateCommentinit0Function",
@@ -1198,14 +1198,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
       }
     },
     "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1226,17 +1226,17 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateCommentpostAuth0Function",
@@ -1246,14 +1246,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1274,14 +1274,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "UpdateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "updateComment",
         "Kind": "PIPELINE",
@@ -1319,7 +1319,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1358,7 +1358,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1370,11 +1370,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1384,14 +1384,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationUpdateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/mutationUpdateCommentResolver"
       }
     },
     "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1412,17 +1412,17 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteCommentpostAuth0Function",
@@ -1432,14 +1432,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1460,14 +1460,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
       }
     },
     "DeleteCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "deleteComment",
         "Kind": "PIPELINE",
@@ -1499,7 +1499,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1538,7 +1538,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1550,11 +1550,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1564,17 +1564,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/mutationDeleteCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/mutationDeleteCommentResolver"
       }
     },
     "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateCommentauth0Function",
@@ -1584,17 +1584,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateCommentpostAuth0Function",
@@ -1604,17 +1604,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateCommentDataResolverFn",
@@ -1626,14 +1626,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onCreateComment",
         "Kind": "PIPELINE",
@@ -1665,7 +1665,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1677,7 +1677,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1689,11 +1689,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1703,17 +1703,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
       }
     },
     "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateCommentauth0Function",
@@ -1723,17 +1723,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateCommentpostAuth0Function",
@@ -1743,17 +1743,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateCommentDataResolverFn",
@@ -1765,14 +1765,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onUpdateComment",
         "Kind": "PIPELINE",
@@ -1804,7 +1804,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1816,7 +1816,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1828,11 +1828,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1842,17 +1842,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
       }
     },
     "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteCommentauth0Function",
@@ -1862,17 +1862,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteCommentpostAuth0Function",
@@ -1882,17 +1882,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteCommentDataResolverFn",
@@ -1904,14 +1904,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onDeleteComment",
         "Kind": "PIPELINE",
@@ -1943,7 +1943,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1955,7 +1955,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1967,11 +1967,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1981,16 +1981,16 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X31OtoD7uuoB63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyA7HGC3wZtsreu2va9h+iBRcpWi7Uze8BdGHEgpLpAHdl59YFOShBQtmTyJhuEPG37OeJPz5O6MQ3A1fGPd0xGFjMcBpjL0Dzv0NBscR7mzhalY9aIuULF6nvxPp8R2KZEHbnybIq6Nfj/3V4qzkf0ZRUgF3pcwsodjsh3pUmBe3M+kY1KzrivF1nM7Gw6O4CIv1yyD1zfYbS7i/TYmVj8QlI/8AVayTVs2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Comment/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -2010,7 +2010,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "GetAtt:CommentTable:StreamArn"
             ]
@@ -2026,7 +2026,7 @@
           [
             "Comment-",
             {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
             },
             "-NONE"
           ]
@@ -2038,7 +2038,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "GetAtt:CommentTable:Name"
             ]
@@ -2046,7 +2046,7 @@
         }
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentDataSourceBABE546FName": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName": {
       "Value": {
         "Fn::GetAtt": [
           "CommentDataSource",
@@ -2054,7 +2054,7 @@
         ]
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn": {
       "Value": {
         "Fn::GetAtt": [
           "CommentTable",
@@ -2062,7 +2062,7 @@
         ]
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "CommentTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataConnectionStackNestedStackConne-1OWUZYB5XE48X.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json
new file mode 100644
index 00000000000..1662c408b2e
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName",
+    "ParameterValue": "PostTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName",
+    "ParameterValue": "CommentTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name",
+    "ParameterValue": "TopicTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json
similarity index 67%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json
index 83be073f99e..718b5346d76 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json
@@ -4,10 +4,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Topicpostsauth0Function",
@@ -17,17 +17,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
       }
     },
     "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "TopicPostsDataResolverFn",
@@ -39,14 +39,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
       }
     },
     "TopicpostsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "posts",
         "Kind": "PIPELINE",
@@ -72,7 +72,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -88,7 +88,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn"
                               }
                             ]
                           }
@@ -108,7 +108,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -120,11 +120,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -134,17 +134,17 @@
         "TypeName": "Topic"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/topicPostsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/topicPostsResolver"
       }
     },
     "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Postcommentsauth0Function",
@@ -154,17 +154,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
       }
     },
     "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "PostCommentsDataResolverFn",
@@ -176,14 +176,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
       }
     },
     "PostcommentsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "comments",
         "Kind": "PIPELINE",
@@ -209,7 +209,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -225,7 +225,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn"
                               }
                             ]
                           }
@@ -245,7 +245,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -257,11 +257,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -271,17 +271,17 @@
         "TypeName": "Post"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/postCommentsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/postCommentsResolver"
       }
     },
     "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Posttopicauth0Function",
@@ -291,17 +291,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
       }
     },
     "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "PostTopicDataResolverFn",
@@ -313,14 +313,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
       }
     },
     "PosttopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "topic",
         "Kind": "PIPELINE",
@@ -346,7 +346,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -362,7 +362,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn"
                               }
                             ]
                           }
@@ -382,7 +382,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -394,11 +394,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -408,17 +408,17 @@
         "TypeName": "Post"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/postTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/postTopicResolver"
       }
     },
     "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Commentpostauth0Function",
@@ -428,17 +428,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
       }
     },
     "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "CommentPostDataResolverFn",
@@ -450,14 +450,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
       }
     },
     "CommentpostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "post",
         "Kind": "PIPELINE",
@@ -483,7 +483,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -499,7 +499,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn"
                               }
                             ]
                           }
@@ -519,7 +519,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -531,11 +531,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -545,16 +545,16 @@
         "TypeName": "Comment"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/commentPostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/commentPostResolver"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMsQ6CMBCA4WdhLycUB1chcXSAByBnOUgBr6TXQgzh3Q06ffmXX4O+5pAluElquimd7Qv2J0mgrgloJoWbtLsULYpQELifKCmgjGaiUKKQwmWRDxvYq54fkU2wjivHvR2ixzNU1XNN4uaV/HGo36MJOFgeDsWuIxjlsmoN+Q2yZBRrUx852DdB/fcLM5uzFKcAAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMsQ6CMBCA4WdhLycWBlchcXSAByBnOUgBr6TXQgzh3Q06ffmXX4MuCsgS3CQ13ZTO9gX7kyRQ1wQ0k8JN2l3yFkUoCNxPlORQRjNRKFFI4bLIhw3sVc+PyCZYx5Xj3g7R4xmq6rkmcfNK/jjU79EEHCwPh2LXEYxyWbWG6w2yZBRrUx852DdB/fcLf5ddvqcAAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -826,37 +826,37 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataFunctionDirectiveStackNestedSta-1U3PX8KU9ZZ8H.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json
new file mode 100644
index 00000000000..2a1991c3dfb
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json
@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json
similarity index 72%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json
index d0b4ddb7a67..9dd0b71ebb9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json
@@ -278,7 +278,7 @@
     }
   },
   "Resources": {
-    "FetchuseractivityGen2MainLambdaDataSourceServiceRole4C155E48": {
+    "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRole9F9579C6": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -300,7 +300,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -317,10 +317,10 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MainLambdaDataSource/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MaintwoLambdaDataSource/ServiceRole/Resource"
       }
     },
-    "FetchuseractivityGen2MainLambdaDataSourceServiceRoleDefaultPolicyD13BD55D": {
+    "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRoleDefaultPolicy29E9C4B2": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -334,12 +334,12 @@
                     "HasEnvironmentParameter",
                     {
                       "Fn::Sub": [
-                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main",
+                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo",
                         {}
                       ]
                     },
                     {
-                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main"
+                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo"
                     }
                   ]
                 },
@@ -352,12 +352,12 @@
                           "HasEnvironmentParameter",
                           {
                             "Fn::Sub": [
-                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main",
+                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo",
                               {}
                             ]
                           },
                           {
-                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main"
+                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo"
                           }
                         ]
                       },
@@ -370,22 +370,22 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "FetchuseractivityGen2MainLambdaDataSourceServiceRoleDefaultPolicyD13BD55D",
+        "PolicyName": "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRoleDefaultPolicy29E9C4B2",
         "Roles": [
           {
-            "Ref": "FetchuseractivityGen2MainLambdaDataSourceServiceRole4C155E48"
+            "Ref": "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRole9F9579C6"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MainLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MaintwoLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "FetchuseractivityGen2MainLambdaDataSource": {
+    "FetchuseractivityGen2MaintwoLambdaDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "LambdaConfig": {
           "LambdaFunctionArn": {
@@ -393,62 +393,62 @@
               "HasEnvironmentParameter",
               {
                 "Fn::Sub": [
-                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main",
+                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo",
                   {}
                 ]
               },
               {
-                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main"
+                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo"
               }
             ]
           }
         },
-        "Name": "FetchuseractivityGen2MainLambdaDataSource",
+        "Name": "FetchuseractivityGen2MaintwoLambdaDataSource",
         "ServiceRoleArn": {
           "Fn::GetAtt": [
-            "FetchuseractivityGen2MainLambdaDataSourceServiceRole4C155E48",
+            "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRole9F9579C6",
             "Arn"
           ]
         },
         "Type": "AWS_LAMBDA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MainLambdaDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MaintwoLambdaDataSource/Resource"
       }
     },
-    "InvokeFetchuseractivityGen2MainLambdaDataSourceInvokeFetchuseractivityGen2MainLambdaDataSourceAppSyncFunctionA6277669": {
+    "InvokeFetchuseractivityGen2MaintwoLambdaDataSourceInvokeFetchuseractivityGen2MaintwoLambdaDataSourceAppSyncFunction267586CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
-            "FetchuseractivityGen2MainLambdaDataSource",
+            "FetchuseractivityGen2MaintwoLambdaDataSource",
             "Name"
           ]
         },
         "FunctionVersion": "2018-05-29",
-        "Name": "InvokeFetchuseractivityGen2MainLambdaDataSource",
+        "Name": "InvokeFetchuseractivityGen2MaintwoLambdaDataSource",
         "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe1fde42ccef15458dbd92a2a8585717ca41949d9a24f6e018c70d3b404315ee.vtl"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/229003a6c44b2e47d16c4b451a515cc342fcad68ed9806b4fec866cf9b64e95e.vtl"
         },
         "ResponseMappingTemplateS3Location": {
           "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a20e304512b1fde77dc16ed9d5e0ed03817afcab629ce87ef11c99877b7b1e30.vtl"
         }
       },
       "DependsOn": [
-        "FetchuseractivityGen2MainLambdaDataSource"
+        "FetchuseractivityGen2MaintwoLambdaDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityGen2MainLambdaDataSource/InvokeFetchuseractivityGen2MainLambdaDataSource.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityGen2MaintwoLambdaDataSource/InvokeFetchuseractivityGen2MaintwoLambdaDataSource.AppSyncFunction"
       }
     },
     "QueryfetchUserActivityResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "fetchUserActivity",
         "Kind": "PIPELINE",
@@ -462,7 +462,7 @@
             },
             {
               "Fn::GetAtt": [
-                "InvokeFetchuseractivityGen2MainLambdaDataSourceInvokeFetchuseractivityGen2MainLambdaDataSourceAppSyncFunctionA6277669",
+                "InvokeFetchuseractivityGen2MaintwoLambdaDataSourceInvokeFetchuseractivityGen2MaintwoLambdaDataSourceAppSyncFunction267586CB",
                 "FunctionId"
               ]
             }
@@ -478,7 +478,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
               {
@@ -486,11 +486,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
             ]
@@ -502,17 +502,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
       }
     },
     "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QueryFetchUserActivityAuthFN",
@@ -522,34 +522,34 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW/CMAyFfwv31IPCYdfRaadpmtofgEziVqapg+oEhKr+d5SgHXb6/J79nlxDfdjBdoN3rawbK89nWH5II7kuoh1N00sTxHHkIAbvelo8TmeH8JXEZvOISgavV32IheW7LD8xYhfSbCnn/6u/XBOk5yHNWJqbXlrS4G80r4ZxgqUNvtwX/gbP9pHla1qN7k+oSlHhI8PoHo7JjhTzP6spZhdxYBlWI8ERXPTtVtewe4ft5qLM1Zwk8kTQvvgElyxBfQsBAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW/CMAyFfwv31GOFA9fRaadpmtofgEziVqapg+oEhKr+d5SgHXb6/J79nlxDvd/DdoN3rawbK89nWH5II7kuoh1N00sTxHHkIAbvelo8TmeH8JXEZvOISgavV32IheW7LD8xYhfSbCnn/6u/XBOk5yHNWJqbXlrS4G80r4ZxgqUNvtwX/gbP9pHla1qN7k6oSlHhI8PoDo7JjhTzP6spZhdxYBlWI8ERXPTtVtfwfoDt5qLM1Zwk8kTQvvgEeF2aIQsBAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json
new file mode 100644
index 00000000000..5a3cd2687d1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName",
+    "OutputValue": "PostTable"
+  },
+  {
+    "OutputKey": "GetAttPostTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:PostTable:StreamArn"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE"
+  },
+  {
+    "OutputKey": "GetAttPostTableName",
+    "OutputValue": "Post-d4mt7tdvurcczil4a5eoajtsxy-NONE",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:PostTable:Name"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json
new file mode 100644
index 00000000000..6f1a0e80991
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json
index 284360e1f9e..922a665ff72 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataPostNestedStackPostNestedStackR-QQ10UZAFYJQD.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Type": "String"
     }
   },
@@ -353,7 +353,7 @@
       "Type": "Custom::AmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6"
         },
         "tableName": {
           "Fn::Join": [
@@ -361,7 +361,7 @@
             [
               "Post-",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "-NONE"
             ]
@@ -462,7 +462,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/PostTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/PostTable/Default/Default"
       }
     },
     "PostIAMRole83BF708F": {
@@ -511,7 +511,7 @@
                               [
                                 "Post-",
                                 {
-                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -530,7 +530,7 @@
                               [
                                 "Post-",
                                 {
-                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -553,7 +553,7 @@
             [
               "PostIAMRolebbce9b-",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "-NONE"
             ]
@@ -566,7 +566,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -583,14 +583,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/PostIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/PostIAMRole/Resource"
       }
     },
     "PostDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -636,17 +636,17 @@
         "PostIAMRole83BF708F"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/PostDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/PostDataSource/Resource"
       }
     },
     "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetPostauth0Function",
@@ -656,17 +656,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
       }
     },
     "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetPostpostAuth0Function",
@@ -676,14 +676,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -704,14 +704,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
       }
     },
     "GetPostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "getPost",
         "Kind": "PIPELINE",
@@ -743,7 +743,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -782,7 +782,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -794,11 +794,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -808,17 +808,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/queryGetPostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/queryGetPostResolver"
       }
     },
     "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistPostsauth0Function",
@@ -828,17 +828,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistPostspostAuth0Function",
@@ -848,14 +848,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -876,14 +876,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
       }
     },
     "ListPostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "listPosts",
         "Kind": "PIPELINE",
@@ -915,7 +915,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -954,7 +954,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -966,11 +966,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -980,17 +980,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/queryListPostsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/queryListPostsResolver"
       }
     },
     "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostinit0Function",
@@ -1000,17 +1000,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
       }
     },
     "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostauth0Function",
@@ -1020,17 +1020,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
       }
     },
     "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostpostAuth0Function",
@@ -1040,14 +1040,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1068,14 +1068,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
       }
     },
     "CreatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "createPost",
         "Kind": "PIPELINE",
@@ -1113,7 +1113,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1152,7 +1152,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1164,11 +1164,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1178,17 +1178,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationCreatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/mutationCreatePostResolver"
       }
     },
     "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdatePostinit0Function",
@@ -1198,14 +1198,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
       }
     },
     "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1226,17 +1226,17 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
       }
     },
     "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdatePostpostAuth0Function",
@@ -1246,14 +1246,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1274,14 +1274,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
       }
     },
     "UpdatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "updatePost",
         "Kind": "PIPELINE",
@@ -1319,7 +1319,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1358,7 +1358,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1370,11 +1370,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1384,14 +1384,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationUpdatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/mutationUpdatePostResolver"
       }
     },
     "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1412,17 +1412,17 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
       }
     },
     "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeletePostpostAuth0Function",
@@ -1432,14 +1432,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1460,14 +1460,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
       }
     },
     "DeletePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "deletePost",
         "Kind": "PIPELINE",
@@ -1499,7 +1499,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1538,7 +1538,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1550,11 +1550,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1564,17 +1564,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/mutationDeletePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/mutationDeletePostResolver"
       }
     },
     "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreatePostauth0Function",
@@ -1584,17 +1584,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreatePostpostAuth0Function",
@@ -1604,17 +1604,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreatePostDataResolverFn",
@@ -1626,14 +1626,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onCreatePost",
         "Kind": "PIPELINE",
@@ -1665,7 +1665,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1677,7 +1677,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1689,11 +1689,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1703,17 +1703,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnCreatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/subscriptionOnCreatePostResolver"
       }
     },
     "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdatePostauth0Function",
@@ -1723,17 +1723,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdatePostpostAuth0Function",
@@ -1743,17 +1743,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdatePostDataResolverFn",
@@ -1765,14 +1765,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onUpdatePost",
         "Kind": "PIPELINE",
@@ -1804,7 +1804,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1816,7 +1816,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1828,11 +1828,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1842,17 +1842,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
       }
     },
     "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeletePostauth0Function",
@@ -1862,17 +1862,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeletePostpostAuth0Function",
@@ -1882,17 +1882,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeletePostDataResolverFn",
@@ -1904,14 +1904,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeletePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onDeletePost",
         "Kind": "PIPELINE",
@@ -1943,7 +1943,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1955,7 +1955,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1967,11 +1967,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1981,16 +1981,16 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/subscriptionOnDeletePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/subscriptionOnDeletePostResolver"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X31OtoD7uuoB63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyA7HGC3wZtsreu2va9h+iBRcpWi7Uze8BdGHEgpLpAHdl59YFOShBQtmTyJhuEPG37OeJPz5O6MQ3A1fGPd0xGFjMcBpjL0Dzv0NBscR7mzhalY9aIuULF6nvxPp8R2KZEHbnybIq6Nfj/3V4qzkf0ZRUgF3pcwsodjsh3pUmBe3M+kY1KzrivF1nM7Gw6O4CIv1yyD1zfYbS7i/TYmVj8QlI/8AVayTVs2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Post/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -2010,7 +2010,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "GetAtt:PostTable:StreamArn"
             ]
@@ -2026,7 +2026,7 @@
           [
             "Post-",
             {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
             },
             "-NONE"
           ]
@@ -2038,7 +2038,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "GetAtt:PostTable:Name"
             ]
@@ -2046,7 +2046,7 @@
         }
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostDataSourceB24AB8DAName": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName": {
       "Value": {
         "Fn::GetAtt": [
           "PostDataSource",
@@ -2054,7 +2054,7 @@
         ]
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "PostTable",
@@ -2062,7 +2062,7 @@
         ]
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "PostTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json
new file mode 100644
index 00000000000..886ca432f35
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "GetAttTopicTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:TopicTable:StreamArn"
+  },
+  {
+    "OutputKey": "GetAttTopicTableName",
+    "OutputValue": "Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:TopicTable:Name"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name",
+    "OutputValue": "TopicTable"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json
new file mode 100644
index 00000000000..6f1a0e80991
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
+    "ParameterValue": "NONE_DS"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json
index a3af2b16da1..4de696d0e80 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c43-amplifyDataTopicNestedStackTopicNestedStac-Y6NEQZHYFNZU.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Type": "String"
     }
   },
@@ -353,7 +353,7 @@
       "Type": "Custom::AmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource5FC82BA6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyTableManagerTableMana62E2E449"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6"
         },
         "tableName": {
           "Fn::Join": [
@@ -361,7 +361,7 @@
             [
               "Topic-",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "-NONE"
             ]
@@ -428,7 +428,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/TopicTable/Default/Default"
       }
     },
     "TopicIAMRoleD9B4C845": {
@@ -477,7 +477,7 @@
                               [
                                 "Topic-",
                                 {
-                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -496,7 +496,7 @@
                               [
                                 "Topic-",
                                 {
-                                  "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
                                 },
                                 "-NONE"
                               ]
@@ -519,7 +519,7 @@
             [
               "TopicIAMRole014e70-",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "-NONE"
             ]
@@ -532,7 +532,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -549,14 +549,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/TopicIAMRole/Resource"
       }
     },
     "TopicDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -602,17 +602,17 @@
         "TopicIAMRoleD9B4C845"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/TopicDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/TopicDataSource/Resource"
       }
     },
     "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetTopicauth0Function",
@@ -622,17 +622,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
       }
     },
     "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetTopicpostAuth0Function",
@@ -642,14 +642,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -670,14 +670,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
       }
     },
     "GetTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "getTopic",
         "Kind": "PIPELINE",
@@ -709,7 +709,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -748,7 +748,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -760,11 +760,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -774,17 +774,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryGetTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/queryGetTopicResolver"
       }
     },
     "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistTopicsauth0Function",
@@ -794,17 +794,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistTopicspostAuth0Function",
@@ -814,14 +814,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -842,14 +842,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
       }
     },
     "ListTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "listTopics",
         "Kind": "PIPELINE",
@@ -881,7 +881,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -920,7 +920,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -932,11 +932,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -946,17 +946,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/queryListTopicsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/queryListTopicsResolver"
       }
     },
     "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicinit0Function",
@@ -966,17 +966,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
       }
     },
     "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicauth0Function",
@@ -986,17 +986,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicpostAuth0Function",
@@ -1006,14 +1006,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1034,14 +1034,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "CreateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "createTopic",
         "Kind": "PIPELINE",
@@ -1079,7 +1079,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1118,7 +1118,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1130,11 +1130,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1144,17 +1144,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationCreateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/mutationCreateTopicResolver"
       }
     },
     "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateTopicinit0Function",
@@ -1164,14 +1164,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
       }
     },
     "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1192,17 +1192,17 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateTopicpostAuth0Function",
@@ -1212,14 +1212,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1240,14 +1240,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "UpdateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "updateTopic",
         "Kind": "PIPELINE",
@@ -1285,7 +1285,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1324,7 +1324,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1336,11 +1336,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1350,14 +1350,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationUpdateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/mutationUpdateTopicResolver"
       }
     },
     "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1378,17 +1378,17 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteTopicpostAuth0Function",
@@ -1398,14 +1398,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1426,14 +1426,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
       }
     },
     "DeleteTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "deleteTopic",
         "Kind": "PIPELINE",
@@ -1465,7 +1465,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1504,7 +1504,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1516,11 +1516,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1530,17 +1530,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/mutationDeleteTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/mutationDeleteTopicResolver"
       }
     },
     "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateTopicauth0Function",
@@ -1550,17 +1550,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateTopicpostAuth0Function",
@@ -1570,17 +1570,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateTopicDataResolverFn",
@@ -1592,14 +1592,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onCreateTopic",
         "Kind": "PIPELINE",
@@ -1631,7 +1631,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1643,7 +1643,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1655,11 +1655,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1669,17 +1669,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
       }
     },
     "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateTopicauth0Function",
@@ -1689,17 +1689,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateTopicpostAuth0Function",
@@ -1709,17 +1709,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateTopicDataResolverFn",
@@ -1731,14 +1731,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onUpdateTopic",
         "Kind": "PIPELINE",
@@ -1770,7 +1770,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1782,7 +1782,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1794,11 +1794,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1808,17 +1808,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
       }
     },
     "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteTopicauth0Function",
@@ -1828,17 +1828,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteTopicpostAuth0Function",
@@ -1848,17 +1848,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPINONEDSA4682650Name"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteTopicDataResolverFn",
@@ -1870,14 +1870,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         },
         "FieldName": "onDeleteTopic",
         "Kind": "PIPELINE",
@@ -1909,7 +1909,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1921,7 +1921,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1933,11 +1933,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1947,16 +1947,16 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X34HXQy44rqMdtgt0rkxiUEhIUO60qxLtP0KnTTr8/+ZP955AfCtjv8MaZNkPmbAvzB7GQaQT1oMrOf2HEkYTiCmXwxooNXtXEIUVNqkwsYfzDzj9nvPF5NnePYzAtfGPr6IhMyuIIcx3cww6OFoXTxHevYa42vWorFGyeJ//TKXm9liiD72yfIm6Nfj+7K8VFcXFGZhKG9zUUF3BMeiBZCyyr+5lkSqK2dSPYW98vygdDcOGXa76H1zc47C5sbRaTFzsS1I/8AQ5tz8k2AQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X31OtoD7uuoB63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyA7HGC3wZtsreu2va9h+iBRcpWi7Uze8BdGHEgpLpAHdl59YFOShBQtmTyJhuEPG37OeJPz5O6MQ3A1fGPd0xGFjMcBpjL0Dzv0NBscR7mzhalY9aIuULF6nvxPp8R2KZEHbnybIq6Nfj/3V4qzkf0ZRUgF3pcwsodjsh3pUmBe3M+kY1KzrivF1nM7Gw6O4CIv1yyD1zfYbS7i/TYmVj8QlI/8AVayTVs2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data/amplifyData/Topic/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -1976,7 +1976,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "GetAtt:TopicTable:StreamArn"
             ]
@@ -1992,7 +1992,7 @@
           [
             "Topic-",
             {
-              "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
             },
             "-NONE"
           ]
@@ -2004,7 +2004,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
               },
               "GetAtt:TopicTable:Name"
             ]
@@ -2012,7 +2012,7 @@
         }
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicDataSourceD850CF00Name": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name": {
       "Value": {
         "Fn::GetAtt": [
           "TopicDataSource",
@@ -2020,7 +2020,7 @@
         ]
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "TopicTable",
@@ -2028,7 +2028,7 @@
         ]
       }
     },
-    "amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "TopicTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json
new file mode 100644
index 00000000000..97c0bd1c796
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "OutputValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref",
+    "OutputValue": "1c1vf5gnunutele7c45m171n11"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "OutputValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "OutputValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef",
+    "OutputValue": "us-east-1_fU7jrxvo5"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-auth179371D7-19LVPI73QPSY7.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
index 5fe017c4f99..28bef35cb22 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-auth179371D7-DAPL7YOMHRB4.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.1\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.11.2\",\"stackType\":\"auth-Cognito\",\"metadata\":{}}",
   "Resources": {
     "amplifyAuthUserPool4BA7F805": {
       "Type": "AWS::Cognito::UserPool",
@@ -18,7 +18,7 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationMessage": "Your verification code is {####}",
         "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
@@ -51,7 +51,7 @@
         },
         "UserPoolTags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
+          "amplify:branch-name": "gen2-maintwo",
           "amplify:deployment-type": "branch",
           "amplify:friendly-name": "amplifyAuth",
           "created-by": "amplify"
@@ -64,7 +64,7 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "Here is your verification code {####}",
+          "EmailMessage": "Your verification code is {####}",
           "EmailSubject": "Verification",
           "SmsMessage": "The verification code to your new account is {####}"
         }
@@ -72,7 +72,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPool/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/Resource"
       }
     },
     "amplifyAuthUserPoolNativeAppClient79534448": {
@@ -95,7 +95,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
       }
     },
     "amplifyAuthUserPoolAppClient2626C6F8": {
@@ -129,7 +129,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/UserPoolAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPoolAppClient/Resource"
       }
     },
     "amplifyAuthIdentityPool3FDE84CC": {
@@ -165,7 +165,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -183,7 +183,7 @@
         "SupportedLoginProviders": {}
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/IdentityPool"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPool"
       }
     },
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
@@ -218,7 +218,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -235,7 +235,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -270,7 +270,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -287,7 +287,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
@@ -341,16 +341,16 @@
         "amplifyAuthUserPoolAppClient2626C6F8"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/amplifyAuth/IdentityPoolRoleAttachment"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPoolRoleAttachment"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv8V7urbBg1fpyYtIxbPEZNVt0w00q0VC/l2KVHuamTczGvSmgnJlxlhY1xWerpAOGAXdSYztlBnjJdlwZ5IA6RxxOIbgVX3jn59N7QlZltWf7B2ykLzn8zI3weNOxNhHjyxZkekhTXAaTppzVhwcQhvXL62h2kK5aiNRMTxZqEdovvoBH9Args4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -622,27 +622,27 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
       "Value": {
         "Ref": "amplifyAuthUserPool4BA7F805"
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPoolAppClientCD70FA03Ref": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
       "Value": {
         "Ref": "amplifyAuthUserPoolAppClient2626C6F8"
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Value": {
         "Ref": "amplifyAuthIdentityPool3FDE84CC"
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Value": {
         "Ref": "amplifyAuthauthenticatedUserRoleD8DA3689"
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Value": {
         "Ref": "amplifyAuthunauthenticatedUserRole2B524D9E"
       }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-data7552DF31-G2MUTCUFR08M.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json
new file mode 100644
index 00000000000..590cbe37cf7
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json
@@ -0,0 +1,30 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIDefaultApiKey22C2FDC2ApiKey",
+    "OutputValue": "da2-g2kwwpglwnakbe2n4gy375uyxy"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1GraphQLUrl",
+    "OutputValue": "https://reebkadyw5e47aagqne7csre5m.appsync-api.us-east-1.amazonaws.com/graphql"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
+    "OutputValue": "d4mt7tdvurcczil4a5eoajtsxy"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB44890AA5DestinationBucketArn",
+    "OutputValue": "arn:aws:s3:::amplify-discussions-ge-amplifydataamplifycodege-eouy18dnw0i5"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json
new file mode 100644
index 00000000000..f4cb686fa23
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json
@@ -0,0 +1,38 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
+    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef",
+    "ParameterValue": "us-east-1_fU7jrxvo5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json
similarity index 70%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json
index 0aac38ac782..8679d9c9d18 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-data7552DF31-ZYDQP1ZT6K5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json
@@ -12,7 +12,7 @@
                 "Ref": "AWS::Region"
               },
               "UserPoolId": {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef"
               }
             }
           },
@@ -29,7 +29,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -46,7 +46,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/GraphQLAPI/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/Resource"
       }
     },
     "amplifyDataGraphQLAPITransformerSchemaFF50A789": {
@@ -59,11 +59,11 @@
           ]
         },
         "DefinitionS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/300f7c12e6b33cf8ae3c81bc9ac9123f7369b5e4b69f14aa10c6e3d2679d5934.graphql"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9199994c2fc1278c43c8dc8f4f5b81dec0666ee6dbb2bcbc8080f8aa8161eb18.graphql"
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/GraphQLAPI/TransformerSchema"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/TransformerSchema"
       }
     },
     "amplifyDataGraphQLAPIDefaultApiKey1C8ED374": {
@@ -75,10 +75,10 @@
             "ApiId"
           ]
         },
-        "Expires": 1773511321
+        "Expires": 1774635725
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/GraphQLAPI/DefaultApiKey"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/DefaultApiKey"
       }
     },
     "amplifyDataGraphQLAPINONEDS684BF699": {
@@ -94,14 +94,14 @@
         "Type": "NONE"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
       }
     },
     "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
@@ -115,7 +115,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -146,7 +146,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/9eccfef062389059bcaffefb8c14ee55fca563d54f06c83b6126e8e07327dbce.json"
+              "/b2bf7e61c06471e8654cdf99ef35b6742f1db64448daf042ed8369d31e485af6.json"
             ]
           ]
         }
@@ -154,8 +154,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerB26D3FB1.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerD667C4D4.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -178,32 +178,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventCD1BABC0Arn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
           }
         },
         "Tags": [
@@ -213,7 +213,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -244,7 +244,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/0040dd6745340d39c87b002e3ded2fb793307733c2965bce28f54e1046b7eb6b.json"
+              "/d9c6f9cb159d5b9df15195d9dac888094b83578e7ddecf630d041d41cfcc49dc.json"
             ]
           ]
         }
@@ -255,8 +255,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopic254FBF1D.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopic57E0359B.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -279,32 +279,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventCD1BABC0Arn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
           }
         },
         "Tags": [
@@ -314,7 +314,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -345,7 +345,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/795cfa14234659d965f47e2477edee3f71c166be24d705120f933f3c40d9f12a.json"
+              "/42855889a81a9a095dc34c56bfeba876f491d478f8919bdf18bc0f67af54caf0.json"
             ]
           ]
         }
@@ -356,8 +356,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPost2E038CE7.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPost8962306B.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -380,32 +380,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource8F5AD471Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManaFB9EF7A3": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEventCD1BABC0Arn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
           }
         },
         "Tags": [
@@ -415,7 +415,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -446,7 +446,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/0db6424c5644efec8587c208a2f2b801d151e2e3a1729fa29907cdc240764f58.json"
+              "/b76dcb431dc7be1ffb40c00f3b12ec709c81e20f049ac444aa51314cb259528d.json"
             ]
           ]
         }
@@ -457,8 +457,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataComment43A5FBB2.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataComment2D077CC5.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -466,22 +466,22 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
@@ -495,7 +495,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -526,7 +526,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/e0951fe9a11c4ab99ba8c97fe27c9a940a3e7ff15830e8a7960e6f437bef3fd7.json"
+              "/82f884dd46d0dae1ebc23ae8f00d812169d09c1755b1dd3b430f5a34f5f55062.json"
             ]
           ]
         }
@@ -537,8 +537,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataFunctionDirectiveStack530ED4C3.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataFunctionDirectiveStack78890689.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -546,61 +546,61 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPINONEDSE249BA0EName": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName": {
             "Fn::GetAtt": [
               "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostDataSource4A81DD73Name"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn": {
             "Fn::GetAtt": [
               "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName": {
             "Fn::GetAtt": [
               "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentDataSource6FC87F25Name"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn": {
             "Fn::GetAtt": [
               "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name": {
             "Fn::GetAtt": [
               "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicDataSourceD97283B9Name"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn": {
             "Fn::GetAtt": [
               "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn"
             ]
           }
         },
@@ -611,7 +611,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -642,7 +642,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/442e97ee7fb08fa60409ba523f55a7b6487546952013239d00ba8038e5ddac3a.json"
+              "/c3ecaa4ae12655da77e8aa83fed61d5a851c595cda1a766af58d8965667a71e7.json"
             ]
           ]
         }
@@ -656,8 +656,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataConnectionStackEEE8A531.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataConnectionStack4FB5E041.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -689,7 +689,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityidResolver": {
@@ -734,7 +734,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -746,11 +746,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -763,7 +763,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/activityIdResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityIdResolver"
       }
     },
     "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4": {
@@ -794,7 +794,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityuserIdResolver": {
@@ -839,7 +839,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -851,11 +851,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -868,7 +868,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/activityUserIdResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityUserIdResolver"
       }
     },
     "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26": {
@@ -899,7 +899,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityactivityTypeResolver": {
@@ -944,7 +944,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -956,11 +956,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -973,7 +973,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/activityActivityTypeResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityActivityTypeResolver"
       }
     },
     "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D": {
@@ -1004,7 +1004,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
       }
     },
     "ActivitytimestampResolver": {
@@ -1049,7 +1049,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1061,11 +1061,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1078,7 +1078,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/activityTimestampResolver"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityTimestampResolver"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA": {
@@ -1118,7 +1118,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1133,7 +1133,7 @@
             "Value": "true"
           },
           {
-            "Key": "aws-cdk:cr-owned:fe2857dc",
+            "Key": "aws-cdk:cr-owned:ab73d017",
             "Value": "true"
           },
           {
@@ -1145,7 +1145,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548": {
@@ -1200,7 +1200,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketAutoDeleteObjectsCustomResource437F26F5": {
@@ -1222,7 +1222,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905": {
@@ -1237,7 +1237,7 @@
         "Description": "/opt/awscli/aws"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
         "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Content"
@@ -1258,7 +1258,7 @@
           }
         ],
         "SourceObjectKeys": [
-          "dbf8037d854a25fa34a911a4cc5b6ee0521fe10deca928ac11a880166a3daaa0.zip"
+          "a0a824407fa0caea8c02802c3aa86a876467d5ceb99a821544a87a142c0efdf0.zip"
         ],
         "SourceMarkers": [
           {}
@@ -1279,7 +1279,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
@@ -1304,7 +1304,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
@@ -1343,7 +1343,7 @@
         "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
         "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
         "aws:asset:property": "Code"
       }
@@ -1384,7 +1384,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1397,7 +1397,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
       }
     },
     "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B": {
@@ -1531,7 +1531,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21": {
@@ -1569,7 +1569,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1587,7 +1587,7 @@
         "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
         "aws:asset:path": "asset.3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -1603,7 +1603,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1614,7 +1614,7 @@
             "Value": "true"
           },
           {
-            "Key": "aws-cdk:cr-owned:01a0a228",
+            "Key": "aws-cdk:cr-owned:cf03fc68",
             "Value": "true"
           },
           {
@@ -1626,7 +1626,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/modelIntrospectionSchemaBucket/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucket/Resource"
       }
     },
     "modelIntrospectionSchemaBucketPolicy4DAB0D15": {
@@ -1715,7 +1715,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/modelIntrospectionSchemaBucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucket/Policy/Resource"
       }
     },
     "modelIntrospectionSchemaBucketAutoDeleteObjectsCustomResourceFE57309F": {
@@ -1737,7 +1737,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "modelIntrospectionSchemaBucketDeploymentAwsCliLayer13C432F7": {
@@ -1752,7 +1752,7 @@
         "Description": "/opt/awscli/aws"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
         "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Content"
@@ -1788,16 +1788,16 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
       }
     },
     "AMPLIFYDATAGRAPHQLENDPOINTParameter1C2CBB16": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2main-branch-96dfd1dc44/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
+        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
+          "amplify:branch-name": "gen2-maintwo",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1810,16 +1810,16 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
       }
     },
     "AMPLIFYDATAMODELINTROSPECTIONSCHEMABUCKETNAMEParameter47BF4F44": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2main-branch-96dfd1dc44/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
+          "amplify:branch-name": "gen2-maintwo",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1829,16 +1829,16 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
       }
     },
     "AMPLIFYDATAMODELINTROSPECTIONSCHEMAKEYParameterB6AEAE8A": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2main-branch-96dfd1dc44/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
+        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
+          "amplify:branch-name": "gen2-maintwo",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1846,16 +1846,16 @@
         "Value": "modelIntrospectionSchema.json"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
       }
     },
     "AMPLIFYDATADEFAULTNAMEParameterE7C23CC4": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2main-branch-96dfd1dc44/AMPLIFY_DATA_DEFAULT_NAME",
+        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_DEFAULT_NAME",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-main",
+          "amplify:branch-name": "gen2-maintwo",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1863,16 +1863,16 @@
         "Value": "amplifyData"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/11RTW/CMAz9LdxDBt0Ou5ai7TCEGJV2RSZ1iyFNujilqqr+9yktnzv5vefIfs+JZPQ2l7MJNDxV2WmqaS+7NbLHLPWgTmKLbGunUEDDuw6qilujZPfpoDr86riiBTCKJDeD8r2KK3pgqTpgCUGIK/rCVqytwSV4SMehSW6e2UdtlCdrEmtyKmoHgYRG8KHP6HrBr7sOmNGzjEMRGVbatiUaLxe1OqFf3oTwWnajOhgdYRh4QWPZWE2qvcsj74WGcp+B7JLcrKBF94OOg6GUTKHR25tfcQMPIXpBUMpua/WQbaj3TdcdzKXsUu/IFBtwUKJHN/SvpO/FEDT1UJApQm/8m6Rmb8vbD12uNODR+E4H0ztoWGmSccOJpiHH0/x/czbOnilDF+7VC2MzlEd+OUeRnL/L2eTIRFNXG08lyu1Y/wC0BiClRgIAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSTW/bMAz9Lc1ZUdu0h2E310F3WNFlMdDLUASMzLhM9OGJcjJD8H8fZGVpup6KnshHig+PepzJ2e2tvLqAA09VvZtqWsv4iBywrgKonVgiu84rFHDgVYS25d4qGb95aF9+66KlO2AU5caOlZ8PRUtnqFIvaCAVipa+Yy8encU5BKgyabmxb9F9Z1UgZ0tnN9R0HhJIjaRD79EPgm9WEZgxsCxSEDW22vUGbZB3ndphmJ8K6bWMuToKzWkizNmvODH0h+zk6+T8C9KyfCPHFh9Ziy64OWoM+GO9RRV4MohPTT8f1SycJtW/asr4A8ryQBUgYFr6Y8LeDz8PQoNZ1yBjubEP0KN/Qs/JiIpsozG4k0/ilJyZNwgCI+PS6dHTMb4umbNBMBsZq+DJNgvwYDCgH/v/wDCI0eAqQEO2Sb18k2XHwZnTZR6vY8yz8JVOoldwYKVJFgcuNY17vOH/j2fh3Z5q9OlOBmFdjXLLl/vZTF5/kVcXWyaa+s4GMiiXOf4FCBed+D4DAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/data/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -1915,16 +1915,16 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthUserPool9D23206ERef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthauthenticatedUserRole95356EEFRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthunauthenticatedUserRoleE19AFD6CRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44authNestedStackauthNestedStackResource3DD9188BOutputsamplifydiscussionsgen2mainbranch96dfd1dc44authamplifyAuthIdentityPoolA0C42AE7Ref": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
       "Type": "String"
     }
   },
@@ -2195,7 +2195,7 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AApiId": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -2203,7 +2203,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPI0A3B504AGraphQLUrl": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1GraphQLUrl": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -2211,7 +2211,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB9A562357DestinationBucketArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB44890AA5DestinationBucketArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929",
@@ -2219,7 +2219,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataGraphQLAPIDefaultApiKey45C980F7ApiKey": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIDefaultApiKey22C2FDC2ApiKey": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPIDefaultApiKey1C8ED374",
@@ -2227,27 +2227,27 @@
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicTopicTableBF2CFCFCTableStreamArn"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn"
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostPostTableCA553058TableStreamArn"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn"
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-          "Outputs.amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCommentTable17A92A14TableStreamArn"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn"
         ]
       }
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-function1351588B-H9TILALYT3XU.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json
new file mode 100644
index 00000000000..a521acd65cf
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json
@@ -0,0 +1,10 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3functionrecorduseractivitygen2maintwolambda15FF9A2DRef",
+    "OutputValue": "recorduseractivity-gen2-maintwo"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3functionfetchuseractivitygen2maintwolambda6D9C5EFDRef",
+    "OutputValue": "fetchuseractivity-gen2-maintwo"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json
new file mode 100644
index 00000000000..f583c02ee47
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref",
+    "ParameterValue": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json
similarity index 61%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json
index f1e2f019205..24ea8e4e047 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-function1351588B-1SQELLES2WBK3.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json
@@ -1,7 +1,7 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.17.0\",\"stackType\":\"function-Lambda\",\"metadata\":{}}",
   "Resources": {
-    "fetchuseractivitygen2mainlambdaServiceRoleCC992996": {
+    "fetchuseractivitygen2maintwolambdaServiceRole0B561055": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -37,7 +37,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -45,7 +45,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "fetchuseractivity-gen2-main"
+            "Value": "fetchuseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -54,10 +54,10 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/fetchuseractivity-gen2-main-lambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/fetchuseractivity-gen2-maintwo-lambda/ServiceRole/Resource"
       }
     },
-    "fetchuseractivitygen2mainlambdaServiceRoleDefaultPolicy4BD1E93F": {
+    "fetchuseractivitygen2maintwolambdaServiceRoleDefaultPolicy752079E1": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -75,14 +75,14 @@
               "Effect": "Allow",
               "Resource": [
                 {
-                  "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
+                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
                 },
                 {
                   "Fn::Join": [
                     "",
                     [
                       {
-                        "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
+                        "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
                       },
                       "/index/*"
                     ]
@@ -93,18 +93,18 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "fetchuseractivitygen2mainlambdaServiceRoleDefaultPolicy4BD1E93F",
+        "PolicyName": "fetchuseractivitygen2maintwolambdaServiceRoleDefaultPolicy752079E1",
         "Roles": [
           {
-            "Ref": "fetchuseractivitygen2mainlambdaServiceRoleCC992996"
+            "Ref": "fetchuseractivitygen2maintwolambdaServiceRole0B561055"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/fetchuseractivity-gen2-main-lambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/fetchuseractivity-gen2-maintwo-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "fetchuseractivitygen2mainlambda788E8B44": {
+    "fetchuseractivitygen2maintwolambda75E37FB2": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -114,33 +114,33 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "ecbc9071d44b5cf33a0786f86ad128e255728702dcca738856d26a584cddd8ec.zip"
+          "S3Key": "64ee581196febc85959027f8318591ccf788a4a57c2f47e0adcce31b6bbb97da.zip"
         },
         "Environment": {
           "Variables": {
-            "ENV": "gen2-main",
+            "ENV": "gen2-maintwo",
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
-            "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
-            },
             "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn"
+            },
+            "STORAGE_ACTIVITY_ARN": {
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
             },
             "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref"
             }
           }
         },
         "EphemeralStorage": {
           "Size": 512
         },
-        "FunctionName": "fetchuseractivity-gen2-main",
+        "FunctionName": "fetchuseractivity-gen2-maintwo",
         "Handler": "index.handler",
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "fetchuseractivitygen2mainlambdaServiceRoleCC992996",
+            "fetchuseractivitygen2maintwolambdaServiceRole0B561055",
             "Arn"
           ]
         },
@@ -152,7 +152,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -160,7 +160,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "fetchuseractivity-gen2-main"
+            "Value": "fetchuseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -170,17 +170,17 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "fetchuseractivitygen2mainlambdaServiceRoleDefaultPolicy4BD1E93F",
-        "fetchuseractivitygen2mainlambdaServiceRoleCC992996"
+        "fetchuseractivitygen2maintwolambdaServiceRoleDefaultPolicy752079E1",
+        "fetchuseractivitygen2maintwolambdaServiceRole0B561055"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/fetchuseractivity-gen2-main-lambda/Resource",
-        "aws:asset:path": "asset.ecbc9071d44b5cf33a0786f86ad128e255728702dcca738856d26a584cddd8ec",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/fetchuseractivity-gen2-maintwo-lambda/Resource",
+        "aws:asset:path": "asset.64ee581196febc85959027f8318591ccf788a4a57c2f47e0adcce31b6bbb97da",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "recorduseractivitygen2mainlambdaServiceRoleAB2F457C": {
+    "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -216,7 +216,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -224,7 +224,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-main"
+            "Value": "recorduseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -233,10 +233,10 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/recorduseractivity-gen2-main-lambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/ServiceRole/Resource"
       }
     },
-    "recorduseractivitygen2mainlambdaServiceRoleDefaultPolicy9501E2A3": {
+    "recorduseractivitygen2maintwolambdaServiceRoleDefaultPolicy8FD603AF": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -263,14 +263,14 @@
               "Effect": "Allow",
               "Resource": [
                 {
-                  "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
+                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
                 },
                 {
                   "Fn::Join": [
                     "",
                     [
                       {
-                        "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
+                        "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
                       },
                       "/index/*"
                     ]
@@ -291,7 +291,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydh04enrtcsd0C187242"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D"
               }
             },
             {
@@ -302,7 +302,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussions42CE1AA5"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64"
               }
             },
             {
@@ -313,24 +313,24 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydh04enr95FF1192"
+                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E"
               }
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "recorduseractivitygen2mainlambdaServiceRoleDefaultPolicy9501E2A3",
+        "PolicyName": "recorduseractivitygen2maintwolambdaServiceRoleDefaultPolicy8FD603AF",
         "Roles": [
           {
-            "Ref": "recorduseractivitygen2mainlambdaServiceRoleAB2F457C"
+            "Ref": "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/recorduseractivity-gen2-main-lambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "recorduseractivitygen2mainlambda641C8AFE": {
+    "recorduseractivitygen2maintwolambdaFBA585F0": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -340,33 +340,33 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "d04b1ab3319039402baa0d4721243aafee639be416149b2f3ce60d0595719ea1.zip"
+          "S3Key": "0f5f3ad02804e7329f1981c8fc67574bd71c722200b653fcefdd6129eb82aa30.zip"
         },
         "Environment": {
           "Variables": {
-            "ENV": "gen2-main",
+            "ENV": "gen2-maintwo",
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
-            "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn"
-            },
             "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn"
+            },
+            "STORAGE_ACTIVITY_ARN": {
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
             },
             "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef"
+              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref"
             }
           }
         },
         "EphemeralStorage": {
           "Size": 512
         },
-        "FunctionName": "recorduseractivity-gen2-main",
+        "FunctionName": "recorduseractivity-gen2-maintwo",
         "Handler": "index.handler",
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "recorduseractivitygen2mainlambdaServiceRoleAB2F457C",
+            "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9",
             "Arn"
           ]
         },
@@ -378,7 +378,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -386,7 +386,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-main"
+            "Value": "recorduseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -396,25 +396,25 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "recorduseractivitygen2mainlambdaServiceRoleDefaultPolicy9501E2A3",
-        "recorduseractivitygen2mainlambdaServiceRoleAB2F457C"
+        "recorduseractivitygen2maintwolambdaServiceRoleDefaultPolicy8FD603AF",
+        "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/recorduseractivity-gen2-main-lambda/Resource",
-        "aws:asset:path": "asset.d04b1ab3319039402baa0d4721243aafee639be416149b2f3ce60d0595719ea1",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/Resource",
+        "aws:asset:path": "asset.0f5f3ad02804e7329f1981c8fc67574bd71c722200b653fcefdd6129eb82aa30",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "recorduseractivitygen2mainlambdaDynamoDBEventSourceamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicCustomTableTopicTableC1EFEB9CA2B9B375": {
+    "recorduseractivitygen2maintwolambdaDynamoDBEventSourceamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicCustomTableTopicTable8B3A6ED9ECB61435": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydh04enrtcsd0C187242"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D"
         },
         "FunctionName": {
-          "Ref": "recorduseractivitygen2mainlambda641C8AFE"
+          "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -424,7 +424,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -432,7 +432,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-main"
+            "Value": "recorduseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -441,18 +441,18 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/recorduseractivity-gen2-main-lambda/DynamoDBEventSource:amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicCustomTableTopicTableC1EFEB9C/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/DynamoDBEventSource:amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicCustomTableTopicTable8B3A6ED9/Resource"
       }
     },
-    "recorduseractivitygen2mainlambdaDynamoDBEventSourceamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostCustomTablePostTableF0CD7D524BF7D876": {
+    "recorduseractivitygen2maintwolambdaDynamoDBEventSourceamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostCustomTablePostTable6F127D041B2A119F": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussions42CE1AA5"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64"
         },
         "FunctionName": {
-          "Ref": "recorduseractivitygen2mainlambda641C8AFE"
+          "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -462,7 +462,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -470,7 +470,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-main"
+            "Value": "recorduseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -479,18 +479,18 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/recorduseractivity-gen2-main-lambda/DynamoDBEventSource:amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostCustomTablePostTableF0CD7D52/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/DynamoDBEventSource:amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostCustomTablePostTable6F127D04/Resource"
       }
     },
-    "recorduseractivitygen2mainlambdaDynamoDBEventSourceamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCustomTableCommentTable0F690D399A9BACF4": {
+    "recorduseractivitygen2maintwolambdaDynamoDBEventSourceamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCustomTableCommentTable7F3A5F9A76CBDA76": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydh04enr95FF1192"
+          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E"
         },
         "FunctionName": {
-          "Ref": "recorduseractivitygen2mainlambda641C8AFE"
+          "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -500,7 +500,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -508,7 +508,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-main"
+            "Value": "recorduseractivity-gen2-maintwo"
           },
           {
             "Key": "created-by",
@@ -517,16 +517,16 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/recorduseractivity-gen2-main-lambda/DynamoDBEventSource:amplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentCustomTableCommentTable0F690D39/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/DynamoDBEventSource:amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCustomTableCommentTable7F3A5F9A/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOvQ6CQBCEn4X+WBEsbMVoJzHwAGQ5FnL83BH2gBjCu5uDxMbqm5niy4QQXs4QeLiwL8vW71QBa0JsqcwsylbgwvnaYV+UmGtTUsOQ7HhOWlpltFDYw5qajsS90jvfplPy4+qRNsFRjsxkGW4OgiOIJ9mSjZFJHHpY75X+WR8zaZuZaZT0wmFQuna+/3XbxK7MLNauCncSGj7NYQjnKwRew0r546St6gnSg19RDXK49wAAAA=="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOwQ6CMBBEv4V7WRE5eBWiN4mRDyBLWUihtIQtGkP4d1NIvHh6M3N4mRjiJIEowDeHsu5DrSpYcmJHdeFQ9gLfXC4ah6rG0tiaOoZ8w2020ilrhMIBlqfVJLLGbHxYreTH1z2tgk8lMpNjuHgIPkE6y55cikxi18OSNeZnvb7IuMLOk6Q7jqMyrff9r+sqNmXhsPVV+JPQ8eEVx3A8QxR0rFQ4zcapgeC58wtmzoOU9wAAAA=="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/function/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -798,34 +798,34 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44storageNestedStackstorageNestedStackResourceF6518C7AOutputsamplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataTopicNestedStackTopicNestedStackResource7AA88BABOutputsamplifydh04enrtcsd0C187242": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataPostNestedStackPostNestedStackResourceDD4F69CDOutputsamplifydiscussions42CE1AA5": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2mainbranch96dfd1dc44dataNestedStackdataNestedStackResource2163667EOutputsamplifydiscussionsgen2mainbranch96dfd1dc44dataamplifyDataCommentNestedStackCommentNestedStackResource47CE1CB5Outputsamplifydh04enr95FF1192": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44functionfetchuseractivitygen2mainlambdaB595A82ARef": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3functionfetchuseractivitygen2maintwolambda6D9C5EFDRef": {
       "Value": {
-        "Ref": "fetchuseractivitygen2mainlambda788E8B44"
+        "Ref": "fetchuseractivitygen2maintwolambda75E37FB2"
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44functionrecorduseractivitygen2mainlambda298FCA5FRef": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3functionrecorduseractivitygen2maintwolambda15FF9A2DRef": {
       "Value": {
-        "Ref": "recorduseractivitygen2mainlambda641C8AFE"
+        "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
       }
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt
similarity index 54%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt
index 7cc23c581cc..4600cb981f5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt
@@ -1 +1 @@
-{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.21.0","stackType":"custom","metadata":{}}
\ No newline at end of file
+{"createdOn":"Linux","createdBy":"AmplifyPipelineDeploy","createdWith":"1.4.3","stackType":"storage-S3","metadata":{}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json
new file mode 100644
index 00000000000..771feb56f0b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json
@@ -0,0 +1,6 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref",
+    "OutputValue": "amplify-discussions-ge-discusavatarsdecb9gen2ma-2na4arzi4tor"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json
new file mode 100644
index 00000000000..f8b3c41e71c
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json
new file mode 100644
index 00000000000..2e736a3fe60
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json
@@ -0,0 +1,746 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
+  "Resources": {
+    "discusavatarsdecb9gen2maintwoBucket5CCF194E": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "BucketKeyEnabled": false,
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "discus-avatarsdecb9-gen2-maintwo"
+          },
+          {
+            "Key": "aws-cdk:auto-delete-objects",
+            "Value": "true"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/discus-avatarsdecb9-gen2-maintwo/Bucket/Resource"
+      }
+    },
+    "discusavatarsdecb9gen2maintwoBucketPolicy125A25F7": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": {
+          "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+        },
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:PutBucketPolicy",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": {
+                  "Fn::GetAtt": [
+                    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+                    "Arn"
+                  ]
+                }
+              },
+              "Resource": [
+                {
+                  "Fn::GetAtt": [
+                    "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                    "Arn"
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/discus-avatarsdecb9-gen2-maintwo/Bucket/Policy/Resource"
+      }
+    },
+    "discusavatarsdecb9gen2maintwoBucketAutoDeleteObjectsCustomResourceF149C46F": {
+      "Type": "Custom::S3AutoDeleteObjects",
+      "Properties": {
+        "ServiceToken": {
+          "Fn::GetAtt": [
+            "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+            "Arn"
+          ]
+        },
+        "BucketName": {
+          "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+        }
+      },
+      "DependsOn": [
+        "discusavatarsdecb9gen2maintwoBucketPolicy125A25F7"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/discus-avatarsdecb9-gen2-maintwo/Bucket/AutoDeleteObjectsCustomResource/Default"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ]
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip"
+        },
+        "Timeout": 900,
+        "MemorySize": 128,
+        "Handler": "index.handler",
+        "Role": {
+          "Fn::GetAtt": [
+            "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs22.x",
+        "Description": {
+          "Fn::Join": [
+            "",
+            [
+              "Lambda function for auto-deleting objects in ",
+              {
+                "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+              },
+              " S3 bucket."
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
+        "aws:asset:property": "Code"
+      }
+    },
+    "DISCUSAVATARSDECB9GEN2MAINTWOBUCKETNAMEParameter04623971": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/DISCUS_AVATARSDECB_9_GEN_2_MAINTWO_BUCKET_NAME",
+        "Tags": {
+          "amplify:app-id": "discussions",
+          "amplify:branch-name": "gen2-maintwo",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": {
+          "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/DISCUS_AVATARSDECB_9_GEN_2_MAINTWO_BUCKET_NAMEParameter/Resource"
+      }
+    },
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageAccess3106BBB91": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:PutObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/*",
+                    "public/",
+                    "protected/*",
+                    "protected/",
+                    "private/*",
+                    "private/"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::GetAtt": [
+                  "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                  "Arn"
+                ]
+              }
+            },
+            {
+              "Action": "s3:DeleteObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      {
+                        "Fn::GetAtt": [
+                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "Arn"
+                        ]
+                      },
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageAccess3106BBB91",
+        "Roles": [
+          {
+            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/amplify-discussions-gen2maintwo-branch-a0081fe3b3--storageAccess3/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNy07DMBBFv6VZO0NJu0Ds2rKGqFkihFxniCaJbckz6UOW/x2llggsWc0dnfuooNpuYb3SFy5NO5QjnSC+Igu2jWgzKH3hz8gbiPvJDCjq8OWyeo+FpSu54rn4HZ79vIE7YsjW3ST+BUcUfDv1aISL9KEyqv1I5ra05v8f3TnQiBa06O7VSTFbiI0Ecl2tg7YoGOaNnycp0hbisp5VSuowsXh7RPZTMDijRf9BdfBnajHsNaPaMaM0ojtyXVLOtwg9P5yrCh6fYL3qmagMkxOyCMd8vwGr7NONegEAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+      "Type": "String"
+    }
+  },
+  "Outputs": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref": {
+      "Value": {
+        "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json
new file mode 100644
index 00000000000..55a58612680
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json
@@ -0,0 +1,14 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref",
+    "OutputValue": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storageactivityA346F297-1PHSGRJSW0US5.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
index 9546b78a0fa..cc272781e62 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd1dc44-storage0EC3F24A-QQN18S0SITDH.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.0\",\"stackType\":\"custom\",\"metadata\":{}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
     "activity1E902D9C": {
       "Type": "AWS::DynamoDB::Table",
@@ -64,7 +64,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-main"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -79,16 +79,16 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/activity/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/activity/Resource"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6MGi+3tLdReJplZiJ8EnERZxLsvaPWeAdPUUBV4ina06NVbuDqWxDQkdIvCUyb6BdwiWbhGtCur9hue3KpniXl3fKsQiWGW8jAG6g9UxSze6z2H5DeG/vUPUV/XUG4AAAA="
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2main-branch-96dfd1dc44/storage/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -360,7 +360,7 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
       "Value": {
         "Fn::GetAtt": [
           "activity1E902D9C",
@@ -368,7 +368,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDStreamArn": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "activity1E902D9C",
@@ -376,7 +376,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2mainbranch96dfd1dc44storageactivityEF3255CDRef": {
+    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
       "Value": {
         "Ref": "activity1E902D9C"
       }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
index 8e4344a2ca2..002324e944a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92-storagebookmarks210DAF62-AOPTK1NWQZNJ.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
@@ -1,16 +1,6 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.21.1\",\"stackType\":\"custom\",\"metadata\":{}}",
   "Resources": {
-    "CDKMetadata": {
-      "Type": "AWS::CDK::Metadata",
-      "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ6NGG+vtt1D7ZZIZIX4ScOKKiHcXtHrPgKkrKDLcRTua9OwtnF+WxNQldJPCXX50BFwiWTh7tDOrzxCeXKplidvq+FIhEsMo+d8UUDZQZ6N4r9ctJL8wtK83qhgjsW4AAAA="
-      },
-      "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks/CDKMetadata/Default"
-      },
-      "Condition": "CDKMetadataAvailable"
-    },
     "bookmarksA4548304": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
@@ -59,17 +49,40 @@
         "StreamSpecification": {
           "StreamViewType": "NEW_IMAGE"
         },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "bookmarks",
-              "-",
-              "blade"
-            ]
-          ]
-        }
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/bookmarks/Resource"
       }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
     }
   },
   "Conditions": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json
similarity index 62%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json
index 6517188ff83..c7f9d67a1d1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "webClientId",
-    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
+    "OutputValue": "1c1vf5gnunutele7c45m171n11"
   },
   {
     "OutputKey": "socialProviders",
@@ -11,13 +11,17 @@
     "OutputKey": "usernameAttributes",
     "OutputValue": "[\"phone_number\"]"
   },
+  {
+    "OutputKey": "bucketName",
+    "OutputValue": "amplify-discussions-ge-discusavatarsdecb9gen2ma-2na4arzi4tor"
+  },
   {
     "OutputKey": "signupAttributes",
     "OutputValue": "[\"email\",\"phone_number\"]"
   },
   {
     "OutputKey": "oauthClientId",
-    "OutputValue": "32gd06g1ofsno77g3aj6a7aenm"
+    "OutputValue": "1c1vf5gnunutele7c45m171n11"
   },
   {
     "OutputKey": "allowUnauthenticatedIdentities",
@@ -47,13 +51,17 @@
     "OutputKey": "mfaConfiguration",
     "OutputValue": "OFF"
   },
+  {
+    "OutputKey": "storageRegion",
+    "OutputValue": "us-east-1"
+  },
   {
     "OutputKey": "oauthResponseType",
     "OutputValue": "code"
   },
   {
     "OutputKey": "awsAppsyncApiKey",
-    "OutputValue": "da2-3ikaaaabp5gubimmave6av37ga"
+    "OutputValue": "da2-g2kwwpglwnakbe2n4gy375uyxy"
   },
   {
     "OutputKey": "awsAppsyncAuthenticationType",
@@ -69,19 +77,23 @@
   },
   {
     "OutputKey": "awsAppsyncApiEndpoint",
-    "OutputValue": "https://ugegaqplxndhddmmhzi2j4rj4u.appsync-api.us-east-1.amazonaws.com/graphql"
+    "OutputValue": "https://reebkadyw5e47aagqne7csre5m.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
     "OutputKey": "awsAppsyncApiId",
-    "OutputValue": "2264xbjvizfhfljloltcb4xr3e"
+    "OutputValue": "d4mt7tdvurcczil4a5eoajtsxy"
   },
   {
     "OutputKey": "authRegion",
     "OutputValue": "us-east-1"
   },
+  {
+    "OutputKey": "buckets",
+    "OutputValue": "[\"{\\\"name\\\":\\\"discus-avatarsdecb9-gen2-maintwo\\\",\\\"bucketName\\\":\\\"amplify-discussions-ge-discusavatarsdecb9gen2ma-2na4arzi4tor\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
+  },
   {
     "OutputKey": "amplifyApiModelSchemaS3Uri",
-    "OutputValue": "s3://amplify-discussions-e2-amplifydataamplifycodege-g8qjz8miowur/model-schema.graphql"
+    "OutputValue": "s3://amplify-discussions-ge-amplifydataamplifycodege-eouy18dnw0i5/model-schema.graphql"
   },
   {
     "OutputKey": "groups",
@@ -89,7 +101,7 @@
   },
   {
     "OutputKey": "definedFunctions",
-    "OutputValue": "[\"fetchuseractivity-e2etest\",\"recorduseractivity-e2etest\"]"
+    "OutputValue": "[\"fetchuseractivity-gen2-maintwo\",\"recorduseractivity-gen2-maintwo\"]"
   },
   {
     "OutputKey": "passwordlessOptions",
@@ -113,11 +125,11 @@
   },
   {
     "OutputKey": "userPoolId",
-    "OutputValue": "us-east-1_dgn42NPnC"
+    "OutputValue": "us-east-1_fU7jrxvo5"
   },
   {
     "OutputKey": "identityPoolId",
-    "OutputValue": "us-east-1:b819ce03-3279-4956-a222-2eca8a9ba575"
+    "OutputValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
   },
   {
     "OutputKey": "verificationMechanisms",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json
similarity index 69%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json
index 86d1e6d99b7..81f1bfe358a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-e2etest-branch-75c4329a92.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json
@@ -51,6 +51,14 @@
       "stackOutputs": [
         "definedFunctions"
       ]
+    },
+    "AWS::Amplify::Storage": {
+      "version": "1",
+      "stackOutputs": [
+        "buckets",
+        "storageRegion",
+        "bucketName"
+      ]
     }
   },
   "Outputs": {
@@ -66,7 +74,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef"
         ]
       }
     },
@@ -74,7 +82,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref"
         ]
       }
     },
@@ -82,7 +90,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
         ]
       }
     },
@@ -140,7 +148,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPoolAppClient0419B6E6Ref"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref"
         ]
       }
     },
@@ -151,7 +159,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455ApiId"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
         ]
       }
     },
@@ -159,7 +167,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPI8D8A4455GraphQLUrl"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1GraphQLUrl"
         ]
       }
     },
@@ -192,7 +200,7 @@
                             {
                               "Fn::GetAtt": [
                                 "data7552DF31",
-                                "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB58A9127ADestinationBucketArn"
+                                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB44890AA5DestinationBucketArn"
                               ]
                             }
                           ]
@@ -212,7 +220,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataGraphQLAPIDefaultApiKey064789F0ApiKey"
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIDefaultApiKey22C2FDC2ApiKey"
         ]
       }
     },
@@ -228,20 +236,54 @@
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifydiscussionse2etestbranch75c4329a92functionfetchuseractivitye2etestlambdaFF02D760Ref"
+                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3functionfetchuseractivitygen2maintwolambda6D9C5EFDRef"
               ]
             },
             "\",\"",
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifydiscussionse2etestbranch75c4329a92functionrecorduseractivitye2etestlambdaEFF63D27Ref"
+                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3functionrecorduseractivitygen2maintwolambda15FF9A2DRef"
               ]
             },
             "\"]"
           ]
         ]
       }
+    },
+    "storageRegion": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    },
+    "bucketName": {
+      "Value": {
+        "Fn::GetAtt": [
+          "storage0EC3F24A",
+          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref"
+        ]
+      }
+    },
+    "buckets": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "[\"{\\\"name\\\":\\\"discus-avatarsdecb9-gen2-maintwo\\\",\\\"bucketName\\\":\\\"",
+            {
+              "Fn::GetAtt": [
+                "storage0EC3F24A",
+                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref"
+              ]
+            },
+            "\\\",\\\"storageRegion\\\":\\\"",
+            {
+              "Ref": "AWS::Region"
+            },
+            "\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
+          ]
+        ]
+      }
     }
   },
   "Resources": {
@@ -281,7 +323,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -294,7 +336,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1": {
@@ -308,7 +350,7 @@
                 "amplify:UpdateBranch"
               ],
               "Effect": "Allow",
-              "Resource": "arn:aws:amplify:*:*:apps/discussions/branches/e2etest"
+              "Resource": "arn:aws:amplify:*:*:apps/discussions/branches/gen2-maintwo"
             }
           ],
           "Version": "2012-10-17"
@@ -321,7 +363,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceLambda582AC093": {
@@ -331,7 +373,7 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "6ea036d9253c8571a595f8e39d788d63c132eafed252fbd584c992dc6663feae.zip"
+          "S3Key": "67425b9f14cfe4a196e61f870e9cabfc0b94dee9b5b91bbeccbb9c69b3bc2993.zip"
         },
         "Handler": "index.handler",
         "Role": {
@@ -348,7 +390,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -366,8 +408,8 @@
         "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceLambda/Resource",
-        "aws:asset:path": "asset.6ea036d9253c8571a595f8e39d788d63c132eafed252fbd584c992dc6663feae",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceLambda/Resource",
+        "aws:asset:path": "asset.67425b9f14cfe4a196e61f870e9cabfc0b94dee9b5b91bbeccbb9c69b3bc2993",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
@@ -408,7 +450,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -421,7 +463,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412": {
@@ -476,7 +518,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900": {
@@ -488,7 +530,7 @@
           },
           "S3Key": "07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57.zip"
         },
-        "Description": "AWS CDK resource provider framework - onEvent (amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider)",
+        "Description": "AWS CDK resource provider framework - onEvent (amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider)",
         "Environment": {
           "Variables": {
             "USER_ON_EVENT_FUNCTION_ARN": {
@@ -518,7 +560,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -536,7 +578,7 @@
         "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
         "aws:asset:path": "asset.07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -552,12 +594,12 @@
           ]
         },
         "appId": "discussions",
-        "branchName": "e2etest"
+        "branchName": "gen2-maintwo"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/AmplifyBranchLinker/CustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResource/Default"
       }
     },
     "auth179371D7": {
@@ -570,7 +612,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -597,7 +639,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/4ade840b69d9728e3d12f22d1a01ab0323f486713a3015d1451d6f631487ca31.json"
+              "/3165d37962f3c936a61898d88ff7df6a61ee55bb5a15d5c6e5d22797439b68b0.json"
             ]
           ]
         }
@@ -605,8 +647,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/auth.NestedStack/auth.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92authCD10F0D5.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth.NestedStack/auth.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3authE55A333D.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -614,28 +656,86 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+            "Fn::GetAtt": [
+              "auth179371D7",
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef"
+            ]
+          },
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthUserPool6C853715Ref"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthauthenticatedUserRole1FD28C30Ref"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthunauthenticatedUserRole57C7A795Ref"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
             ]
+          }
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92authNestedStackauthNestedStackResource5FCD0ACDOutputsamplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref": {
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-maintwo"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ],
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+              },
+              "/86f88508166e592fe54f8777f9fe0baff54a789b8177fb10b8f9fd3663f5104e.json"
+            ]
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data.NestedStack/data.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataC1492795.nested.template.json",
+        "aws:asset:property": "TemplateURL"
+      }
+    },
+    "storage0EC3F24A": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92authamplifyAuthIdentityPool88A68FC5Ref"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
             ]
           }
         },
@@ -646,7 +746,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -673,7 +773,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/c4383513aa103986e3602ad7edcd2a810c5c8963857210f974eec9aec932ddb0.json"
+              "/48f663d645afd5420b43aef0928872002d3f2f9f78f650528e81320079bb6df0.json"
             ]
           ]
         }
@@ -681,8 +781,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/data.NestedStack/data.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92dataD836B8FC.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage.NestedStack/storage.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageEFBED291.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -690,40 +790,40 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Arn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971StreamArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92storageactivityNestedStackstorageactivityNestedStackResource4920750AOutputsamplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92storageactivity5954B971Ref"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifyd1skq8aomhbBE16F004": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicNestedStackTopicNestedStackResourceA7537F66Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataTopicTopicTable8B37B260TableStreamArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifyd1skq8aomhb77CA70D332": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostNestedStackPostNestedStackResourceCC520A3FOutputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataPostPostTableCC3E5BC0TableStreamArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn"
             ]
           },
-          "referencetoamplifydiscussionse2etestbranch75c4329a92dataNestedStackdataNestedStackResourceDA897066Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifyd1skq8a28D11EA9": {
+          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentNestedStackCommentNestedStackResource3430FEE6Outputsamplifydiscussionse2etestbranch75c4329a92dataamplifyDataCommentCommentTable5A2616EFTableStreamArn"
+              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn"
             ]
           }
         },
@@ -734,7 +834,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -761,7 +861,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/998f4e16ca757850ea9693dda3b958dd39b0c197b47526137726706f8e346431.json"
+              "/eca94e4abd9336d5a4e172550c856d29f2270e1c01ce9da49a0ae9e563807891.json"
             ]
           ]
         }
@@ -769,8 +869,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/function.NestedStack/function.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92function1DEFB26B.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function.NestedStack/function.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3function1E08C893.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -784,7 +884,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -811,7 +911,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/3b8f4ab2ff24cca9f51b69dc51e83199b76a68e4c5f60eb81bfe0e175192b182.json"
+              "/bf47b0dd2f6e2e217d594cb4a09f7fd1c2713723e6ed3712212ee2b5ebb44cb2.json"
             ]
           ]
         }
@@ -819,8 +919,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storageactivity.NestedStack/storageactivity.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92storageactivityCC1C5F88.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity.NestedStack/storageactivity.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivity997FBF27.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -834,7 +934,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "e2etest"
+            "Value": "gen2-maintwo"
           },
           {
             "Key": "amplify:deployment-type",
@@ -861,7 +961,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/0d947563b18f50accc548da0a038516a37798609704a114b1b1abcbce6932675.json"
+              "/a81a43a8edbe65c9a0a780bf184736317634b82a82d34463ce17daa624f6fd80.json"
             ]
           ]
         }
@@ -869,18 +969,18 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionse2etestbranch75c4329a92storagebookmarksDA286ADD.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3storagebookmarks047699E9.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
     "CDKMetadata": {
       "Type": "AWS::CDK::Metadata",
       "Properties": {
-        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02PzU7DQAyEn6V3x5SkF440Ekeo0geI3I1bOT+7aO1thaK8O8oGEKdvrNGMPCWWhwr3O3po4bqhGOWC89nIDVBf/Ueyz2RAD23nkaZLR60PHfeK7xlvyTuT4EFowrkJI6+pzFMYxX2t56YW0KolVTbF1xWgFR6TG9iOpAxbPc711f+1/oplgRw5G93E38AltTC1kTWk6FjxFMNdOo5QZ6f5MfIz/3TetcA6AXt9upd7fH7Bw65XkSImbzIxNhu/AWzDJeQZAQAA"
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/02PzWrDQAyEnyV3WU2dHHJtDD22wXkAo6yVIP/slpU2oRi/e/C6LT19I4YZNCWW+z1uN/TQwrV9McgFp7OR66G6+s9kX8mAHtpMA42XlhofWu4UPzLek3cmwYPQiFMdBl5SmacwiPtezlXNoLuGVNkU3xaA7vCYXM92JGVY63Gqrv6v9VfMM+TI2egm/gYuqYWxiawhRceKpxju0nKEKjv1j5Gf+afzrhmWCdjpy70s8fWA202nIkVM3mRkrFc+AXlCmgwZAQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-e2etest-branch-75c4329a92/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.outputs.json
deleted file mode 100644
index 806ac6a1fc0..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.outputs.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttCommentDataSourceName",
-    "OutputValue": "CommentTable",
-    "Description": "Your model DataSource name.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:CommentDataSource:Name"
-  },
-  {
-    "OutputKey": "GetAttCommentTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.739",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:CommentTable:StreamArn"
-  },
-  {
-    "OutputKey": "transformerrootstackCommentCommentDataSourceA0E54655Name",
-    "OutputValue": "CommentTable"
-  },
-  {
-    "OutputKey": "transformerrootstackCommentCommentTable5427FDE2Ref",
-    "OutputValue": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "OutputKey": "GetAttCommentTableName",
-    "OutputValue": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:CommentTable:Name"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.template.json
deleted file mode 100644
index 53e4eeb8269..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.template.json
+++ /dev/null
@@ -1,1195 +0,0 @@
-{
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetotransformerrootstackenv10C5A902Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-            },
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "ShouldUseServerSideEncryption": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnableServerSideEncryption"
-        },
-        "true"
-      ]
-    },
-    "ShouldUsePayPerRequestBilling": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBBillingMode"
-        },
-        "PAY_PER_REQUEST"
-      ]
-    },
-    "ShouldUsePointInTimeRecovery": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnablePointInTimeRecovery"
-        },
-        "true"
-      ]
-    }
-  },
-  "Resources": {
-    "CommentTable": {
-      "Type": "AWS::DynamoDB::Table",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "id",
-            "AttributeType": "S"
-          },
-          {
-            "AttributeName": "postCommentsId",
-            "AttributeType": "S"
-          }
-        ],
-        "BillingMode": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            "PAY_PER_REQUEST",
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "GlobalSecondaryIndexes": [
-          {
-            "IndexName": "gsi-Post.comments",
-            "KeySchema": [
-              {
-                "AttributeName": "postCommentsId",
-                "KeyType": "HASH"
-              }
-            ],
-            "Projection": {
-              "ProjectionType": "ALL"
-            },
-            "ProvisionedThroughput": {
-              "Fn::If": [
-                "ShouldUsePayPerRequestBilling",
-                {
-                  "Ref": "AWS::NoValue"
-                },
-                {
-                  "ReadCapacityUnits": {
-                    "Ref": "DynamoDBModelTableReadIOPS"
-                  },
-                  "WriteCapacityUnits": {
-                    "Ref": "DynamoDBModelTableWriteIOPS"
-                  }
-                }
-              ]
-            }
-          }
-        ],
-        "KeySchema": [
-          {
-            "AttributeName": "id",
-            "KeyType": "HASH"
-          }
-        ],
-        "PointInTimeRecoverySpecification": {
-          "Fn::If": [
-            "ShouldUsePointInTimeRecovery",
-            {
-              "PointInTimeRecoveryEnabled": true
-            },
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "ProvisionedThroughput": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            {
-              "Ref": "AWS::NoValue"
-            },
-            {
-              "ReadCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "WriteCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          ]
-        },
-        "SSESpecification": {
-          "SSEEnabled": {
-            "Fn::If": [
-              "ShouldUseServerSideEncryption",
-              true,
-              false
-            ]
-          }
-        },
-        "StreamSpecification": {
-          "StreamViewType": "NEW_AND_OLD_IMAGES"
-        },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "Comment-",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "-",
-              {
-                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-              }
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete"
-    },
-    "CommentIAMRoleD5EC5F51": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:BatchGetItem",
-                    "dynamodb:BatchWriteItem",
-                    "dynamodb:PutItem",
-                    "dynamodb:DeleteItem",
-                    "dynamodb:GetItem",
-                    "dynamodb:Scan",
-                    "dynamodb:Query",
-                    "dynamodb:UpdateItem",
-                    "dynamodb:ConditionCheckItem",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:GetRecords",
-                    "dynamodb:GetShardIterator"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
-                        {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Comment-",
-                                {
-                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-                                },
-                                "-",
-                                {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              ]
-                            ]
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
-                        {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Comment-",
-                                {
-                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-                                },
-                                "-",
-                                {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              ]
-                            ]
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "DynamoDBAccess"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "CommentIAMRole20388d-",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "-",
-              {
-                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-              }
-            ]
-          ]
-        }
-      }
-    },
-    "CommentIAMRoleDefaultPolicyA8D6F6B5": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "dynamodb:BatchGetItem",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator",
-                "dynamodb:Query",
-                "dynamodb:GetItem",
-                "dynamodb:Scan",
-                "dynamodb:ConditionCheckItem",
-                "dynamodb:BatchWriteItem",
-                "dynamodb:PutItem",
-                "dynamodb:UpdateItem",
-                "dynamodb:DeleteItem",
-                "dynamodb:DescribeTable"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "CommentTable",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "CommentTable",
-                          "Arn"
-                        ]
-                      },
-                      "/index/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "CommentIAMRoleDefaultPolicyA8D6F6B5",
-        "Roles": [
-          {
-            "Ref": "CommentIAMRoleD5EC5F51"
-          }
-        ]
-      }
-    },
-    "CommentDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DynamoDBConfig": {
-          "AwsRegion": {
-            "Ref": "AWS::Region"
-          },
-          "TableName": {
-            "Ref": "CommentTable"
-          }
-        },
-        "Name": "CommentTable",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "CommentIAMRoleD5EC5F51",
-            "Arn"
-          ]
-        },
-        "Type": "AMAZON_DYNAMODB"
-      },
-      "DependsOn": [
-        "CommentIAMRoleD5EC5F51"
-      ]
-    },
-    "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryGetCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getComment.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getComment.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "GetCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "getComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "CommentTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      }
-    },
-    "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryListCommentsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.listComments.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.listComments.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "ListCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "listComments",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "CommentTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      }
-    },
-    "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationCreateCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createComment.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createComment.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "CreateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "createComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "CommentTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateComment.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateComment.auth.1.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationUpdateCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateComment.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateComment.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "UpdateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "updateComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30",
-                "FunctionId"
-              ]
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "CommentTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeleteCommentauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteComment.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteComment.auth.1.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "CommentDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationDeleteCommentDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteComment.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteComment.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "CommentDataSource"
-      ]
-    },
-    "DeleteCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "deleteComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A",
-                "FunctionId"
-              ]
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "CommentTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "SubscriptiononCreateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onCreateComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    },
-    "SubscriptiononUpdateCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onUpdateComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    },
-    "SubscriptiononDeleteCommentResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onDeleteComment",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    }
-  },
-  "Outputs": {
-    "GetAttCommentTableStreamArn": {
-      "Description": "Your DynamoDB table StreamArn.",
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentTable",
-          "StreamArn"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:CommentTable:StreamArn"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttCommentTableName": {
-      "Description": "Your DynamoDB table name.",
-      "Value": {
-        "Ref": "CommentTable"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:CommentTable:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttCommentDataSourceName": {
-      "Description": "Your model DataSource name.",
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentDataSource",
-          "Name"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:CommentDataSource:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "transformerrootstackCommentCommentDataSourceA0E54655Name": {
-      "Value": {
-        "Fn::GetAtt": [
-          "CommentDataSource",
-          "Name"
-        ]
-      }
-    },
-    "transformerrootstackCommentCommentTable5427FDE2Ref": {
-      "Value": {
-        "Ref": "CommentTable"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.outputs.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.outputs.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.parameters.json
deleted file mode 100644
index 6a7c72fa20a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.parameters.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref",
-    "ParameterValue": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef",
-    "ParameterValue": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref",
-    "ParameterValue": "Comment-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name",
-    "ParameterValue": "CommentTable"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name",
-    "ParameterValue": "PostTable"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName",
-    "ParameterValue": "TopicTable"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.template.json
deleted file mode 100644
index 869d26f9c71..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-ConnectionStack-80K87W31YMJP.template.json
+++ /dev/null
@@ -1,422 +0,0 @@
-{
-  "Resources": {
-    "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "Topicpostsauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Topic.posts.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "TopicPostsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Topic.posts.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Topic.posts.res.vtl"
-            ]
-          ]
-        }
-      }
-    },
-    "TopicpostsResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "posts",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Topic"
-      }
-    },
-    "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "PostCommentsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Post.comments.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Post.comments.res.vtl"
-            ]
-          ]
-        }
-      }
-    },
-    "PostcommentsResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "comments",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Post"
-      }
-    },
-    "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "PostTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Post.topic.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Post.topic.res.vtl"
-            ]
-          ]
-        }
-      }
-    },
-    "PosttopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "topic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Post"
-      }
-    },
-    "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "CommentPostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Comment.post.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Comment.post.res.vtl"
-            ]
-          ]
-        }
-      }
-    },
-    "CommentpostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "post",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "Topicpostsauth0FunctionTopicpostsauth0FunctionAppSyncFunctionF8CB58E2",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Comment"
-      }
-    }
-  },
-  "Parameters": {
-    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
-      "Type": "String"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.description.txt
deleted file mode 100644
index 87d574fa42f..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-An auto-generated nested stack for the @function directive.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.outputs.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.outputs.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.outputs.json
deleted file mode 100644
index 23b0ff7d495..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.outputs.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttPostDataSourceName",
-    "OutputValue": "PostTable",
-    "Description": "Your model DataSource name.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:PostDataSource:Name"
-  },
-  {
-    "OutputKey": "GetAttPostTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:12:19.057",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:PostTable:StreamArn"
-  },
-  {
-    "OutputKey": "transformerrootstackPostPostDataSource6998E105Name",
-    "OutputValue": "PostTable"
-  },
-  {
-    "OutputKey": "GetAttPostTableName",
-    "OutputValue": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:PostTable:Name"
-  },
-  {
-    "OutputKey": "transformerrootstackPostPostTable34CAE87BRef",
-    "OutputValue": "Post-ruiylk7rjnb4ziygno3jh4wrsq-main"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.template.json
deleted file mode 100644
index aa25d3b0d9c..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.template.json
+++ /dev/null
@@ -1,1195 +0,0 @@
-{
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetotransformerrootstackenv10C5A902Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-            },
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "ShouldUseServerSideEncryption": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnableServerSideEncryption"
-        },
-        "true"
-      ]
-    },
-    "ShouldUsePayPerRequestBilling": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBBillingMode"
-        },
-        "PAY_PER_REQUEST"
-      ]
-    },
-    "ShouldUsePointInTimeRecovery": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnablePointInTimeRecovery"
-        },
-        "true"
-      ]
-    }
-  },
-  "Resources": {
-    "PostTable": {
-      "Type": "AWS::DynamoDB::Table",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "id",
-            "AttributeType": "S"
-          },
-          {
-            "AttributeName": "topicPostsId",
-            "AttributeType": "S"
-          }
-        ],
-        "BillingMode": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            "PAY_PER_REQUEST",
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "GlobalSecondaryIndexes": [
-          {
-            "IndexName": "gsi-Topic.posts",
-            "KeySchema": [
-              {
-                "AttributeName": "topicPostsId",
-                "KeyType": "HASH"
-              }
-            ],
-            "Projection": {
-              "ProjectionType": "ALL"
-            },
-            "ProvisionedThroughput": {
-              "Fn::If": [
-                "ShouldUsePayPerRequestBilling",
-                {
-                  "Ref": "AWS::NoValue"
-                },
-                {
-                  "ReadCapacityUnits": {
-                    "Ref": "DynamoDBModelTableReadIOPS"
-                  },
-                  "WriteCapacityUnits": {
-                    "Ref": "DynamoDBModelTableWriteIOPS"
-                  }
-                }
-              ]
-            }
-          }
-        ],
-        "KeySchema": [
-          {
-            "AttributeName": "id",
-            "KeyType": "HASH"
-          }
-        ],
-        "PointInTimeRecoverySpecification": {
-          "Fn::If": [
-            "ShouldUsePointInTimeRecovery",
-            {
-              "PointInTimeRecoveryEnabled": true
-            },
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "ProvisionedThroughput": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            {
-              "Ref": "AWS::NoValue"
-            },
-            {
-              "ReadCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "WriteCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          ]
-        },
-        "SSESpecification": {
-          "SSEEnabled": {
-            "Fn::If": [
-              "ShouldUseServerSideEncryption",
-              true,
-              false
-            ]
-          }
-        },
-        "StreamSpecification": {
-          "StreamViewType": "NEW_AND_OLD_IMAGES"
-        },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "Post-",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "-",
-              {
-                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-              }
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete"
-    },
-    "PostIAMRole83BF708F": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:BatchGetItem",
-                    "dynamodb:BatchWriteItem",
-                    "dynamodb:PutItem",
-                    "dynamodb:DeleteItem",
-                    "dynamodb:GetItem",
-                    "dynamodb:Scan",
-                    "dynamodb:Query",
-                    "dynamodb:UpdateItem",
-                    "dynamodb:ConditionCheckItem",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:GetRecords",
-                    "dynamodb:GetShardIterator"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
-                        {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Post-",
-                                {
-                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-                                },
-                                "-",
-                                {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              ]
-                            ]
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
-                        {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Post-",
-                                {
-                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-                                },
-                                "-",
-                                {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              ]
-                            ]
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "DynamoDBAccess"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "PostIAMRolebbce9b-",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "-",
-              {
-                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-              }
-            ]
-          ]
-        }
-      }
-    },
-    "PostIAMRoleDefaultPolicy04190CA0": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "dynamodb:BatchGetItem",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator",
-                "dynamodb:Query",
-                "dynamodb:GetItem",
-                "dynamodb:Scan",
-                "dynamodb:ConditionCheckItem",
-                "dynamodb:BatchWriteItem",
-                "dynamodb:PutItem",
-                "dynamodb:UpdateItem",
-                "dynamodb:DeleteItem",
-                "dynamodb:DescribeTable"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "PostTable",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::GetAtt": [
-                          "PostTable",
-                          "Arn"
-                        ]
-                      },
-                      "/index/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "PostIAMRoleDefaultPolicy04190CA0",
-        "Roles": [
-          {
-            "Ref": "PostIAMRole83BF708F"
-          }
-        ]
-      }
-    },
-    "PostDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DynamoDBConfig": {
-          "AwsRegion": {
-            "Ref": "AWS::Region"
-          },
-          "TableName": {
-            "Ref": "PostTable"
-          }
-        },
-        "Name": "PostTable",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "PostIAMRole83BF708F",
-            "Arn"
-          ]
-        },
-        "Type": "AMAZON_DYNAMODB"
-      },
-      "DependsOn": [
-        "PostIAMRole83BF708F"
-      ]
-    },
-    "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryGetPostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getPost.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getPost.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "GetPostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "getPost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "PostTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      }
-    },
-    "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryListPostsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.listPosts.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.listPosts.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "ListPostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "listPosts",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "PostTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      }
-    },
-    "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationCreatePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createPost.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createPost.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "CreatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "createPost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "PostTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdatePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updatePost.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updatePost.auth.1.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationUpdatePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updatePost.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updatePost.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "UpdatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "updatePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835",
-                "FunctionId"
-              ]
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "PostTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeletePostauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deletePost.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deletePost.auth.1.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "PostDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationDeletePostDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deletePost.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deletePost.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "PostDataSource"
-      ]
-    },
-    "DeletePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "deletePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7",
-                "FunctionId"
-              ]
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "PostTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "SubscriptiononCreatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onCreatePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    },
-    "SubscriptiononUpdatePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onUpdatePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    },
-    "SubscriptiononDeletePostResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onDeletePost",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            },
-            {
-              "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    }
-  },
-  "Outputs": {
-    "GetAttPostTableStreamArn": {
-      "Description": "Your DynamoDB table StreamArn.",
-      "Value": {
-        "Fn::GetAtt": [
-          "PostTable",
-          "StreamArn"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:PostTable:StreamArn"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttPostTableName": {
-      "Description": "Your DynamoDB table name.",
-      "Value": {
-        "Ref": "PostTable"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:PostTable:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttPostDataSourceName": {
-      "Description": "Your model DataSource name.",
-      "Value": {
-        "Fn::GetAtt": [
-          "PostDataSource",
-          "Name"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:PostDataSource:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "transformerrootstackPostPostDataSource6998E105Name": {
-      "Value": {
-        "Fn::GetAtt": [
-          "PostDataSource",
-          "Name"
-        ]
-      }
-    },
-    "transformerrootstackPostPostTable34CAE87BRef": {
-      "Value": {
-        "Ref": "PostTable"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.template.json
deleted file mode 100644
index 017db04917d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.template.json
+++ /dev/null
@@ -1,1470 +0,0 @@
-{
-  "Parameters": {
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "referencetotransformerrootstackenv10C5A902Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-            },
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "ShouldUseServerSideEncryption": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnableServerSideEncryption"
-        },
-        "true"
-      ]
-    },
-    "ShouldUsePayPerRequestBilling": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBBillingMode"
-        },
-        "PAY_PER_REQUEST"
-      ]
-    },
-    "ShouldUsePointInTimeRecovery": {
-      "Fn::Equals": [
-        {
-          "Ref": "DynamoDBEnablePointInTimeRecovery"
-        },
-        "true"
-      ]
-    }
-  },
-  "Resources": {
-    "TopicTable": {
-      "Type": "AWS::DynamoDB::Table",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "id",
-            "AttributeType": "S"
-          }
-        ],
-        "BillingMode": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            "PAY_PER_REQUEST",
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "KeySchema": [
-          {
-            "AttributeName": "id",
-            "KeyType": "HASH"
-          }
-        ],
-        "PointInTimeRecoverySpecification": {
-          "Fn::If": [
-            "ShouldUsePointInTimeRecovery",
-            {
-              "PointInTimeRecoveryEnabled": true
-            },
-            {
-              "Ref": "AWS::NoValue"
-            }
-          ]
-        },
-        "ProvisionedThroughput": {
-          "Fn::If": [
-            "ShouldUsePayPerRequestBilling",
-            {
-              "Ref": "AWS::NoValue"
-            },
-            {
-              "ReadCapacityUnits": {
-                "Ref": "DynamoDBModelTableReadIOPS"
-              },
-              "WriteCapacityUnits": {
-                "Ref": "DynamoDBModelTableWriteIOPS"
-              }
-            }
-          ]
-        },
-        "SSESpecification": {
-          "SSEEnabled": {
-            "Fn::If": [
-              "ShouldUseServerSideEncryption",
-              true,
-              false
-            ]
-          }
-        },
-        "StreamSpecification": {
-          "StreamViewType": "NEW_AND_OLD_IMAGES"
-        },
-        "TableName": {
-          "Fn::Join": [
-            "",
-            [
-              "Topic-",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "-",
-              {
-                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-              }
-            ]
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete"
-    },
-    "TopicIAMRoleD9B4C845": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "dynamodb:BatchGetItem",
-                    "dynamodb:BatchWriteItem",
-                    "dynamodb:PutItem",
-                    "dynamodb:DeleteItem",
-                    "dynamodb:GetItem",
-                    "dynamodb:Scan",
-                    "dynamodb:Query",
-                    "dynamodb:UpdateItem",
-                    "dynamodb:ConditionCheckItem",
-                    "dynamodb:DescribeTable",
-                    "dynamodb:GetRecords",
-                    "dynamodb:GetShardIterator"
-                  ],
-                  "Effect": "Allow",
-                  "Resource": [
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
-                        {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Topic-",
-                                {
-                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-                                },
-                                "-",
-                                {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              ]
-                            ]
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
-                        {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Topic-",
-                                {
-                                  "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-                                },
-                                "-",
-                                {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              ]
-                            ]
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "DynamoDBAccess"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "TopicIAMRole014e70-",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "-",
-              {
-                "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-              }
-            ]
-          ]
-        }
-      }
-    },
-    "TopicIAMRoleDefaultPolicy205E7C23": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "dynamodb:BatchGetItem",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator",
-                "dynamodb:Query",
-                "dynamodb:GetItem",
-                "dynamodb:Scan",
-                "dynamodb:ConditionCheckItem",
-                "dynamodb:BatchWriteItem",
-                "dynamodb:PutItem",
-                "dynamodb:UpdateItem",
-                "dynamodb:DeleteItem",
-                "dynamodb:DescribeTable"
-              ],
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::GetAtt": [
-                    "TopicTable",
-                    "Arn"
-                  ]
-                },
-                {
-                  "Ref": "AWS::NoValue"
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "TopicIAMRoleDefaultPolicy205E7C23",
-        "Roles": [
-          {
-            "Ref": "TopicIAMRoleD9B4C845"
-          }
-        ]
-      }
-    },
-    "TopicDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DynamoDBConfig": {
-          "AwsRegion": {
-            "Ref": "AWS::Region"
-          },
-          "TableName": {
-            "Ref": "TopicTable"
-          }
-        },
-        "Name": "TopicTable",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "TopicIAMRoleD9B4C845",
-            "Arn"
-          ]
-        },
-        "Type": "AMAZON_DYNAMODB"
-      },
-      "DependsOn": [
-        "TopicIAMRoleD9B4C845"
-      ]
-    },
-    "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getTopic.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QuerygetTopicpostAuth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getTopic.postAuth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryGetTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getTopic.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.getTopic.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "GetTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "getTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "TopicTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      }
-    },
-    "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryListTopicsDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.listTopics.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.listTopics.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "ListTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "listTopics",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "TopicTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Query"
-      }
-    },
-    "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateTopicinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createTopic.init.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationcreateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createTopic.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationCreateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createTopic.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.createTopic.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "CreateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "createTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "TopicTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateTopicinit0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateTopic.init.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationupdateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateTopic.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateTopic.auth.1.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationUpdateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateTopic.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.updateTopic.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "UpdateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "updateTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "TopicTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationdeleteTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteTopic.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteTopic.auth.1.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "TopicDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "MutationDeleteTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteTopic.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Mutation.deleteTopic.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "TopicDataSource"
-      ]
-    },
-    "DeleteTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "deleteTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
-              {
-                "Ref": "TopicTable"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Mutation"
-      }
-    },
-    "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptiononCreateTopicauth0Function",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Subscription.onCreateTopic.auth.1.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    },
-    "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "SubscriptionOnCreateTopicDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Subscription.onCreateTopic.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Subscription.onCreateTopic.res.vtl"
-            ]
-          ]
-        }
-      }
-    },
-    "SubscriptiononCreateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onCreateTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    },
-    "SubscriptiononUpdateTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onUpdateTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    },
-    "SubscriptiononDeleteTopicResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "onDeleteTopic",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Subscription"
-      }
-    }
-  },
-  "Outputs": {
-    "GetAttTopicTableStreamArn": {
-      "Description": "Your DynamoDB table StreamArn.",
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicTable",
-          "StreamArn"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:TopicTable:StreamArn"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttTopicTableName": {
-      "Description": "Your DynamoDB table name.",
-      "Value": {
-        "Ref": "TopicTable"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:TopicTable:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "GetAttTopicDataSourceName": {
-      "Description": "Your model DataSource name.",
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicDataSource",
-          "Name"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-              },
-              "GetAtt:TopicDataSource:Name"
-            ]
-          ]
-        }
-      }
-    },
-    "transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-      "Value": {
-        "Fn::GetAtt": [
-          "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879",
-          "FunctionId"
-        ]
-      }
-    },
-    "transformerrootstackTopicTopicDataSource63D2F34BName": {
-      "Value": {
-        "Fn::GetAtt": [
-          "TopicDataSource",
-          "Name"
-        ]
-      }
-    },
-    "transformerrootstackTopicTopicTableFD91FB92Ref": {
-      "Value": {
-        "Ref": "TopicTable"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.outputs.json
deleted file mode 100644
index ac2112bba78..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.outputs.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "OutputKey": "GraphQLAPIIdOutput",
-    "OutputValue": "ruiylk7rjnb4ziygno3jh4wrsq",
-    "Description": "Your GraphQL API ID.",
-    "ExportName": "amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D:GraphQLApiId"
-  },
-  {
-    "OutputKey": "GraphQLAPIEndpointOutput",
-    "OutputValue": "https://ouxhkkyjibe47illvcmepix6ru.appsync-api.us-east-1.amazonaws.com/graphql",
-    "Description": "Your GraphQL API endpoint.",
-    "ExportName": "amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D:GraphQLApiEndpoint"
-  },
-  {
-    "OutputKey": "GraphQLAPIKeyOutput",
-    "OutputValue": "da2-fakeapikey00000000000000",
-    "Description": "Your GraphQL API ID.",
-    "ExportName": "amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D:GraphQLApiKey"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.template.json
deleted file mode 100644
index 363ce9641a3..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.template.json
+++ /dev/null
@@ -1,1065 +0,0 @@
-{
-  "Parameters": {
-    "env": {
-      "Type": "String",
-      "Default": "NONE"
-    },
-    "AppSyncApiName": {
-      "Type": "String",
-      "Default": "AppSyncSimpleTransform"
-    },
-    "DynamoDBModelTableReadIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of read IOPS the table should support."
-    },
-    "DynamoDBModelTableWriteIOPS": {
-      "Type": "Number",
-      "Default": 5,
-      "Description": "The number of write IOPS the table should support."
-    },
-    "DynamoDBBillingMode": {
-      "Type": "String",
-      "Default": "PAY_PER_REQUEST",
-      "AllowedValues": [
-        "PAY_PER_REQUEST",
-        "PROVISIONED"
-      ],
-      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
-    },
-    "DynamoDBEnablePointInTimeRecovery": {
-      "Type": "String",
-      "Default": "false",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Whether to enable Point in Time Recovery on the table."
-    },
-    "DynamoDBEnableServerSideEncryption": {
-      "Type": "String",
-      "Default": "true",
-      "AllowedValues": [
-        "true",
-        "false"
-      ],
-      "Description": "Enable server side encryption powered by KMS."
-    },
-    "S3DeploymentBucket": {
-      "Type": "String",
-      "Description": "An S3 Bucket name where assets are deployed"
-    },
-    "S3DeploymentRootKey": {
-      "Type": "String",
-      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root of the deployment directory."
-    }
-  },
-  "Resources": {
-    "GraphQLAPI": {
-      "Type": "AWS::AppSync::GraphQLApi",
-      "Properties": {
-        "AuthenticationType": "API_KEY",
-        "Name": {
-          "Fn::Join": [
-            "",
-            [
-              {
-                "Ref": "AppSyncApiName"
-              },
-              "-",
-              {
-                "Ref": "env"
-              }
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPITransformerSchema3CB2AE18": {
-      "Type": "AWS::AppSync::GraphQLSchema",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DefinitionS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/schema.graphql"
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPIDefaultApiKey215A6DD7": {
-      "Type": "AWS::AppSync::ApiKey",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "Expires": 1773510303
-      }
-    },
-    "GraphQLAPINONEDS95A13CF0": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "Name": "NONE_DS",
-        "Type": "NONE"
-      }
-    },
-    "Topic": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-            "Fn::GetAtt": [
-              "GraphQLAPINONEDS95A13CF0",
-              "Name"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          }
-        },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/Topic.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "Post": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            ]
-          }
-        },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/Post.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "Comment": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "DynamoDBModelTableReadIOPS": {
-            "Ref": "DynamoDBModelTableReadIOPS"
-          },
-          "DynamoDBModelTableWriteIOPS": {
-            "Ref": "DynamoDBModelTableWriteIOPS"
-          },
-          "DynamoDBBillingMode": {
-            "Ref": "DynamoDBBillingMode"
-          },
-          "DynamoDBEnablePointInTimeRecovery": {
-            "Ref": "DynamoDBEnablePointInTimeRecovery"
-          },
-          "DynamoDBEnableServerSideEncryption": {
-            "Ref": "DynamoDBEnableServerSideEncryption"
-          },
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-            ]
-          }
-        },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/Comment.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "FunctionDirectiveStack": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetotransformerrootstackenv10C5A902Ref": {
-            "Ref": "env"
-          },
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-            "Fn::GetAtt": [
-              "GraphQLAPINONEDS95A13CF0",
-              "Name"
-            ]
-          }
-        },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/FunctionDirectiveStack.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ConnectionStack": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-            "Fn::GetAtt": [
-              "GraphQLAPINONEDS95A13CF0",
-              "Name"
-            ]
-          },
-          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-            "Ref": "S3DeploymentRootKey"
-          },
-          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
-            "Fn::GetAtt": [
-              "Post",
-              "Outputs.transformerrootstackPostPostDataSource6998E105Name"
-            ]
-          },
-          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
-            "Fn::GetAtt": [
-              "Post",
-              "Outputs.transformerrootstackPostPostTable34CAE87BRef"
-            ]
-          },
-          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
-            "Fn::GetAtt": [
-              "Comment",
-              "Outputs.transformerrootstackCommentCommentDataSourceA0E54655Name"
-            ]
-          },
-          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
-            "Fn::GetAtt": [
-              "Comment",
-              "Outputs.transformerrootstackCommentCommentTable5427FDE2Ref"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicTopicDataSource63D2F34BName"
-            ]
-          },
-          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
-            "Fn::GetAtt": [
-              "Topic",
-              "Outputs.transformerrootstackTopicTopicTableFD91FB92Ref"
-            ]
-          }
-        },
-        "TemplateURL": {
-          "Fn::Join": [
-            "",
-            [
-              "https://s3.",
-              {
-                "Ref": "AWS::Region"
-              },
-              ".",
-              {
-                "Ref": "AWS::URLSuffix"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/stacks/ConnectionStack.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "Comment",
-        "GraphQLAPITransformerSchema3CB2AE18",
-        "Post",
-        "Topic"
-      ]
-    },
-    "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityIdDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.id.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.id.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityidResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "FieldName": "id",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityUserIdDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.userId.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.userId.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityuserIdResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "FieldName": "userId",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityActivityTypeDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.activityType.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.activityType.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityactivityTypeResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "FieldName": "activityType",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "GraphQLAPINONEDS95A13CF0",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "ActivityTimestampDataResolverFn",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.timestamp.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              "/",
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "/resolvers/Activity.timestamp.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "ActivitytimestampResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Fn::GetAtt": [
-            "GraphQLAPI",
-            "ApiId"
-          ]
-        },
-        "FieldName": "timestamp",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": {
-          "Fn::Join": [
-            "",
-            [
-              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-              {
-                "Fn::GetAtt": [
-                  "GraphQLAPI",
-                  "ApiId"
-                ]
-              },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-        "TypeName": "Activity"
-      },
-      "DependsOn": [
-        "GraphQLAPITransformerSchema3CB2AE18"
-      ]
-    },
-    "CustomResourcesjson": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "Parameters": {
-          "AppSyncApiId": {
-            "Fn::GetAtt": [
-              "GraphQLAPI",
-              "ApiId"
-            ]
-          },
-          "AppSyncApiName": {
-            "Ref": "AppSyncApiName"
-          },
-          "env": {
-            "Ref": "env"
-          },
-          "S3DeploymentBucket": {
-            "Ref": "S3DeploymentBucket"
-          },
-          "S3DeploymentRootKey": {
-            "Ref": "S3DeploymentRootKey"
-          }
-        },
-        "TemplateURL": {
-          "Fn::Join": [
-            "/",
-            [
-              "https://s3.amazonaws.com",
-              {
-                "Ref": "S3DeploymentBucket"
-              },
-              {
-                "Ref": "S3DeploymentRootKey"
-              },
-              "stacks",
-              "CustomResources.json"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "GraphQLAPI",
-        "GraphQLAPITransformerSchema3CB2AE18",
-        "Topic",
-        "Post",
-        "Comment",
-        "FunctionDirectiveStack",
-        "ConnectionStack"
-      ]
-    }
-  },
-  "Outputs": {
-    "GraphQLAPIKeyOutput": {
-      "Description": "Your GraphQL API ID.",
-      "Value": {
-        "Fn::GetAtt": [
-          "GraphQLAPIDefaultApiKey215A6DD7",
-          "ApiKey"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "AWS::StackName"
-              },
-              "GraphQLApiKey"
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPIIdOutput": {
-      "Description": "Your GraphQL API ID.",
-      "Value": {
-        "Fn::GetAtt": [
-          "GraphQLAPI",
-          "ApiId"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "AWS::StackName"
-              },
-              "GraphQLApiId"
-            ]
-          ]
-        }
-      }
-    },
-    "GraphQLAPIEndpointOutput": {
-      "Description": "Your GraphQL API endpoint.",
-      "Value": {
-        "Fn::GetAtt": [
-          "GraphQLAPI",
-          "GraphQLUrl"
-        ]
-      },
-      "Export": {
-        "Name": {
-          "Fn::Join": [
-            ":",
-            [
-              {
-                "Ref": "AWS::StackName"
-              },
-              "GraphQLApiEndpoint"
-            ]
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.outputs.json
deleted file mode 100644
index 216747cc180..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.outputs.json
+++ /dev/null
@@ -1,40 +0,0 @@
-[
-  {
-    "OutputKey": "CreatedSNSRole",
-    "OutputValue": "arn:aws:iam::123456789012:role/sns22367c68d5a80-main",
-    "Description": "role arn"
-  },
-  {
-    "OutputKey": "UserPoolId",
-    "OutputValue": "us-east-1_Zs9EZpCYX",
-    "Description": "Id for the user pool"
-  },
-  {
-    "OutputKey": "AppClientIDWeb",
-    "OutputValue": "ptm2eqjiee7l3e202lstfjd3r",
-    "Description": "The user pool app client id for web"
-  },
-  {
-    "OutputKey": "AppClientID",
-    "OutputValue": "75sq8s16g37d0as1148og20p3i",
-    "Description": "The user pool app client id"
-  },
-  {
-    "OutputKey": "IdentityPoolId",
-    "OutputValue": "us-east-1:d1df5c0c-2dd2-4471-bb0b-59c99bdbfe7f",
-    "Description": "Id for the identity pool"
-  },
-  {
-    "OutputKey": "UserPoolArn",
-    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_Zs9EZpCYX",
-    "Description": "Arn for the user pool"
-  },
-  {
-    "OutputKey": "IdentityPoolName",
-    "OutputValue": "discussions22367c68_identitypool_22367c68__main"
-  },
-  {
-    "OutputKey": "UserPoolName",
-    "OutputValue": "discussions22367c68_userpool_22367c68"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json
deleted file mode 100644
index c305475136f..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.template.json
+++ /dev/null
@@ -1,533 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Parameters": {
-    "env": {
-      "Type": "String"
-    },
-    "identityPoolName": {
-      "Type": "String"
-    },
-    "allowUnauthenticatedIdentities": {
-      "Type": "String"
-    },
-    "resourceNameTruncated": {
-      "Type": "String"
-    },
-    "userPoolName": {
-      "Type": "String"
-    },
-    "autoVerifiedAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "mfaConfiguration": {
-      "Type": "String"
-    },
-    "mfaTypes": {
-      "Type": "CommaDelimitedList"
-    },
-    "smsAuthenticationMessage": {
-      "Type": "String"
-    },
-    "smsVerificationMessage": {
-      "Type": "String"
-    },
-    "emailVerificationSubject": {
-      "Type": "String"
-    },
-    "emailVerificationMessage": {
-      "Type": "String"
-    },
-    "defaultPasswordPolicy": {
-      "Type": "String"
-    },
-    "passwordPolicyMinLength": {
-      "Type": "String"
-    },
-    "passwordPolicyCharacters": {
-      "Type": "CommaDelimitedList"
-    },
-    "requiredAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "aliasAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userpoolClientGenerateSecret": {
-      "Type": "String"
-    },
-    "userpoolClientRefreshTokenValidity": {
-      "Type": "String"
-    },
-    "userpoolClientWriteAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userpoolClientReadAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userpoolClientLambdaRole": {
-      "Type": "String"
-    },
-    "userpoolClientSetAttributes": {
-      "Type": "String"
-    },
-    "sharedId": {
-      "Type": "String"
-    },
-    "resourceName": {
-      "Type": "String"
-    },
-    "authSelections": {
-      "Type": "String"
-    },
-    "useDefault": {
-      "Type": "String"
-    },
-    "thirdPartyAuth": {
-      "Type": "String"
-    },
-    "usernameAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userPoolGroups": {
-      "Type": "String"
-    },
-    "adminQueries": {
-      "Type": "String"
-    },
-    "triggers": {
-      "Type": "String"
-    },
-    "hostedUI": {
-      "Type": "String"
-    },
-    "userPoolGroupList": {
-      "Type": "CommaDelimitedList"
-    },
-    "serviceName": {
-      "Type": "String"
-    },
-    "usernameCaseSensitive": {
-      "Type": "String"
-    },
-    "useEnabledMfas": {
-      "Type": "String"
-    },
-    "authRoleArn": {
-      "Type": "String"
-    },
-    "unauthRoleArn": {
-      "Type": "String"
-    },
-    "breakCircularDependency": {
-      "Type": "String"
-    },
-    "dependsOn": {
-      "Type": "CommaDelimitedList"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        {
-          "Ref": "env"
-        },
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "SNSRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Sid": "",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "cognito-idp.amazonaws.com"
-              },
-              "Action": [
-                "sts:AssumeRole"
-              ],
-              "Condition": {
-                "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
-                }
-              }
-            }
-          ]
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Version": "2012-10-17",
-              "Statement": [
-                {
-                  "Effect": "Allow",
-                  "Action": [
-                    "sns:Publish"
-                  ],
-                  "Resource": "*"
-                }
-              ]
-            },
-            "PolicyName": "discus22367c68-sns-policy"
-          }
-        ],
-        "RoleName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            "discus22367c68_sns-role",
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "sns22367c68",
-                  {
-                    "Fn::Select": [
-                      3,
-                      {
-                        "Fn::Split": [
-                          "-",
-                          {
-                            "Ref": "AWS::StackName"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "UserPool": {
-      "Type": "AWS::Cognito::UserPool",
-      "Properties": {
-        "AutoVerifiedAttributes": [
-          "email"
-        ],
-        "EmailVerificationMessage": {
-          "Ref": "emailVerificationMessage"
-        },
-        "EmailVerificationSubject": {
-          "Ref": "emailVerificationSubject"
-        },
-        "MfaConfiguration": {
-          "Ref": "mfaConfiguration"
-        },
-        "Policies": {
-          "PasswordPolicy": {
-            "MinimumLength": {
-              "Ref": "passwordPolicyMinLength"
-            },
-            "RequireLowercase": false,
-            "RequireNumbers": false,
-            "RequireSymbols": false,
-            "RequireUppercase": false
-          }
-        },
-        "Schema": [
-          {
-            "Mutable": true,
-            "Name": "email",
-            "Required": true
-          },
-          {
-            "Mutable": true,
-            "Name": "phone_number",
-            "Required": true
-          }
-        ],
-        "SmsAuthenticationMessage": {
-          "Ref": "smsAuthenticationMessage"
-        },
-        "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
-          "SnsCallerArn": {
-            "Fn::GetAtt": [
-              "SNSRole",
-              "Arn"
-            ]
-          }
-        },
-        "SmsVerificationMessage": {
-          "Ref": "smsVerificationMessage"
-        },
-        "UserAttributeUpdateSettings": {
-          "AttributesRequireVerificationBeforeUpdate": [
-            "email"
-          ]
-        },
-        "UserPoolName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            {
-              "Ref": "userPoolName"
-            },
-            {
-              "Fn::Join": [
-                "",
-                [
-                  {
-                    "Ref": "userPoolName"
-                  },
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        },
-        "UsernameAttributes": {
-          "Ref": "usernameAttributes"
-        },
-        "UsernameConfiguration": {
-          "CaseSensitive": false
-        }
-      },
-      "DependsOn": [
-        "SNSRole"
-      ]
-    },
-    "UserPoolClientWeb": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
-        "RefreshTokenValidity": {
-          "Ref": "userpoolClientRefreshTokenValidity"
-        },
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": {
-          "Ref": "UserPool"
-        }
-      },
-      "DependsOn": [
-        "UserPool"
-      ]
-    },
-    "UserPoolClient": {
-      "Type": "AWS::Cognito::UserPoolClient",
-      "Properties": {
-        "ClientName": "discus22367c68_app_client",
-        "GenerateSecret": {
-          "Ref": "userpoolClientGenerateSecret"
-        },
-        "RefreshTokenValidity": {
-          "Ref": "userpoolClientRefreshTokenValidity"
-        },
-        "TokenValidityUnits": {
-          "RefreshToken": "days"
-        },
-        "UserPoolId": {
-          "Ref": "UserPool"
-        }
-      },
-      "DependsOn": [
-        "UserPool"
-      ]
-    },
-    "UserPoolClientRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              },
-              "Action": "sts:AssumeRole"
-            }
-          ]
-        },
-        "RoleName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            {
-              "Ref": "userpoolClientLambdaRole"
-            },
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "upClientLambdaRole22367c68",
-                  {
-                    "Fn::Select": [
-                      3,
-                      {
-                        "Fn::Split": [
-                          "-",
-                          {
-                            "Ref": "AWS::StackName"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "IdentityPool": {
-      "Type": "AWS::Cognito::IdentityPool",
-      "Properties": {
-        "AllowUnauthenticatedIdentities": {
-          "Ref": "allowUnauthenticatedIdentities"
-        },
-        "CognitoIdentityProviders": [
-          {
-            "ClientId": {
-              "Ref": "UserPoolClient"
-            },
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": {
-                    "Ref": "UserPool"
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "ClientId": {
-              "Ref": "UserPoolClientWeb"
-            },
-            "ProviderName": {
-              "Fn::Sub": [
-                "cognito-idp.${region}.amazonaws.com/${client}",
-                {
-                  "region": {
-                    "Ref": "AWS::Region"
-                  },
-                  "client": {
-                    "Ref": "UserPool"
-                  }
-                }
-              ]
-            }
-          }
-        ],
-        "IdentityPoolName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            "discussions22367c68_identitypool_22367c68",
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "discussions22367c68_identitypool_22367c68__",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "IdentityPoolRoleMap": {
-      "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
-      "Properties": {
-        "IdentityPoolId": {
-          "Ref": "IdentityPool"
-        },
-        "Roles": {
-          "unauthenticated": {
-            "Ref": "unauthRoleArn"
-          },
-          "authenticated": {
-            "Ref": "authRoleArn"
-          }
-        }
-      },
-      "DependsOn": [
-        "IdentityPool"
-      ]
-    }
-  },
-  "Outputs": {
-    "IdentityPoolId": {
-      "Description": "Id for the identity pool",
-      "Value": {
-        "Ref": "IdentityPool"
-      }
-    },
-    "IdentityPoolName": {
-      "Value": {
-        "Fn::GetAtt": [
-          "IdentityPool",
-          "Name"
-        ]
-      }
-    },
-    "UserPoolId": {
-      "Description": "Id for the user pool",
-      "Value": {
-        "Ref": "UserPool"
-      }
-    },
-    "UserPoolArn": {
-      "Description": "Arn for the user pool",
-      "Value": {
-        "Fn::GetAtt": [
-          "UserPool",
-          "Arn"
-        ]
-      }
-    },
-    "UserPoolName": {
-      "Value": {
-        "Ref": "userPoolName"
-      }
-    },
-    "AppClientIDWeb": {
-      "Description": "The user pool app client id for web",
-      "Value": {
-        "Ref": "UserPoolClientWeb"
-      }
-    },
-    "AppClientID": {
-      "Description": "The user pool app client id",
-      "Value": {
-        "Ref": "UserPoolClient"
-      }
-    },
-    "CreatedSNSRole": {
-      "Description": "role arn",
-      "Value": {
-        "Fn::GetAtt": [
-          "SNSRole",
-          "Arn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.parameters.json
deleted file mode 100644
index c61d35e72bc..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "ParameterKey": "CloudWatchRule",
-    "ParameterValue": "NONE"
-  },
-  {
-    "ParameterKey": "storageactivityName",
-    "ParameterValue": "activity-main"
-  },
-  {
-    "ParameterKey": "s3Key",
-    "ParameterValue": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip"
-  },
-  {
-    "ParameterKey": "deploymentBucketName",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
-  },
-  {
-    "ParameterKey": "apidiscussionsGraphQLAPIEndpointOutput",
-    "ParameterValue": "https://ouxhkkyjibe47illvcmepix6ru.appsync-api.us-east-1.amazonaws.com/graphql"
-  },
-  {
-    "ParameterKey": "apidiscussionsGraphQLAPIIdOutput",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
-  },
-  {
-    "ParameterKey": "storageactivityStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "main"
-  },
-  {
-    "ParameterKey": "storageactivityArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.outputs.json
deleted file mode 100644
index afc86896b50..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.outputs.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  {
-    "OutputKey": "PartitionKeyName",
-    "OutputValue": "id"
-  },
-  {
-    "OutputKey": "SortKeyName",
-    "OutputValue": "userId"
-  },
-  {
-    "OutputKey": "SortKeyType",
-    "OutputValue": "S"
-  },
-  {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
-  },
-  {
-    "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591"
-  },
-  {
-    "OutputKey": "PartitionKeyType",
-    "OutputValue": "S"
-  },
-  {
-    "OutputKey": "Name",
-    "OutputValue": "activity-main"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json
deleted file mode 100644
index d4a8a1d9363..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "ParameterKey": "partitionKeyType",
-    "ParameterValue": "S"
-  },
-  {
-    "ParameterKey": "partitionKeyName",
-    "ParameterValue": "id"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "main"
-  },
-  {
-    "ParameterKey": "sortKeyName",
-    "ParameterValue": "userId"
-  },
-  {
-    "ParameterKey": "sortKeyType",
-    "ParameterValue": "S"
-  },
-  {
-    "ParameterKey": "tableName",
-    "ParameterValue": "activity"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
deleted file mode 100644
index 7fe1ed68a50..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "ParameterKey": "tableName",
-    "ParameterValue": "bookmarks"
-  },
-  {
-    "ParameterKey": "partitionKeyName",
-    "ParameterValue": "userId"
-  },
-  {
-    "ParameterKey": "partitionKeyType",
-    "ParameterValue": "S"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "main"
-  },
-  {
-    "ParameterKey": "sortKeyName",
-    "ParameterValue": "postId"
-  },
-  {
-    "ParameterKey": "sortKeyType",
-    "ParameterValue": "S"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
deleted file mode 100644
index a3e4723d6a1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.template.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "Description": "DDB Resource for AWS Amplify CLI",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Parameters": {
-    "partitionKeyName": {
-      "Type": "String"
-    },
-    "partitionKeyType": {
-      "Type": "String"
-    },
-    "env": {
-      "Type": "String"
-    },
-    "sortKeyName": {
-      "Type": "String"
-    },
-    "sortKeyType": {
-      "Type": "String"
-    },
-    "tableName": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        {
-          "Ref": "env"
-        },
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "DynamoDBTable": {
-      "Type": "AWS::DynamoDB::Table",
-      "Properties": {
-        "AttributeDefinitions": [
-          {
-            "AttributeName": "userId",
-            "AttributeType": "S"
-          },
-          {
-            "AttributeName": "postId",
-            "AttributeType": "S"
-          }
-        ],
-        "GlobalSecondaryIndexes": [
-          {
-            "IndexName": "byPost",
-            "KeySchema": [
-              {
-                "AttributeName": "postId",
-                "KeyType": "HASH"
-              }
-            ],
-            "Projection": {
-              "ProjectionType": "ALL"
-            },
-            "ProvisionedThroughput": {
-              "ReadCapacityUnits": 5,
-              "WriteCapacityUnits": 5
-            }
-          }
-        ],
-        "KeySchema": [
-          {
-            "AttributeName": "userId",
-            "KeyType": "HASH"
-          },
-          {
-            "AttributeName": "postId",
-            "KeyType": "RANGE"
-          }
-        ],
-        "ProvisionedThroughput": {
-          "ReadCapacityUnits": 5,
-          "WriteCapacityUnits": 5
-        },
-        "StreamSpecification": {
-          "StreamViewType": "NEW_IMAGE"
-        },
-        "TableName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            {
-              "Ref": "tableName"
-            },
-            {
-              "Fn::Join": [
-                "",
-                [
-                  {
-                    "Ref": "tableName"
-                  },
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        }
-      }
-    }
-  },
-  "Outputs": {
-    "Name": {
-      "Value": {
-        "Ref": "DynamoDBTable"
-      }
-    },
-    "Arn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "DynamoDBTable",
-          "Arn"
-        ]
-      }
-    },
-    "StreamArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "DynamoDBTable",
-          "StreamArn"
-        ]
-      }
-    },
-    "PartitionKeyName": {
-      "Value": {
-        "Ref": "partitionKeyName"
-      }
-    },
-    "PartitionKeyType": {
-      "Value": {
-        "Ref": "partitionKeyType"
-      }
-    },
-    "SortKeyName": {
-      "Value": {
-        "Ref": "sortKeyName"
-      }
-    },
-    "SortKeyType": {
-      "Value": {
-        "Ref": "sortKeyType"
-      }
-    },
-    "Region": {
-      "Value": {
-        "Ref": "AWS::Region"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.parameters.json
deleted file mode 100644
index 8395415a35d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.parameters.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "ParameterKey": "AuthRoleName",
-    "ParameterValue": "amplify-discussions-main-d5a80-authRole"
-  },
-  {
-    "ParameterKey": "DeploymentBucketName",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
-  },
-  {
-    "ParameterKey": "UnauthRoleName",
-    "ParameterValue": "amplify-discussions-main-d5a80-unauthRole"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
deleted file mode 100644
index 240159af730..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.template.json
+++ /dev/null
@@ -1,577 +0,0 @@
-{
-  "Description": "Root Stack for AWS Amplify CLI",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Parameters": {
-    "DeploymentBucketName": {
-      "Type": "String",
-      "Default": "DeploymentBucket",
-      "Description": "Name of the common deployment bucket provided by the parent stack"
-    },
-    "AuthRoleName": {
-      "Type": "String",
-      "Default": "AuthRoleName",
-      "Description": "Name of the common deployment bucket provided by the parent stack"
-    },
-    "UnauthRoleName": {
-      "Type": "String",
-      "Default": "UnAuthRoleName",
-      "Description": "Name of the common deployment bucket provided by the parent stack"
-    }
-  },
-  "Outputs": {
-    "Region": {
-      "Description": "CloudFormation provider root stack Region",
-      "Value": {
-        "Ref": "AWS::Region"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Sub": "${AWS::StackName}-Region"
-        }
-      }
-    },
-    "StackName": {
-      "Description": "CloudFormation provider root stack ID",
-      "Value": {
-        "Ref": "AWS::StackName"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Sub": "${AWS::StackName}-StackName"
-        }
-      }
-    },
-    "StackId": {
-      "Description": "CloudFormation provider root stack name",
-      "Value": {
-        "Ref": "AWS::StackId"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Sub": "${AWS::StackName}-StackId"
-        }
-      }
-    },
-    "AuthRoleArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "AuthRole",
-          "Arn"
-        ]
-      }
-    },
-    "UnauthRoleArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "UnauthRole",
-          "Arn"
-        ]
-      }
-    },
-    "DeploymentBucketName": {
-      "Description": "CloudFormation provider root stack deployment bucket name",
-      "Value": {
-        "Ref": "DeploymentBucketName"
-      },
-      "Export": {
-        "Name": {
-          "Fn::Sub": "${AWS::StackName}-DeploymentBucketName"
-        }
-      }
-    },
-    "AuthRoleName": {
-      "Value": {
-        "Ref": "AuthRole"
-      }
-    },
-    "UnauthRoleName": {
-      "Value": {
-        "Ref": "UnauthRole"
-      }
-    }
-  },
-  "Resources": {
-    "DeploymentBucket": {
-      "Type": "AWS::S3::Bucket",
-      "Properties": {
-        "BucketName": {
-          "Ref": "DeploymentBucketName"
-        },
-        "BucketEncryption": {
-          "ServerSideEncryptionConfiguration": [
-            {
-              "ServerSideEncryptionByDefault": {
-                "SSEAlgorithm": "AES256"
-              }
-            }
-          ]
-        }
-      },
-      "UpdateReplacePolicy": "Retain",
-      "DeletionPolicy": "Retain"
-    },
-    "DeploymentBucketBlockHTTP": {
-      "Type": "AWS::S3::BucketPolicy",
-      "Properties": {
-        "Bucket": {
-          "Ref": "DeploymentBucketName"
-        },
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "s3:*",
-              "Effect": "Deny",
-              "Principal": "*",
-              "Resource": [
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "arn:aws:s3:::",
-                      {
-                        "Ref": "DeploymentBucketName"
-                      },
-                      "/*"
-                    ]
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "arn:aws:s3:::",
-                      {
-                        "Ref": "DeploymentBucketName"
-                      }
-                    ]
-                  ]
-                }
-              ],
-              "Condition": {
-                "Bool": {
-                  "aws:SecureTransport": false
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "AuthRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Sid": "",
-              "Effect": "Deny",
-              "Principal": {
-                "Federated": "cognito-identity.amazonaws.com"
-              },
-              "Action": "sts:AssumeRoleWithWebIdentity"
-            }
-          ]
-        },
-        "RoleName": {
-          "Ref": "AuthRoleName"
-        }
-      }
-    },
-    "UnauthRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Sid": "",
-              "Effect": "Deny",
-              "Principal": {
-                "Federated": "cognito-identity.amazonaws.com"
-              },
-              "Action": "sts:AssumeRoleWithWebIdentity"
-            }
-          ]
-        },
-        "RoleName": {
-          "Ref": "UnauthRoleName"
-        }
-      }
-    },
-    "apidiscussions": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/api/cloudformation-template.json",
-        "Parameters": {
-          "AppSyncApiName": "discussions",
-          "DynamoDBBillingMode": "PAY_PER_REQUEST",
-          "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-main-d5a80-deployment",
-          "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "main"
-        }
-      }
-    },
-    "authdiscussions22367c6822367c68": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
-        "Parameters": {
-          "identityPoolName": "discussions22367c68_identitypool_22367c68",
-          "allowUnauthenticatedIdentities": false,
-          "resourceNameTruncated": "discus22367c68",
-          "userPoolName": "discussions22367c68_userpool_22367c68",
-          "autoVerifiedAttributes": "email",
-          "mfaConfiguration": "OFF",
-          "mfaTypes": "SMS Text Message",
-          "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Your verification code is {####}",
-          "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Here is your verification code {####}",
-          "defaultPasswordPolicy": false,
-          "passwordPolicyMinLength": 8,
-          "passwordPolicyCharacters": "",
-          "requiredAttributes": "email,phone_number",
-          "aliasAttributes": "",
-          "userpoolClientGenerateSecret": false,
-          "userpoolClientRefreshTokenValidity": "120",
-          "userpoolClientWriteAttributes": "email",
-          "userpoolClientReadAttributes": "email",
-          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
-          "userpoolClientSetAttributes": false,
-          "sharedId": "22367c68",
-          "resourceName": "discussions22367c6822367c68",
-          "authSelections": "identityPoolAndUserPool",
-          "useDefault": "manual",
-          "thirdPartyAuth": false,
-          "usernameAttributes": "phone_number",
-          "userPoolGroups": false,
-          "adminQueries": false,
-          "triggers": "{}",
-          "hostedUI": false,
-          "userPoolGroupList": "",
-          "serviceName": "Cognito",
-          "usernameCaseSensitive": false,
-          "useEnabledMfas": true,
-          "authRoleArn": {
-            "Fn::GetAtt": [
-              "AuthRole",
-              "Arn"
-            ]
-          },
-          "unauthRoleArn": {
-            "Fn::GetAtt": [
-              "UnauthRole",
-              "Arn"
-            ]
-          },
-          "breakCircularDependency": true,
-          "dependsOn": "",
-          "env": "main"
-        }
-      }
-    },
-    "functionfetchuseractivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
-        "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip",
-          "storageactivityName": {
-            "Fn::GetAtt": [
-              "storageactivity",
-              "Outputs.Name"
-            ]
-          },
-          "storageactivityArn": {
-            "Fn::GetAtt": [
-              "storageactivity",
-              "Outputs.Arn"
-            ]
-          },
-          "storageactivityStreamArn": {
-            "Fn::GetAtt": [
-              "storageactivity",
-              "Outputs.StreamArn"
-            ]
-          },
-          "env": "main"
-        }
-      }
-    },
-    "functionrecorduseractivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
-        "Parameters": {
-          "deploymentBucketName": "amplify-discussions-main-d5a80-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-4969755347686f776962-build.zip",
-          "apidiscussionsGraphQLAPIIdOutput": {
-            "Fn::GetAtt": [
-              "apidiscussions",
-              "Outputs.GraphQLAPIIdOutput"
-            ]
-          },
-          "apidiscussionsGraphQLAPIEndpointOutput": {
-            "Fn::GetAtt": [
-              "apidiscussions",
-              "Outputs.GraphQLAPIEndpointOutput"
-            ]
-          },
-          "storageactivityName": {
-            "Fn::GetAtt": [
-              "storageactivity",
-              "Outputs.Name"
-            ]
-          },
-          "storageactivityArn": {
-            "Fn::GetAtt": [
-              "storageactivity",
-              "Outputs.Arn"
-            ]
-          },
-          "storageactivityStreamArn": {
-            "Fn::GetAtt": [
-              "storageactivity",
-              "Outputs.StreamArn"
-            ]
-          },
-          "env": "main"
-        }
-      }
-    },
-    "storageactivity": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "activity",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
-        }
-      }
-    },
-    "UpdateRolesWithIDPFunction": {
-      "DependsOn": [
-        "AuthRole",
-        "UnauthRole",
-        "authdiscussions22367c6822367c68"
-      ],
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "ZipFile": {
-            "Fn::Join": [
-              "\n",
-              [
-                "const response = require('cfn-response');",
-                "const { IAMClient, GetRoleCommand, UpdateAssumeRolePolicyCommand } = require('@aws-sdk/client-iam');",
-                "exports.handler = function(event, context) {",
-                "    // Don't return promise, response.send() marks context as done internally",
-                "    const ignoredPromise = handleEvent(event, context)",
-                "};",
-                "async function handleEvent(event, context) {",
-                "    try {",
-                "        let authRoleName = event.ResourceProperties.authRoleName;",
-                "        let unauthRoleName = event.ResourceProperties.unauthRoleName;",
-                "        let idpId = event.ResourceProperties.idpId;",
-                "        let authParamsJson = {",
-                "            'Version': '2012-10-17',",
-                "            'Statement': [{",
-                "                'Effect': 'Allow',",
-                "                'Principal': {'Federated': 'cognito-identity.amazonaws.com'},",
-                "                'Action': 'sts:AssumeRoleWithWebIdentity',",
-                "                'Condition': {",
-                "                    'StringEquals': {'cognito-identity.amazonaws.com:aud': idpId},",
-                "                    'ForAnyValue:StringLike': {'cognito-identity.amazonaws.com:amr': 'authenticated'}",
-                "                }",
-                "            }]",
-                "        };",
-                "        let unauthParamsJson = {",
-                "            'Version': '2012-10-17',",
-                "            'Statement': [{",
-                "                'Effect': 'Allow',",
-                "                'Principal': {'Federated': 'cognito-identity.amazonaws.com'},",
-                "                'Action': 'sts:AssumeRoleWithWebIdentity',",
-                "                'Condition': {",
-                "                    'StringEquals': {'cognito-identity.amazonaws.com:aud': idpId},",
-                "                    'ForAnyValue:StringLike': {'cognito-identity.amazonaws.com:amr': 'unauthenticated'}",
-                "                }",
-                "            }]",
-                "        };",
-                "        if (event.RequestType === 'Delete') {",
-                "            try {",
-                "                delete authParamsJson.Statement[0].Condition;",
-                "                delete unauthParamsJson.Statement[0].Condition;",
-                "                authParamsJson.Statement[0].Effect = 'Deny'",
-                "                unauthParamsJson.Statement[0].Effect = 'Deny'",
-                "                let authParams = {PolicyDocument: JSON.stringify(authParamsJson), RoleName: authRoleName};",
-                "                let unauthParams = {PolicyDocument: JSON.stringify(unauthParamsJson), RoleName: unauthRoleName};",
-                "                const iam = new IAMClient({region: event.ResourceProperties.region});",
-                "                let res = await Promise.all([",
-                "                    iam.send(new GetRoleCommand({RoleName: authParams.RoleName})),",
-                "                    iam.send(new GetRoleCommand({RoleName: unauthParams.RoleName}))",
-                "                ]);",
-                "                res = await Promise.all([",
-                "                    iam.send(new UpdateAssumeRolePolicyCommand(authParams)),",
-                "                    iam.send(new UpdateAssumeRolePolicyCommand(unauthParams))",
-                "                ]);",
-                "                response.send(event, context, response.SUCCESS, {});",
-                "            } catch (err) {",
-                "                console.log(err.stack);",
-                "                response.send(event, context, response.SUCCESS, {Error: err});",
-                "            }",
-                "        } else if (event.RequestType === 'Update' || event.RequestType === 'Create') {",
-                "            const iam = new IAMClient({region: event.ResourceProperties.region});",
-                "            let authParams = {PolicyDocument: JSON.stringify(authParamsJson), RoleName: authRoleName};",
-                "            let unauthParams = {PolicyDocument: JSON.stringify(unauthParamsJson), RoleName: unauthRoleName};",
-                "            const res = await Promise.all([",
-                "                iam.send(new UpdateAssumeRolePolicyCommand(authParams)),",
-                "                iam.send(new UpdateAssumeRolePolicyCommand(unauthParams))",
-                "            ]);",
-                "            response.send(event, context, response.SUCCESS, {});",
-                "        }",
-                "    } catch (err) {",
-                "        console.log(err.stack);",
-                "        response.send(event, context, response.FAILED, {Error: err});",
-                "    }",
-                "};"
-              ]
-            ]
-          }
-        },
-        "Handler": "index.handler",
-        "Runtime": "nodejs22.x",
-        "Timeout": 300,
-        "Role": {
-          "Fn::GetAtt": [
-            "UpdateRolesWithIDPFunctionRole",
-            "Arn"
-          ]
-        }
-      }
-    },
-    "UpdateRolesWithIDPFunctionOutputs": {
-      "Type": "Custom::LambdaCallout",
-      "Properties": {
-        "ServiceToken": {
-          "Fn::GetAtt": [
-            "UpdateRolesWithIDPFunction",
-            "Arn"
-          ]
-        },
-        "region": {
-          "Ref": "AWS::Region"
-        },
-        "idpId": {
-          "Fn::GetAtt": [
-            "authdiscussions22367c6822367c68",
-            "Outputs.IdentityPoolId"
-          ]
-        },
-        "authRoleName": {
-          "Ref": "AuthRole"
-        },
-        "unauthRoleName": {
-          "Ref": "UnauthRole"
-        }
-      }
-    },
-    "UpdateRolesWithIDPFunctionRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              {
-                "Ref": "AuthRole"
-              },
-              "-idp"
-            ]
-          ]
-        },
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Principal": {
-                "Service": [
-                  "lambda.amazonaws.com"
-                ]
-              },
-              "Action": [
-                "sts:AssumeRole"
-              ]
-            }
-          ]
-        },
-        "Policies": [
-          {
-            "PolicyName": "UpdateRolesWithIDPFunctionPolicy",
-            "PolicyDocument": {
-              "Version": "2012-10-17",
-              "Statement": [
-                {
-                  "Effect": "Allow",
-                  "Action": [
-                    "logs:CreateLogGroup",
-                    "logs:CreateLogStream",
-                    "logs:PutLogEvents"
-                  ],
-                  "Resource": "arn:aws:logs:*:*:*"
-                },
-                {
-                  "Effect": "Allow",
-                  "Action": [
-                    "iam:UpdateAssumeRolePolicy",
-                    "iam:GetRole"
-                  ],
-                  "Resource": {
-                    "Fn::GetAtt": [
-                      "AuthRole",
-                      "Arn"
-                    ]
-                  }
-                },
-                {
-                  "Effect": "Allow",
-                  "Action": [
-                    "iam:UpdateAssumeRolePolicy",
-                    "iam:GetRole"
-                  ],
-                  "Resource": {
-                    "Fn::GetAtt": [
-                      "UnauthRole",
-                      "Arn"
-                    ]
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "storagebookmarks": {
-      "Type": "AWS::CloudFormation::Stack",
-      "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-d5a80-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
-        "Parameters": {
-          "tableName": "bookmarks",
-          "partitionKeyName": "id",
-          "partitionKeyType": "S",
-          "sortKeyName": "userId",
-          "sortKeyType": "S",
-          "env": "main"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataAmplifyTableManagerNestedStackA-XL6RWZM0VCUI.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json
similarity index 62%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json
index 35cad8456e3..1c2bceac333 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json
@@ -3,13 +3,13 @@
     "OutputKey": "GetAttCommentDataSourceName",
     "OutputValue": "CommentTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:CommentDataSource:Name"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:CommentDataSource:Name"
   },
   {
     "OutputKey": "GetAttCommentTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-37vodjk43jhz3mwuryjmdktahy-blade/stream/2026-03-17T15:14:05.236",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-st35wex2drhe5piowtinjea47y-maintwo/stream/2026-01-29T19:51:34.005",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:CommentTable:StreamArn"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:CommentTable:StreamArn"
   },
   {
     "OutputKey": "transformerrootstackCommentCommentDataSourceA0E54655Name",
@@ -17,12 +17,12 @@
   },
   {
     "OutputKey": "transformerrootstackCommentCommentTable5427FDE2Ref",
-    "OutputValue": "Comment-37vodjk43jhz3mwuryjmdktahy-blade"
+    "OutputValue": "Comment-st35wex2drhe5piowtinjea47y-maintwo"
   },
   {
     "OutputKey": "GetAttCommentTableName",
-    "OutputValue": "Comment-37vodjk43jhz3mwuryjmdktahy-blade",
+    "OutputValue": "Comment-st35wex2drhe5piowtinjea47y-maintwo",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:CommentTable:Name"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:CommentTable:Name"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json
index 55a79f9c1e4..2b2abf43553 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Comment-J7DYWK8LJ835.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "ParameterValue": "v33ohxhiardujhblr3cbueojua"
+    "ParameterValue": "cthbhhlyd5gwrjmbn2oe3mmzpe"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
@@ -13,7 +13,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "ParameterValue": "j24ncyswjrdjrp74d2czrvi3w4"
+    "ParameterValue": "qd7jydnwobcfvanwmjhvrbpwhm"
   },
   {
     "ParameterKey": "DynamoDBBillingMode",
@@ -21,15 +21,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "ParameterValue": "tlsfwlcgg5di7lxqnhmu5wk7f4"
+    "ParameterValue": "j3guc4443jaurd5t57uyfjrzoe"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "ParameterValue": "ropc7w3dtfbtbb2ivo6nruvbtq"
+    "ParameterValue": "knbxu4bubjg6fnww57kmgtvdpa"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -37,7 +37,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "ParameterValue": "mevy2rvonzhc5neigj4afhf6hu"
+    "ParameterValue": "mzwd7p5cufaxpjscvvjhpvu42y"
   },
   {
     "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
@@ -45,11 +45,11 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "ParameterValue": "asvjdjgp3ngllp2axydm4gymoi"
+    "ParameterValue": "fv2vfbtkeff2bmihzfq7ruoqqi"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "ParameterValue": "apg6dyz26rfxhp7enncytav54e"
+    "ParameterValue": "fe6mxc5oa5afdm65jz72xihooi"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -57,10 +57,10 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json
similarity index 99%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json
index d04c4c40216..3af2c09b2f6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataCommentNestedStackCommentNested-1B2YB5H2V3Y68.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json
index 2d1a6332797..27bd26ffe73 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json
@@ -1,7 +1,7 @@
 [
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref",
-    "ParameterValue": "Topic-37vodjk43jhz3mwuryjmdktahy-blade"
+    "ParameterValue": "Topic-st35wex2drhe5piowtinjea47y-maintwo"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
@@ -13,15 +13,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef",
-    "ParameterValue": "Post-37vodjk43jhz3mwuryjmdktahy-blade"
+    "ParameterValue": "Post-st35wex2drhe5piowtinjea47y-maintwo"
   },
   {
     "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref",
-    "ParameterValue": "Comment-37vodjk43jhz3mwuryjmdktahy-blade"
+    "ParameterValue": "Comment-st35wex2drhe5piowtinjea47y-maintwo"
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name",
@@ -29,7 +29,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json
index 952951a26a1..660f4be4274 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -289,7 +289,7 @@
               {
                 "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -378,7 +378,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json
similarity index 70%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json
index 1e6f1e52d38..cadffe01b82 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json
@@ -1,15 +1,15 @@
 [
   {
     "ParameterKey": "S3DeploymentBucket",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "AppSyncApiId",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "S3DeploymentRootKey",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-CustomResourcesjson-18P7JI1QCI4Q7.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataFunctionDirectiveStackNestedSta-WLZNOFALEWKP.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json
similarity index 78%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json
index c7a05e23d29..35126b8a742 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json
@@ -9,14 +9,14 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-FunctionDirectiveStack-1B1A5238QSLAB.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataConnectionStackNestedStackConne-IBU39YZBPPIH.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json
similarity index 61%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json
index d20b6754c9a..54398177034 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json
@@ -3,13 +3,13 @@
     "OutputKey": "GetAttPostDataSourceName",
     "OutputValue": "PostTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:PostDataSource:Name"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:PostDataSource:Name"
   },
   {
     "OutputKey": "GetAttPostTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-37vodjk43jhz3mwuryjmdktahy-blade/stream/2026-03-17T15:14:05.173",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-st35wex2drhe5piowtinjea47y-maintwo/stream/2026-01-29T19:51:33.824",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:PostTable:StreamArn"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:PostTable:StreamArn"
   },
   {
     "OutputKey": "transformerrootstackPostPostDataSource6998E105Name",
@@ -17,12 +17,12 @@
   },
   {
     "OutputKey": "GetAttPostTableName",
-    "OutputValue": "Post-37vodjk43jhz3mwuryjmdktahy-blade",
+    "OutputValue": "Post-st35wex2drhe5piowtinjea47y-maintwo",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:PostTable:Name"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:PostTable:Name"
   },
   {
     "OutputKey": "transformerrootstackPostPostTable34CAE87BRef",
-    "OutputValue": "Post-37vodjk43jhz3mwuryjmdktahy-blade"
+    "OutputValue": "Post-st35wex2drhe5piowtinjea47y-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json
index 55a79f9c1e4..2b2abf43553 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Post-QYQEAFVTEYTH.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "ParameterValue": "v33ohxhiardujhblr3cbueojua"
+    "ParameterValue": "cthbhhlyd5gwrjmbn2oe3mmzpe"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
@@ -13,7 +13,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "ParameterValue": "j24ncyswjrdjrp74d2czrvi3w4"
+    "ParameterValue": "qd7jydnwobcfvanwmjhvrbpwhm"
   },
   {
     "ParameterKey": "DynamoDBBillingMode",
@@ -21,15 +21,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "ParameterValue": "tlsfwlcgg5di7lxqnhmu5wk7f4"
+    "ParameterValue": "j3guc4443jaurd5t57uyfjrzoe"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "ParameterValue": "ropc7w3dtfbtbb2ivo6nruvbtq"
+    "ParameterValue": "knbxu4bubjg6fnww57kmgtvdpa"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -37,7 +37,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "ParameterValue": "mevy2rvonzhc5neigj4afhf6hu"
+    "ParameterValue": "mzwd7p5cufaxpjscvvjhpvu42y"
   },
   {
     "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
@@ -45,11 +45,11 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "ParameterValue": "asvjdjgp3ngllp2axydm4gymoi"
+    "ParameterValue": "fv2vfbtkeff2bmihzfq7ruoqqi"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "ParameterValue": "apg6dyz26rfxhp7enncytav54e"
+    "ParameterValue": "fe6mxc5oa5afdm65jz72xihooi"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -57,10 +57,10 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json
similarity index 99%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json
index bf1876efe04..1340edb7eec 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-96dfd-amplifyDataPostNestedStackPostNestedStackR-1C18CMFRV9WU0.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json
similarity index 70%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json
index 53844842cf7..26284d78aed 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json
@@ -1,37 +1,37 @@
 [
   {
     "OutputKey": "GetAttTopicTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-ruiylk7rjnb4ziygno3jh4wrsq-main/stream/2026-03-07T17:11:31.408",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-st35wex2drhe5piowtinjea47y-maintwo/stream/2026-01-29T19:50:46.476",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:TopicTable:StreamArn"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:TopicTable:StreamArn"
   },
   {
     "OutputKey": "GetAttTopicTableName",
-    "OutputValue": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main",
+    "OutputValue": "Topic-st35wex2drhe5piowtinjea47y-maintwo",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:TopicTable:Name"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:TopicTable:Name"
   },
   {
     "OutputKey": "transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "OutputValue": "asvjdjgp3ngllp2axydm4gymoi"
+    "OutputValue": "fv2vfbtkeff2bmihzfq7ruoqqi"
   },
   {
     "OutputKey": "transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "OutputValue": "apg6dyz26rfxhp7enncytav54e"
+    "OutputValue": "fe6mxc5oa5afdm65jz72xihooi"
   },
   {
     "OutputKey": "transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "OutputValue": "ropc7w3dtfbtbb2ivo6nruvbtq"
+    "OutputValue": "knbxu4bubjg6fnww57kmgtvdpa"
   },
   {
     "OutputKey": "GetAttTopicDataSourceName",
     "OutputValue": "TopicTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "ruiylk7rjnb4ziygno3jh4wrsq:GetAtt:TopicDataSource:Name"
+    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:TopicDataSource:Name"
   },
   {
     "OutputKey": "transformerrootstackTopicTopicTableFD91FB92Ref",
-    "OutputValue": "Topic-ruiylk7rjnb4ziygno3jh4wrsq-main"
+    "OutputValue": "Topic-st35wex2drhe5piowtinjea47y-maintwo"
   },
   {
     "OutputKey": "transformerrootstackTopicTopicDataSource63D2F34BName",
@@ -39,18 +39,18 @@
   },
   {
     "OutputKey": "transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "OutputValue": "mevy2rvonzhc5neigj4afhf6hu"
+    "OutputValue": "mzwd7p5cufaxpjscvvjhpvu42y"
   },
   {
     "OutputKey": "transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "OutputValue": "v33ohxhiardujhblr3cbueojua"
+    "OutputValue": "cthbhhlyd5gwrjmbn2oe3mmzpe"
   },
   {
     "OutputKey": "transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "OutputValue": "tlsfwlcgg5di7lxqnhmu5wk7f4"
+    "OutputValue": "j3guc4443jaurd5t57uyfjrzoe"
   },
   {
     "OutputKey": "transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "OutputValue": "j24ncyswjrdjrp74d2czrvi3w4"
+    "OutputValue": "qd7jydnwobcfvanwmjhvrbpwhm"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json
index d8524bb5e14..81d1f203be1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D-Topic-1A739L0D5ZWOL.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json
@@ -25,7 +25,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "ruiylk7rjnb4ziygno3jh4wrsq"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -33,10 +33,10 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json
similarity index 99%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json
index df7d4fdb8a9..206fa8ec0f5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json
@@ -503,7 +503,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -604,7 +604,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -771,7 +771,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -959,7 +959,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1111,7 +1111,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1232,7 +1232,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1278,7 +1278,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1324,7 +1324,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt
new file mode 100644
index 00000000000..8951597b908
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"api-AppSync","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json
new file mode 100644
index 00000000000..fabe366a8cf
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json
@@ -0,0 +1,20 @@
+[
+  {
+    "OutputKey": "GraphQLAPIIdOutput",
+    "OutputValue": "st35wex2drhe5piowtinjea47y",
+    "Description": "Your GraphQL API ID.",
+    "ExportName": "amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN:GraphQLApiId"
+  },
+  {
+    "OutputKey": "GraphQLAPIEndpointOutput",
+    "OutputValue": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql",
+    "Description": "Your GraphQL API endpoint.",
+    "ExportName": "amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN:GraphQLApiEndpoint"
+  },
+  {
+    "OutputKey": "GraphQLAPIKeyOutput",
+    "OutputValue": "da2-fakeapikey00000000000000",
+    "Description": "Your GraphQL API ID.",
+    "ExportName": "amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN:GraphQLApiKey"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json
index d338f541858..bbaa3d0cce4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-apidiscussions-EQ7EIZZ1X77D.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json
@@ -17,7 +17,7 @@
   },
   {
     "ParameterKey": "S3DeploymentBucket",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -25,7 +25,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "S3DeploymentRootKey",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json
index a30cfdf0b8c..e702f6821aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1774365166
+        "Expires": 1770321021
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-blade\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt
similarity index 57%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt
index 28ba956271c..aaebecdf2a7 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt
@@ -1 +1 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.5","stackType":"auth-Cognito","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"auth-Cognito","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json
similarity index 60%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json
index 1edd34901b4..4cf42c946d5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json
@@ -1,40 +1,40 @@
 [
   {
     "OutputKey": "CreatedSNSRole",
-    "OutputValue": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade",
+    "OutputValue": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo",
     "Description": "role arn"
   },
   {
     "OutputKey": "UserPoolId",
-    "OutputValue": "us-east-1_3t0fqaGQN",
+    "OutputValue": "us-east-1_RCPurfiEw",
     "Description": "Id for the user pool"
   },
   {
     "OutputKey": "AppClientIDWeb",
-    "OutputValue": "7t0bpmsnis3540umt8r65jcicc",
+    "OutputValue": "2kictuhtu6967eqd0qhtsv5roh",
     "Description": "The user pool app client id for web"
   },
   {
     "OutputKey": "AppClientID",
-    "OutputValue": "7oh5id275ip4505msdvhrtv5vq",
+    "OutputValue": "35iqavrc56jmhttprdv2frl8qf",
     "Description": "The user pool app client id"
   },
   {
     "OutputKey": "IdentityPoolId",
-    "OutputValue": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d",
+    "OutputValue": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
     "Description": "Id for the identity pool"
   },
   {
     "OutputKey": "UserPoolArn",
-    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_3t0fqaGQN",
+    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw",
     "Description": "Arn for the user pool"
   },
   {
     "OutputKey": "IdentityPoolName",
-    "OutputValue": "discussions22367c68_identitypool_22367c68__blade"
+    "OutputValue": "discussionsc578c16e_identitypool_c578c16e__maintwo"
   },
   {
     "OutputKey": "UserPoolName",
-    "OutputValue": "discussions22367c68_userpool_22367c68"
+    "OutputValue": "discussionsc578c16e_userpool_c578c16e"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
index 81a9d17476d..9f2b0c0d239 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-authdiscussions22367c6822367c68-XLSGP9AEXCHG.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "authRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
   },
   {
     "ParameterKey": "autoVerifiedAttributes",
@@ -41,7 +41,7 @@
   },
   {
     "ParameterKey": "sharedId",
-    "ParameterValue": "22367c68"
+    "ParameterValue": "c578c16e"
   },
   {
     "ParameterKey": "useDefault",
@@ -57,7 +57,7 @@
   },
   {
     "ParameterKey": "identityPoolName",
-    "ParameterValue": "discussions22367c68_identitypool_22367c68"
+    "ParameterValue": "discussionsc578c16e_identitypool_c578c16e"
   },
   {
     "ParameterKey": "thirdPartyAuth",
@@ -77,7 +77,7 @@
   },
   {
     "ParameterKey": "resourceNameTruncated",
-    "ParameterValue": "discus22367c68"
+    "ParameterValue": "discusc578c16e"
   },
   {
     "ParameterKey": "userPoolGroups",
@@ -93,7 +93,7 @@
   },
   {
     "ParameterKey": "userPoolName",
-    "ParameterValue": "discussions22367c68_userpool_22367c68"
+    "ParameterValue": "discussionsc578c16e_userpool_c578c16e"
   },
   {
     "ParameterKey": "userpoolClientWriteAttributes",
@@ -113,11 +113,11 @@
   },
   {
     "ParameterKey": "resourceName",
-    "ParameterValue": "discussions22367c6822367c68"
+    "ParameterValue": "discussionsc578c16ec578c16e"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "triggers",
@@ -129,7 +129,7 @@
   },
   {
     "ParameterKey": "emailVerificationMessage",
-    "ParameterValue": "Here is your verification code {####}"
+    "ParameterValue": "Your verification code is {####}"
   },
   {
     "ParameterKey": "userpoolClientRefreshTokenValidity",
@@ -141,7 +141,7 @@
   },
   {
     "ParameterKey": "unauthRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole"
   },
   {
     "ParameterKey": "requiredAttributes",
@@ -157,7 +157,7 @@
   },
   {
     "ParameterKey": "userpoolClientLambdaRole",
-    "ParameterValue": "discus22367c68_userpoolclient_lambda_role"
+    "ParameterValue": "discusc578c16e_userpoolclient_lambda_role"
   },
   {
     "ParameterKey": "defaultPasswordPolicy",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
similarity index 95%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
index c305475136f..50d85ddc94f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussions22367c6822367c68/build/discussions22367c6822367c68-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -154,7 +154,7 @@
               ],
               "Condition": {
                 "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
+                  "sts:ExternalId": "discusc578c16e_role_external_id"
                 }
               }
             }
@@ -174,18 +174,18 @@
                 }
               ]
             },
-            "PolicyName": "discus22367c68-sns-policy"
+            "PolicyName": "discusc578c16e-sns-policy"
           }
         ],
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discus22367c68_sns-role",
+            "discusc578c16e_sns-role",
             {
               "Fn::Join": [
                 "",
                 [
-                  "sns22367c68",
+                  "snsc578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -252,7 +252,7 @@
           "Ref": "smsAuthenticationMessage"
         },
         "SmsConfiguration": {
-          "ExternalId": "discus22367c68_role_external_id",
+          "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": {
             "Fn::GetAtt": [
               "SNSRole",
@@ -304,7 +304,7 @@
     "UserPoolClientWeb": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_clientWeb",
+        "ClientName": "discusc578c16e_app_clientWeb",
         "RefreshTokenValidity": {
           "Ref": "userpoolClientRefreshTokenValidity"
         },
@@ -322,7 +322,7 @@
     "UserPoolClient": {
       "Type": "AWS::Cognito::UserPoolClient",
       "Properties": {
-        "ClientName": "discus22367c68_app_client",
+        "ClientName": "discusc578c16e_app_client",
         "GenerateSecret": {
           "Ref": "userpoolClientGenerateSecret"
         },
@@ -365,7 +365,7 @@
               "Fn::Join": [
                 "",
                 [
-                  "upClientLambdaRole22367c68",
+                  "upClientLambdaRolec578c16e",
                   {
                     "Fn::Select": [
                       3,
@@ -437,12 +437,12 @@
         "IdentityPoolName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussions22367c68_identitypool_22367c68",
+            "discussionsc578c16e_identitypool_c578c16e",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussions22367c68_identitypool_22367c68__",
+                  "discussionsc578c16e_identitypool_c578c16e__",
                   {
                     "Ref": "env"
                   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt
similarity index 57%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt
index 445081e4df1..90219dbf396 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt
@@ -1 +1 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json
similarity index 69%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json
index e135284b360..6f5507529a4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "LambdaExecutionRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole0d8fb131-main"
+    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-maintwo"
   },
   {
     "OutputKey": "Region",
@@ -9,14 +9,14 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-main"
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-maintwo"
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "fetchuseractivity-main"
+    "OutputValue": "fetchuseractivity-maintwo"
   },
   {
     "OutputKey": "LambdaExecutionRole",
-    "OutputValue": "discussionsLambdaRole0d8fb131-main"
+    "OutputValue": "discussionsLambdaRole44bd86bc-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json
similarity index 61%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json
index 9d89d254977..0072850d21f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json
@@ -5,26 +5,26 @@
   },
   {
     "ParameterKey": "storageactivityName",
-    "ParameterValue": "activity-main"
+    "ParameterValue": "activity-maintwo"
   },
   {
     "ParameterKey": "s3Key",
-    "ParameterValue": "amplify-builds/fetchuseractivity-6e6d76524e6255314269-build.zip"
+    "ParameterValue": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
   },
   {
     "ParameterKey": "deploymentBucketName",
-    "ParameterValue": "amplify-discussions-main-d5a80-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "storageactivityStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-07T17:11:10.591"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "storageactivityArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json
similarity index 97%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json
index cff69443a2b..9297a858679 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionfetchuseractivity-WUMXMK423PKD.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -110,12 +110,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole0d8fb131",
+            "discussionsLambdaRole44bd86bc",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole0d8fb131",
+                  "discussionsLambdaRole44bd86bc",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt
similarity index 57%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt
index 445081e4df1..90219dbf396 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt
@@ -1 +1 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json
index ea41d68a359..b6d7eb874af 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "LambdaExecutionRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole7674760b-main"
+    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-maintwo"
   },
   {
     "OutputKey": "Region",
@@ -9,14 +9,14 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-main"
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-maintwo"
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "recorduseractivity-main"
+    "OutputValue": "recorduseractivity-maintwo"
   },
   {
     "OutputKey": "LambdaExecutionRole",
-    "OutputValue": "discussionsLambdaRole7674760b-main"
+    "OutputValue": "discussionsLambdaRole62a425ae-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json
similarity index 61%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json
index 0854d2bb6bd..f266a452908 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json
@@ -5,34 +5,34 @@
   },
   {
     "ParameterKey": "storageactivityName",
-    "ParameterValue": "activity-blade"
+    "ParameterValue": "activity-maintwo"
   },
   {
     "ParameterKey": "s3Key",
-    "ParameterValue": "amplify-builds/recorduseractivity-67683636486963333764-build.zip"
+    "ParameterValue": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
   },
   {
     "ParameterKey": "deploymentBucketName",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
   },
   {
     "ParameterKey": "apidiscussionsGraphQLAPIEndpointOutput",
-    "ParameterValue": "https://z5rkwijhofdwngjrtmese4mpmu.appsync-api.us-east-1.amazonaws.com/graphql"
+    "ParameterValue": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
     "ParameterKey": "apidiscussionsGraphQLAPIIdOutput",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
+    "ParameterValue": "st35wex2drhe5piowtinjea47y"
   },
   {
     "ParameterKey": "storageactivityStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "blade"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "storageactivityArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json
index 1b1d6a91237..0a05f67e87a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-functionrecorduseractivity-UG5EXUFUZZTY.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
@@ -118,12 +118,12 @@
         "RoleName": {
           "Fn::If": [
             "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole7674760b",
+            "discussionsLambdaRole62a425ae",
             {
               "Fn::Join": [
                 "",
                 [
-                  "discussionsLambdaRole7674760b",
+                  "discussionsLambdaRole62a425ae",
                   "-",
                   {
                     "Ref": "env"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt
similarity index 58%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt
index 8a7d80f26b2..42c7da6ff2d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.description.txt
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt
@@ -1 +1 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json
similarity index 84%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json
index 983341e780e..1f8a5f4401f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json
@@ -17,11 +17,11 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
   },
   {
     "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
   },
   {
     "OutputKey": "PartitionKeyType",
@@ -29,6 +29,6 @@
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "activity-blade"
+    "OutputValue": "activity-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
index c06bdde08ee..029f443974a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "blade"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
index a2cf77e20fa..ca188b6e7fb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storageactivity-MDZCD7YSRDN4.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt
new file mode 100644
index 00000000000..eae70debfb9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"storage-S3","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json
new file mode 100644
index 00000000000..6622bd76b8f
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json
@@ -0,0 +1,11 @@
+[
+  {
+    "OutputKey": "BucketName",
+    "OutputValue": "discus-avatarsdecb9-maintwo",
+    "Description": "Bucket name for the S3 bucket"
+  },
+  {
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json
new file mode 100644
index 00000000000..429ce4bc46c
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json
@@ -0,0 +1,86 @@
+[
+  {
+    "ParameterKey": "s3PermissionsGuestPublic",
+    "ParameterValue": "DISALLOW"
+  },
+  {
+    "ParameterKey": "bucketName",
+    "ParameterValue": "discus-avatars"
+  },
+  {
+    "ParameterKey": "s3PublicPolicy",
+    "ParameterValue": "Public_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "AuthenticatedAllowList",
+    "ParameterValue": "ALLOW"
+  },
+  {
+    "ParameterKey": "unauthRoleName",
+    "ParameterValue": "amplify-discussions-maintwo-decb9-unauthRole"
+  },
+  {
+    "ParameterKey": "s3PrivatePolicy",
+    "ParameterValue": "Private_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "selectedGuestPermissions",
+    "ParameterValue": ""
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedPublic",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:DeleteObject"
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedPrivate",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:DeleteObject"
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedUploads",
+    "ParameterValue": "s3:PutObject"
+  },
+  {
+    "ParameterKey": "s3UploadsPolicy",
+    "ParameterValue": "Uploads_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "maintwo"
+  },
+  {
+    "ParameterKey": "unauthPolicyName",
+    "ParameterValue": "s3_amplify_bf41454d"
+  },
+  {
+    "ParameterKey": "authRoleName",
+    "ParameterValue": "amplify-discussions-maintwo-decb9-authRole"
+  },
+  {
+    "ParameterKey": "GuestAllowList",
+    "ParameterValue": "DISALLOW"
+  },
+  {
+    "ParameterKey": "authPolicyName",
+    "ParameterValue": "s3_amplify_bf41454d"
+  },
+  {
+    "ParameterKey": "s3ProtectedPolicy",
+    "ParameterValue": "Protected_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedProtected",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:DeleteObject"
+  },
+  {
+    "ParameterKey": "s3PermissionsGuestUploads",
+    "ParameterValue": "DISALLOW"
+  },
+  {
+    "ParameterKey": "s3ReadPolicy",
+    "ParameterValue": "read_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "selectedAuthenticatedPermissions",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json
new file mode 100644
index 00000000000..49679c245fc
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json
@@ -0,0 +1,599 @@
+{
+  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        {
+          "Ref": "env"
+        },
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedProtected"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedPrivate"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsAuthenticatedUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestPublic"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "s3PermissionsGuestUploads"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AuthenticatedAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "GuestAllowList"
+            },
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": {
+        "Ref": "S3Bucket"
+      }
+    },
+    "Region": {
+      "Value": {
+        "Ref": "AWS::Region"
+      }
+    }
+  },
+  "Resources": {
+    "S3Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::If": [
+            "ShouldNotCreateEnvResources",
+            {
+              "Ref": "bucketName"
+            },
+            {
+              "Fn::Join": [
+                "",
+                [
+                  {
+                    "Ref": "bucketName"
+                  },
+                  {
+                    "Fn::Select": [
+                      3,
+                      {
+                        "Fn::Split": [
+                          "-",
+                          {
+                            "Ref": "AWS::StackName"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "-",
+                  {
+                    "Ref": "env"
+                  }
+                ]
+              ]
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPublic"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PublicPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedProtected"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3ProtectedPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedPrivate"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3PrivatePolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  {
+                    "Ref": "s3PermissionsAuthenticatedUploads"
+                  }
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      {
+                        "Ref": "S3Bucket"
+                      },
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": {
+          "Ref": "s3UploadsPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "authRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "AuthReadAndList"
+    },
+    "S3GuestReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    },
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    {
+                      "Ref": "S3Bucket"
+                    }
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": {
+          "Ref": "s3ReadPolicy"
+        },
+        "Roles": [
+          {
+            "Ref": "unauthRoleName"
+          }
+        ]
+      },
+      "DependsOn": [
+        "S3Bucket"
+      ],
+      "Condition": "GuestReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json
index e7c5f6cfaa1..d15c94260d9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json
@@ -1,34 +1,34 @@
 [
   {
-    "OutputKey": "Name",
-    "OutputValue": "bookmarks-blade"
+    "OutputKey": "PartitionKeyName",
+    "OutputValue": "userId"
   },
   {
-    "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
+    "OutputKey": "SortKeyName",
+    "OutputValue": "postId"
   },
   {
-    "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
+    "OutputKey": "SortKeyType",
+    "OutputValue": "S"
   },
   {
-    "OutputKey": "PartitionKeyName",
-    "OutputValue": "userId"
+    "OutputKey": "Region",
+    "OutputValue": "us-east-1"
   },
   {
-    "OutputKey": "PartitionKeyType",
-    "OutputValue": "S"
+    "OutputKey": "Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo"
   },
   {
-    "OutputKey": "SortKeyName",
-    "OutputValue": "postId"
+    "OutputKey": "StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305"
   },
   {
-    "OutputKey": "SortKeyType",
+    "OutputKey": "PartitionKeyType",
     "OutputValue": "S"
   },
   {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1"
+    "OutputKey": "Name",
+    "OutputValue": "bookmarks-maintwo"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
index 7fe1ed68a50..357002d677e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-d5a80-storagebookmarks-19Q2XZYRDN4T.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
@@ -1,19 +1,15 @@
 [
   {
-    "ParameterKey": "tableName",
-    "ParameterValue": "bookmarks"
+    "ParameterKey": "partitionKeyType",
+    "ParameterValue": "S"
   },
   {
     "ParameterKey": "partitionKeyName",
     "ParameterValue": "userId"
   },
-  {
-    "ParameterKey": "partitionKeyType",
-    "ParameterValue": "S"
-  },
   {
     "ParameterKey": "env",
-    "ParameterValue": "main"
+    "ParameterValue": "maintwo"
   },
   {
     "ParameterKey": "sortKeyName",
@@ -22,5 +18,9 @@
   {
     "ParameterKey": "sortKeyType",
     "ParameterValue": "S"
+  },
+  {
+    "ParameterKey": "tableName",
+    "ParameterValue": "bookmarks"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/bookmarks/build/bookmarks-cloudformation-template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.outputs.json
similarity index 55%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.outputs.json
index c747dd78ab5..dcc754b32a9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-d5a80.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.outputs.json
@@ -1,42 +1,42 @@
 [
   {
     "OutputKey": "AuthRoleName",
-    "OutputValue": "amplify-discussions-main-d5a80-authRole"
+    "OutputValue": "amplify-discussions-maintwo-decb9-authRole"
   },
   {
     "OutputKey": "UnauthRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-unauthRole"
+    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole"
   },
   {
     "OutputKey": "AuthRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-d5a80-authRole"
+    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
   },
   {
     "OutputKey": "Region",
     "OutputValue": "us-east-1",
     "Description": "CloudFormation provider root stack Region",
-    "ExportName": "amplify-discussions-main-d5a80-Region"
+    "ExportName": "amplify-discussions-maintwo-decb9-Region"
   },
   {
     "OutputKey": "DeploymentBucketName",
-    "OutputValue": "amplify-discussions-main-d5a80-deployment",
+    "OutputValue": "amplify-discussions-maintwo-decb9-deployment",
     "Description": "CloudFormation provider root stack deployment bucket name",
-    "ExportName": "amplify-discussions-main-d5a80-DeploymentBucketName"
+    "ExportName": "amplify-discussions-maintwo-decb9-DeploymentBucketName"
   },
   {
     "OutputKey": "UnauthRoleName",
-    "OutputValue": "amplify-discussions-main-d5a80-unauthRole"
+    "OutputValue": "amplify-discussions-maintwo-decb9-unauthRole"
   },
   {
     "OutputKey": "StackName",
-    "OutputValue": "amplify-discussions-main-d5a80",
+    "OutputValue": "amplify-discussions-maintwo-decb9",
     "Description": "CloudFormation provider root stack ID",
-    "ExportName": "amplify-discussions-main-d5a80-StackName"
+    "ExportName": "amplify-discussions-maintwo-decb9-StackName"
   },
   {
     "OutputKey": "StackId",
-    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-d5a80/2bc587e0-1a44-11f1-8b6b-0affd4d11c2d",
+    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
     "Description": "CloudFormation provider root stack name",
-    "ExportName": "amplify-discussions-main-d5a80-StackId"
+    "ExportName": "amplify-discussions-maintwo-decb9-StackId"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json
new file mode 100644
index 00000000000..c9362564858
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json
@@ -0,0 +1,14 @@
+[
+  {
+    "ParameterKey": "AuthRoleName",
+    "ParameterValue": "amplify-discussions-maintwo-decb9-authRole"
+  },
+  {
+    "ParameterKey": "DeploymentBucketName",
+    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+  },
+  {
+    "ParameterKey": "UnauthRoleName",
+    "ParameterValue": "amplify-discussions-maintwo-decb9-unauthRole"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.template.json
similarity index 84%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.template.json
index fb0e76dd1dc..30ad934f79d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.template.json
@@ -202,33 +202,33 @@
     "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
           "AppSyncApiName": "discussions",
           "DynamoDBBillingMode": "PAY_PER_REQUEST",
           "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussionsblade-blade-4edfd-deployment",
+          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
           "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "blade"
+          "env": "maintwo"
         }
       }
     },
-    "authdiscussions22367c6822367c68": {
+    "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/auth/discussions22367c6822367c68-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
-          "identityPoolName": "discussions22367c68_identitypool_22367c68",
+          "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
-          "resourceNameTruncated": "discus22367c68",
-          "userPoolName": "discussions22367c68_userpool_22367c68",
+          "resourceNameTruncated": "discusc578c16e",
+          "userPoolName": "discussionsc578c16e_userpool_c578c16e",
           "autoVerifiedAttributes": "email",
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Here is your verification code {####}",
+          "emailVerificationMessage": "Your verification code is {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
@@ -238,10 +238,10 @@
           "userpoolClientRefreshTokenValidity": "120",
           "userpoolClientWriteAttributes": "email",
           "userpoolClientReadAttributes": "email",
-          "userpoolClientLambdaRole": "discus22367c68_userpoolclient_lambda_role",
+          "userpoolClientLambdaRole": "discusc578c16e_userpoolclient_lambda_role",
           "userpoolClientSetAttributes": false,
-          "sharedId": "22367c68",
-          "resourceName": "discussions22367c6822367c68",
+          "sharedId": "c578c16e",
+          "resourceName": "discussionsc578c16ec578c16e",
           "authSelections": "identityPoolAndUserPool",
           "useDefault": "manual",
           "thirdPartyAuth": false,
@@ -268,17 +268,17 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "blade"
+          "env": "maintwo"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussionsblade-blade-4edfd-deployment",
-          "s3Key": "amplify-builds/fetchuseractivity-663875517431786f5935-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
               "storageactivity",
@@ -297,17 +297,17 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "blade"
+          "env": "maintwo"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussionsblade-blade-4edfd-deployment",
-          "s3Key": "amplify-builds/recorduseractivity-67683636486963333764-build.zip",
+          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
               "apidiscussions",
@@ -338,35 +338,68 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "blade"
+          "env": "maintwo"
         }
       }
     },
     "storageactivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
         "Parameters": {
           "tableName": "activity",
           "partitionKeyName": "id",
           "partitionKeyType": "S",
           "sortKeyName": "userId",
           "sortKeyType": "S",
-          "env": "blade"
+          "env": "maintwo"
+        }
+      }
+    },
+    "storageavatars": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "Parameters": {
+          "bucketName": "discus-avatars",
+          "selectedGuestPermissions": "",
+          "selectedAuthenticatedPermissions": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject",
+          "unauthRoleName": {
+            "Ref": "UnauthRoleName"
+          },
+          "authRoleName": {
+            "Ref": "AuthRoleName"
+          },
+          "s3PrivatePolicy": "Private_policy_bf41454d",
+          "s3ProtectedPolicy": "Protected_policy_bf41454d",
+          "s3PublicPolicy": "Public_policy_bf41454d",
+          "s3ReadPolicy": "read_policy_bf41454d",
+          "s3UploadsPolicy": "Uploads_policy_bf41454d",
+          "authPolicyName": "s3_amplify_bf41454d",
+          "unauthPolicyName": "s3_amplify_bf41454d",
+          "AuthenticatedAllowList": "ALLOW",
+          "GuestAllowList": "DISALLOW",
+          "s3PermissionsAuthenticatedPrivate": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedProtected": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedPublic": "s3:PutObject,s3:GetObject,s3:DeleteObject",
+          "s3PermissionsAuthenticatedUploads": "s3:PutObject",
+          "s3PermissionsGuestPublic": "DISALLOW",
+          "s3PermissionsGuestUploads": "DISALLOW",
+          "env": "maintwo"
         }
       }
     },
     "storagebookmarks": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussionsblade-blade-4edfd-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "Parameters": {
           "tableName": "bookmarks",
           "partitionKeyName": "userId",
           "partitionKeyType": "S",
           "sortKeyName": "postId",
           "sortKeyType": "S",
-          "env": "blade"
+          "env": "maintwo"
         }
       }
     },
@@ -374,7 +407,7 @@
       "DependsOn": [
         "AuthRole",
         "UnauthRole",
-        "authdiscussions22367c6822367c68"
+        "authdiscussionsc578c16ec578c16e"
       ],
       "Type": "AWS::Lambda::Function",
       "Properties": {
@@ -484,7 +517,7 @@
         },
         "idpId": {
           "Fn::GetAtt": [
-            "authdiscussions22367c6822367c68",
+            "authdiscussionsc578c16ec578c16e",
             "Outputs.IdentityPoolId"
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt
deleted file mode 100644
index 87d574fa42f..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-An auto-generated nested stack for the @function directive.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.outputs.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json
deleted file mode 100644
index 0f773c546a1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json
deleted file mode 100644
index 2893dd20e86..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY-FunctionDirectiveStack-JUWBQLX2MIUS.template.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
-  "Description": "An auto-generated nested stack for the @function directive.",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-            },
-            "NONE"
-          ]
-        }
-      ]
-    }
-  },
-  "Resources": {
-    "FetchuseractivityLambdaDataSourceServiceRole6102CA71": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "appsync.amazonaws.com"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        }
-      }
-    },
-    "FetchuseractivityLambdaDataSourceServiceRoleDefaultPolicy91915AF7": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": "lambda:InvokeFunction",
-              "Effect": "Allow",
-              "Resource": [
-                {
-                  "Fn::If": [
-                    "HasEnvironmentParameter",
-                    {
-                      "Fn::Sub": [
-                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-${env}",
-                        {
-                          "env": {
-                            "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity"
-                    }
-                  ]
-                },
-                {
-                  "Fn::Join": [
-                    "",
-                    [
-                      {
-                        "Fn::If": [
-                          "HasEnvironmentParameter",
-                          {
-                            "Fn::Sub": [
-                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-${env}",
-                              {
-                                "env": {
-                                  "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity"
-                          }
-                        ]
-                      },
-                      ":*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "PolicyName": "FetchuseractivityLambdaDataSourceServiceRoleDefaultPolicy91915AF7",
-        "Roles": [
-          {
-            "Ref": "FetchuseractivityLambdaDataSourceServiceRole6102CA71"
-          }
-        ]
-      }
-    },
-    "FetchuseractivityLambdaDataSource": {
-      "Type": "AWS::AppSync::DataSource",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "LambdaConfig": {
-          "LambdaFunctionArn": {
-            "Fn::If": [
-              "HasEnvironmentParameter",
-              {
-                "Fn::Sub": [
-                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-${env}",
-                  {
-                    "env": {
-                      "Ref": "referencetotransformerrootstackenv10C5A902Ref"
-                    }
-                  }
-                ]
-              },
-              {
-                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity"
-              }
-            ]
-          }
-        },
-        "Name": "FetchuseractivityLambdaDataSource",
-        "ServiceRoleArn": {
-          "Fn::GetAtt": [
-            "FetchuseractivityLambdaDataSourceServiceRole6102CA71",
-            "Arn"
-          ]
-        },
-        "Type": "AWS_LAMBDA"
-      }
-    },
-    "InvokeFetchuseractivityLambdaDataSourceInvokeFetchuseractivityLambdaDataSourceAppSyncFunction05F09D4C": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Fn::GetAtt": [
-            "FetchuseractivityLambdaDataSource",
-            "Name"
-          ]
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "InvokeFetchuseractivityLambdaDataSource",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/InvokeFetchuseractivityLambdaDataSource.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/InvokeFetchuseractivityLambdaDataSource.res.vtl"
-            ]
-          ]
-        }
-      },
-      "DependsOn": [
-        "FetchuseractivityLambdaDataSource"
-      ]
-    },
-    "QueryfetchUserActivityResolver": {
-      "Type": "AWS::AppSync::Resolver",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "FieldName": "fetchUserActivity",
-        "Kind": "PIPELINE",
-        "PipelineConfig": {
-          "Functions": [
-            {
-              "Fn::GetAtt": [
-                "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612",
-                "FunctionId"
-              ]
-            },
-            {
-              "Fn::GetAtt": [
-                "InvokeFetchuseractivityLambdaDataSourceInvokeFetchuseractivityLambdaDataSourceAppSyncFunction05F09D4C",
-                "FunctionId"
-              ]
-            }
-          ]
-        },
-        "RequestMappingTemplate": "## [Start] Stash resolver specific context.. **\n$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"fetchUserActivity\"))\n{}\n## [End] Stash resolver specific context.. **",
-        "ResponseMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.fetchUserActivity.res.vtl"
-            ]
-          ]
-        },
-        "TypeName": "Query"
-      }
-    },
-    "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
-      "Type": "AWS::AppSync::FunctionConfiguration",
-      "Properties": {
-        "ApiId": {
-          "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
-        },
-        "DataSourceName": {
-          "Ref": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name"
-        },
-        "FunctionVersion": "2018-05-29",
-        "Name": "QueryFetchUserActivityAuthFN",
-        "RequestMappingTemplateS3Location": {
-          "Fn::Join": [
-            "",
-            [
-              "s3://",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentBucket7592718ARef"
-              },
-              "/",
-              {
-                "Ref": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref"
-              },
-              "/resolvers/Query.fetchUserActivity.auth.req.vtl"
-            ]
-          ]
-        },
-        "ResponseMappingTemplate": "$util.toJson({})"
-      }
-    }
-  },
-  "Parameters": {
-    "referencetotransformerrootstackenv10C5A902Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-      "Type": "String"
-    },
-    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-      "Type": "String"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json
deleted file mode 100644
index 9c2ce20460a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Comment-1JNK5MYREU7SI.parameters.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "ParameterValue": "el5tw63g3fdc3gbbstjp4r4j6y"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "ParameterValue": "wdzyxfso6neadaza2qtk2mghhm"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "ParameterValue": "2k4q3mg4hfbqbglueul424f74i"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "ParameterValue": "3z32nwy4qfcivlkko7asumm3y4"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "ParameterValue": "eoihadwr4rglppq5wsdbosfby4"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "ParameterValue": "65l3h37jc5bi7ppqoq2ytmewqa"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "ParameterValue": "gkrbngcxbnftvheqhs6zedhfm4"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-ConnectionStack-1V0C4C1EXD8J9.outputs.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt
deleted file mode 100644
index 293dec5639e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-An auto-generated nested stack.
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json
deleted file mode 100644
index 5e9753d822a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.outputs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "OutputKey": "EmptyOutput",
-    "OutputValue": "",
-    "Description": "An empty output. You may delete this if you have at least one resource above."
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json
deleted file mode 100644
index 23a129d21fe..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "ParameterKey": "S3DeploymentBucket",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "AppSyncApiId",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "blade"
-  },
-  {
-    "ParameterKey": "S3DeploymentRootKey",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "AppSyncApiName",
-    "ParameterValue": "discussions"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json
deleted file mode 100644
index 016991278d0..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-CustomResourcesjson-1TP4VIYV7SW7T.template.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "An auto-generated nested stack.",
-  "Metadata": {},
-  "Parameters": {
-    "AppSyncApiId": {
-      "Type": "String",
-      "Description": "The id of the AppSync API associated with this project."
-    },
-    "AppSyncApiName": {
-      "Type": "String",
-      "Description": "The name of the AppSync API",
-      "Default": "AppSyncSimpleTransform"
-    },
-    "env": {
-      "Type": "String",
-      "Description": "The environment name. e.g. Dev, Test, or Production",
-      "Default": "NONE"
-    },
-    "S3DeploymentBucket": {
-      "Type": "String",
-      "Description": "The S3 bucket containing all deployment assets for the project."
-    },
-    "S3DeploymentRootKey": {
-      "Type": "String",
-      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root\nof the deployment directory."
-    }
-  },
-  "Resources": {
-    "EmptyResource": {
-      "Type": "Custom::EmptyResource",
-      "Condition": "AlwaysFalse"
-    }
-  },
-  "Conditions": {
-    "HasEnvironmentParameter": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            {
-              "Ref": "env"
-            },
-            "NONE"
-          ]
-        }
-      ]
-    },
-    "AlwaysFalse": {
-      "Fn::Equals": [
-        "true",
-        "false"
-      ]
-    }
-  },
-  "Outputs": {
-    "EmptyOutput": {
-      "Description": "An empty output. You may delete this if you have at least one resource above.",
-      "Value": ""
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json
deleted file mode 100644
index 9c2ce20460a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Post-14Y25NP173QZR.parameters.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "ParameterValue": "el5tw63g3fdc3gbbstjp4r4j6y"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "ParameterValue": "wdzyxfso6neadaza2qtk2mghhm"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "ParameterValue": "2k4q3mg4hfbqbglueul424f74i"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "ParameterValue": "3z32nwy4qfcivlkko7asumm3y4"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "ParameterValue": "eoihadwr4rglppq5wsdbosfby4"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "ParameterValue": "65l3h37jc5bi7ppqoq2ytmewqa"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "ParameterValue": "gkrbngcxbnftvheqhs6zedhfm4"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.description.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json
deleted file mode 100644
index 862ce371ccf..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.outputs.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttTopicTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-37vodjk43jhz3mwuryjmdktahy-blade/stream/2026-03-17T15:13:17.105",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:TopicTable:StreamArn"
-  },
-  {
-    "OutputKey": "GetAttTopicTableName",
-    "OutputValue": "Topic-37vodjk43jhz3mwuryjmdktahy-blade",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:TopicTable:Name"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "OutputValue": "65l3h37jc5bi7ppqoq2ytmewqa"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "OutputValue": "gkrbngcxbnftvheqhs6zedhfm4"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "OutputValue": "3z32nwy4qfcivlkko7asumm3y4"
-  },
-  {
-    "OutputKey": "GetAttTopicDataSourceName",
-    "OutputValue": "TopicTable",
-    "Description": "Your model DataSource name.",
-    "ExportName": "37vodjk43jhz3mwuryjmdktahy:GetAtt:TopicDataSource:Name"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicTopicTableFD91FB92Ref",
-    "OutputValue": "Topic-37vodjk43jhz3mwuryjmdktahy-blade"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicTopicDataSource63D2F34BName",
-    "OutputValue": "TopicTable"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "OutputValue": "eoihadwr4rglppq5wsdbosfby4"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "OutputValue": "el5tw63g3fdc3gbbstjp4r4j6y"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "OutputValue": "2k4q3mg4hfbqbglueul424f74i"
-  },
-  {
-    "OutputKey": "transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "OutputValue": "wdzyxfso6neadaza2qtk2mghhm"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json
deleted file mode 100644
index 613fc953f7d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7-Topic-H46P3V70TYLP.parameters.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "37vodjk43jhz3mwuryjmdktahy"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt
deleted file mode 100644
index 0c9fe4d79b3..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"api-AppSync","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json
deleted file mode 100644
index f742b0a76f1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.outputs.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "OutputKey": "GraphQLAPIIdOutput",
-    "OutputValue": "37vodjk43jhz3mwuryjmdktahy",
-    "Description": "Your GraphQL API ID.",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7:GraphQLApiId"
-  },
-  {
-    "OutputKey": "GraphQLAPIEndpointOutput",
-    "OutputValue": "https://z5rkwijhofdwngjrtmese4mpmu.appsync-api.us-east-1.amazonaws.com/graphql",
-    "Description": "Your GraphQL API endpoint.",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7:GraphQLApiEndpoint"
-  },
-  {
-    "OutputKey": "GraphQLAPIKeyOutput",
-    "OutputValue": "da2-ydjxofoqk5huvpkfkxhrziqfwa",
-    "Description": "Your GraphQL API ID.",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7:GraphQLApiKey"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json
deleted file mode 100644
index 4ef37b27214..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-apidiscussions-IQT4EPRDAYY7.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "S3DeploymentBucket",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "blade"
-  },
-  {
-    "ParameterKey": "S3DeploymentRootKey",
-    "ParameterValue": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
-  },
-  {
-    "ParameterKey": "AppSyncApiName",
-    "ParameterValue": "discussions"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt
deleted file mode 100644
index 8b558f82186..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"auth-Cognito","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json
deleted file mode 100644
index d6c6bddb891..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.parameters.json
+++ /dev/null
@@ -1,166 +0,0 @@
-[
-  {
-    "ParameterKey": "usernameAttributes",
-    "ParameterValue": "phone_number"
-  },
-  {
-    "ParameterKey": "authRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
-  },
-  {
-    "ParameterKey": "autoVerifiedAttributes",
-    "ParameterValue": "email"
-  },
-  {
-    "ParameterKey": "allowUnauthenticatedIdentities",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "hostedUI",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "smsVerificationMessage",
-    "ParameterValue": "Your verification code is {####}"
-  },
-  {
-    "ParameterKey": "userpoolClientReadAttributes",
-    "ParameterValue": "email"
-  },
-  {
-    "ParameterKey": "breakCircularDependency",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "mfaTypes",
-    "ParameterValue": "SMS Text Message"
-  },
-  {
-    "ParameterKey": "emailVerificationSubject",
-    "ParameterValue": "Verification"
-  },
-  {
-    "ParameterKey": "sharedId",
-    "ParameterValue": "22367c68"
-  },
-  {
-    "ParameterKey": "useDefault",
-    "ParameterValue": "manual"
-  },
-  {
-    "ParameterKey": "userpoolClientGenerateSecret",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "mfaConfiguration",
-    "ParameterValue": "OFF"
-  },
-  {
-    "ParameterKey": "identityPoolName",
-    "ParameterValue": "discussions22367c68_identitypool_22367c68"
-  },
-  {
-    "ParameterKey": "thirdPartyAuth",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "userPoolGroupList",
-    "ParameterValue": ""
-  },
-  {
-    "ParameterKey": "authSelections",
-    "ParameterValue": "identityPoolAndUserPool"
-  },
-  {
-    "ParameterKey": "adminQueries",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "resourceNameTruncated",
-    "ParameterValue": "discus22367c68"
-  },
-  {
-    "ParameterKey": "userPoolGroups",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "smsAuthenticationMessage",
-    "ParameterValue": "Your authentication code is {####}"
-  },
-  {
-    "ParameterKey": "passwordPolicyMinLength",
-    "ParameterValue": "8"
-  },
-  {
-    "ParameterKey": "userPoolName",
-    "ParameterValue": "discussions22367c68_userpool_22367c68"
-  },
-  {
-    "ParameterKey": "userpoolClientWriteAttributes",
-    "ParameterValue": "email"
-  },
-  {
-    "ParameterKey": "dependsOn",
-    "ParameterValue": ""
-  },
-  {
-    "ParameterKey": "useEnabledMfas",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "usernameCaseSensitive",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "resourceName",
-    "ParameterValue": "discussions22367c6822367c68"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "blade"
-  },
-  {
-    "ParameterKey": "triggers",
-    "ParameterValue": "{}"
-  },
-  {
-    "ParameterKey": "serviceName",
-    "ParameterValue": "Cognito"
-  },
-  {
-    "ParameterKey": "emailVerificationMessage",
-    "ParameterValue": "Here is your verification code {####}"
-  },
-  {
-    "ParameterKey": "userpoolClientRefreshTokenValidity",
-    "ParameterValue": "120"
-  },
-  {
-    "ParameterKey": "userpoolClientSetAttributes",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "unauthRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole"
-  },
-  {
-    "ParameterKey": "requiredAttributes",
-    "ParameterValue": "email,phone_number"
-  },
-  {
-    "ParameterKey": "passwordPolicyCharacters",
-    "ParameterValue": ""
-  },
-  {
-    "ParameterKey": "aliasAttributes",
-    "ParameterValue": ""
-  },
-  {
-    "ParameterKey": "userpoolClientLambdaRole",
-    "ParameterValue": "discus22367c68_userpoolclient_lambda_role"
-  },
-  {
-    "ParameterKey": "defaultPasswordPolicy",
-    "ParameterValue": "false"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json
deleted file mode 100644
index 4e432156fb1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR.template.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Parameters": {
-    "env": {
-      "Type": "String"
-    },
-    "identityPoolName": {
-      "Type": "String"
-    },
-    "allowUnauthenticatedIdentities": {
-      "Type": "String"
-    },
-    "resourceNameTruncated": {
-      "Type": "String"
-    },
-    "userPoolName": {
-      "Type": "String"
-    },
-    "autoVerifiedAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "mfaConfiguration": {
-      "Type": "String"
-    },
-    "mfaTypes": {
-      "Type": "CommaDelimitedList"
-    },
-    "smsAuthenticationMessage": {
-      "Type": "String"
-    },
-    "smsVerificationMessage": {
-      "Type": "String"
-    },
-    "emailVerificationSubject": {
-      "Type": "String"
-    },
-    "emailVerificationMessage": {
-      "Type": "String"
-    },
-    "defaultPasswordPolicy": {
-      "Type": "String"
-    },
-    "passwordPolicyMinLength": {
-      "Type": "String"
-    },
-    "passwordPolicyCharacters": {
-      "Type": "CommaDelimitedList"
-    },
-    "requiredAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "aliasAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userpoolClientGenerateSecret": {
-      "Type": "String"
-    },
-    "userpoolClientRefreshTokenValidity": {
-      "Type": "String"
-    },
-    "userpoolClientWriteAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userpoolClientReadAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userpoolClientLambdaRole": {
-      "Type": "String"
-    },
-    "userpoolClientSetAttributes": {
-      "Type": "String"
-    },
-    "sharedId": {
-      "Type": "String"
-    },
-    "resourceName": {
-      "Type": "String"
-    },
-    "authSelections": {
-      "Type": "String"
-    },
-    "useDefault": {
-      "Type": "String"
-    },
-    "thirdPartyAuth": {
-      "Type": "String"
-    },
-    "usernameAttributes": {
-      "Type": "CommaDelimitedList"
-    },
-    "userPoolGroups": {
-      "Type": "String"
-    },
-    "adminQueries": {
-      "Type": "String"
-    },
-    "triggers": {
-      "Type": "String"
-    },
-    "hostedUI": {
-      "Type": "String"
-    },
-    "userPoolGroupList": {
-      "Type": "CommaDelimitedList"
-    },
-    "serviceName": {
-      "Type": "String"
-    },
-    "usernameCaseSensitive": {
-      "Type": "String"
-    },
-    "useEnabledMfas": {
-      "Type": "String"
-    },
-    "authRoleArn": {
-      "Type": "String"
-    },
-    "unauthRoleArn": {
-      "Type": "String"
-    },
-    "breakCircularDependency": {
-      "Type": "String"
-    },
-    "dependsOn": {
-      "Type": "CommaDelimitedList"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        "blade",
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "SNSRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Sid": "",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "cognito-idp.amazonaws.com"
-              },
-              "Action": [
-                "sts:AssumeRole"
-              ],
-              "Condition": {
-                "StringEquals": {
-                  "sts:ExternalId": "discus22367c68_role_external_id"
-                }
-              }
-            }
-          ]
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Version": "2012-10-17",
-              "Statement": [
-                {
-                  "Effect": "Allow",
-                  "Action": [
-                    "sns:Publish"
-                  ],
-                  "Resource": "*"
-                }
-              ]
-            },
-            "PolicyName": "discus22367c68-sns-policy"
-          }
-        ],
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "sns22367c68",
-              {
-                "Fn::Select": [
-                  3,
-                  {
-                    "Fn::Split": [
-                      "-",
-                      "amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR"
-                    ]
-                  }
-                ]
-              },
-              "-",
-              "blade"
-            ]
-          ]
-        }
-      }
-    },
-    "UserPoolClientRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "lambda.amazonaws.com"
-              },
-              "Action": "sts:AssumeRole"
-            }
-          ]
-        },
-        "RoleName": {
-          "Fn::Join": [
-            "",
-            [
-              "upClientLambdaRole22367c68",
-              {
-                "Fn::Select": [
-                  3,
-                  {
-                    "Fn::Split": [
-                      "-",
-                      "amplify-discussionsblade-blade-4edfd-authdiscussions22367c6822367c68-AZ1ABOD9U7XR"
-                    ]
-                  }
-                ]
-              },
-              "-",
-              "blade"
-            ]
-          ]
-        }
-      }
-    }
-  },
-  "Outputs": {
-    "IdentityPoolId": {
-      "Description": "Id for the identity pool",
-      "Value": "us-east-1:09b19c4e-2cc9-40f9-87da-99bbea62536d"
-    },
-    "IdentityPoolName": {
-      "Value": "discussions22367c68_identitypool_22367c68__blade"
-    },
-    "UserPoolId": {
-      "Description": "Id for the user pool",
-      "Value": "us-east-1_3t0fqaGQN"
-    },
-    "UserPoolArn": {
-      "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_3t0fqaGQN"
-    },
-    "UserPoolName": {
-      "Value": "discussions22367c68_userpool_22367c68"
-    },
-    "AppClientIDWeb": {
-      "Description": "The user pool app client id for web",
-      "Value": "7t0bpmsnis3540umt8r65jcicc"
-    },
-    "AppClientID": {
-      "Description": "The user pool app client id",
-      "Value": "7oh5id275ip4505msdvhrtv5vq"
-    },
-    "CreatedSNSRole": {
-      "Description": "role arn",
-      "Value": "arn:aws:iam::123456789012:role/sns22367c684edfd-blade"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt
deleted file mode 100644
index e0ba9d9ec0a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json
deleted file mode 100644
index e3823e218b2..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.outputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "OutputKey": "LambdaExecutionRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole0d8fb131-blade"
-  },
-  {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-blade"
-  },
-  {
-    "OutputKey": "Name",
-    "OutputValue": "fetchuseractivity-blade"
-  },
-  {
-    "OutputKey": "LambdaExecutionRole",
-    "OutputValue": "discussionsLambdaRole0d8fb131-blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json
deleted file mode 100644
index a61e245ab6b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.parameters.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "ParameterKey": "CloudWatchRule",
-    "ParameterValue": "NONE"
-  },
-  {
-    "ParameterKey": "storageactivityName",
-    "ParameterValue": "activity-blade"
-  },
-  {
-    "ParameterKey": "s3Key",
-    "ParameterValue": "amplify-builds/fetchuseractivity-663875517431786f5935-build.zip"
-  },
-  {
-    "ParameterKey": "deploymentBucketName",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "storageactivityStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
-  },
-  {
-    "ParameterKey": "env",
-    "ParameterValue": "blade"
-  },
-  {
-    "ParameterKey": "storageactivityArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json
deleted file mode 100644
index 800fb75ebc8..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionfetchuseractivity-62CQ5IY9UUX6.template.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
-  "Parameters": {
-    "CloudWatchRule": {
-      "Type": "String",
-      "Default": "NONE",
-      "Description": " Schedule Expression"
-    },
-    "deploymentBucketName": {
-      "Type": "String"
-    },
-    "env": {
-      "Type": "String"
-    },
-    "s3Key": {
-      "Type": "String"
-    },
-    "storageactivityName": {
-      "Type": "String",
-      "Default": "storageactivityName"
-    },
-    "storageactivityArn": {
-      "Type": "String",
-      "Default": "storageactivityArn"
-    },
-    "storageactivityStreamArn": {
-      "Type": "String",
-      "Default": "storageactivityStreamArn"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        {
-          "Ref": "env"
-        },
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "LambdaFunction": {
-      "Type": "AWS::Lambda::Function",
-      "Metadata": {
-        "aws:asset:path": "./src",
-        "aws:asset:property": "Code"
-      },
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Ref": "deploymentBucketName"
-          },
-          "S3Key": {
-            "Ref": "s3Key"
-          }
-        },
-        "Handler": "index.handler",
-        "FunctionName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            "fetchuseractivity",
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "fetchuseractivity",
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        },
-        "Environment": {
-          "Variables": {
-            "ENV": {
-              "Ref": "env"
-            },
-            "REGION": {
-              "Ref": "AWS::Region"
-            },
-            "STORAGE_ACTIVITY_NAME": {
-              "Ref": "storageactivityName"
-            },
-            "STORAGE_ACTIVITY_ARN": {
-              "Ref": "storageactivityArn"
-            },
-            "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "storageactivityStreamArn"
-            }
-          }
-        },
-        "Role": {
-          "Fn::GetAtt": [
-            "LambdaExecutionRole",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Layers": [],
-        "Timeout": 25
-      }
-    },
-    "LambdaExecutionRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "RoleName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole0d8fb131",
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "discussionsLambdaRole0d8fb131",
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        },
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Principal": {
-                "Service": [
-                  "lambda.amazonaws.com"
-                ]
-              },
-              "Action": [
-                "sts:AssumeRole"
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "lambdaexecutionpolicy": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "lambda-execution-policy",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "logs:CreateLogGroup",
-                "logs:CreateLogStream",
-                "logs:PutLogEvents"
-              ],
-              "Resource": {
-                "Fn::Sub": [
-                  "arn:aws:logs:${region}:${account}:log-group:/aws/lambda/${lambda}:log-stream:*",
-                  {
-                    "region": {
-                      "Ref": "AWS::Region"
-                    },
-                    "account": {
-                      "Ref": "AWS::AccountId"
-                    },
-                    "lambda": {
-                      "Ref": "LambdaFunction"
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      }
-    },
-    "AmplifyResourcesPolicy": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "amplify-lambda-execution-policy",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "dynamodb:Get*",
-                "dynamodb:BatchGetItem",
-                "dynamodb:List*",
-                "dynamodb:Describe*",
-                "dynamodb:Scan",
-                "dynamodb:Query",
-                "dynamodb:PartiQLSelect"
-              ],
-              "Resource": [
-                {
-                  "Ref": "storageactivityArn"
-                },
-                {
-                  "Fn::Join": [
-                    "/",
-                    [
-                      {
-                        "Ref": "storageactivityArn"
-                      },
-                      "index/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    }
-  },
-  "Outputs": {
-    "Name": {
-      "Value": {
-        "Ref": "LambdaFunction"
-      }
-    },
-    "Arn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "LambdaFunction",
-          "Arn"
-        ]
-      }
-    },
-    "Region": {
-      "Value": {
-        "Ref": "AWS::Region"
-      }
-    },
-    "LambdaExecutionRole": {
-      "Value": {
-        "Ref": "LambdaExecutionRole"
-      }
-    },
-    "LambdaExecutionRoleArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "LambdaExecutionRole",
-          "Arn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt
deleted file mode 100644
index e0ba9d9ec0a..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json
deleted file mode 100644
index f801efe7e9d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.outputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "OutputKey": "LambdaExecutionRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole7674760b-blade"
-  },
-  {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-blade"
-  },
-  {
-    "OutputKey": "Name",
-    "OutputValue": "recorduseractivity-blade"
-  },
-  {
-    "OutputKey": "LambdaExecutionRole",
-    "OutputValue": "discussionsLambdaRole7674760b-blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json
deleted file mode 100644
index 1d53e1280c5..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-functionrecorduseractivity-18VPX4OJ3YT33.template.json
+++ /dev/null
@@ -1,455 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
-  "Parameters": {
-    "CloudWatchRule": {
-      "Type": "String",
-      "Default": "NONE",
-      "Description": " Schedule Expression"
-    },
-    "deploymentBucketName": {
-      "Type": "String"
-    },
-    "env": {
-      "Type": "String"
-    },
-    "s3Key": {
-      "Type": "String"
-    },
-    "apidiscussionsGraphQLAPIIdOutput": {
-      "Type": "String",
-      "Default": "apidiscussionsGraphQLAPIIdOutput"
-    },
-    "apidiscussionsGraphQLAPIEndpointOutput": {
-      "Type": "String",
-      "Default": "apidiscussionsGraphQLAPIEndpointOutput"
-    },
-    "storageactivityName": {
-      "Type": "String",
-      "Default": "storageactivityName"
-    },
-    "storageactivityArn": {
-      "Type": "String",
-      "Default": "storageactivityArn"
-    },
-    "storageactivityStreamArn": {
-      "Type": "String",
-      "Default": "storageactivityStreamArn"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        {
-          "Ref": "env"
-        },
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "LambdaFunction": {
-      "Type": "AWS::Lambda::Function",
-      "Metadata": {
-        "aws:asset:path": "./src",
-        "aws:asset:property": "Code"
-      },
-      "Properties": {
-        "Code": {
-          "S3Bucket": {
-            "Ref": "deploymentBucketName"
-          },
-          "S3Key": {
-            "Ref": "s3Key"
-          }
-        },
-        "Handler": "index.handler",
-        "FunctionName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            "recorduseractivity",
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "recorduseractivity",
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        },
-        "Environment": {
-          "Variables": {
-            "ENV": {
-              "Ref": "env"
-            },
-            "REGION": {
-              "Ref": "AWS::Region"
-            },
-            "STORAGE_ACTIVITY_NAME": {
-              "Ref": "storageactivityName"
-            },
-            "STORAGE_ACTIVITY_ARN": {
-              "Ref": "storageactivityArn"
-            },
-            "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "storageactivityStreamArn"
-            }
-          }
-        },
-        "Role": {
-          "Fn::GetAtt": [
-            "LambdaExecutionRole",
-            "Arn"
-          ]
-        },
-        "Runtime": "nodejs22.x",
-        "Layers": [],
-        "Timeout": 25
-      }
-    },
-    "LambdaExecutionRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "RoleName": {
-          "Fn::If": [
-            "ShouldNotCreateEnvResources",
-            "discussionsLambdaRole7674760b",
-            {
-              "Fn::Join": [
-                "",
-                [
-                  "discussionsLambdaRole7674760b",
-                  "-",
-                  {
-                    "Ref": "env"
-                  }
-                ]
-              ]
-            }
-          ]
-        },
-        "AssumeRolePolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Principal": {
-                "Service": [
-                  "lambda.amazonaws.com"
-                ]
-              },
-              "Action": [
-                "sts:AssumeRole"
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "lambdaexecutionpolicy": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "lambda-execution-policy",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "logs:CreateLogGroup",
-                "logs:CreateLogStream",
-                "logs:PutLogEvents"
-              ],
-              "Resource": {
-                "Fn::Sub": [
-                  "arn:aws:logs:${region}:${account}:log-group:/aws/lambda/${lambda}:log-stream:*",
-                  {
-                    "region": {
-                      "Ref": "AWS::Region"
-                    },
-                    "account": {
-                      "Ref": "AWS::AccountId"
-                    },
-                    "lambda": {
-                      "Ref": "LambdaFunction"
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      }
-    },
-    "AmplifyResourcesPolicy": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "amplify-lambda-execution-policy",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "dynamodb:Put*",
-                "dynamodb:Create*",
-                "dynamodb:BatchWriteItem",
-                "dynamodb:PartiQLInsert",
-                "dynamodb:Get*",
-                "dynamodb:BatchGetItem",
-                "dynamodb:List*",
-                "dynamodb:Describe*",
-                "dynamodb:Scan",
-                "dynamodb:Query",
-                "dynamodb:PartiQLSelect",
-                "dynamodb:Update*",
-                "dynamodb:RestoreTable*",
-                "dynamodb:PartiQLUpdate",
-                "dynamodb:Delete*",
-                "dynamodb:PartiQLDelete"
-              ],
-              "Resource": [
-                {
-                  "Ref": "storageactivityArn"
-                },
-                {
-                  "Fn::Join": [
-                    "/",
-                    [
-                      {
-                        "Ref": "storageactivityArn"
-                      },
-                      "index/*"
-                    ]
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "LambdaTriggerPolicyTopic": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "amplify-lambda-execution-policy-Topic",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "dynamodb:DescribeStream",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator",
-                "dynamodb:ListStreams"
-              ],
-              "Resource": {
-                "Fn::ImportValue": {
-                  "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:TopicTable:StreamArn"
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "LambdaEventSourceMappingTopic": {
-      "Type": "AWS::Lambda::EventSourceMapping",
-      "DependsOn": [
-        "LambdaTriggerPolicyTopic",
-        "LambdaExecutionRole"
-      ],
-      "Properties": {
-        "BatchSize": 100,
-        "Enabled": true,
-        "EventSourceArn": {
-          "Fn::ImportValue": {
-            "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:TopicTable:StreamArn"
-          }
-        },
-        "FunctionName": {
-          "Fn::GetAtt": [
-            "LambdaFunction",
-            "Arn"
-          ]
-        },
-        "StartingPosition": "LATEST"
-      }
-    },
-    "LambdaTriggerPolicyPost": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "amplify-lambda-execution-policy-Post",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "dynamodb:DescribeStream",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator",
-                "dynamodb:ListStreams"
-              ],
-              "Resource": {
-                "Fn::ImportValue": {
-                  "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:PostTable:StreamArn"
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "LambdaEventSourceMappingPost": {
-      "Type": "AWS::Lambda::EventSourceMapping",
-      "DependsOn": [
-        "LambdaTriggerPolicyPost",
-        "LambdaExecutionRole"
-      ],
-      "Properties": {
-        "BatchSize": 100,
-        "Enabled": true,
-        "EventSourceArn": {
-          "Fn::ImportValue": {
-            "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:PostTable:StreamArn"
-          }
-        },
-        "FunctionName": {
-          "Fn::GetAtt": [
-            "LambdaFunction",
-            "Arn"
-          ]
-        },
-        "StartingPosition": "LATEST"
-      }
-    },
-    "LambdaTriggerPolicyComment": {
-      "DependsOn": [
-        "LambdaExecutionRole"
-      ],
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyName": "amplify-lambda-execution-policy-Comment",
-        "Roles": [
-          {
-            "Ref": "LambdaExecutionRole"
-          }
-        ],
-        "PolicyDocument": {
-          "Version": "2012-10-17",
-          "Statement": [
-            {
-              "Effect": "Allow",
-              "Action": [
-                "dynamodb:DescribeStream",
-                "dynamodb:GetRecords",
-                "dynamodb:GetShardIterator",
-                "dynamodb:ListStreams"
-              ],
-              "Resource": {
-                "Fn::ImportValue": {
-                  "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:CommentTable:StreamArn"
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "LambdaEventSourceMappingComment": {
-      "Type": "AWS::Lambda::EventSourceMapping",
-      "DependsOn": [
-        "LambdaTriggerPolicyComment",
-        "LambdaExecutionRole"
-      ],
-      "Properties": {
-        "BatchSize": 100,
-        "Enabled": true,
-        "EventSourceArn": {
-          "Fn::ImportValue": {
-            "Fn::Sub": "${apidiscussionsGraphQLAPIIdOutput}:GetAtt:CommentTable:StreamArn"
-          }
-        },
-        "FunctionName": {
-          "Fn::GetAtt": [
-            "LambdaFunction",
-            "Arn"
-          ]
-        },
-        "StartingPosition": "LATEST"
-      }
-    }
-  },
-  "Outputs": {
-    "Name": {
-      "Value": {
-        "Ref": "LambdaFunction"
-      }
-    },
-    "Arn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "LambdaFunction",
-          "Arn"
-        ]
-      }
-    },
-    "Region": {
-      "Value": {
-        "Ref": "AWS::Region"
-      }
-    },
-    "LambdaExecutionRole": {
-      "Value": {
-        "Ref": "LambdaExecutionRole"
-      }
-    },
-    "LambdaExecutionRoleArn": {
-      "Value": {
-        "Fn::GetAtt": [
-          "LambdaExecutionRole",
-          "Arn"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json
deleted file mode 100644
index a4d2dfbadb7..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storageactivity-1OKZSX7N0DR6H.template.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Parameters": {
-    "partitionKeyName": {
-      "Type": "String"
-    },
-    "partitionKeyType": {
-      "Type": "String"
-    },
-    "env": {
-      "Type": "String"
-    },
-    "sortKeyName": {
-      "Type": "String"
-    },
-    "sortKeyType": {
-      "Type": "String"
-    },
-    "tableName": {
-      "Type": "String"
-    }
-  },
-  "Conditions": {
-    "ShouldNotCreateEnvResources": {
-      "Fn::Equals": [
-        "blade",
-        "NONE"
-      ]
-    }
-  },
-  "Resources": {
-    "MigrationPlaceholder": {
-      "Type": "AWS::CloudFormation::WaitConditionHandle",
-      "Properties": {}
-    }
-  },
-  "Outputs": {
-    "Name": {
-      "Value": "activity-blade"
-    },
-    "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade"
-    },
-    "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-blade/stream/2026-03-17T15:12:56.430"
-    },
-    "PartitionKeyName": {
-      "Value": "id"
-    },
-    "PartitionKeyType": {
-      "Value": "S"
-    },
-    "SortKeyName": {
-      "Value": "userId"
-    },
-    "SortKeyType": {
-      "Value": "S"
-    },
-    "Region": {
-      "Value": "us-east-1"
-    }
-  }
-}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt
deleted file mode 100644
index 85c7bf4fcc3..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json
deleted file mode 100644
index 59a4047a8af..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd-storagebookmarks-1319IZBITHXQD.outputs.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  {
-    "OutputKey": "PartitionKeyName",
-    "OutputValue": "userId"
-  },
-  {
-    "OutputKey": "SortKeyName",
-    "OutputValue": "postId"
-  },
-  {
-    "OutputKey": "SortKeyType",
-    "OutputValue": "S"
-  },
-  {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1"
-  },
-  {
-    "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade"
-  },
-  {
-    "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-blade/stream/2026-03-17T15:41:00.107"
-  },
-  {
-    "OutputKey": "PartitionKeyType",
-    "OutputValue": "S"
-  },
-  {
-    "OutputKey": "Name",
-    "OutputValue": "bookmarks-blade"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt
deleted file mode 100644
index daf66c0bc85..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Root Stack for AWS Amplify CLI
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json
deleted file mode 100644
index a27fb7bb5e7..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.outputs.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "OutputKey": "AuthRoleName",
-    "OutputValue": "amplify-discussionsblade-blade-4edfd-authRole"
-  },
-  {
-    "OutputKey": "UnauthRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-unauthRole"
-  },
-  {
-    "OutputKey": "AuthRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussionsblade-blade-4edfd-authRole"
-  },
-  {
-    "OutputKey": "Region",
-    "OutputValue": "us-east-1",
-    "Description": "CloudFormation provider root stack Region",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-Region"
-  },
-  {
-    "OutputKey": "DeploymentBucketName",
-    "OutputValue": "amplify-discussionsblade-blade-4edfd-deployment",
-    "Description": "CloudFormation provider root stack deployment bucket name",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-DeploymentBucketName"
-  },
-  {
-    "OutputKey": "UnauthRoleName",
-    "OutputValue": "amplify-discussionsblade-blade-4edfd-unauthRole"
-  },
-  {
-    "OutputKey": "StackName",
-    "OutputValue": "amplify-discussionsblade-blade-4edfd",
-    "Description": "CloudFormation provider root stack ID",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-StackName"
-  },
-  {
-    "OutputKey": "StackId",
-    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussionsblade-blade-4edfd/2190d960-2213-11f1-a861-127cff1666cb",
-    "Description": "CloudFormation provider root stack name",
-    "ExportName": "amplify-discussionsblade-blade-4edfd-StackId"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json
deleted file mode 100644
index fb5c8cacb79..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussionsblade-blade-4edfd.parameters.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "ParameterKey": "AuthRoleName",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-authRole"
-  },
-  {
-    "ParameterKey": "DeploymentBucketName",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-deployment"
-  },
-  {
-    "ParameterKey": "UnauthRoleName",
-    "ParameterValue": "amplify-discussionsblade-blade-4edfd-unauthRole"
-  }
-]
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 14b3730a9c3..2ca1f1adb52 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38,28 +38,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@amplify-migration-apps/discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate":
-  version: 0.0.0-use.local
-  resolution: "@amplify-migration-apps/discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate"
-  dependencies:
-    "@aws-amplify/backend": ^1.18.0
-    "@aws-amplify/backend-cli": ^1.8.0
-    "@aws-amplify/backend-data": ^1.6.2
-    "@aws-sdk/client-dynamodb": ^3.936.0
-    "@aws-sdk/lib-dynamodb": ^3.936.0
-    "@types/aws-lambda": ^8.10.92
-    "@types/node": "*"
-    aws-amplify: ^6.15.8
-    aws-cdk: ^2
-    aws-cdk-lib: ^2
-    ci-info: ^4.3.1
-    constructs: ^10.0.0
-    esbuild: ^0.27.0
-    tsx: ^4.20.6
-    vite: ^7.2.2
-  languageName: unknown
-  linkType: soft
-
 "@amplify-migration-apps/fitness-goal-tracker@workspace:amplify-migration-apps/fitness-tracker/_snapshot.post.generate":
   version: 0.0.0-use.local
   resolution: "@amplify-migration-apps/fitness-goal-tracker@workspace:amplify-migration-apps/fitness-tracker/_snapshot.post.generate"
@@ -26696,6 +26674,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate":
+  version: 0.0.0-use.local
+  resolution: "discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate"
+  dependencies:
+    "@aws-amplify/backend": ^1.18.0
+    "@aws-amplify/backend-cli": ^1.8.0
+    "@aws-amplify/backend-data": ^1.6.2
+    "@aws-sdk/client-dynamodb": ^3.936.0
+    "@aws-sdk/lib-dynamodb": ^3.936.0
+    "@types/aws-lambda": ^8.10.92
+    "@types/node": "*"
+    aws-amplify: ^6.15.8
+    aws-cdk: ^2
+    aws-cdk-lib: ^2
+    ci-info: ^4.3.1
+    constructs: ^10.0.0
+    esbuild: ^0.27.0
+    tsx: ^4.20.6
+    vite: ^7.2.2
+  languageName: unknown
+  linkType: soft
+
 "dlv@npm:^1.1.3":
   version: 1.1.3
   resolution: "dlv@npm:1.1.3"

From 22f98969b0af9eada073d2f1883b26bc922314ff Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Fri, 20 Mar 2026 22:38:01 +0000
Subject: [PATCH 08/20] fix(cli): disambiguate S3 nested stack from DDB
 per-table stacks

The S3 forward/rollback refactorers used findNestedStack with a bare
'storage' prefix, which matched DDB per-table stacks (e.g.
'storageactivity') before the S3 stack ('storage0EC3F24A'). Fixed by
using 'storage' + resourceName for Gen1 lookup and a new
findS3NestedStack method that distinguishes the CDK-hashed S3 stack
from lowercase-prefixed DDB stacks for Gen2 lookup.

Also refreshes discussions snapshots from a clean main/gen2-main deploy.
---
 .../amplify/backend.ts                        |    6 +-
 .../amplify/data/resource.ts                  |    8 +-
 .../amplify/storage/resource.ts               |    2 +-
 ...79371D7-6NIMXK30VQKX-holding.mappings.json |   52 +
 ...6NIMXK30VQKX-holding.source.template.json} |   34 +-
 ...6NIMXK30VQKX-holding.target.template.json} |   40 +-
 ...EC3F24A-O1Q835F0QK5N-holding.mappings.json |   12 +
 ...-O1Q835F0QK5N-holding.source.template.json |  579 +++++
 ...-O1Q835F0QK5N-holding.target.template.json |   79 +
 ...346F297-6KCEOSFCBCK1-holding.mappings.json |   12 +
 ...6KCEOSFCBCK1-holding.source.template.json} |   14 +-
 ...6KCEOSFCBCK1-holding.target.template.json} |    4 +-
 ...0DAF62-135V889SZ0ORT-holding.mappings.json |   12 +
 ...35V889SZ0ORT-holding.source.template.json} |    2 +-
 ...35V889SZ0ORT-holding.target.template.json} |    4 +-
 ...79371D7-2NLVKCUURH94-holding.mappings.json |   52 -
 ...346F297-URG4H1Y2NQLX-holding.mappings.json |   12 -
 ...10DAF62-6NUUN10S5348-holding.mappings.json |   12 -
 ...0a-auth179371D7-6NIMXK30VQKX.mappings.json |   52 +
 ...79371D7-6NIMXK30VQKX.source.template.json} |   26 +-
 ...79371D7-6NIMXK30VQKX.target.template.json} |   58 +-
 ...ctivityA346F297-6KCEOSFCBCK1.mappings.json |   12 +
 ...346F297-6KCEOSFCBCK1.source.template.json} |   10 +-
 ...346F297-6KCEOSFCBCK1.target.template.json} |   16 +-
 ...storage0EC3F24A-O1Q835F0QK5N.mappings.json |   12 +
 ...0EC3F24A-O1Q835F0QK5N.source.template.json |  386 ++++
 ...0EC3F24A-O1Q835F0QK5N.target.template.json |  643 ++++++
 ...kmarks210DAF62-135V889SZ0ORT.mappings.json |   12 +
 ...0DAF62-135V889SZ0ORT.source.template.json} |    8 +-
 ...0DAF62-135V889SZ0ORT.target.template.json} |    4 +-
 ...b3-auth179371D7-2NLVKCUURH94.mappings.json |   52 -
 ...ctivityA346F297-URG4H1Y2NQLX.mappings.json |   12 -
 ...okmarks210DAF62-6NUUN10S5348.mappings.json |   12 -
 ...auth179371D7-6NIMXK30VQKX.parameters.json} |    0
 ...a-auth179371D7-6NIMXK30VQKX.template.json} |   74 +-
 ...orage0EC3F24A-O1Q835F0QK5N.parameters.json |    6 +
 ...storage0EC3F24A-O1Q835F0QK5N.template.json |  651 ++++++
 ...vityA346F297-6KCEOSFCBCK1.parameters.json} |    0
 ...tivityA346F297-6KCEOSFCBCK1.template.json} |   18 +-
 ...rks210DAF62-135V889SZ0ORT.parameters.json} |    0
 ...marks210DAF62-135V889SZ0ORT.template.json} |    6 +-
 ...16ec578c16e-1XF3OX52Z0KBB.parameters.json} |    6 +-
 ...8c16ec578c16e-1XF3OX52Z0KBB.template.json} |   50 +-
 ...ageactivity-138JAQS8Q4D3V.parameters.json} |    2 +-
 ...orageactivity-138JAQS8Q4D3V.template.json} |   12 +-
 ...rageavatars-1BVCGXECPBEMB.parameters.json} |    6 +-
 ...storageavatars-1BVCGXECPBEMB.template.json |  450 ++++
 ...agebookmarks-B7BEMLBCHV3W.parameters.json} |    2 +-
 ...oragebookmarks-B7BEMLBCHV3W.template.json} |   10 +-
 .../#current-cloud-backend/amplify-meta.json  |  152 +-
 .../build/cloudformation-template.json        |   12 +-
 .../api/discussions/build/parameters.json     |    2 +-
 .../api/discussions/build/stacks/Comment.json |   16 +-
 .../build/stacks/ConnectionStack.json         |    8 +-
 .../api/discussions/build/stacks/Post.json    |   16 +-
 .../api/discussions/build/stacks/Topic.json   |   16 +-
 ...8c16ec578c16e-cloudformation-template.json |    2 +-
 .../build/cloudformation-template.json        |   12 +-
 ...8c16ec578c16e-cloudformation-template.json |    2 +-
 .../build/root-cloudformation-stack.json      |   34 +-
 ...huseractivity-cloudformation-template.json |    2 +-
 ...duseractivity-cloudformation-template.json |    2 +-
 .../build/root-cloudformation-stack.json      |   34 +-
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |    2 +-
 ...huseractivity-cloudformation-template.json |    2 +-
 ...duseractivity-cloudformation-template.json |    2 +-
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |    2 +-
 .../storage/bookmarks/cli-inputs.json         |    2 +-
 .../amplify/backend-config.json               |  140 ++
 .../amplify/backend/amplify-meta.json         |  152 +-
 .../build/cloudformation-template.json        | 2035 +++++++++--------
 .../api/discussions/build/parameters.json     |    2 +-
 .../api/discussions/build/stacks/Comment.json |   16 +-
 .../build/stacks/ConnectionStack.json         |    8 +-
 .../api/discussions/build/stacks/Post.json    |   16 +-
 .../api/discussions/build/stacks/Topic.json   |   16 +-
 ...8c16ec578c16e-cloudformation-template.json |    2 +-
 .../build/cloudformation-template.json        |   12 +-
 ...8c16ec578c16e-cloudformation-template.json |    2 +-
 .../build/root-cloudformation-stack.json      |   34 +-
 ...huseractivity-cloudformation-template.json |    2 +-
 ...duseractivity-cloudformation-template.json |    2 +-
 .../build/root-cloudformation-stack.json      |   34 +-
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |    2 +-
 ...huseractivity-cloudformation-template.json |    2 +-
 ...duseractivity-cloudformation-template.json |    2 +-
 .../activity-cloudformation-template.json     |    2 +-
 .../build/cloudformation-template.json        |    2 +-
 .../backend/storage/bookmarks/cli-inputs.json |    2 +-
 .../amplify/team-provider-info.json           |   22 +-
 ...estedStackA-1G8UPOF56UCBP.description.txt} |    0
 ...gerNestedStackA-1G8UPOF56UCBP.outputs.json |    6 +
 ...NestedStackA-1G8UPOF56UCBP.parameters.json |    6 +
 ...rNestedStackA-1G8UPOF56UCBP.template.json} |  132 +-
 ...ommentNested-222WVXGP4U1I.description.txt} |    0
 ...ackCommentNested-222WVXGP4U1I.outputs.json |   26 +
 ...CommentNested-222WVXGP4U1I.parameters.json |   46 +
 ...kCommentNested-222WVXGP4U1I.template.json} |  357 ++-
 ...edStackConne-PQO5GNBUSDH0.description.txt} |    0
 ...estedStackConne-PQO5GNBUSDH0.outputs.json} |    0
 ...tedStackConne-PQO5GNBUSDH0.parameters.json |   46 +
 ...stedStackConne-PQO5GNBUSDH0.template.json} |  128 +-
 ...ackNestedSta-BHA8YE0S9OYY.description.txt} |    0
 ...eStackNestedSta-BHA8YE0S9OYY.outputs.json} |    0
 ...tackNestedSta-BHA8YE0S9OYY.parameters.json |   22 +
 ...StackNestedSta-BHA8YE0S9OYY.template.json} |   80 +-
 ...estedStackR-19TBN9UY0LSCB.description.txt} |    0
 ...ostNestedStackR-19TBN9UY0LSCB.outputs.json |   26 +
 ...NestedStackR-19TBN9UY0LSCB.parameters.json |   46 +
 ...tNestedStackR-19TBN9UY0LSCB.template.json} |  357 ++-
 ...icNestedStac-DPN73D3I6YDW.description.txt} |    0
 ...kTopicNestedStac-DPN73D3I6YDW.outputs.json |   26 +
 ...picNestedStac-DPN73D3I6YDW.parameters.json |   46 +
 ...opicNestedStac-DPN73D3I6YDW.template.json} |  337 ++-
 ...auth179371D7-6NIMXK30VQKX.description.txt} |    0
 ...30a-auth179371D7-6NIMXK30VQKX.outputs.json |   22 +
 ...auth179371D7-6NIMXK30VQKX.parameters.json} |    0
 ...a-auth179371D7-6NIMXK30VQKX.template.json} |   42 +-
 ...-data7552DF31-O97JQYUH4F0.description.txt} |    0
 ...c30a-data7552DF31-O97JQYUH4F0.outputs.json |   30 +
 ...a-data7552DF31-O97JQYUH4F0.parameters.json |   38 +
 ...0a-data7552DF31-O97JQYUH4F0.template.json} |  320 +--
 ...tion1351588B-3VEH789QLSJQ.description.txt} |    0
 ...function1351588B-3VEH789QLSJQ.outputs.json |   10 +
 ...ction1351588B-3VEH789QLSJQ.parameters.json |   26 +
 ...nction1351588B-3VEH789QLSJQ.template.json} |  160 +-
 ...rage0EC3F24A-O1Q835F0QK5N.description.txt} |    0
 ...-storage0EC3F24A-O1Q835F0QK5N.outputs.json |    6 +
 ...orage0EC3F24A-O1Q835F0QK5N.parameters.json |    6 +
 ...torage0EC3F24A-O1Q835F0QK5N.template.json} |   82 +-
 ...vityA346F297-6KCEOSFCBCK1.description.txt} |    0
 ...activityA346F297-6KCEOSFCBCK1.outputs.json |   14 +
 ...vityA346F297-6KCEOSFCBCK1.parameters.json} |    0
 ...tivityA346F297-6KCEOSFCBCK1.template.json} |   12 +-
 ...rks210DAF62-135V889SZ0ORT.description.txt} |    0
 ...kmarks210DAF62-135V889SZ0ORT.outputs.json} |    0
 ...rks210DAF62-135V889SZ0ORT.parameters.json} |    0
 ...marks210DAF62-135V889SZ0ORT.template.json} |    6 +-
 ...en2main-branch-a27e51c30a.description.txt} |    0
 ...s-gen2main-branch-a27e51c30a.outputs.json} |   22 +-
 ...en2main-branch-a27e51c30a.parameters.json} |    0
 ...-gen2main-branch-a27e51c30a.template.json} |  152 +-
 ...agerNestedStackA-OQJNODUL69WQ.outputs.json |    6 -
 ...rNestedStackA-OQJNODUL69WQ.parameters.json |    6 -
 ...ackCommentNested-RTBK7X4W3WZ5.outputs.json |   26 -
 ...CommentNested-RTBK7X4W3WZ5.parameters.json |   46 -
 ...tedStackConne-786MWSCGWATV.parameters.json |   46 -
 ...ackNestedSta-1DIRT0QDIWBFM.parameters.json |   22 -
 ...ostNestedStackR-1DFTLBBEXN9CL.outputs.json |   26 -
 ...NestedStackR-1DFTLBBEXN9CL.parameters.json |   46 -
 ...kTopicNestedStac-YH948UOUEKFY.outputs.json |   26 -
 ...picNestedStac-YH948UOUEKFY.parameters.json |   46 -
 ...3b3-auth179371D7-2NLVKCUURH94.outputs.json |   22 -
 ...b3-data7552DF31-1UMPATHK2POAL.outputs.json |   30 -
 ...data7552DF31-1UMPATHK2POAL.parameters.json |   38 -
 ...unction1351588B-1M6WNJD1W2J5X.outputs.json |   10 -
 ...tion1351588B-1M6WNJD1W2J5X.parameters.json |   26 -
 ...-storage0EC3F24A-TNJDP7TV84DW.outputs.json |    6 -
 ...orage0EC3F24A-TNJDP7TV84DW.parameters.json |    6 -
 ...activityA346F297-URG4H1Y2NQLX.outputs.json |   14 -
 ...PU4-Comment-1R56B3L2EK68O.description.txt} |    0
 ...IAIPU4-Comment-1R56B3L2EK68O.outputs.json} |   12 +-
 ...PU4-Comment-1R56B3L2EK68O.parameters.json} |   20 +-
 ...AIPU4-Comment-1R56B3L2EK68O.template.json} |   16 +-
 ...ectionStack-1D7MI9B5PWZI9.description.txt} |    0
 ...onnectionStack-1D7MI9B5PWZI9.outputs.json} |    0
 ...ectionStack-1D7MI9B5PWZI9.parameters.json} |   10 +-
 ...nnectionStack-1D7MI9B5PWZI9.template.json} |    8 +-
 ...esourcesjson-2UYKNHZR1DQ9.description.txt} |    0
 ...omResourcesjson-2UYKNHZR1DQ9.outputs.json} |    0
 ...esourcesjson-2UYKNHZR1DQ9.parameters.json} |    6 +-
 ...mResourcesjson-2UYKNHZR1DQ9.template.json} |    0
 ...rectiveStack-XXYDFRMQMROV.description.txt} |    0
 ...nDirectiveStack-XXYDFRMQMROV.outputs.json} |    0
 ...rectiveStack-XXYDFRMQMROV.parameters.json} |    6 +-
 ...DirectiveStack-XXYDFRMQMROV.template.json} |    0
 ...IAIPU4-Post-1M7ZECDZE6HW1.description.txt} |    0
 ...O40IAIPU4-Post-1M7ZECDZE6HW1.outputs.json} |   12 +-
 ...IAIPU4-Post-1M7ZECDZE6HW1.parameters.json} |   20 +-
 ...40IAIPU4-Post-1M7ZECDZE6HW1.template.json} |   16 +-
 ...AIPU4-Topic-1Y1P33HAY8NE1.description.txt} |    0
 ...40IAIPU4-Topic-1Y1P33HAY8NE1.outputs.json} |   26 +-
 ...AIPU4-Topic-1Y1P33HAY8NE1.parameters.json} |    6 +-
 ...0IAIPU4-Topic-1Y1P33HAY8NE1.template.json} |   16 +-
 ...pidiscussions-ZIHO40IAIPU4.description.txt |    0
 ...5-apidiscussions-ZIHO40IAIPU4.outputs.json |   20 +
 ...idiscussions-ZIHO40IAIPU4.parameters.json} |    4 +-
 ...apidiscussions-ZIHO40IAIPU4.template.json} |   13 +-
 ...c16ec578c16e-1XF3OX52Z0KBB.description.txt |    1 +
 ...78c16ec578c16e-1XF3OX52Z0KBB.outputs.json} |   14 +-
 ...16ec578c16e-1XF3OX52Z0KBB.parameters.json} |    6 +-
 ...8c16ec578c16e-1XF3OX52Z0KBB.template.json} |    2 +-
 ...huseractivity-KCGDT7S68U6K.description.txt |    1 +
 ...tchuseractivity-KCGDT7S68U6K.outputs.json} |    8 +-
 ...useractivity-KCGDT7S68U6K.parameters.json} |   10 +-
 ...chuseractivity-KCGDT7S68U6K.template.json} |    2 +-
 ...useractivity-1343ZMSQE34K3.description.txt |    1 +
 ...rduseractivity-1343ZMSQE34K3.outputs.json} |    8 +-
 ...seractivity-1343ZMSQE34K3.parameters.json} |   14 +-
 ...duseractivity-1343ZMSQE34K3.template.json} |    2 +-
 ...ageactivity-138JAQS8Q4D3V.description.txt} |    0
 ...torageactivity-138JAQS8Q4D3V.outputs.json} |    6 +-
 ...ageactivity-138JAQS8Q4D3V.parameters.json} |    2 +-
 ...orageactivity-138JAQS8Q4D3V.template.json} |    2 +-
 ...orageavatars-1BVCGXECPBEMB.description.txt |    1 +
 ...storageavatars-1BVCGXECPBEMB.outputs.json} |    2 +-
 ...orageavatars-1BVCGXECPBEMB.parameters.json |   86 +
 ...torageavatars-1BVCGXECPBEMB.template.json} |    2 +-
 ...ragebookmarks-B7BEMLBCHV3W.description.txt |    1 +
 ...toragebookmarks-B7BEMLBCHV3W.outputs.json} |    6 +-
 ...agebookmarks-B7BEMLBCHV3W.parameters.json} |    2 +-
 ...oragebookmarks-B7BEMLBCHV3W.template.json} |    0
 ...fy-discussions-main-c39a5.description.txt} |    0
 ...plify-discussions-main-c39a5.outputs.json} |   22 +-
 ...ify-discussions-main-c39a5.parameters.json |   14 +
 ...lify-discussions-main-c39a5.template.json} |   34 +-
 ...pidiscussions-OIVY6UM866SN.description.txt |    1 -
 ...9-apidiscussions-OIVY6UM866SN.outputs.json |   20 -
 ...c16ec578c16e-1IQSRWBM9RZF3.description.txt |    1 -
 ...huseractivity-P1L2V5FTFCQW.description.txt |    1 -
 ...duseractivity-7TS57MXKFC36.description.txt |    1 -
 ...rageactivity-197RFHHQU9L6N.description.txt |    1 -
 ...torageavatars-5MXLESJM1SP0.description.txt |    1 -
 ...-discussions-maintwo-decb9.parameters.json |   14 -
 .../category-plan-orchestration.test.ts       |   24 +-
 .../gen2-migration/refactor/refactor.test.ts  |    6 +-
 .../gen2-migration/refactor/refactor.ts       |   15 +-
 .../refactor/storage/storage-forward.ts       |   32 +-
 .../refactor/storage/storage-rollback.ts      |   32 +-
 232 files changed, 6551 insertions(+), 3518 deletions(-)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json => refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.source.template.json} (88%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json => refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json} (79%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.source.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.target.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json => refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.source.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json => refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.target.template.json} (93%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json => refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.source.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json => refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.target.template.json} (92%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json => refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.source.template.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json => refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json} (88%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json => refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.source.template.json} (77%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json => refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.target.template.json} (91%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.mappings.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.source.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.target.template.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json => refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.source.template.json} (91%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json => refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.target.template.json} (98%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json => update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json => update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json} (85%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json => update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json => update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json} (90%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json => update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json => update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json} (96%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json => update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json} (97%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json => update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json => update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json => update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json} (88%)
 rename amplify-migration-apps/discussions/{_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json => _snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json} (92%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json => update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.post.refactor/{update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json => update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json} (94%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend-config.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.description.txt => amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json => amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.template.json} (78%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.description.txt => amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json => amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.template.json} (71%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.description.txt => amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.outputs.json => amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json => amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.template.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.description.txt => amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.outputs.json => amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.outputs.json} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json => amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.template.json} (73%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.description.txt => amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json => amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.template.json} (71%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.description.txt => amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json => amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.template.json} (71%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.description.txt => amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json => amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json => amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json} (89%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.description.txt => amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json => amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.template.json} (71%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.description.txt => amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json => amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.template.json} (63%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt => amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.outputs.json
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json => amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json} (82%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.description.txt => amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.description.txt} (100%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json => amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json => amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json} (94%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.description.txt => amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.outputs.json => amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json => amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json => amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json} (96%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3.description.txt => amplify-discussions-gen2main-branch-a27e51c30a.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json => amplify-discussions-gen2main-branch-a27e51c30a.outputs.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3.parameters.json => amplify-discussions-gen2main-branch-a27e51c30a.parameters.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json => amplify-discussions-gen2main-branch-a27e51c30a.template.json} (75%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.description.txt => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.outputs.json} (62%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.parameters.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.template.json} (96%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.description.txt => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.outputs.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.parameters.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.template.json} (94%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.description.txt => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.outputs.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.parameters.json} (70%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.description.txt => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.outputs.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.outputs.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.parameters.json} (78%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.description.txt => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.outputs.json} (61%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.parameters.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.template.json} (96%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.description.txt => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.outputs.json} (70%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.parameters.json} (87%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.template.json} (96%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.description.txt
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.outputs.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.parameters.json} (88%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json => amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.template.json} (97%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.description.txt
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json => amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.outputs.json} (71%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json => amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json} (97%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json => amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json} (98%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.description.txt
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json => amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.outputs.json} (69%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json => amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.parameters.json} (72%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json => amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.template.json} (96%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.description.txt
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json => amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.outputs.json} (68%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json => amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.parameters.json} (69%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json => amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.template.json} (98%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.description.txt => amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json => amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.outputs.json} (84%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json => amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json => amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json} (94%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.description.txt
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json => amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.outputs.json} (76%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json => amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json} (98%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.description.txt
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json => amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.outputs.json} (83%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json => amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json} (92%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json => amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9.description.txt => amplify-discussions-main-c39a5.description.txt} (100%)
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9.outputs.json => amplify-discussions-main-c39a5.outputs.json} (55%)
 create mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.parameters.json
 rename amplify-migration-apps/discussions/_snapshot.pre.refactor/{amplify-discussions-maintwo-decb9.template.json => amplify-discussions-main-c39a5.template.json} (94%)
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt
 delete mode 100644 amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json

diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
index b7df8c9f1cf..b6573ff9559 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts
@@ -30,7 +30,7 @@ const activity = new Table(storageActivityStack, 'activity', {
   stream: StreamViewType.NEW_IMAGE,
   sortKey: { name: 'userId', type: AttributeType.STRING },
 });
-// Add this property to the Table above post refactor: tableName: 'activity-maintwo'
+// Add this property to the Table above post refactor: tableName: 'activity-main'
 activity.addGlobalSecondaryIndex({
   indexName: 'byUserId',
   partitionKey: { name: 'userId', type: AttributeType.STRING },
@@ -47,7 +47,7 @@ const bookmarks = new Table(storageBookmarksStack, 'bookmarks', {
   stream: StreamViewType.NEW_IMAGE,
   sortKey: { name: 'postId', type: AttributeType.STRING },
 });
-// Add this property to the Table above post refactor: tableName: 'bookmarks-maintwo'
+// Add this property to the Table above post refactor: tableName: 'bookmarks-main'
 bookmarks.addGlobalSecondaryIndex({
   indexName: 'byPost',
   partitionKey: { name: 'postId', type: AttributeType.STRING },
@@ -145,7 +145,7 @@ for (const model of ['Topic', 'Post', 'Comment']) {
 }
 const s3Bucket = backend.storage.resources.cfnResources.cfnBucket;
 // Use this bucket name post refactor
-// s3Bucket.bucketName = 'discus-avatarsdecb9-maintwo';
+// s3Bucket.bucketName = 'discus-avatarsc39a5-main';
 s3Bucket.bucketEncryption = {
   serverSideEncryptionConfiguration: [
     {
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts
index 204ef3c9aef..2d3a097ac7d 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts
@@ -39,11 +39,11 @@ export const data = defineData({
   migratedAmplifyGen1DynamoDbTableMappings: [
     {
       //The "branchname" variable needs to be the same as your deployment branch if you want to reuse your Gen1 app tables
-      branchName: 'maintwo',
+      branchName: 'main',
       modelNameToTableNameMapping: {
-        Topic: 'Topic-st35wex2drhe5piowtinjea47y-maintwo',
-        Post: 'Post-st35wex2drhe5piowtinjea47y-maintwo',
-        Comment: 'Comment-st35wex2drhe5piowtinjea47y-maintwo',
+        Topic: 'Topic-u3jn2qbupzbyhc3h53673wdvim-main',
+        Post: 'Post-u3jn2qbupzbyhc3h53673wdvim-main',
+        Comment: 'Comment-u3jn2qbupzbyhc3h53673wdvim-main',
       },
     },
   ],
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts
index 062e2dcc249..771ac52715d 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/storage/resource.ts
@@ -3,7 +3,7 @@ import { defineStorage } from '@aws-amplify/backend';
 const branchName = process.env.AWS_BRANCH ?? 'sandbox';
 
 export const storage = defineStorage({
-  name: `discus-avatarsdecb9-${branchName}`,
+  name: `discus-avatarsc39a5-${branchName}`,
   access: (allow) => ({
     'public/*': [allow.authenticated.to(['write', 'read', 'delete'])],
     'protected/{entity_id}/*': [
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.mappings.json
new file mode 100644
index 00000000000..fffe159462e
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.mappings.json
@@ -0,0 +1,52 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.source.template.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.source.template.json
index 43ae73ed2f6..23e722d6843 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.source.template.json
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -31,7 +31,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -81,7 +81,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,7 +98,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
@@ -107,7 +107,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -379,20 +379,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
-      "Value": "us-east-1_fU7jrxvo5"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref": {
+      "Value": "us-east-1_I3YejOBUa"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
-      "Value": "1c1vf5gnunutele7c45m171n11"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref": {
+      "Value": "3mosah7bsr7412hqq9soj1j2pp"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-      "Value": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+      "Value": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
similarity index 79%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
index 7f1bd16ebfa..189983e370e 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
@@ -19,8 +19,8 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Your verification code is {####}",
-        "EmailVerificationSubject": "Verification",
+        "EmailVerificationMessage": "The verification code to your new account is {####}",
+        "EmailVerificationSubject": "Verify your new account",
         "MfaConfiguration": "OFF",
         "Policies": {
           "PasswordPolicy": {
@@ -52,7 +52,7 @@
         },
         "UserPoolTags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "amplify:friendly-name": "amplifyAuth",
           "created-by": "amplify"
@@ -65,15 +65,15 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "Your verification code is {####}",
-          "EmailSubject": "Verification",
+          "EmailMessage": "The verification code to your new account is {####}",
+          "EmailSubject": "Verify your new account",
           "SmsMessage": "The verification code to your new account is {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPool/Resource"
       }
     },
     "amplifyAuthUserPoolNativeAppClient79534448": {
@@ -91,10 +91,10 @@
         "TokenValidityUnits": {
           "RefreshToken": "minutes"
         },
-        "UserPoolId": "us-east-1_fU7jrxvo5"
+        "UserPoolId": "us-east-1_I3YejOBUa"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
       }
     },
     "amplifyAuthUserPoolAppClient2626C6F8": {
@@ -123,10 +123,10 @@
         "SupportedIdentityProviders": [
           "COGNITO"
         ],
-        "UserPoolId": "us-east-1_fU7jrxvo5"
+        "UserPoolId": "us-east-1_I3YejOBUa"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPoolAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPoolAppClient/Resource"
       }
     },
     "amplifyAuthIdentityPool3FDE84CC": {
@@ -135,7 +135,7 @@
         "AllowUnauthenticatedIdentities": false,
         "CognitoIdentityProviders": [
           {
-            "ClientId": "1c1vf5gnunutele7c45m171n11",
+            "ClientId": "3mosah7bsr7412hqq9soj1j2pp",
             "ProviderName": {
               "Fn::Join": [
                 "",
@@ -145,7 +145,7 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_fU7jrxvo5"
+                  "us-east-1_I3YejOBUa"
                 ]
               ]
             }
@@ -158,7 +158,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -176,13 +176,13 @@
         "SupportedLoginProviders": {}
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPool"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/IdentityPool"
       }
     },
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546",
+        "IdentityPoolId": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022",
         "RoleMappings": {
           "UserPoolWebClientRoleMapping": {
             "AmbiguousRoleResolution": "AuthenticatedRole",
@@ -195,9 +195,9 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_fU7jrxvo5",
+                  "us-east-1_I3YejOBUa",
                   ":",
-                  "1c1vf5gnunutele7c45m171n11"
+                  "3mosah7bsr7412hqq9soj1j2pp"
                 ]
               ]
             },
@@ -205,8 +205,8 @@
           }
         },
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
         }
       },
       "DependsOn": [
@@ -214,7 +214,7 @@
         "amplifyAuthUserPoolAppClient2626C6F8"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPoolRoleAttachment"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/IdentityPoolRoleAttachment"
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.mappings.json
new file mode 100644
index 00000000000..cd3e3af58a3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N",
+      "LogicalResourceId": "discusavatarsc39a5gen2mainBucketB24EA230"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding",
+      "LogicalResourceId": "discusavatarsc39a5gen2mainBucketB24EA230"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.source.template.json
new file mode 100644
index 00000000000..31457687dae
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.source.template.json
@@ -0,0 +1,579 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
+  "Resources": {
+    "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:PutBucketPolicy",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": "arn:aws:iam::123456789012:role/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+              },
+              "Resource": [
+                "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Policy/Resource"
+      }
+    },
+    "discusavatarsc39a5gen2mainBucketAutoDeleteObjectsCustomResource2CB8EFAF": {
+      "Type": "Custom::S3AutoDeleteObjects",
+      "Properties": {
+        "ServiceToken": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+        "BucketName": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+      },
+      "DependsOn": [
+        "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/AutoDeleteObjectsCustomResource/Default"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ]
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip"
+        },
+        "Timeout": 900,
+        "MemorySize": 128,
+        "Handler": "index.handler",
+        "Role": "arn:aws:iam::123456789012:role/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+        "Runtime": "nodejs22.x",
+        "Description": {
+          "Fn::Join": [
+            "",
+            [
+              "Lambda function for auto-deleting objects in ",
+              "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+              " S3 bucket."
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
+        "aws:asset:property": "Code"
+      }
+    },
+    "DISCUSAVATARSC39A5GEN2MAINBUCKETNAMEParameter7EBC4CDD": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAME",
+        "Tags": {
+          "amplify:app-id": "discussions",
+          "amplify:branch-name": "gen2-main",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAMEParameter/Resource"
+      }
+    },
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:PutObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/*",
+                    "public/",
+                    "protected/*",
+                    "protected/",
+                    "private/*",
+                    "private/"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+            },
+            {
+              "Action": "s3:DeleteObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C",
+        "Roles": [
+          {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/amplify-discussions-gen2main-branch-a27e51c30a--storageAccess3/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNy07DMBBFv6VZO0NJu0Ds2rKGqFkihFxniCaJbckz6UOW/x2llggsWc0dnfuooNpuYb3SFy5NO5QjnSC+Igu2jWgzKH3hz8gbiPvJDCjq8OWyeo+FpSu54rn4HZ79vIE7YsjW3ST+BUcUfDv1aISL9KEyqv1I5ra05v8f3TnQiBa06O7VSTFbiI0Ecl2tg7YoGOaNnycp0hbisp5VSuowsXh7RPZTMDijRf9BdfBnajHsNaPaMaM0ojtyXVLOtwg9P5yrCh6fYL3qmagMkxOyCMd8vwGr7NONegEAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+      "Type": "String"
+    }
+  },
+  "Outputs": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef": {
+      "Value": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.target.template.json
new file mode 100644
index 00000000000..fc4d3669518
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N-holding.target.template.json
@@ -0,0 +1,79 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Temporary holding stack for Gen2 migration",
+  "Resources": {
+    "discusavatarsc39a5gen2mainBucketB24EA230": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "BucketKeyEnabled": false,
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-main"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "discus-avatarsc39a5-gen2-main"
+          },
+          {
+            "Key": "aws-cdk:auto-delete-objects",
+            "Value": "true"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Resource"
+      }
+    }
+  },
+  "Outputs": {}
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.mappings.json
new file mode 100644
index 00000000000..1694ef6b30a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1",
+      "LogicalResourceId": "activity1E902D9C"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding",
+      "LogicalResourceId": "activity1E902D9C"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.source.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.source.template.json
index 5cf80db5525..1cb91855653 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.source.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -279,14 +279,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z/stream/2026-03-20T21:41:02.189"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
-      "Value": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref": {
+      "Value": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.target.template.json
similarity index 93%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.target.template.json
index f9df1a6b8a3..ce8c0b6d95f 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-holding.target.template.json
@@ -65,7 +65,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -80,7 +80,7 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/activity/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/activity/Resource"
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.mappings.json
new file mode 100644
index 00000000000..121533e2cfc
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT",
+      "LogicalResourceId": "bookmarksA4548304"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.source.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.source.template.json
index ce308cd186a..8809916f3bb 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.source.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.target.template.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.target.template.json
index 31bfb38947e..17431e7ccb6 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT-holding.target.template.json
@@ -57,7 +57,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -72,7 +72,7 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/bookmarks/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/bookmarks/Resource"
       }
     }
   },
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json
deleted file mode 100644
index 46430b97e81..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding.mappings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94-holding",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json
deleted file mode 100644
index 4c1d39978d1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX",
-      "LogicalResourceId": "activity1E902D9C"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-holding",
-      "LogicalResourceId": "activity1E902D9C"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json
deleted file mode 100644
index 8443e9b9f56..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348",
-      "LogicalResourceId": "bookmarksA4548304"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348-holding",
-      "LogicalResourceId": "bookmarksA4548304"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.mappings.json
new file mode 100644
index 00000000000..26862da33c0
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.mappings.json
@@ -0,0 +1,52 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB",
+      "LogicalResourceId": "UserPool"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB",
+      "LogicalResourceId": "UserPoolClientWeb"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB",
+      "LogicalResourceId": "UserPoolClient"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB",
+      "LogicalResourceId": "IdentityPool"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
+    }
+  },
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB",
+      "LogicalResourceId": "IdentityPoolRoleMap"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX",
+      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.source.template.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.source.template.json
index 189af1d96d9..aa44825b9cc 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -129,7 +129,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "maintwo",
+        "main",
         "NONE"
       ]
     }
@@ -186,13 +186,13 @@
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
+                      "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB"
                     ]
                   }
                 ]
               },
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -224,13 +224,13 @@
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
+                      "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB"
                     ]
                   }
                 ]
               },
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -240,33 +240,33 @@
   "Outputs": {
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
-      "Value": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e"
+      "Value": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464"
     },
     "IdentityPoolName": {
-      "Value": "discussionsc578c16e_identitypool_c578c16e__maintwo"
+      "Value": "discussionsc578c16e_identitypool_c578c16e__main"
     },
     "UserPoolId": {
       "Description": "Id for the user pool",
-      "Value": "us-east-1_RCPurfiEw"
+      "Value": "us-east-1_vv2HFjwRK"
     },
     "UserPoolArn": {
       "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw"
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_vv2HFjwRK"
     },
     "UserPoolName": {
       "Value": "discussionsc578c16e_userpool_c578c16e"
     },
     "AppClientIDWeb": {
       "Description": "The user pool app client id for web",
-      "Value": "2kictuhtu6967eqd0qhtsv5roh"
+      "Value": "7nhjrv5jepqc7kacqiknlj0siu"
     },
     "AppClientID": {
       "Description": "The user pool app client id",
-      "Value": "35iqavrc56jmhttprdv2frl8qf"
+      "Value": "7tbnnc27p4edfrp7m6bqqkh0gq"
     },
     "CreatedSNSRole": {
       "Description": "role arn",
-      "Value": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
+      "Value": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
index 1a217b319ca..64a7404cb13 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
@@ -10,7 +10,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -31,7 +31,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -48,7 +48,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -60,7 +60,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -81,7 +81,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -98,7 +98,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "CDKMetadata": {
@@ -107,7 +107,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -144,7 +144,7 @@
         "SmsAuthenticationMessage": "Your authentication code is {####}",
         "SmsConfiguration": {
           "ExternalId": "discusc578c16e_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
         },
         "SmsVerificationMessage": "Your verification code is {####}",
         "UserAttributeUpdateSettings": {
@@ -158,7 +158,7 @@
             [
               "discussionsc578c16e_userpool_c578c16e",
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         },
@@ -179,7 +179,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_RCPurfiEw"
+        "UserPoolId": "us-east-1_vv2HFjwRK"
       },
       "DependsOn": [
         "amplifyAuthUserPool4BA7F805"
@@ -194,7 +194,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_RCPurfiEw"
+        "UserPoolId": "us-east-1_vv2HFjwRK"
       },
       "DependsOn": [
         "amplifyAuthUserPool4BA7F805"
@@ -206,7 +206,7 @@
         "AllowUnauthenticatedIdentities": "false",
         "CognitoIdentityProviders": [
           {
-            "ClientId": "35iqavrc56jmhttprdv2frl8qf",
+            "ClientId": "7tbnnc27p4edfrp7m6bqqkh0gq",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -214,13 +214,13 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_RCPurfiEw"
+                  "client": "us-east-1_vv2HFjwRK"
                 }
               ]
             }
           },
           {
-            "ClientId": "2kictuhtu6967eqd0qhtsv5roh",
+            "ClientId": "7nhjrv5jepqc7kacqiknlj0siu",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -228,7 +228,7 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_RCPurfiEw"
+                  "client": "us-east-1_vv2HFjwRK"
                 }
               ]
             }
@@ -239,7 +239,7 @@
             "",
             [
               "discussionsc578c16e_identitypool_c578c16e__",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -248,10 +248,10 @@
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
+        "IdentityPoolId": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464",
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole"
         }
       },
       "DependsOn": [
@@ -526,20 +526,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
-      "Value": "us-east-1_fU7jrxvo5"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref": {
+      "Value": "us-east-1_I3YejOBUa"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
-      "Value": "1c1vf5gnunutele7c45m171n11"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref": {
+      "Value": "3mosah7bsr7412hqq9soj1j2pp"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-      "Value": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+      "Value": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.mappings.json
new file mode 100644
index 00000000000..fd2a4652eec
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V",
+      "LogicalResourceId": "DynamoDBTable"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1",
+      "LogicalResourceId": "activity1E902D9C"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.source.template.json
similarity index 77%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.source.template.json
index 9528be37699..e43f0f1c6b2 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.source.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "maintwo",
+        "main",
         "NONE"
       ]
     }
@@ -37,13 +37,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "activity-maintwo"
+      "Value": "activity-main"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516"
     },
     "PartitionKeyName": {
       "Value": "id"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.target.template.json
similarity index 91%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.target.template.json
index 382f1636160..3097de7c52b 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.target.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -73,7 +73,7 @@
             [
               "activity",
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -347,14 +347,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z/stream/2026-03-20T21:41:02.189"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
-      "Value": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref": {
+      "Value": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.mappings.json
new file mode 100644
index 00000000000..ec102eb8ca2
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB",
+      "LogicalResourceId": "S3Bucket"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N",
+      "LogicalResourceId": "discusavatarsc39a5gen2mainBucketB24EA230"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.source.template.json
new file mode 100644
index 00000000000..40b2aebaa72
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.source.template.json
@@ -0,0 +1,386 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "main",
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject,s3:GetObject,s3:DeleteObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject,s3:GetObject,s3:DeleteObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject,s3:GetObject,s3:DeleteObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "DISALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "DISALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "ALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "DISALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": "discus-avatarsc39a5-main"
+    },
+    "Region": {
+      "Value": "us-east-1"
+    }
+  },
+  "Resources": {
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject,s3:GetObject,s3:DeleteObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Public_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject,s3:GetObject,s3:DeleteObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Protected_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject,s3:GetObject,s3:DeleteObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Private_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Uploads_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    "discus-avatarsc39a5-main",
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    "discus-avatarsc39a5-main"
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "read_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "AuthReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.target.template.json
new file mode 100644
index 00000000000..053e6a76b6b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.target.template.json
@@ -0,0 +1,643 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
+  "Resources": {
+    "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:PutBucketPolicy",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": "arn:aws:iam::123456789012:role/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+              },
+              "Resource": [
+                "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Policy/Resource"
+      }
+    },
+    "discusavatarsc39a5gen2mainBucketAutoDeleteObjectsCustomResource2CB8EFAF": {
+      "Type": "Custom::S3AutoDeleteObjects",
+      "Properties": {
+        "ServiceToken": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+        "BucketName": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+      },
+      "DependsOn": [
+        "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/AutoDeleteObjectsCustomResource/Default"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ]
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip"
+        },
+        "Timeout": 900,
+        "MemorySize": 128,
+        "Handler": "index.handler",
+        "Role": "arn:aws:iam::123456789012:role/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+        "Runtime": "nodejs22.x",
+        "Description": {
+          "Fn::Join": [
+            "",
+            [
+              "Lambda function for auto-deleting objects in ",
+              "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+              " S3 bucket."
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
+        "aws:asset:property": "Code"
+      }
+    },
+    "DISCUSAVATARSC39A5GEN2MAINBUCKETNAMEParameter7EBC4CDD": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAME",
+        "Tags": {
+          "amplify:app-id": "discussions",
+          "amplify:branch-name": "gen2-main",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAMEParameter/Resource"
+      }
+    },
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:PutObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/*",
+                    "public/",
+                    "protected/*",
+                    "protected/",
+                    "private/*",
+                    "private/"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+            },
+            {
+              "Action": "s3:DeleteObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C",
+        "Roles": [
+          {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/amplify-discussions-gen2main-branch-a27e51c30a--storageAccess3/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNy07DMBBFv6VZO0NJu0Ds2rKGqFkihFxniCaJbckz6UOW/x2llggsWc0dnfuooNpuYb3SFy5NO5QjnSC+Igu2jWgzKH3hz8gbiPvJDCjq8OWyeo+FpSu54rn4HZ79vIE7YsjW3ST+BUcUfDv1aISL9KEyqv1I5ra05v8f3TnQiBa06O7VSTFbiI0Ecl2tg7YoGOaNnycp0hbisp5VSuowsXh7RPZTMDijRf9BdfBnajHsNaPaMaM0ojtyXVLOtwg9P5yrCh6fYL3qmagMkxOyCMd8vwGr7NONegEAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    },
+    "discusavatarsc39a5gen2mainBucketB24EA230": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::Join": [
+            "",
+            [
+              "discus-avatars",
+              {
+                "Fn::Select": [
+                  3,
+                  {
+                    "Fn::Split": [
+                      "-",
+                      "amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB"
+                    ]
+                  }
+                ]
+              },
+              "-",
+              "main"
+            ]
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+      "Type": "String"
+    }
+  },
+  "Outputs": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef": {
+      "Value": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.mappings.json
new file mode 100644
index 00000000000..787dc52108b
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.mappings.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Source": {
+      "StackName": "amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W",
+      "LogicalResourceId": "DynamoDBTable"
+    },
+    "Destination": {
+      "StackName": "amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT",
+      "LogicalResourceId": "bookmarksA4548304"
+    }
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.source.template.json
similarity index 91%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.source.template.json
index 9c180c57b36..4dcbc73d76c 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.source.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.source.template.json
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "maintwo",
+        "main",
         "NONE"
       ]
     }
@@ -37,13 +37,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "bookmarks-maintwo"
+      "Value": "bookmarks-main"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-20T21:19:57.495"
     },
     "PartitionKeyName": {
       "Value": "userId"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.target.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.target.template.json
index 1be22696e35..0711ae62f14 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.__to__.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.target.template.json
@@ -7,7 +7,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     },
@@ -65,7 +65,7 @@
             [
               "bookmarks",
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json
deleted file mode 100644
index 65fb4f021fb..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.mappings.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
-      "LogicalResourceId": "UserPool"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthUserPool4BA7F805"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
-      "LogicalResourceId": "UserPoolClientWeb"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthUserPoolAppClient2626C6F8"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
-      "LogicalResourceId": "UserPoolClient"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthUserPoolNativeAppClient79534448"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
-      "LogicalResourceId": "IdentityPool"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthIdentityPool3FDE84CC"
-    }
-  },
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3",
-      "LogicalResourceId": "IdentityPoolRoleMap"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94",
-      "LogicalResourceId": "amplifyAuthIdentityPoolRoleAttachment045F17C8"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json
deleted file mode 100644
index 98d462430b6..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N",
-      "LogicalResourceId": "DynamoDBTable"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX",
-      "LogicalResourceId": "activity1E902D9C"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json
deleted file mode 100644
index 69854e9745d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.__to__.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.mappings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "Source": {
-      "StackName": "amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX",
-      "LogicalResourceId": "DynamoDBTable"
-    },
-    "Destination": {
-      "StackName": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348",
-      "LogicalResourceId": "bookmarksA4548304"
-    }
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
similarity index 85%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
index eeb1f83c17b..f86184ab2f8 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
@@ -18,8 +18,8 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Your verification code is {####}",
-        "EmailVerificationSubject": "Verification",
+        "EmailVerificationMessage": "The verification code to your new account is {####}",
+        "EmailVerificationSubject": "Verify your new account",
         "MfaConfiguration": "OFF",
         "Policies": {
           "PasswordPolicy": {
@@ -51,7 +51,7 @@
         },
         "UserPoolTags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "amplify:friendly-name": "amplifyAuth",
           "created-by": "amplify"
@@ -64,15 +64,15 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "Your verification code is {####}",
-          "EmailSubject": "Verification",
+          "EmailMessage": "The verification code to your new account is {####}",
+          "EmailSubject": "Verify your new account",
           "SmsMessage": "The verification code to your new account is {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPool/Resource"
       }
     },
     "amplifyAuthUserPoolNativeAppClient79534448": {
@@ -90,10 +90,10 @@
         "TokenValidityUnits": {
           "RefreshToken": "minutes"
         },
-        "UserPoolId": "us-east-1_fU7jrxvo5"
+        "UserPoolId": "us-east-1_I3YejOBUa"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
       }
     },
     "amplifyAuthUserPoolAppClient2626C6F8": {
@@ -122,10 +122,10 @@
         "SupportedIdentityProviders": [
           "COGNITO"
         ],
-        "UserPoolId": "us-east-1_fU7jrxvo5"
+        "UserPoolId": "us-east-1_I3YejOBUa"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPoolAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPoolAppClient/Resource"
       }
     },
     "amplifyAuthIdentityPool3FDE84CC": {
@@ -134,7 +134,7 @@
         "AllowUnauthenticatedIdentities": false,
         "CognitoIdentityProviders": [
           {
-            "ClientId": "1c1vf5gnunutele7c45m171n11",
+            "ClientId": "3mosah7bsr7412hqq9soj1j2pp",
             "ProviderName": {
               "Fn::Join": [
                 "",
@@ -144,7 +144,7 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_fU7jrxvo5"
+                  "us-east-1_I3YejOBUa"
                 ]
               ]
             }
@@ -157,7 +157,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -175,7 +175,7 @@
         "SupportedLoginProviders": {}
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPool"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/IdentityPool"
       }
     },
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
@@ -187,7 +187,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "authenticated"
@@ -208,7 +208,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -225,7 +225,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -237,7 +237,7 @@
               "Action": "sts:AssumeRoleWithWebIdentity",
               "Condition": {
                 "StringEquals": {
-                  "cognito-identity.amazonaws.com:aud": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+                  "cognito-identity.amazonaws.com:aud": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
                 },
                 "ForAnyValue:StringLike": {
                   "cognito-identity.amazonaws.com:amr": "unauthenticated"
@@ -258,7 +258,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -275,13 +275,13 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546",
+        "IdentityPoolId": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022",
         "RoleMappings": {
           "UserPoolWebClientRoleMapping": {
             "AmbiguousRoleResolution": "AuthenticatedRole",
@@ -294,9 +294,9 @@
                     "Ref": "AWS::Region"
                   },
                   ".amazonaws.com/",
-                  "us-east-1_fU7jrxvo5",
+                  "us-east-1_I3YejOBUa",
                   ":",
-                  "1c1vf5gnunutele7c45m171n11"
+                  "3mosah7bsr7412hqq9soj1j2pp"
                 ]
               ]
             },
@@ -304,8 +304,8 @@
           }
         },
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
         }
       },
       "DependsOn": [
@@ -313,7 +313,7 @@
         "amplifyAuthUserPoolAppClient2626C6F8"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPoolRoleAttachment"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/IdentityPoolRoleAttachment"
       }
     },
     "CDKMetadata": {
@@ -322,7 +322,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -594,20 +594,20 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
-      "Value": "us-east-1_fU7jrxvo5"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref": {
+      "Value": "us-east-1_I3YejOBUa"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
-      "Value": "1c1vf5gnunutele7c45m171n11"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref": {
+      "Value": "3mosah7bsr7412hqq9soj1j2pp"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-      "Value": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+      "Value": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+      "Value": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+      "Value": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json
new file mode 100644
index 00000000000..db99c1f6430
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json
new file mode 100644
index 00000000000..e5802525794
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json
@@ -0,0 +1,651 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
+  "Resources": {
+    "discusavatarsc39a5gen2mainBucketB24EA230": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "BucketKeyEnabled": false,
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "Tags": [
+          {
+            "Key": "amplify:app-id",
+            "Value": "discussions"
+          },
+          {
+            "Key": "amplify:branch-name",
+            "Value": "gen2-main"
+          },
+          {
+            "Key": "amplify:deployment-type",
+            "Value": "branch"
+          },
+          {
+            "Key": "amplify:friendly-name",
+            "Value": "discus-avatarsc39a5-gen2-main"
+          },
+          {
+            "Key": "aws-cdk:auto-delete-objects",
+            "Value": "true"
+          },
+          {
+            "Key": "created-by",
+            "Value": "amplify"
+          }
+        ]
+      },
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Resource"
+      }
+    },
+    "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2": {
+      "Type": "AWS::S3::BucketPolicy",
+      "Properties": {
+        "Bucket": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:*",
+              "Condition": {
+                "Bool": {
+                  "aws:SecureTransport": "false"
+                }
+              },
+              "Effect": "Deny",
+              "Principal": {
+                "AWS": "*"
+              },
+              "Resource": [
+                "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": [
+                "s3:PutBucketPolicy",
+                "s3:GetBucket*",
+                "s3:List*",
+                "s3:DeleteObject*"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "AWS": "arn:aws:iam::123456789012:role/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+              },
+              "Resource": [
+                "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Policy/Resource"
+      }
+    },
+    "discusavatarsc39a5gen2mainBucketAutoDeleteObjectsCustomResource2CB8EFAF": {
+      "Type": "Custom::S3AutoDeleteObjects",
+      "Properties": {
+        "ServiceToken": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F",
+        "BucketName": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+      },
+      "DependsOn": [
+        "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2"
+      ],
+      "UpdateReplacePolicy": "Delete",
+      "DeletionPolicy": "Delete",
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/AutoDeleteObjectsCustomResource/Default"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ]
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+      }
+    },
+    "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "S3Bucket": {
+            "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+          },
+          "S3Key": "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6.zip"
+        },
+        "Timeout": 900,
+        "MemorySize": 128,
+        "Handler": "index.handler",
+        "Role": "arn:aws:iam::123456789012:role/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N/CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092",
+        "Runtime": "nodejs22.x",
+        "Description": {
+          "Fn::Join": [
+            "",
+            [
+              "Lambda function for auto-deleting objects in ",
+              "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+              " S3 bucket."
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
+      ],
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
+        "aws:asset:property": "Code"
+      }
+    },
+    "DISCUSAVATARSC39A5GEN2MAINBUCKETNAMEParameter7EBC4CDD": {
+      "Type": "AWS::SSM::Parameter",
+      "Properties": {
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAME",
+        "Tags": {
+          "amplify:app-id": "discussions",
+          "amplify:branch-name": "gen2-main",
+          "amplify:deployment-type": "branch",
+          "created-by": "amplify"
+        },
+        "Type": "String",
+        "Value": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAMEParameter/Resource"
+      }
+    },
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:PutObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/*",
+                    "public/",
+                    "protected/*",
+                    "protected/",
+                    "private/*",
+                    "private/"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+            },
+            {
+              "Action": "s3:DeleteObject",
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/public/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/protected/*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4",
+                      "/private/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C",
+        "Roles": [
+          {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
+          }
+        ]
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/amplify-discussions-gen2main-branch-a27e51c30a--storageAccess3/Resource"
+      }
+    },
+    "CDKMetadata": {
+      "Type": "AWS::CDK::Metadata",
+      "Properties": {
+        "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNy07DMBBFv6VZO0NJu0Ds2rKGqFkihFxniCaJbckz6UOW/x2llggsWc0dnfuooNpuYb3SFy5NO5QjnSC+Igu2jWgzKH3hz8gbiPvJDCjq8OWyeo+FpSu54rn4HZ79vIE7YsjW3ST+BUcUfDv1aISL9KEyqv1I5ra05v8f3TnQiBa06O7VSTFbiI0Ecl2tg7YoGOaNnycp0hbisp5VSuowsXh7RPZTMDijRf9BdfBnajHsNaPaMaM0ojtyXVLOtwg9P5yrCh6fYL3qmagMkxOyCMd8vwGr7NONegEAAA=="
+      },
+      "Metadata": {
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/CDKMetadata/Default"
+      },
+      "Condition": "CDKMetadataAvailable"
+    }
+  },
+  "Conditions": {
+    "CDKMetadataAvailable": {
+      "Fn::Or": [
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "af-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-northeast-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-south-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-3"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ap-southeast-4"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "ca-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "cn-northwest-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-central-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-north-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-south-2"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Or": [
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "eu-west-3"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "il-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-central-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "me-south-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "sa-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-1"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-east-2"
+              ]
+            },
+            {
+              "Fn::Equals": [
+                {
+                  "Ref": "AWS::Region"
+                },
+                "us-west-1"
+              ]
+            }
+          ]
+        },
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "AWS::Region"
+            },
+            "us-west-2"
+          ]
+        }
+      ]
+    }
+  },
+  "Parameters": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+      "Type": "String"
+    }
+  },
+  "Outputs": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef": {
+      "Value": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json
similarity index 90%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json
index 559d4521407..5df373994d4 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json
@@ -64,7 +64,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -79,7 +79,7 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/activity/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/activity/Resource"
       }
     },
     "CDKMetadata": {
@@ -88,7 +88,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -360,14 +360,14 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn": {
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z/stream/2026-03-20T21:41:02.189"
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
-      "Value": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref": {
+      "Value": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json
index 002324e944a..f0838f73760 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json
@@ -56,7 +56,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -71,7 +71,7 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/bookmarks/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/bookmarks/Resource"
       }
     },
     "CDKMetadata": {
@@ -80,7 +80,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
similarity index 97%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index 9f2b0c0d239..74fcae6c0f2 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "authRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole"
   },
   {
     "ParameterKey": "autoVerifiedAttributes",
@@ -117,7 +117,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "triggers",
@@ -141,7 +141,7 @@
   },
   {
     "ParameterKey": "unauthRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole"
   },
   {
     "ParameterKey": "requiredAttributes",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
index 55a46e16d05..402c761bf8d 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
@@ -129,7 +129,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "maintwo",
+        "main",
         "NONE"
       ]
     }
@@ -186,13 +186,13 @@
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
+                      "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB"
                     ]
                   }
                 ]
               },
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -231,7 +231,7 @@
         "SmsAuthenticationMessage": "Your authentication code is {####}",
         "SmsConfiguration": {
           "ExternalId": "discusc578c16e_role_external_id",
-          "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
+          "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
         },
         "SmsVerificationMessage": "Your verification code is {####}",
         "UserAttributeUpdateSettings": {
@@ -245,7 +245,7 @@
             [
               "discussionsc578c16e_userpool_c578c16e",
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         },
@@ -266,7 +266,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_RCPurfiEw"
+        "UserPoolId": "us-east-1_vv2HFjwRK"
       },
       "DependsOn": [
         "UserPool"
@@ -281,7 +281,7 @@
         "TokenValidityUnits": {
           "RefreshToken": "days"
         },
-        "UserPoolId": "us-east-1_RCPurfiEw"
+        "UserPoolId": "us-east-1_vv2HFjwRK"
       },
       "DependsOn": [
         "UserPool"
@@ -313,13 +313,13 @@
                   {
                     "Fn::Split": [
                       "-",
-                      "amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3"
+                      "amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB"
                     ]
                   }
                 ]
               },
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -331,7 +331,7 @@
         "AllowUnauthenticatedIdentities": "false",
         "CognitoIdentityProviders": [
           {
-            "ClientId": "35iqavrc56jmhttprdv2frl8qf",
+            "ClientId": "7tbnnc27p4edfrp7m6bqqkh0gq",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -339,13 +339,13 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_RCPurfiEw"
+                  "client": "us-east-1_vv2HFjwRK"
                 }
               ]
             }
           },
           {
-            "ClientId": "2kictuhtu6967eqd0qhtsv5roh",
+            "ClientId": "7nhjrv5jepqc7kacqiknlj0siu",
             "ProviderName": {
               "Fn::Sub": [
                 "cognito-idp.${region}.amazonaws.com/${client}",
@@ -353,7 +353,7 @@
                   "region": {
                     "Ref": "AWS::Region"
                   },
-                  "client": "us-east-1_RCPurfiEw"
+                  "client": "us-east-1_vv2HFjwRK"
                 }
               ]
             }
@@ -364,7 +364,7 @@
             "",
             [
               "discussionsc578c16e_identitypool_c578c16e__",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -373,10 +373,10 @@
     "IdentityPoolRoleMap": {
       "Type": "AWS::Cognito::IdentityPoolRoleAttachment",
       "Properties": {
-        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
+        "IdentityPoolId": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464",
         "Roles": {
-          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
-          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
+          "unauthenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole",
+          "authenticated": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole"
         }
       },
       "DependsOn": [
@@ -387,33 +387,33 @@
   "Outputs": {
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
-      "Value": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e"
+      "Value": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464"
     },
     "IdentityPoolName": {
-      "Value": "discussionsc578c16e_identitypool_c578c16e__maintwo"
+      "Value": "discussionsc578c16e_identitypool_c578c16e__main"
     },
     "UserPoolId": {
       "Description": "Id for the user pool",
-      "Value": "us-east-1_RCPurfiEw"
+      "Value": "us-east-1_vv2HFjwRK"
     },
     "UserPoolArn": {
       "Description": "Arn for the user pool",
-      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw"
+      "Value": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_vv2HFjwRK"
     },
     "UserPoolName": {
       "Value": "discussionsc578c16e_userpool_c578c16e"
     },
     "AppClientIDWeb": {
       "Description": "The user pool app client id for web",
-      "Value": "2kictuhtu6967eqd0qhtsv5roh"
+      "Value": "7nhjrv5jepqc7kacqiknlj0siu"
     },
     "AppClientID": {
       "Description": "The user pool app client id",
-      "Value": "35iqavrc56jmhttprdv2frl8qf"
+      "Value": "7tbnnc27p4edfrp7m6bqqkh0gq"
     },
     "CreatedSNSRole": {
       "Description": "role arn",
-      "Value": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo"
+      "Value": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json
index 029f443974a..d4a8a1d9363 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json
index 29704b7c908..8a1693f4fa7 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "maintwo",
+        "main",
         "NONE"
       ]
     }
@@ -92,7 +92,7 @@
             [
               "activity",
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -105,13 +105,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "activity-maintwo"
+      "Value": "activity-main"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516"
     },
     "PartitionKeyName": {
       "Value": "id"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json
index 429ce4bc46c..4e3d2a6b496 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json
@@ -17,7 +17,7 @@
   },
   {
     "ParameterKey": "unauthRoleName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-unauthRole"
+    "ParameterValue": "amplify-discussions-main-c39a5-unauthRole"
   },
   {
     "ParameterKey": "s3PrivatePolicy",
@@ -45,7 +45,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "unauthPolicyName",
@@ -53,7 +53,7 @@
   },
   {
     "ParameterKey": "authRoleName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-authRole"
+    "ParameterValue": "amplify-discussions-main-c39a5-authRole"
   },
   {
     "ParameterKey": "GuestAllowList",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json
new file mode 100644
index 00000000000..873f59b7fb1
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json
@@ -0,0 +1,450 @@
+{
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Parameters": {
+    "env": {
+      "Type": "String"
+    },
+    "bucketName": {
+      "Type": "String"
+    },
+    "authRoleName": {
+      "Type": "String"
+    },
+    "unauthRoleName": {
+      "Type": "String"
+    },
+    "authPolicyName": {
+      "Type": "String"
+    },
+    "unauthPolicyName": {
+      "Type": "String"
+    },
+    "s3PublicPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PrivatePolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ProtectedPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3UploadsPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3ReadPolicy": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "s3PermissionsAuthenticatedPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedProtected": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedPrivate": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsAuthenticatedUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestPublic": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "s3PermissionsGuestUploads": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "AuthenticatedAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "GuestAllowList": {
+      "Type": "String",
+      "Default": "DISALLOW"
+    },
+    "selectedGuestPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    },
+    "selectedAuthenticatedPermissions": {
+      "Type": "CommaDelimitedList",
+      "Default": "NONE"
+    }
+  },
+  "Conditions": {
+    "ShouldNotCreateEnvResources": {
+      "Fn::Equals": [
+        "main",
+        "NONE"
+      ]
+    },
+    "CreateAuthPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject,s3:GetObject,s3:DeleteObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthProtected": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject,s3:GetObject,s3:DeleteObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthPrivate": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject,s3:GetObject,s3:DeleteObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateAuthUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "s3:PutObject",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestPublic": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "DISALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "CreateGuestUploads": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "DISALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "AuthReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "ALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    },
+    "GuestReadAndList": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            "DISALLOW",
+            "DISALLOW"
+          ]
+        }
+      ]
+    }
+  },
+  "Outputs": {
+    "BucketName": {
+      "Description": "Bucket name for the S3 bucket",
+      "Value": "discus-avatarsc39a5-main"
+    },
+    "Region": {
+      "Value": "us-east-1"
+    }
+  },
+  "Resources": {
+    "S3Bucket": {
+      "Type": "AWS::S3::Bucket",
+      "Properties": {
+        "BucketName": {
+          "Fn::Join": [
+            "",
+            [
+              "discus-avatars",
+              {
+                "Fn::Select": [
+                  3,
+                  {
+                    "Fn::Split": [
+                      "-",
+                      "amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB"
+                    ]
+                  }
+                ]
+              },
+              "-",
+              "main"
+            ]
+          ]
+        },
+        "CorsConfiguration": {
+          "CorsRules": [
+            {
+              "AllowedHeaders": [
+                "*"
+              ],
+              "AllowedMethods": [
+                "GET",
+                "HEAD",
+                "PUT",
+                "POST",
+                "DELETE"
+              ],
+              "AllowedOrigins": [
+                "*"
+              ],
+              "ExposedHeaders": [
+                "x-amz-server-side-encryption",
+                "x-amz-request-id",
+                "x-amz-id-2",
+                "ETag"
+              ],
+              "Id": "S3CORSRuleId1",
+              "MaxAge": 3000
+            }
+          ]
+        },
+        "BucketEncryption": {
+          "ServerSideEncryptionConfiguration": [
+            {
+              "ServerSideEncryptionByDefault": {
+                "SSEAlgorithm": "AES256"
+              }
+            }
+          ]
+        }
+      },
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain"
+    },
+    "S3AuthPublicPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject,s3:GetObject,s3:DeleteObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/public/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Public_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthPublic"
+    },
+    "S3AuthProtectedPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject,s3:GetObject,s3:DeleteObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/protected/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Protected_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthProtected"
+    },
+    "S3AuthPrivatePolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject,s3:GetObject,s3:DeleteObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/private/${cognito-identity.amazonaws.com:sub}/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Private_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthPrivate"
+    },
+    "S3AuthUploadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": {
+                "Fn::Split": [
+                  ",",
+                  "s3:PutObject"
+                ]
+              },
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:aws:s3:::",
+                      "discus-avatarsc39a5-main",
+                      "/uploads/*"
+                    ]
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "PolicyName": "Uploads_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "CreateAuthUploads"
+    },
+    "S3AuthReadPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": "s3:GetObject",
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    "discus-avatarsc39a5-main",
+                    "/protected/*"
+                  ]
+                ]
+              }
+            },
+            {
+              "Action": "s3:ListBucket",
+              "Condition": {
+                "StringLike": {
+                  "s3:prefix": [
+                    "public/",
+                    "public/*",
+                    "protected/",
+                    "protected/*",
+                    "private/${cognito-identity.amazonaws.com:sub}/",
+                    "private/${cognito-identity.amazonaws.com:sub}/*"
+                  ]
+                }
+              },
+              "Effect": "Allow",
+              "Resource": {
+                "Fn::Join": [
+                  "",
+                  [
+                    "arn:aws:s3:::",
+                    "discus-avatarsc39a5-main"
+                  ]
+                ]
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "read_policy_bf41454d",
+        "Roles": [
+          "amplify-discussions-main-c39a5-authRole"
+        ]
+      },
+      "DependsOn": [],
+      "Condition": "AuthReadAndList"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json
index 357002d677e..5862fff0861 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json
similarity index 94%
rename from amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
rename to amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json
index 3af46614f09..eace9a5cc98 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json
@@ -24,7 +24,7 @@
   "Conditions": {
     "ShouldNotCreateEnvResources": {
       "Fn::Equals": [
-        "maintwo",
+        "main",
         "NONE"
       ]
     }
@@ -84,7 +84,7 @@
             [
               "bookmarks",
               "-",
-              "maintwo"
+              "main"
             ]
           ]
         }
@@ -97,13 +97,13 @@
   },
   "Outputs": {
     "Name": {
-      "Value": "bookmarks-maintwo"
+      "Value": "bookmarks-main"
     },
     "Arn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
     },
     "StreamArn": {
-      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305"
+      "Value": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-20T21:19:57.495"
     },
     "PartitionKeyName": {
       "Value": "userId"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
index afa06ddc5a9..34b789e4330 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/amplify-meta.json
@@ -1,14 +1,14 @@
 {
   "providers": {
     "awscloudformation": {
-      "AuthRoleName": "amplify-discussions-maintwo-decb9-authRole",
-      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole",
+      "AuthRoleName": "amplify-discussions-main-c39a5-authRole",
+      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole",
       "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-      "UnauthRoleName": "amplify-discussions-maintwo-decb9-unauthRole",
-      "StackName": "amplify-discussions-maintwo-decb9",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
+      "DeploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+      "UnauthRoleName": "amplify-discussions-main-c39a5-unauthRole",
+      "StackName": "amplify-discussions-main-c39a5",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-c39a5/0e9a6f60-24a2-11f1-8462-0afffd2fb801",
       "AmplifyAppId": "discussions"
     }
   },
@@ -25,17 +25,18 @@
             "authenticationType": "API_KEY"
           }
         },
-        "GraphQLAPIIdOutput": "st35wex2drhe5piowtinjea47y",
-        "GraphQLAPIEndpointOutput": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql",
+        "GraphQLAPIIdOutput": "u3jn2qbupzbyhc3h53673wdvim",
+        "GraphQLAPIEndpointOutput": "https://jsm5ex363jcy5fm2reylyox4te.appsync-api.us-east-1.amazonaws.com/graphql",
         "GraphQLAPIKeyOutput": "da2-fakeapikey00000000000000"
       },
       "providerPlugin": "awscloudformation",
       "service": "AppSync",
-      "lastPushTimeStamp": "2026-03-20T18:02:07.524Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "logicalId": "apidiscussions"
-      }
+      },
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "lastPushDirHash": "f67ZKOJM4WJlPWXfx5EsRQOT4UA="
     }
   },
   "auth": {
@@ -65,21 +66,22 @@
       },
       "providerPlugin": "awscloudformation",
       "service": "Cognito",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "logicalId": "authdiscussionsc578c16ec578c16e"
+      },
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
       "output": {
-        "CreatedSNSRole": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo",
-        "UserPoolId": "us-east-1_RCPurfiEw",
-        "AppClientIDWeb": "2kictuhtu6967eqd0qhtsv5roh",
-        "AppClientID": "35iqavrc56jmhttprdv2frl8qf",
-        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
-        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw",
-        "IdentityPoolName": "discussionsc578c16e_identitypool_c578c16e__maintwo",
+        "CreatedSNSRole": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main",
+        "UserPoolId": "us-east-1_vv2HFjwRK",
+        "AppClientIDWeb": "7nhjrv5jepqc7kacqiknlj0siu",
+        "AppClientID": "7tbnnc27p4edfrp7m6bqqkh0gq",
+        "IdentityPoolId": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464",
+        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_vv2HFjwRK",
+        "IdentityPoolName": "discussionsc578c16e_identitypool_c578c16e__main",
         "UserPoolName": "discussionsc578c16e_userpool_c578c16e"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.525Z",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
-        "logicalId": "authdiscussionsc578c16ec578c16e"
-      }
+      "lastPushDirHash": "mPKsrH+CL3NCuCtTWB9nkOHB7ls="
     }
   },
   "function": {
@@ -98,22 +100,27 @@
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda",
-      "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-maintwo",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-maintwo",
-        "Name": "fetchuseractivity-maintwo",
-        "LambdaExecutionRole": "discussionsLambdaRole44bd86bc-maintwo"
+      "lastBuildTimeStamp": "2026-03-20T21:19:47.115Z",
+      "lastBuildType": "PROD",
+      "lastPackageTimeStamp": "2026-03-20T21:19:47.147Z",
+      "distZipFilename": "fetchuseractivity-6e523036545438726f37-build.zip",
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+        "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.527Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "logicalId": "functionfetchuseractivity"
       },
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-        "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
-      }
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-main",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-main",
+        "Name": "fetchuseractivity-main",
+        "LambdaExecutionRole": "discussionsLambdaRole44bd86bc-main"
+      },
+      "lastPushDirHash": "R64T5GvXPz84ttStgLRDEvqSeOg="
     },
     "recorduseractivity": {
       "build": true,
@@ -138,77 +145,84 @@
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda",
-      "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-maintwo",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-maintwo",
-        "Name": "recorduseractivity-maintwo",
-        "LambdaExecutionRole": "discussionsLambdaRole62a425ae-maintwo"
+      "lastBuildTimeStamp": "2026-03-20T21:19:47.546Z",
+      "lastBuildType": "PROD",
+      "lastPackageTimeStamp": "2026-03-20T21:19:47.560Z",
+      "distZipFilename": "recorduseractivity-433947686f7145754543-build.zip",
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+        "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.529Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "logicalId": "functionrecorduseractivity"
       },
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-        "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
-      }
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-main",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-main",
+        "Name": "recorduseractivity-main",
+        "LambdaExecutionRole": "discussionsLambdaRole62a425ae-main"
+      },
+      "lastPushDirHash": "wpepR6GRBy0XTCEXNmYdMZdmEvM="
     }
   },
   "storage": {
     "activity": {
       "providerPlugin": "awscloudformation",
       "service": "DynamoDB",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "logicalId": "storageactivity"
+      },
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
       "output": {
         "PartitionKeyName": "id",
         "SortKeyName": "userId",
         "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516",
         "PartitionKeyType": "S",
-        "Name": "activity-maintwo"
+        "Name": "activity-main"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.531Z",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "logicalId": "storageactivity"
-      }
+      "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
     },
     "avatars": {
       "dependsOn": [],
       "providerPlugin": "awscloudformation",
       "service": "S3",
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "logicalId": "storageavatars"
+      },
       "output": {
-        "BucketName": "discus-avatarsdecb9-maintwo",
+        "BucketName": "discus-avatarsc39a5-main",
         "Region": "us-east-1"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.533Z",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
-        "logicalId": "storageavatars"
-      }
+      "lastPushDirHash": "rNwwRZG31h4CJSNavssQfx7X9sQ="
     },
     "bookmarks": {
-      "service": "DynamoDB",
       "providerPlugin": "awscloudformation",
+      "service": "DynamoDB",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "logicalId": "storagebookmarks"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.857Z",
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
       "output": {
         "PartitionKeyName": "userId",
         "SortKeyName": "postId",
         "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-20T21:19:57.495",
         "PartitionKeyType": "S",
-        "Name": "bookmarks-maintwo"
+        "Name": "bookmarks-main"
       },
-      "lastPushDirHash": "wMsU0GvHfV+624G1E8Mx7jnsGwo="
+      "lastPushDirHash": "UcosRNORY7WR8bi+QNNLl+eX+Eo="
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json
index e702f6821aa..647ae86b7e0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/cloudformation-template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1770321021
+        "Expires": 1774646388
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json
index 4f42071a5ad..7219a2a69a5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/parameters.json
@@ -2,6 +2,6 @@
     "AppSyncApiName": "discussions",
     "DynamoDBBillingMode": "PAY_PER_REQUEST",
     "DynamoDBEnableServerSideEncryption": false,
-    "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+    "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
     "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json
index 3af2c09b2f6..555e8d77192 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Comment.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json
index 660f4be4274..fc750c366eb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/ConnectionStack.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -289,7 +289,7 @@
               {
                 "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -378,7 +378,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json
index 1340edb7eec..c9369d72715 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Post.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json
index 206fa8ec0f5..233b2a28467 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/api/discussions/build/stacks/Topic.json
@@ -503,7 +503,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -604,7 +604,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -771,7 +771,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -959,7 +959,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1111,7 +1111,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1232,7 +1232,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1278,7 +1278,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1324,7 +1324,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index 50d85ddc94f..3f10aeedb88 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
index e702f6821aa..647ae86b7e0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1770321021
+        "Expires": 1774646388
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index 50d85ddc94f..3f10aeedb88 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 30ad934f79d..433a496539b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -202,21 +202,21 @@
     "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
           "AppSyncApiName": "discussions",
           "DynamoDBBillingMode": "PAY_PER_REQUEST",
           "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
           "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
           "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
@@ -268,16 +268,16 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
@@ -297,16 +297,16 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
@@ -338,28 +338,28 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageactivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
         "Parameters": {
           "tableName": "activity",
           "partitionKeyName": "id",
           "partitionKeyType": "S",
           "sortKeyName": "userId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageavatars": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "Parameters": {
           "bucketName": "discus-avatars",
           "selectedGuestPermissions": "",
@@ -385,21 +385,21 @@
           "s3PermissionsAuthenticatedUploads": "s3:PutObject",
           "s3PermissionsGuestPublic": "DISALLOW",
           "s3PermissionsGuestUploads": "DISALLOW",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storagebookmarks": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "Parameters": {
           "tableName": "bookmarks",
           "partitionKeyName": "userId",
           "partitionKeyType": "S",
           "sortKeyName": "postId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index 9297a858679..e44e73d93aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 0a05f67e87a..34511d0c3c6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 30ad934f79d..433a496539b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -202,21 +202,21 @@
     "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
           "AppSyncApiName": "discussions",
           "DynamoDBBillingMode": "PAY_PER_REQUEST",
           "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
           "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
           "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
@@ -268,16 +268,16 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
@@ -297,16 +297,16 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
@@ -338,28 +338,28 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageactivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
         "Parameters": {
           "tableName": "activity",
           "partitionKeyName": "id",
           "partitionKeyType": "S",
           "sortKeyName": "userId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageavatars": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "Parameters": {
           "bucketName": "discus-avatars",
           "selectedGuestPermissions": "",
@@ -385,21 +385,21 @@
           "s3PermissionsAuthenticatedUploads": "s3:PutObject",
           "s3PermissionsGuestPublic": "DISALLOW",
           "s3PermissionsGuestUploads": "DISALLOW",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storagebookmarks": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "Parameters": {
           "tableName": "bookmarks",
           "partitionKeyName": "userId",
           "partitionKeyType": "S",
           "sortKeyName": "postId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
index ca188b6e7fb..17ea25a0a60 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
index 49679c245fc..81494e78af7 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index 9297a858679..e44e73d93aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 0a05f67e87a..34511d0c3c6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json
index ca188b6e7fb..17ea25a0a60 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json
index 981b2eb9f8e..b7a3303032f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/avatars/build/cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
index 3a1bf18a43c..4eff10ee1dd 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/storage/bookmarks/cli-inputs.json
@@ -19,4 +19,4 @@
     }
   ],
   "triggerFunctions": []
-}
\ No newline at end of file
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend-config.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend-config.json
new file mode 100644
index 00000000000..49fe6deb7c4
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend-config.json
@@ -0,0 +1,140 @@
+{
+  "api": {
+    "discussions": {
+      "dependsOn": [],
+      "output": {
+        "authConfig": {
+          "additionalAuthenticationProviders": [],
+          "defaultAuthentication": {
+            "apiKeyConfig": {
+              "apiKeyExpirationDays": 7
+            },
+            "authenticationType": "API_KEY"
+          }
+        }
+      },
+      "providerPlugin": "awscloudformation",
+      "service": "AppSync"
+    }
+  },
+  "auth": {
+    "discussionsc578c16ec578c16e": {
+      "customAuth": false,
+      "dependsOn": [],
+      "frontendAuthConfig": {
+        "mfaConfiguration": "OFF",
+        "mfaTypes": [
+          "SMS"
+        ],
+        "passwordProtectionSettings": {
+          "passwordPolicyCharacters": [],
+          "passwordPolicyMinLength": 8
+        },
+        "signupAttributes": [
+          "EMAIL",
+          "PHONE_NUMBER"
+        ],
+        "socialProviders": [],
+        "usernameAttributes": [
+          "PHONE_NUMBER"
+        ],
+        "verificationMechanisms": [
+          "EMAIL"
+        ]
+      },
+      "providerPlugin": "awscloudformation",
+      "service": "Cognito"
+    }
+  },
+  "function": {
+    "fetchuseractivity": {
+      "build": true,
+      "dependsOn": [
+        {
+          "attributes": [
+            "Name",
+            "Arn",
+            "StreamArn"
+          ],
+          "category": "storage",
+          "resourceName": "activity"
+        }
+      ],
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
+    },
+    "recorduseractivity": {
+      "build": true,
+      "dependsOn": [
+        {
+          "attributes": [
+            "GraphQLAPIIdOutput",
+            "GraphQLAPIEndpointOutput"
+          ],
+          "category": "api",
+          "resourceName": "discussions"
+        },
+        {
+          "attributes": [
+            "Name",
+            "Arn",
+            "StreamArn"
+          ],
+          "category": "storage",
+          "resourceName": "activity"
+        }
+      ],
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
+    }
+  },
+  "parameters": {
+    "AMPLIFY_function_fetchuseractivity_deploymentBucketName": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "fetchuseractivity"
+        }
+      ]
+    },
+    "AMPLIFY_function_fetchuseractivity_s3Key": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "fetchuseractivity"
+        }
+      ]
+    },
+    "AMPLIFY_function_recorduseractivity_deploymentBucketName": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "recorduseractivity"
+        }
+      ]
+    },
+    "AMPLIFY_function_recorduseractivity_s3Key": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "recorduseractivity"
+        }
+      ]
+    }
+  },
+  "storage": {
+    "activity": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB"
+    },
+    "avatars": {
+      "dependsOn": [],
+      "providerPlugin": "awscloudformation",
+      "service": "S3"
+    },
+    "bookmarks": {
+      "providerPlugin": "awscloudformation",
+      "service": "DynamoDB"
+    }
+  }
+}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
index afa06ddc5a9..34b789e4330 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/amplify-meta.json
@@ -1,14 +1,14 @@
 {
   "providers": {
     "awscloudformation": {
-      "AuthRoleName": "amplify-discussions-maintwo-decb9-authRole",
-      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole",
+      "AuthRoleName": "amplify-discussions-main-c39a5-authRole",
+      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole",
       "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-      "UnauthRoleName": "amplify-discussions-maintwo-decb9-unauthRole",
-      "StackName": "amplify-discussions-maintwo-decb9",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
+      "DeploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+      "UnauthRoleName": "amplify-discussions-main-c39a5-unauthRole",
+      "StackName": "amplify-discussions-main-c39a5",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-c39a5/0e9a6f60-24a2-11f1-8462-0afffd2fb801",
       "AmplifyAppId": "discussions"
     }
   },
@@ -25,17 +25,18 @@
             "authenticationType": "API_KEY"
           }
         },
-        "GraphQLAPIIdOutput": "st35wex2drhe5piowtinjea47y",
-        "GraphQLAPIEndpointOutput": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql",
+        "GraphQLAPIIdOutput": "u3jn2qbupzbyhc3h53673wdvim",
+        "GraphQLAPIEndpointOutput": "https://jsm5ex363jcy5fm2reylyox4te.appsync-api.us-east-1.amazonaws.com/graphql",
         "GraphQLAPIKeyOutput": "da2-fakeapikey00000000000000"
       },
       "providerPlugin": "awscloudformation",
       "service": "AppSync",
-      "lastPushTimeStamp": "2026-03-20T18:02:07.524Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "logicalId": "apidiscussions"
-      }
+      },
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "lastPushDirHash": "f67ZKOJM4WJlPWXfx5EsRQOT4UA="
     }
   },
   "auth": {
@@ -65,21 +66,22 @@
       },
       "providerPlugin": "awscloudformation",
       "service": "Cognito",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "logicalId": "authdiscussionsc578c16ec578c16e"
+      },
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
       "output": {
-        "CreatedSNSRole": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo",
-        "UserPoolId": "us-east-1_RCPurfiEw",
-        "AppClientIDWeb": "2kictuhtu6967eqd0qhtsv5roh",
-        "AppClientID": "35iqavrc56jmhttprdv2frl8qf",
-        "IdentityPoolId": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
-        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw",
-        "IdentityPoolName": "discussionsc578c16e_identitypool_c578c16e__maintwo",
+        "CreatedSNSRole": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main",
+        "UserPoolId": "us-east-1_vv2HFjwRK",
+        "AppClientIDWeb": "7nhjrv5jepqc7kacqiknlj0siu",
+        "AppClientID": "7tbnnc27p4edfrp7m6bqqkh0gq",
+        "IdentityPoolId": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464",
+        "UserPoolArn": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_vv2HFjwRK",
+        "IdentityPoolName": "discussionsc578c16e_identitypool_c578c16e__main",
         "UserPoolName": "discussionsc578c16e_userpool_c578c16e"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.525Z",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
-        "logicalId": "authdiscussionsc578c16ec578c16e"
-      }
+      "lastPushDirHash": "mPKsrH+CL3NCuCtTWB9nkOHB7ls="
     }
   },
   "function": {
@@ -98,22 +100,27 @@
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda",
-      "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-maintwo",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-maintwo",
-        "Name": "fetchuseractivity-maintwo",
-        "LambdaExecutionRole": "discussionsLambdaRole44bd86bc-maintwo"
+      "lastBuildTimeStamp": "2026-03-20T21:19:47.115Z",
+      "lastBuildType": "PROD",
+      "lastPackageTimeStamp": "2026-03-20T21:19:47.147Z",
+      "distZipFilename": "fetchuseractivity-6e523036545438726f37-build.zip",
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+        "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.527Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "logicalId": "functionfetchuseractivity"
       },
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-        "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
-      }
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-main",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-main",
+        "Name": "fetchuseractivity-main",
+        "LambdaExecutionRole": "discussionsLambdaRole44bd86bc-main"
+      },
+      "lastPushDirHash": "R64T5GvXPz84ttStgLRDEvqSeOg="
     },
     "recorduseractivity": {
       "build": true,
@@ -138,77 +145,84 @@
       ],
       "providerPlugin": "awscloudformation",
       "service": "Lambda",
-      "output": {
-        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-maintwo",
-        "Region": "us-east-1",
-        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-maintwo",
-        "Name": "recorduseractivity-maintwo",
-        "LambdaExecutionRole": "discussionsLambdaRole62a425ae-maintwo"
+      "lastBuildTimeStamp": "2026-03-20T21:19:47.546Z",
+      "lastBuildType": "PROD",
+      "lastPackageTimeStamp": "2026-03-20T21:19:47.560Z",
+      "distZipFilename": "recorduseractivity-433947686f7145754543-build.zip",
+      "s3Bucket": {
+        "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+        "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.529Z",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "logicalId": "functionrecorduseractivity"
       },
-      "s3Bucket": {
-        "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-        "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
-      }
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "output": {
+        "LambdaExecutionRoleArn": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-main",
+        "Region": "us-east-1",
+        "Arn": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-main",
+        "Name": "recorduseractivity-main",
+        "LambdaExecutionRole": "discussionsLambdaRole62a425ae-main"
+      },
+      "lastPushDirHash": "wpepR6GRBy0XTCEXNmYdMZdmEvM="
     }
   },
   "storage": {
     "activity": {
       "providerPlugin": "awscloudformation",
       "service": "DynamoDB",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "logicalId": "storageactivity"
+      },
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
       "output": {
         "PartitionKeyName": "id",
         "SortKeyName": "userId",
         "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516",
         "PartitionKeyType": "S",
-        "Name": "activity-maintwo"
+        "Name": "activity-main"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.531Z",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
-        "logicalId": "storageactivity"
-      }
+      "lastPushDirHash": "LKrx9n9rI5MFeuTLmyTA2Bho0zg="
     },
     "avatars": {
       "dependsOn": [],
       "providerPlugin": "awscloudformation",
       "service": "S3",
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
+      "providerMetadata": {
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "logicalId": "storageavatars"
+      },
       "output": {
-        "BucketName": "discus-avatarsdecb9-maintwo",
+        "BucketName": "discus-avatarsc39a5-main",
         "Region": "us-east-1"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.533Z",
-      "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
-        "logicalId": "storageavatars"
-      }
+      "lastPushDirHash": "rNwwRZG31h4CJSNavssQfx7X9sQ="
     },
     "bookmarks": {
-      "service": "DynamoDB",
       "providerPlugin": "awscloudformation",
+      "service": "DynamoDB",
       "providerMetadata": {
-        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "s3TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "logicalId": "storagebookmarks"
       },
-      "lastPushTimeStamp": "2026-03-20T18:02:07.857Z",
+      "lastPushTimeStamp": "2026-03-20T21:24:14.059Z",
       "output": {
         "PartitionKeyName": "userId",
         "SortKeyName": "postId",
         "SortKeyType": "S",
         "Region": "us-east-1",
-        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo",
-        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305",
+        "Arn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main",
+        "StreamArn": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-20T21:19:57.495",
         "PartitionKeyType": "S",
-        "Name": "bookmarks-maintwo"
+        "Name": "bookmarks-main"
       },
-      "lastPushDirHash": "wMsU0GvHfV+624G1E8Mx7jnsGwo="
+      "lastPushDirHash": "UcosRNORY7WR8bi+QNNLl+eX+Eo="
     }
   }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json
index d7d234fc6ab..647ae86b7e0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/cloudformation-template.json
@@ -1,1065 +1,1066 @@
 {
-    "Parameters": {
-        "env": {
-            "Type": "String",
-            "Default": "NONE"
+  "Parameters": {
+    "env": {
+      "Type": "String",
+      "Default": "NONE"
+    },
+    "AppSyncApiName": {
+      "Type": "String",
+      "Default": "AppSyncSimpleTransform"
+    },
+    "DynamoDBModelTableReadIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of read IOPS the table should support."
+    },
+    "DynamoDBModelTableWriteIOPS": {
+      "Type": "Number",
+      "Default": 5,
+      "Description": "The number of write IOPS the table should support."
+    },
+    "DynamoDBBillingMode": {
+      "Type": "String",
+      "Default": "PAY_PER_REQUEST",
+      "AllowedValues": [
+        "PAY_PER_REQUEST",
+        "PROVISIONED"
+      ],
+      "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+    },
+    "DynamoDBEnablePointInTimeRecovery": {
+      "Type": "String",
+      "Default": "false",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Whether to enable Point in Time Recovery on the table."
+    },
+    "DynamoDBEnableServerSideEncryption": {
+      "Type": "String",
+      "Default": "true",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Description": "Enable server side encryption powered by KMS."
+    },
+    "S3DeploymentBucket": {
+      "Type": "String",
+      "Description": "An S3 Bucket name where assets are deployed"
+    },
+    "S3DeploymentRootKey": {
+      "Type": "String",
+      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root of the deployment directory."
+    }
+  },
+  "Resources": {
+    "GraphQLAPI": {
+      "Type": "AWS::AppSync::GraphQLApi",
+      "Properties": {
+        "AuthenticationType": "API_KEY",
+        "Name": {
+          "Fn::Join": [
+            "",
+            [
+              {
+                "Ref": "AppSyncApiName"
+              },
+              "-",
+              {
+                "Ref": "env"
+              }
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPITransformerSchema3CB2AE18": {
+      "Type": "AWS::AppSync::GraphQLSchema",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "AppSyncApiName": {
-            "Type": "String",
-            "Default": "AppSyncSimpleTransform"
+        "DefinitionS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/schema.graphql"
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPIDefaultApiKey215A6DD7": {
+      "Type": "AWS::AppSync::ApiKey",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "DynamoDBModelTableReadIOPS": {
-            "Type": "Number",
-            "Default": 5,
-            "Description": "The number of read IOPS the table should support."
+        "Expires": 1774646388
+      }
+    },
+    "GraphQLAPINONEDS95A13CF0": {
+      "Type": "AWS::AppSync::DataSource",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "DynamoDBModelTableWriteIOPS": {
-            "Type": "Number",
-            "Default": 5,
-            "Description": "The number of write IOPS the table should support."
+        "Name": "NONE_DS",
+        "Type": "NONE"
+      }
+    },
+    "Topic": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          }
         },
-        "DynamoDBBillingMode": {
-            "Type": "String",
-            "Default": "PAY_PER_REQUEST",
-            "AllowedValues": [
-                "PAY_PER_REQUEST",
-                "PROVISIONED"
-            ],
-            "Description": "Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes."
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/Topic.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "Post": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            ]
+          }
         },
-        "DynamoDBEnablePointInTimeRecovery": {
-            "Type": "String",
-            "Default": "false",
-            "AllowedValues": [
-                "true",
-                "false"
-            ],
-            "Description": "Whether to enable Point in Time Recovery on the table."
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/Post.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "Comment": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "DynamoDBModelTableReadIOPS": {
+            "Ref": "DynamoDBModelTableReadIOPS"
+          },
+          "DynamoDBModelTableWriteIOPS": {
+            "Ref": "DynamoDBModelTableWriteIOPS"
+          },
+          "DynamoDBBillingMode": {
+            "Ref": "DynamoDBBillingMode"
+          },
+          "DynamoDBEnablePointInTimeRecovery": {
+            "Ref": "DynamoDBEnablePointInTimeRecovery"
+          },
+          "DynamoDBEnableServerSideEncryption": {
+            "Ref": "DynamoDBEnableServerSideEncryption"
+          },
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
+            ]
+          }
         },
-        "DynamoDBEnableServerSideEncryption": {
-            "Type": "String",
-            "Default": "true",
-            "AllowedValues": [
-                "true",
-                "false"
-            ],
-            "Description": "Enable server side encryption powered by KMS."
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/Comment.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "FunctionDirectiveStack": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetotransformerrootstackenv10C5A902Ref": {
+            "Ref": "env"
+          },
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          }
         },
-        "S3DeploymentBucket": {
-            "Type": "String",
-            "Description": "An S3 Bucket name where assets are deployed"
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/FunctionDirectiveStack.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ConnectionStack": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
+            "Fn::GetAtt": [
+              "GraphQLAPINONEDS95A13CF0",
+              "Name"
+            ]
+          },
+          "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
+            "Ref": "S3DeploymentRootKey"
+          },
+          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
+            "Fn::GetAtt": [
+              "Post",
+              "Outputs.transformerrootstackPostPostDataSource6998E105Name"
+            ]
+          },
+          "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
+            "Fn::GetAtt": [
+              "Post",
+              "Outputs.transformerrootstackPostPostTable34CAE87BRef"
+            ]
+          },
+          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
+            "Fn::GetAtt": [
+              "Comment",
+              "Outputs.transformerrootstackCommentCommentDataSourceA0E54655Name"
+            ]
+          },
+          "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
+            "Fn::GetAtt": [
+              "Comment",
+              "Outputs.transformerrootstackCommentCommentTable5427FDE2Ref"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicTopicDataSource63D2F34BName"
+            ]
+          },
+          "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
+            "Fn::GetAtt": [
+              "Topic",
+              "Outputs.transformerrootstackTopicTopicTableFD91FB92Ref"
+            ]
+          }
         },
-        "S3DeploymentRootKey": {
-            "Type": "String",
-            "Description": "An S3 key relative to the S3DeploymentBucket that points to the root of the deployment directory."
+        "TemplateURL": {
+          "Fn::Join": [
+            "",
+            [
+              "https://s3.",
+              {
+                "Ref": "AWS::Region"
+              },
+              ".",
+              {
+                "Ref": "AWS::URLSuffix"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/stacks/ConnectionStack.json"
+            ]
+          ]
         }
+      },
+      "DependsOn": [
+        "Comment",
+        "GraphQLAPITransformerSchema3CB2AE18",
+        "Post",
+        "Topic"
+      ]
     },
-    "Resources": {
-        "GraphQLAPI": {
-            "Type": "AWS::AppSync::GraphQLApi",
-            "Properties": {
-                "AuthenticationType": "API_KEY",
-                "Name": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            {
-                                "Ref": "AppSyncApiName"
-                            },
-                            "-",
-                            {
-                                "Ref": "env"
-                            }
-                        ]
-                    ]
-                }
-            }
+    "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "GraphQLAPITransformerSchema3CB2AE18": {
-            "Type": "AWS::AppSync::GraphQLSchema",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "DefinitionS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/schema.graphql"
-                        ]
-                    ]
-                }
-            }
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
         },
-        "GraphQLAPIDefaultApiKey215A6DD7": {
-            "Type": "AWS::AppSync::ApiKey",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "Expires": 1774634455
-            }
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityIdDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.id.req.vtl"
+            ]
+          ]
         },
-        "GraphQLAPINONEDS95A13CF0": {
-            "Type": "AWS::AppSync::DataSource",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "Name": "NONE_DS",
-                "Type": "NONE"
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.id.res.vtl"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityidResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "FieldName": "id",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830",
+                "FunctionId"
+              ]
             }
+          ]
         },
-        "Topic": {
-            "Type": "AWS::CloudFormation::Stack",
-            "Properties": {
-                "Parameters": {
-                    "DynamoDBModelTableReadIOPS": {
-                        "Ref": "DynamoDBModelTableReadIOPS"
-                    },
-                    "DynamoDBModelTableWriteIOPS": {
-                        "Ref": "DynamoDBModelTableWriteIOPS"
-                    },
-                    "DynamoDBBillingMode": {
-                        "Ref": "DynamoDBBillingMode"
-                    },
-                    "DynamoDBEnablePointInTimeRecovery": {
-                        "Ref": "DynamoDBEnablePointInTimeRecovery"
-                    },
-                    "DynamoDBEnableServerSideEncryption": {
-                        "Ref": "DynamoDBEnableServerSideEncryption"
-                    },
-                    "referencetotransformerrootstackenv10C5A902Ref": {
-                        "Ref": "env"
-                    },
-                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPI",
-                            "ApiId"
-                        ]
-                    },
-                    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPINONEDS95A13CF0",
-                            "Name"
-                        ]
-                    },
-                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-                        "Ref": "S3DeploymentBucket"
-                    },
-                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-                        "Ref": "S3DeploymentRootKey"
-                    }
-                },
-                "TemplateURL": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "https://s3.",
-                            {
-                                "Ref": "AWS::Region"
-                            },
-                            ".",
-                            {
-                                "Ref": "AWS::URLSuffix"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/stacks/Topic.json"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
+          ]
         },
-        "Post": {
-            "Type": "AWS::CloudFormation::Stack",
-            "Properties": {
-                "Parameters": {
-                    "DynamoDBModelTableReadIOPS": {
-                        "Ref": "DynamoDBModelTableReadIOPS"
-                    },
-                    "DynamoDBModelTableWriteIOPS": {
-                        "Ref": "DynamoDBModelTableWriteIOPS"
-                    },
-                    "DynamoDBBillingMode": {
-                        "Ref": "DynamoDBBillingMode"
-                    },
-                    "DynamoDBEnablePointInTimeRecovery": {
-                        "Ref": "DynamoDBEnablePointInTimeRecovery"
-                    },
-                    "DynamoDBEnableServerSideEncryption": {
-                        "Ref": "DynamoDBEnableServerSideEncryption"
-                    },
-                    "referencetotransformerrootstackenv10C5A902Ref": {
-                        "Ref": "env"
-                    },
-                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPI",
-                            "ApiId"
-                        ]
-                    },
-                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-                        "Ref": "S3DeploymentBucket"
-                    },
-                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-                        "Ref": "S3DeploymentRootKey"
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-                        ]
-                    }
-                },
-                "TemplateURL": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "https://s3.",
-                            {
-                                "Ref": "AWS::Region"
-                            },
-                            ".",
-                            {
-                                "Ref": "AWS::URLSuffix"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/stacks/Post.json"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
-            ]
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "Comment": {
-            "Type": "AWS::CloudFormation::Stack",
-            "Properties": {
-                "Parameters": {
-                    "DynamoDBModelTableReadIOPS": {
-                        "Ref": "DynamoDBModelTableReadIOPS"
-                    },
-                    "DynamoDBModelTableWriteIOPS": {
-                        "Ref": "DynamoDBModelTableWriteIOPS"
-                    },
-                    "DynamoDBBillingMode": {
-                        "Ref": "DynamoDBBillingMode"
-                    },
-                    "DynamoDBEnablePointInTimeRecovery": {
-                        "Ref": "DynamoDBEnablePointInTimeRecovery"
-                    },
-                    "DynamoDBEnableServerSideEncryption": {
-                        "Ref": "DynamoDBEnableServerSideEncryption"
-                    },
-                    "referencetotransformerrootstackenv10C5A902Ref": {
-                        "Ref": "env"
-                    },
-                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPI",
-                            "ApiId"
-                        ]
-                    },
-                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-                        "Ref": "S3DeploymentBucket"
-                    },
-                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-                        "Ref": "S3DeploymentRootKey"
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId"
-                        ]
-                    }
-                },
-                "TemplateURL": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "https://s3.",
-                            {
-                                "Ref": "AWS::Region"
-                            },
-                            ".",
-                            {
-                                "Ref": "AWS::URLSuffix"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/stacks/Comment.json"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
-            ]
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
         },
-        "FunctionDirectiveStack": {
-            "Type": "AWS::CloudFormation::Stack",
-            "Properties": {
-                "Parameters": {
-                    "referencetotransformerrootstackenv10C5A902Ref": {
-                        "Ref": "env"
-                    },
-                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPI",
-                            "ApiId"
-                        ]
-                    },
-                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-                        "Ref": "S3DeploymentBucket"
-                    },
-                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-                        "Ref": "S3DeploymentRootKey"
-                    },
-                    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPINONEDS95A13CF0",
-                            "Name"
-                        ]
-                    }
-                },
-                "TemplateURL": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "https://s3.",
-                            {
-                                "Ref": "AWS::Region"
-                            },
-                            ".",
-                            {
-                                "Ref": "AWS::URLSuffix"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/stacks/FunctionDirectiveStack.json"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityUserIdDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.userId.req.vtl"
             ]
+          ]
         },
-        "ConnectionStack": {
-            "Type": "AWS::CloudFormation::Stack",
-            "Properties": {
-                "Parameters": {
-                    "referencetotransformerrootstackGraphQLAPI20497F53ApiId": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPI",
-                            "ApiId"
-                        ]
-                    },
-                    "referencetotransformerrootstackGraphQLAPINONEDS2BA9D1C8Name": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPINONEDS95A13CF0",
-                            "Name"
-                        ]
-                    },
-                    "referencetotransformerrootstackS3DeploymentBucket7592718ARef": {
-                        "Ref": "S3DeploymentBucket"
-                    },
-                    "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref": {
-                        "Ref": "S3DeploymentRootKey"
-                    },
-                    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name": {
-                        "Fn::GetAtt": [
-                            "Post",
-                            "Outputs.transformerrootstackPostPostDataSource6998E105Name"
-                        ]
-                    },
-                    "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef": {
-                        "Fn::GetAtt": [
-                            "Post",
-                            "Outputs.transformerrootstackPostPostTable34CAE87BRef"
-                        ]
-                    },
-                    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name": {
-                        "Fn::GetAtt": [
-                            "Comment",
-                            "Outputs.transformerrootstackCommentCommentDataSourceA0E54655Name"
-                        ]
-                    },
-                    "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref": {
-                        "Fn::GetAtt": [
-                            "Comment",
-                            "Outputs.transformerrootstackCommentCommentTable5427FDE2Ref"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicDataSource63D2F34BName": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicTopicDataSource63D2F34BName"
-                        ]
-                    },
-                    "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref": {
-                        "Fn::GetAtt": [
-                            "Topic",
-                            "Outputs.transformerrootstackTopicTopicTableFD91FB92Ref"
-                        ]
-                    }
-                },
-                "TemplateURL": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "https://s3.",
-                            {
-                                "Ref": "AWS::Region"
-                            },
-                            ".",
-                            {
-                                "Ref": "AWS::URLSuffix"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/stacks/ConnectionStack.json"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "Comment",
-                "GraphQLAPITransformerSchema3CB2AE18",
-                "Post",
-                "Topic"
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.userId.res.vtl"
             ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityuserIdResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830": {
-            "Type": "AWS::AppSync::FunctionConfiguration",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "DataSourceName": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPINONEDS95A13CF0",
-                        "Name"
-                    ]
-                },
-                "FunctionVersion": "2018-05-29",
-                "Name": "ActivityIdDataResolverFn",
-                "RequestMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.id.req.vtl"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.id.res.vtl"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
-            ]
+        "FieldName": "userId",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF",
+                "FunctionId"
+              ]
+            }
+          ]
         },
-        "ActivityidResolver": {
-            "Type": "AWS::AppSync::Resolver",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "FieldName": "id",
-                "Kind": "PIPELINE",
-                "PipelineConfig": {
-                    "Functions": [
-                        {
-                            "Fn::GetAtt": [
-                                "ActivityIdDataResolverFnActivityIdDataResolverFnAppSyncFunction8AF5D830",
-                                "FunctionId"
-                            ]
-                        }
-                    ]
-                },
-                "RequestMappingTemplate": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"id\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-                            {
-                                "Fn::GetAtt": [
-                                    "GraphQLAPI",
-                                    "ApiId"
-                                ]
-                            },
-                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-                "TypeName": "Activity"
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
+          ]
         },
-        "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF": {
-            "Type": "AWS::AppSync::FunctionConfiguration",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "DataSourceName": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPINONEDS95A13CF0",
-                        "Name"
-                    ]
-                },
-                "FunctionVersion": "2018-05-29",
-                "Name": "ActivityUserIdDataResolverFn",
-                "RequestMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.userId.req.vtl"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.userId.res.vtl"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
-            ]
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "ActivityuserIdResolver": {
-            "Type": "AWS::AppSync::Resolver",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "FieldName": "userId",
-                "Kind": "PIPELINE",
-                "PipelineConfig": {
-                    "Functions": [
-                        {
-                            "Fn::GetAtt": [
-                                "ActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunctionB4E2E8CF",
-                                "FunctionId"
-                            ]
-                        }
-                    ]
-                },
-                "RequestMappingTemplate": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"userId\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-                            {
-                                "Fn::GetAtt": [
-                                    "GraphQLAPI",
-                                    "ApiId"
-                                ]
-                            },
-                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-                "TypeName": "Activity"
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
-            ]
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
         },
-        "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E": {
-            "Type": "AWS::AppSync::FunctionConfiguration",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "DataSourceName": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPINONEDS95A13CF0",
-                        "Name"
-                    ]
-                },
-                "FunctionVersion": "2018-05-29",
-                "Name": "ActivityActivityTypeDataResolverFn",
-                "RequestMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.activityType.req.vtl"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.activityType.res.vtl"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityActivityTypeDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.activityType.req.vtl"
             ]
+          ]
         },
-        "ActivityactivityTypeResolver": {
-            "Type": "AWS::AppSync::Resolver",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "FieldName": "activityType",
-                "Kind": "PIPELINE",
-                "PipelineConfig": {
-                    "Functions": [
-                        {
-                            "Fn::GetAtt": [
-                                "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E",
-                                "FunctionId"
-                            ]
-                        }
-                    ]
-                },
-                "RequestMappingTemplate": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-                            {
-                                "Fn::GetAtt": [
-                                    "GraphQLAPI",
-                                    "ApiId"
-                                ]
-                            },
-                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-                "TypeName": "Activity"
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.activityType.res.vtl"
             ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityactivityTypeResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380": {
-            "Type": "AWS::AppSync::FunctionConfiguration",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "DataSourceName": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPINONEDS95A13CF0",
-                        "Name"
-                    ]
-                },
-                "FunctionVersion": "2018-05-29",
-                "Name": "ActivityTimestampDataResolverFn",
-                "RequestMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.timestamp.req.vtl"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplateS3Location": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "s3://",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            "/",
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "/resolvers/Activity.timestamp.res.vtl"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "FieldName": "activityType",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF3DF665E",
+                "FunctionId"
+              ]
+            }
+          ]
+        },
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"activityType\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
+                "Fn::GetAtt": [
+                  "GraphQLAPI",
+                  "ApiId"
+                ]
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
+          ]
         },
-        "ActivitytimestampResolver": {
-            "Type": "AWS::AppSync::Resolver",
-            "Properties": {
-                "ApiId": {
-                    "Fn::GetAtt": [
-                        "GraphQLAPI",
-                        "ApiId"
-                    ]
-                },
-                "FieldName": "timestamp",
-                "Kind": "PIPELINE",
-                "PipelineConfig": {
-                    "Functions": [
-                        {
-                            "Fn::GetAtt": [
-                                "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380",
-                                "FunctionId"
-                            ]
-                        }
-                    ]
-                },
-                "RequestMappingTemplate": {
-                    "Fn::Join": [
-                        "",
-                        [
-                            "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
-                            {
-                                "Fn::GetAtt": [
-                                    "GraphQLAPI",
-                                    "ApiId"
-                                ]
-                            },
-                            "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
-                        ]
-                    ]
-                },
-                "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
-                "TypeName": "Activity"
-            },
-            "DependsOn": [
-                "GraphQLAPITransformerSchema3CB2AE18"
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380": {
+      "Type": "AWS::AppSync::FunctionConfiguration",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
+        },
+        "DataSourceName": {
+          "Fn::GetAtt": [
+            "GraphQLAPINONEDS95A13CF0",
+            "Name"
+          ]
+        },
+        "FunctionVersion": "2018-05-29",
+        "Name": "ActivityTimestampDataResolverFn",
+        "RequestMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.timestamp.req.vtl"
             ]
+          ]
         },
-        "CustomResourcesjson": {
-            "Type": "AWS::CloudFormation::Stack",
-            "Properties": {
-                "Parameters": {
-                    "AppSyncApiId": {
-                        "Fn::GetAtt": [
-                            "GraphQLAPI",
-                            "ApiId"
-                        ]
-                    },
-                    "AppSyncApiName": {
-                        "Ref": "AppSyncApiName"
-                    },
-                    "env": {
-                        "Ref": "env"
-                    },
-                    "S3DeploymentBucket": {
-                        "Ref": "S3DeploymentBucket"
-                    },
-                    "S3DeploymentRootKey": {
-                        "Ref": "S3DeploymentRootKey"
-                    }
-                },
-                "TemplateURL": {
-                    "Fn::Join": [
-                        "/",
-                        [
-                            "https://s3.amazonaws.com",
-                            {
-                                "Ref": "S3DeploymentBucket"
-                            },
-                            {
-                                "Ref": "S3DeploymentRootKey"
-                            },
-                            "stacks",
-                            "CustomResources.json"
-                        ]
-                    ]
-                }
-            },
-            "DependsOn": [
-                "GraphQLAPI",
-                "GraphQLAPITransformerSchema3CB2AE18",
-                "Topic",
-                "Post",
-                "Comment",
-                "FunctionDirectiveStack",
-                "ConnectionStack"
+        "ResponseMappingTemplateS3Location": {
+          "Fn::Join": [
+            "",
+            [
+              "s3://",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              "/",
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "/resolvers/Activity.timestamp.res.vtl"
             ]
+          ]
         }
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
     },
-    "Outputs": {
-        "GraphQLAPIKeyOutput": {
-            "Description": "Your GraphQL API ID.",
-            "Value": {
-                "Fn::GetAtt": [
-                    "GraphQLAPIDefaultApiKey215A6DD7",
-                    "ApiKey"
-                ]
-            },
-            "Export": {
-                "Name": {
-                    "Fn::Join": [
-                        ":",
-                        [
-                            {
-                                "Ref": "AWS::StackName"
-                            },
-                            "GraphQLApiKey"
-                        ]
-                    ]
-                }
-            }
+    "ActivitytimestampResolver": {
+      "Type": "AWS::AppSync::Resolver",
+      "Properties": {
+        "ApiId": {
+          "Fn::GetAtt": [
+            "GraphQLAPI",
+            "ApiId"
+          ]
         },
-        "GraphQLAPIIdOutput": {
-            "Description": "Your GraphQL API ID.",
-            "Value": {
-                "Fn::GetAtt": [
-                    "GraphQLAPI",
-                    "ApiId"
-                ]
-            },
-            "Export": {
-                "Name": {
-                    "Fn::Join": [
-                        ":",
-                        [
-                            {
-                                "Ref": "AWS::StackName"
-                            },
-                            "GraphQLApiId"
-                        ]
-                    ]
-                }
+        "FieldName": "timestamp",
+        "Kind": "PIPELINE",
+        "PipelineConfig": {
+          "Functions": [
+            {
+              "Fn::GetAtt": [
+                "ActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionEF347380",
+                "FunctionId"
+              ]
             }
+          ]
         },
-        "GraphQLAPIEndpointOutput": {
-            "Description": "Your GraphQL API endpoint.",
-            "Value": {
+        "RequestMappingTemplate": {
+          "Fn::Join": [
+            "",
+            [
+              "$util.qr($ctx.stash.put(\"typeName\", \"Activity\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"timestamp\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
+              {
                 "Fn::GetAtt": [
-                    "GraphQLAPI",
-                    "GraphQLUrl"
+                  "GraphQLAPI",
+                  "ApiId"
                 ]
-            },
-            "Export": {
-                "Name": {
-                    "Fn::Join": [
-                        ":",
-                        [
-                            {
-                                "Ref": "AWS::StackName"
-                            },
-                            "GraphQLApiEndpoint"
-                        ]
-                    ]
-                }
-            }
+              },
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
+            ]
+          ]
+        },
+        "ResponseMappingTemplate": "$util.toJson($ctx.prev.result)",
+        "TypeName": "Activity"
+      },
+      "DependsOn": [
+        "GraphQLAPITransformerSchema3CB2AE18"
+      ]
+    },
+    "CustomResourcesjson": {
+      "Type": "AWS::CloudFormation::Stack",
+      "Properties": {
+        "Parameters": {
+          "AppSyncApiId": {
+            "Fn::GetAtt": [
+              "GraphQLAPI",
+              "ApiId"
+            ]
+          },
+          "AppSyncApiName": {
+            "Ref": "AppSyncApiName"
+          },
+          "env": {
+            "Ref": "env"
+          },
+          "S3DeploymentBucket": {
+            "Ref": "S3DeploymentBucket"
+          },
+          "S3DeploymentRootKey": {
+            "Ref": "S3DeploymentRootKey"
+          }
+        },
+        "TemplateURL": {
+          "Fn::Join": [
+            "/",
+            [
+              "https://s3.amazonaws.com",
+              {
+                "Ref": "S3DeploymentBucket"
+              },
+              {
+                "Ref": "S3DeploymentRootKey"
+              },
+              "stacks",
+              "CustomResources.json"
+            ]
+          ]
+        }
+      },
+      "DependsOn": [
+        "GraphQLAPI",
+        "GraphQLAPITransformerSchema3CB2AE18",
+        "Topic",
+        "Post",
+        "Comment",
+        "FunctionDirectiveStack",
+        "ConnectionStack"
+      ]
+    }
+  },
+  "Outputs": {
+    "GraphQLAPIKeyOutput": {
+      "Description": "Your GraphQL API ID.",
+      "Value": {
+        "Fn::GetAtt": [
+          "GraphQLAPIDefaultApiKey215A6DD7",
+          "ApiKey"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              "GraphQLApiKey"
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPIIdOutput": {
+      "Description": "Your GraphQL API ID.",
+      "Value": {
+        "Fn::GetAtt": [
+          "GraphQLAPI",
+          "ApiId"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              "GraphQLApiId"
+            ]
+          ]
+        }
+      }
+    },
+    "GraphQLAPIEndpointOutput": {
+      "Description": "Your GraphQL API endpoint.",
+      "Value": {
+        "Fn::GetAtt": [
+          "GraphQLAPI",
+          "GraphQLUrl"
+        ]
+      },
+      "Export": {
+        "Name": {
+          "Fn::Join": [
+            ":",
+            [
+              {
+                "Ref": "AWS::StackName"
+              },
+              "GraphQLApiEndpoint"
+            ]
+          ]
         }
+      }
     }
+  },
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json
index 4f42071a5ad..7219a2a69a5 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/parameters.json
@@ -2,6 +2,6 @@
     "AppSyncApiName": "discussions",
     "DynamoDBBillingMode": "PAY_PER_REQUEST",
     "DynamoDBEnableServerSideEncryption": false,
-    "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+    "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
     "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json
index 287bb629899..555e8d77192 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Comment.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json
index b790f8bd3e0..fc750c366eb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/ConnectionStack.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -289,7 +289,7 @@
               {
                 "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -378,7 +378,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json
index 78e0e838e59..c9369d72715 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Post.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json
index 46248478a7e..233b2a28467 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/api/discussions/build/stacks/Topic.json
@@ -503,7 +503,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -604,7 +604,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -771,7 +771,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -959,7 +959,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1111,7 +1111,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1232,7 +1232,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1278,7 +1278,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1324,7 +1324,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index c4e7e7b7bd6..3f10aeedb88 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "Amplify Cognito Stack for AWS Amplify CLI",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
index e702f6821aa..647ae86b7e0 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/api/discussions/build/cloudformation-template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1770321021
+        "Expires": 1774646388
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1062,5 +1062,5 @@
       }
     }
   },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
index 50d85ddc94f..3f10aeedb88 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/auth/discussionsc578c16ec578c16e/build/discussionsc578c16ec578c16e-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 30ad934f79d..433a496539b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -202,21 +202,21 @@
     "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
           "AppSyncApiName": "discussions",
           "DynamoDBBillingMode": "PAY_PER_REQUEST",
           "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
           "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
           "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
@@ -268,16 +268,16 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
@@ -297,16 +297,16 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
@@ -338,28 +338,28 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageactivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
         "Parameters": {
           "tableName": "activity",
           "partitionKeyName": "id",
           "partitionKeyType": "S",
           "sortKeyName": "userId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageavatars": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "Parameters": {
           "bucketName": "discus-avatars",
           "selectedGuestPermissions": "",
@@ -385,21 +385,21 @@
           "s3PermissionsAuthenticatedUploads": "s3:PutObject",
           "s3PermissionsGuestPublic": "DISALLOW",
           "s3PermissionsGuestUploads": "DISALLOW",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storagebookmarks": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "Parameters": {
           "tableName": "bookmarks",
           "partitionKeyName": "userId",
           "partitionKeyType": "S",
           "sortKeyName": "postId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index 9297a858679..e44e73d93aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 0a05f67e87a..34511d0c3c6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
index 30ad934f79d..433a496539b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
@@ -202,21 +202,21 @@
     "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
           "AppSyncApiName": "discussions",
           "DynamoDBBillingMode": "PAY_PER_REQUEST",
           "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
           "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
           "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
@@ -268,16 +268,16 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
@@ -297,16 +297,16 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
@@ -338,28 +338,28 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageactivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
         "Parameters": {
           "tableName": "activity",
           "partitionKeyName": "id",
           "partitionKeyType": "S",
           "sortKeyName": "userId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageavatars": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "Parameters": {
           "bucketName": "discus-avatars",
           "selectedGuestPermissions": "",
@@ -385,21 +385,21 @@
           "s3PermissionsAuthenticatedUploads": "s3:PutObject",
           "s3PermissionsGuestPublic": "DISALLOW",
           "s3PermissionsGuestUploads": "DISALLOW",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storagebookmarks": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "Parameters": {
           "tableName": "bookmarks",
           "partitionKeyName": "userId",
           "partitionKeyType": "S",
           "sortKeyName": "postId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
index ca188b6e7fb..17ea25a0a60 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
index 49679c245fc..81494e78af7 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/storage/avatars/build/cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
index 9297a858679..e44e73d93aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/fetchuseractivity/fetchuseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
index 0a05f67e87a..34511d0c3c6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/function/recorduseractivity/recorduseractivity-cloudformation-template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json
index 8d569a36f15..17ea25a0a60 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/activity/build/activity-cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "DDB Resource for AWS Amplify CLI",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json
index d8a77c21716..b7a3303032f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/avatars/build/cloudformation-template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "S3 Resource for AWS Amplify CLI",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
index 3a1bf18a43c..4eff10ee1dd 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/storage/bookmarks/cli-inputs.json
@@ -19,4 +19,4 @@
     }
   ],
   "triggerFunctions": []
-}
\ No newline at end of file
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
index 14344daa3c0..9908807370a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/team-provider-info.json
@@ -1,14 +1,14 @@
 {
-  "maintwo": {
+  "main": {
     "awscloudformation": {
-      "AuthRoleName": "amplify-discussions-maintwo-decb9-authRole",
-      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole",
-      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole",
+      "AuthRoleName": "amplify-discussions-main-c39a5-authRole",
+      "UnauthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole",
+      "AuthRoleArn": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole",
       "Region": "us-east-1",
-      "DeploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
-      "UnauthRoleName": "amplify-discussions-maintwo-decb9-unauthRole",
-      "StackName": "amplify-discussions-maintwo-decb9",
-      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
+      "DeploymentBucketName": "amplify-discussions-main-c39a5-deployment",
+      "UnauthRoleName": "amplify-discussions-main-c39a5-unauthRole",
+      "StackName": "amplify-discussions-main-c39a5",
+      "StackId": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-c39a5/0e9a6f60-24a2-11f1-8462-0afffd2fb801",
       "AmplifyAppId": "discussions"
     },
     "categories": {
@@ -17,11 +17,11 @@
       },
       "function": {
         "fetchuseractivity": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip"
         },
         "recorduseractivity": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip"
         },
         "activity": {},
@@ -37,4 +37,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.outputs.json
new file mode 100644
index 00000000000..7601f2d4846
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.outputs.json
@@ -0,0 +1,6 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent7EFC42D0Arn",
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-7KlxeduafKru"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.parameters.json
new file mode 100644
index 00000000000..0e9d9ecff8c
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "ParameterValue": "33zwnmmin5anviw7lh6x2wxanq"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.template.json
similarity index 78%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.template.json
index f9c9aad3aef..2969c16bed4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataAmplifyTableManagerNestedStackA-1G8UPOF56UCBP.template.json
@@ -48,17 +48,43 @@
                     "dynamodb:ListTagsOfResource"
                   ],
                   "Effect": "Allow",
-                  "Resource": {
-                    "Fn::Sub": [
-                      "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
-                      {
-                        "apiId": {
-                          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                        },
-                        "envName": "NONE"
-                      }
-                    ]
-                  }
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
+                        {
+                          "apiId": {
+                            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
+                          },
+                          "envName": "NONE"
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
+                        {
+                          "tableName": "Topic-u3jn2qbupzbyhc3h53673wdvim-main"
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
+                        {
+                          "tableName": "Post-u3jn2qbupzbyhc3h53673wdvim-main"
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
+                        {
+                          "tableName": "Comment-u3jn2qbupzbyhc3h53673wdvim-main"
+                        }
+                      ]
+                    }
+                  ]
                 },
                 {
                   "Action": "lambda:ListTags",
@@ -83,7 +109,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -100,7 +126,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/AmplifyManagedTableIsCompleteRole/Resource"
       }
     },
     "AmplifyManagedTableOnEventRoleB4E71DEA": {
@@ -151,17 +177,43 @@
                     "dynamodb:ListTagsOfResource"
                   ],
                   "Effect": "Allow",
-                  "Resource": {
-                    "Fn::Sub": [
-                      "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
-                      {
-                        "apiId": {
-                          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                        },
-                        "envName": "NONE"
-                      }
-                    ]
-                  }
+                  "Resource": [
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/*-${apiId}-${envName}",
+                        {
+                          "apiId": {
+                            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
+                          },
+                          "envName": "NONE"
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
+                        {
+                          "tableName": "Topic-u3jn2qbupzbyhc3h53673wdvim-main"
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
+                        {
+                          "tableName": "Post-u3jn2qbupzbyhc3h53673wdvim-main"
+                        }
+                      ]
+                    },
+                    {
+                      "Fn::Sub": [
+                        "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}",
+                        {
+                          "tableName": "Comment-u3jn2qbupzbyhc3h53673wdvim-main"
+                        }
+                      ]
+                    }
+                  ]
                 },
                 {
                   "Action": "lambda:ListTags",
@@ -186,7 +238,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -203,7 +255,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/Resource"
       }
     },
     "AmplifyManagedTableOnEventRoleDefaultPolicyF6DABCB6": {
@@ -229,7 +281,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/AmplifyManagedTableOnEventRole/DefaultPolicy/Resource"
       }
     },
     "TableManagerCustomProviderframeworkonEvent1DFC2ECC": {
@@ -241,7 +293,7 @@
           },
           "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
         },
-        "Description": "AmplifyManagedTable - onEvent (amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Description": "AmplifyManagedTable - onEvent (amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
         "Environment": {
           "Variables": {
             "WAITER_STATE_MACHINE_ARN": {
@@ -264,7 +316,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -286,7 +338,7 @@
         "AmplifyManagedTableOnEventRoleB4E71DEA"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-onEvent/Resource",
         "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -301,7 +353,7 @@
           },
           "S3Key": "f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6.zip"
         },
-        "Description": "AmplifyManagedTable - isComplete (amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
+        "Description": "AmplifyManagedTable - isComplete (amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider)",
         "Handler": "amplify-table-manager-handler.isComplete",
         "Role": {
           "Fn::GetAtt": [
@@ -317,7 +369,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -338,7 +390,7 @@
         "AmplifyManagedTableIsCompleteRoleF825222C"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/TableManagerCustomProvider/framework-isComplete/Resource",
         "aws:asset:path": "asset.f2c5bec0e463cae18d0bf683be5923ae6bd676a06af1a994bdfa076a66ac07d6",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -366,7 +418,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -383,7 +435,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/Resource"
       }
     },
     "AmplifyTableWaiterStateMachineRoleDefaultPolicy89F3836A": {
@@ -428,7 +480,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Role/DefaultPolicy/Resource"
       }
     },
     "AmplifyTableWaiterStateMachine060600BC": {
@@ -461,7 +513,7 @@
         "AmplifyTableWaiterStateMachineRole470BE899"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/AmplifyTableWaiterStateMachine/Resource"
       }
     },
     "CDKMetadata": {
@@ -470,7 +522,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/zWNQQ6CMBBFz8K+jAgs3IqJS2PgAGRoR1IobcIUiWl6dwPo6r2ft/g55GUJWYIrp1KNqdEdhAexJ9V4lKPAldugcYJQO0Pi9rI7n85o+dnmYVEYnDqFEO6LlV47u7W/R8FFi8zkGa4bBBdQLXIkXyFTFDWxW2ZJYq+Nx17bfj/7hSisUwQDn955DucLZMnAWqfzYr2eCOqDX96JKODPAAAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -742,12 +794,12 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent7EFC42D0Arn": {
       "Value": {
         "Fn::GetAtt": [
           "TableManagerCustomProviderframeworkonEvent1DFC2ECC",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.outputs.json
new file mode 100644
index 00000000000..f42ce2f2133
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "GetAttCommentTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.630",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "33zwnmmin5anviw7lh6x2wxanq:GetAtt:CommentTable:StreamArn"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.630"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main"
+  },
+  {
+    "OutputKey": "GetAttCommentTableName",
+    "OutputValue": "Comment-u3jn2qbupzbyhc3h53673wdvim-main",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "33zwnmmin5anviw7lh6x2wxanq:GetAtt:CommentTable:Name"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name",
+    "OutputValue": "CommentTable"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.parameters.json
new file mode 100644
index 00000000000..edd12e2f741
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "ParameterValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "ParameterValue": "33zwnmmin5anviw7lh6x2wxanq"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-7KlxeduafKru"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName",
+    "ParameterValue": "NONE_DS"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.template.json
index 9e30da1fe26..bb7448171e8 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataCommentNestedStackCommentNested-222WVXGP4U1I.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Type": "String"
     }
   },
@@ -350,23 +350,12 @@
   },
   "Resources": {
     "CommentTable": {
-      "Type": "Custom::AmplifyDynamoDBTable",
+      "Type": "Custom::ImportedAmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6"
-        },
-        "tableName": {
-          "Fn::Join": [
-            "",
-            [
-              "Comment-",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-              },
-              "-NONE"
-            ]
-          ]
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112"
         },
+        "tableName": "Comment-u3jn2qbupzbyhc3h53673wdvim-main",
         "attributeDefinitions": [
           {
             "attributeName": "id",
@@ -396,20 +385,12 @@
               "projectionType": "ALL"
             },
             "provisionedThroughput": {
-              "Fn::If": [
-                "ShouldUsePayPerRequestBilling",
-                {
-                  "Ref": "AWS::NoValue"
-                },
-                {
-                  "ReadCapacityUnits": {
-                    "Ref": "DynamoDBModelTableReadIOPS"
-                  },
-                  "WriteCapacityUnits": {
-                    "Ref": "DynamoDBModelTableWriteIOPS"
-                  }
-                }
-              ]
+              "readCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "writeCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
             }
           }
         ],
@@ -435,9 +416,10 @@
         "streamSpecification": {
           "streamViewType": "NEW_AND_OLD_IMAGES"
         },
-        "deletionProtectionEnabled": false,
+        "deletionProtectionEnabled": true,
         "allowDestructiveGraphqlSchemaUpdates": true,
         "replaceTableUponGsiUpdate": false,
+        "isImported": true,
         "pointInTimeRecoverySpecification": {
           "Fn::If": [
             "ShouldUsePointInTimeRecovery",
@@ -459,10 +441,10 @@
           ]
         }
       },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CommentTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/CommentTable/Default/Default"
       }
     },
     "CommentIAMRoleD5EC5F51": {
@@ -505,18 +487,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
                         {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Comment-",
-                                {
-                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                                },
-                                "-NONE"
-                              ]
-                            ]
-                          }
+                          "tablename": "Comment-u3jn2qbupzbyhc3h53673wdvim-main"
                         }
                       ]
                     },
@@ -524,18 +495,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
                         {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Comment-",
-                                {
-                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                                },
-                                "-NONE"
-                              ]
-                            ]
-                          }
+                          "tablename": "Comment-u3jn2qbupzbyhc3h53673wdvim-main"
                         }
                       ]
                     }
@@ -553,7 +513,7 @@
             [
               "CommentIAMRole20388d-",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "-NONE"
             ]
@@ -566,7 +526,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -583,14 +543,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CommentIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/CommentIAMRole/Resource"
       }
     },
     "CommentDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -636,17 +596,17 @@
         "CommentIAMRoleD5EC5F51"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CommentDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/CommentDataSource/Resource"
       }
     },
     "QuerygetCommentauth0FunctionQuerygetCommentauth0FunctionAppSyncFunction4992FD06": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetCommentauth0Function",
@@ -656,17 +616,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/QuerygetCommentauth0Function/QuerygetCommentauth0Function.AppSyncFunction"
       }
     },
     "QuerygetCommentpostAuth0FunctionQuerygetCommentpostAuth0FunctionAppSyncFunction27405A71": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetCommentpostAuth0Function",
@@ -676,14 +636,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/QuerygetCommentpostAuth0Function/QuerygetCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetCommentDataResolverFnQueryGetCommentDataResolverFnAppSyncFunction8473E2B0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -704,14 +664,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/QueryGetCommentDataResolverFn/QueryGetCommentDataResolverFn.AppSyncFunction"
       }
     },
     "GetCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "getComment",
         "Kind": "PIPELINE",
@@ -743,7 +703,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -782,7 +742,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -794,11 +754,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -808,17 +768,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/queryGetCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/queryGetCommentResolver"
       }
     },
     "QuerylistCommentsauth0FunctionQuerylistCommentsauth0FunctionAppSyncFunctionC7B0414F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistCommentsauth0Function",
@@ -828,17 +788,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/QuerylistCommentsauth0Function/QuerylistCommentsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistCommentspostAuth0FunctionQuerylistCommentspostAuth0FunctionAppSyncFunctionEDC68EF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistCommentspostAuth0Function",
@@ -848,14 +808,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/QuerylistCommentspostAuth0Function/QuerylistCommentspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListCommentsDataResolverFnQueryListCommentsDataResolverFnAppSyncFunction474D4A91": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -876,14 +836,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/QueryListCommentsDataResolverFn/QueryListCommentsDataResolverFn.AppSyncFunction"
       }
     },
     "ListCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "listComments",
         "Kind": "PIPELINE",
@@ -915,7 +875,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listComments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -954,7 +914,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -966,11 +926,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -980,17 +940,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/queryListCommentsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/queryListCommentsResolver"
       }
     },
     "MutationcreateCommentinit0FunctionMutationcreateCommentinit0FunctionAppSyncFunction77870FAC": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentinit0Function",
@@ -1000,17 +960,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationcreateCommentinit0Function/MutationcreateCommentinit0Function.AppSyncFunction"
       }
     },
     "MutationcreateCommentauth0FunctionMutationcreateCommentauth0FunctionAppSyncFunctionE6EA011A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentauth0Function",
@@ -1020,17 +980,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationcreateCommentauth0Function/MutationcreateCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationcreateCommentpostAuth0FunctionMutationcreateCommentpostAuth0FunctionAppSyncFunction4F8AA7FF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateCommentpostAuth0Function",
@@ -1040,14 +1000,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationcreateCommentpostAuth0Function/MutationcreateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreateCommentDataResolverFnMutationCreateCommentDataResolverFnAppSyncFunctionD019FFE0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1068,14 +1028,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationCreateCommentDataResolverFn/MutationCreateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "CreateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "createComment",
         "Kind": "PIPELINE",
@@ -1113,7 +1073,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1152,7 +1112,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1164,11 +1124,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1178,17 +1138,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/mutationCreateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/mutationCreateCommentResolver"
       }
     },
     "MutationupdateCommentinit0FunctionMutationupdateCommentinit0FunctionAppSyncFunction9C9EFBAD": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateCommentinit0Function",
@@ -1198,14 +1158,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationupdateCommentinit0Function/MutationupdateCommentinit0Function.AppSyncFunction"
       }
     },
     "MutationupdateCommentauth0FunctionMutationupdateCommentauth0FunctionAppSyncFunction4E4C7C30": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1226,17 +1186,17 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationupdateCommentauth0Function/MutationupdateCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationupdateCommentpostAuth0FunctionMutationupdateCommentpostAuth0FunctionAppSyncFunctionCDD716F2": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateCommentpostAuth0Function",
@@ -1246,14 +1206,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationupdateCommentpostAuth0Function/MutationupdateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdateCommentDataResolverFnMutationUpdateCommentDataResolverFnAppSyncFunctionB47372B5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1274,14 +1234,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationUpdateCommentDataResolverFn/MutationUpdateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "UpdateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "updateComment",
         "Kind": "PIPELINE",
@@ -1319,7 +1279,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1358,7 +1318,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1370,11 +1330,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1384,14 +1344,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/mutationUpdateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/mutationUpdateCommentResolver"
       }
     },
     "MutationdeleteCommentauth0FunctionMutationdeleteCommentauth0FunctionAppSyncFunction268B298A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1412,17 +1372,17 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationdeleteCommentauth0Function/MutationdeleteCommentauth0Function.AppSyncFunction"
       }
     },
     "MutationdeleteCommentpostAuth0FunctionMutationdeleteCommentpostAuth0FunctionAppSyncFunctionDFFD097E": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteCommentpostAuth0Function",
@@ -1432,14 +1392,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationdeleteCommentpostAuth0Function/MutationdeleteCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeleteCommentDataResolverFnMutationDeleteCommentDataResolverFnAppSyncFunctionD661C8CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1460,14 +1420,14 @@
         "CommentDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/MutationDeleteCommentDataResolverFn/MutationDeleteCommentDataResolverFn.AppSyncFunction"
       }
     },
     "DeleteCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "deleteComment",
         "Kind": "PIPELINE",
@@ -1499,7 +1459,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1538,7 +1498,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1550,11 +1510,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1564,17 +1524,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/mutationDeleteCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/mutationDeleteCommentResolver"
       }
     },
     "SubscriptiononCreateCommentauth0FunctionSubscriptiononCreateCommentauth0FunctionAppSyncFunction883537CC": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateCommentauth0Function",
@@ -1584,17 +1544,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptiononCreateCommentauth0Function/SubscriptiononCreateCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreateCommentpostAuth0FunctionSubscriptiononCreateCommentpostAuth0FunctionAppSyncFunction34E6A73D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateCommentpostAuth0Function",
@@ -1604,17 +1564,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptiononCreateCommentpostAuth0Function/SubscriptiononCreateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreateCommentDataResolverFnSubscriptionOnCreateCommentDataResolverFnAppSyncFunction72E30EF8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateCommentDataResolverFn",
@@ -1626,14 +1586,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptionOnCreateCommentDataResolverFn/SubscriptionOnCreateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onCreateComment",
         "Kind": "PIPELINE",
@@ -1665,7 +1625,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1677,7 +1637,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1689,11 +1649,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1703,17 +1663,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/subscriptionOnCreateCommentResolver"
       }
     },
     "SubscriptiononUpdateCommentauth0FunctionSubscriptiononUpdateCommentauth0FunctionAppSyncFunction6F76395C": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateCommentauth0Function",
@@ -1723,17 +1683,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptiononUpdateCommentauth0Function/SubscriptiononUpdateCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateCommentpostAuth0FunctionSubscriptiononUpdateCommentpostAuth0FunctionAppSyncFunction0EF93814": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateCommentpostAuth0Function",
@@ -1743,17 +1703,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptiononUpdateCommentpostAuth0Function/SubscriptiononUpdateCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdateCommentDataResolverFnSubscriptionOnUpdateCommentDataResolverFnAppSyncFunction6B18681F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateCommentDataResolverFn",
@@ -1765,14 +1725,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptionOnUpdateCommentDataResolverFn/SubscriptionOnUpdateCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onUpdateComment",
         "Kind": "PIPELINE",
@@ -1804,7 +1764,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1816,7 +1776,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1828,11 +1788,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1842,17 +1802,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/subscriptionOnUpdateCommentResolver"
       }
     },
     "SubscriptiononDeleteCommentauth0FunctionSubscriptiononDeleteCommentauth0FunctionAppSyncFunctionA85E4D19": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteCommentauth0Function",
@@ -1862,17 +1822,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptiononDeleteCommentauth0Function/SubscriptiononDeleteCommentauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteCommentpostAuth0FunctionSubscriptiononDeleteCommentpostAuth0FunctionAppSyncFunction67A1094D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteCommentpostAuth0Function",
@@ -1882,17 +1842,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptiononDeleteCommentpostAuth0Function/SubscriptiononDeleteCommentpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeleteCommentDataResolverFnSubscriptionOnDeleteCommentDataResolverFnAppSyncFunctionB17CE9F9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteCommentDataResolverFn",
@@ -1904,14 +1864,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/SubscriptionOnDeleteCommentDataResolverFn/SubscriptionOnDeleteCommentDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteCommentResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onDeleteComment",
         "Kind": "PIPELINE",
@@ -1943,7 +1903,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteComment\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1955,7 +1915,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1967,11 +1927,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1981,7 +1941,7 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/subscriptionOnDeleteCommentResolver"
       }
     },
     "CDKMetadata": {
@@ -1990,7 +1950,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X31OtoD7uuoB63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyA7HGC3wZtsreu2va9h+iBRcpWi7Uze8BdGHEgpLpAHdl59YFOShBQtmTyJhuEPG37OeJPz5O6MQ3A1fGPd0xGFjMcBpjL0Dzv0NBscR7mzhalY9aIuULF6nvxPp8R2KZEHbnybIq6Nfj/3V4qzkf0ZRUgF3pcwsodjsh3pUmBe3M+kY1KzrivF1nM7Gw6O4CIv1yyD1zfYbS7i/TYmVj8QlI/8AVayTVs2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -2010,7 +1970,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "GetAtt:CommentTable:StreamArn"
             ]
@@ -2020,25 +1980,14 @@
     },
     "GetAttCommentTableName": {
       "Description": "Your DynamoDB table name.",
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "Comment-",
-            {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-            },
-            "-NONE"
-          ]
-        ]
-      },
+      "Value": "Comment-u3jn2qbupzbyhc3h53673wdvim-main",
       "Export": {
         "Name": {
           "Fn::Join": [
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "GetAtt:CommentTable:Name"
             ]
@@ -2046,7 +1995,7 @@
         }
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name": {
       "Value": {
         "Fn::GetAtt": [
           "CommentDataSource",
@@ -2054,7 +2003,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn": {
       "Value": {
         "Fn::GetAtt": [
           "CommentTable",
@@ -2062,7 +2011,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "CommentTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.parameters.json
new file mode 100644
index 00000000000..bd69ee2226d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "ParameterValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName",
+    "ParameterValue": "TopicTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "ParameterValue": "33zwnmmin5anviw7lh6x2wxanq"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name",
+    "ParameterValue": "CommentTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name",
+    "ParameterValue": "PostTable"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName",
+    "ParameterValue": "NONE_DS"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.template.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.template.json
index 718b5346d76..9b2db466b44 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataConnectionStackNestedStackConne-PQO5GNBUSDH0.template.json
@@ -4,10 +4,10 @@
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Topicpostsauth0Function",
@@ -17,17 +17,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/Topicpostsauth0Function/Topicpostsauth0Function.AppSyncFunction"
       }
     },
     "TopicPostsDataResolverFnTopicPostsDataResolverFnAppSyncFunctionBB79629F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "TopicPostsDataResolverFn",
@@ -39,14 +39,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/TopicPostsDataResolverFn/TopicPostsDataResolverFn.AppSyncFunction"
       }
     },
     "TopicpostsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "posts",
         "Kind": "PIPELINE",
@@ -72,7 +72,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Topic\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"posts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -88,7 +88,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn"
                               }
                             ]
                           }
@@ -108,7 +108,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -120,11 +120,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -134,17 +134,17 @@
         "TypeName": "Topic"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/topicPostsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/topicPostsResolver"
       }
     },
     "Postcommentsauth0FunctionPostcommentsauth0FunctionAppSyncFunction0DA41083": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Postcommentsauth0Function",
@@ -154,17 +154,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/Postcommentsauth0Function/Postcommentsauth0Function.AppSyncFunction"
       }
     },
     "PostCommentsDataResolverFnPostCommentsDataResolverFnAppSyncFunction87EBA9A8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "PostCommentsDataResolverFn",
@@ -176,14 +176,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/PostCommentsDataResolverFn/PostCommentsDataResolverFn.AppSyncFunction"
       }
     },
     "PostcommentsResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "comments",
         "Kind": "PIPELINE",
@@ -209,7 +209,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"comments\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -225,7 +225,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn"
                               }
                             ]
                           }
@@ -245,7 +245,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -257,11 +257,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -271,17 +271,17 @@
         "TypeName": "Post"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/postCommentsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/postCommentsResolver"
       }
     },
     "Posttopicauth0FunctionPosttopicauth0FunctionAppSyncFunctionFCD7294D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Posttopicauth0Function",
@@ -291,17 +291,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/Posttopicauth0Function/Posttopicauth0Function.AppSyncFunction"
       }
     },
     "PostTopicDataResolverFnPostTopicDataResolverFnAppSyncFunctionEF6EA503": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "PostTopicDataResolverFn",
@@ -313,14 +313,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/PostTopicDataResolverFn/PostTopicDataResolverFn.AppSyncFunction"
       }
     },
     "PosttopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "topic",
         "Kind": "PIPELINE",
@@ -346,7 +346,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Post\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"topic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -362,7 +362,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn"
                               }
                             ]
                           }
@@ -382,7 +382,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -394,11 +394,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -408,17 +408,17 @@
         "TypeName": "Post"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/postTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/postTopicResolver"
       }
     },
     "Commentpostauth0FunctionCommentpostauth0FunctionAppSyncFunction99E13BF9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "Commentpostauth0Function",
@@ -428,17 +428,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/Commentpostauth0Function/Commentpostauth0Function.AppSyncFunction"
       }
     },
     "CommentPostDataResolverFnCommentPostDataResolverFnAppSyncFunction20ABACCE": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "CommentPostDataResolverFn",
@@ -450,14 +450,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/CommentPostDataResolverFn/CommentPostDataResolverFn.AppSyncFunction"
       }
     },
     "CommentpostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "post",
         "Kind": "PIPELINE",
@@ -483,7 +483,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Comment\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"post\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -499,7 +499,7 @@
                             "Fn::Split": [
                               ":",
                               {
-                                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn"
+                                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn"
                               }
                             ]
                           }
@@ -519,7 +519,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -531,11 +531,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -545,7 +545,7 @@
         "TypeName": "Comment"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/commentPostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/commentPostResolver"
       }
     },
     "CDKMetadata": {
@@ -554,7 +554,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXMsQ6CMBCA4WdhLycWBlchcXSAByBnOUgBr6TXQgzh3Q06ffmXX4MuCsgS3CQ13ZTO9gX7kyRQ1wQ0k8JN2l3yFkUoCNxPlORQRjNRKFFI4bLIhw3sVc+PyCZYx5Xj3g7R4xmq6rkmcfNK/jjU79EEHCwPh2LXEYxyWbWG6w2yZBRrUx852DdB/fcLf5ddvqcAAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -826,37 +826,37 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.parameters.json
new file mode 100644
index 00000000000..404c0f6de05
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.parameters.json
@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "ParameterValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "ParameterValue": "33zwnmmin5anviw7lh6x2wxanq"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName",
+    "ParameterValue": "NONE_DS"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.template.json
similarity index 73%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.template.json
index 9dd0b71ebb9..5b1ef3df34b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataFunctionDirectiveStackNestedSta-BHA8YE0S9OYY.template.json
@@ -278,7 +278,7 @@
     }
   },
   "Resources": {
-    "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRole9F9579C6": {
+    "FetchuseractivityGen2MainLambdaDataSourceServiceRole4C155E48": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -300,7 +300,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -317,10 +317,10 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MaintwoLambdaDataSource/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MainLambdaDataSource/ServiceRole/Resource"
       }
     },
-    "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRoleDefaultPolicy29E9C4B2": {
+    "FetchuseractivityGen2MainLambdaDataSourceServiceRoleDefaultPolicyD13BD55D": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -334,12 +334,12 @@
                     "HasEnvironmentParameter",
                     {
                       "Fn::Sub": [
-                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo",
+                        "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main",
                         {}
                       ]
                     },
                     {
-                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo"
+                      "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main"
                     }
                   ]
                 },
@@ -352,12 +352,12 @@
                           "HasEnvironmentParameter",
                           {
                             "Fn::Sub": [
-                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo",
+                              "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main",
                               {}
                             ]
                           },
                           {
-                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo"
+                            "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main"
                           }
                         ]
                       },
@@ -370,22 +370,22 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRoleDefaultPolicy29E9C4B2",
+        "PolicyName": "FetchuseractivityGen2MainLambdaDataSourceServiceRoleDefaultPolicyD13BD55D",
         "Roles": [
           {
-            "Ref": "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRole9F9579C6"
+            "Ref": "FetchuseractivityGen2MainLambdaDataSourceServiceRole4C155E48"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MaintwoLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MainLambdaDataSource/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "FetchuseractivityGen2MaintwoLambdaDataSource": {
+    "FetchuseractivityGen2MainLambdaDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "LambdaConfig": {
           "LambdaFunctionArn": {
@@ -393,62 +393,62 @@
               "HasEnvironmentParameter",
               {
                 "Fn::Sub": [
-                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo",
+                  "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main",
                   {}
                 ]
               },
               {
-                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-maintwo"
+                "Fn::Sub": "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:fetchuseractivity-gen2-main"
               }
             ]
           }
         },
-        "Name": "FetchuseractivityGen2MaintwoLambdaDataSource",
+        "Name": "FetchuseractivityGen2MainLambdaDataSource",
         "ServiceRoleArn": {
           "Fn::GetAtt": [
-            "FetchuseractivityGen2MaintwoLambdaDataSourceServiceRole9F9579C6",
+            "FetchuseractivityGen2MainLambdaDataSourceServiceRole4C155E48",
             "Arn"
           ]
         },
         "Type": "AWS_LAMBDA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MaintwoLambdaDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/FetchuseractivityGen2MainLambdaDataSource/Resource"
       }
     },
-    "InvokeFetchuseractivityGen2MaintwoLambdaDataSourceInvokeFetchuseractivityGen2MaintwoLambdaDataSourceAppSyncFunction267586CB": {
+    "InvokeFetchuseractivityGen2MainLambdaDataSourceInvokeFetchuseractivityGen2MainLambdaDataSourceAppSyncFunctionA6277669": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
-            "FetchuseractivityGen2MaintwoLambdaDataSource",
+            "FetchuseractivityGen2MainLambdaDataSource",
             "Name"
           ]
         },
         "FunctionVersion": "2018-05-29",
-        "Name": "InvokeFetchuseractivityGen2MaintwoLambdaDataSource",
+        "Name": "InvokeFetchuseractivityGen2MainLambdaDataSource",
         "RequestMappingTemplateS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/229003a6c44b2e47d16c4b451a515cc342fcad68ed9806b4fec866cf9b64e95e.vtl"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fe1fde42ccef15458dbd92a2a8585717ca41949d9a24f6e018c70d3b404315ee.vtl"
         },
         "ResponseMappingTemplateS3Location": {
           "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a20e304512b1fde77dc16ed9d5e0ed03817afcab629ce87ef11c99877b7b1e30.vtl"
         }
       },
       "DependsOn": [
-        "FetchuseractivityGen2MaintwoLambdaDataSource"
+        "FetchuseractivityGen2MainLambdaDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityGen2MaintwoLambdaDataSource/InvokeFetchuseractivityGen2MaintwoLambdaDataSource.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/InvokeFetchuseractivityGen2MainLambdaDataSource/InvokeFetchuseractivityGen2MainLambdaDataSource.AppSyncFunction"
       }
     },
     "QueryfetchUserActivityResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "fetchUserActivity",
         "Kind": "PIPELINE",
@@ -462,7 +462,7 @@
             },
             {
               "Fn::GetAtt": [
-                "InvokeFetchuseractivityGen2MaintwoLambdaDataSourceInvokeFetchuseractivityGen2MaintwoLambdaDataSourceAppSyncFunction267586CB",
+                "InvokeFetchuseractivityGen2MainLambdaDataSourceInvokeFetchuseractivityGen2MainLambdaDataSourceAppSyncFunctionA6277669",
                 "FunctionId"
               ]
             }
@@ -478,7 +478,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:aws:sts::",
               {
@@ -486,11 +486,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n{}\n## [End] Stash resolver specific context.. **"
             ]
@@ -502,17 +502,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/queryFetchUserActivityResolver"
       }
     },
     "QueryFetchUserActivityAuthFNQueryFetchUserActivityAuthFNAppSyncFunctionC061F612": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QueryFetchUserActivityAuthFN",
@@ -522,7 +522,7 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/QueryFetchUserActivityAuthFN/QueryFetchUserActivityAuthFN.AppSyncFunction"
       }
     },
     "CDKMetadata": {
@@ -531,25 +531,25 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOQW/CMAyFfwv31GOFA9fRaadpmtofgEziVqapg+oEhKr+d5SgHXb6/J79nlxDvd/DdoN3rawbK89nWH5II7kuoh1N00sTxHHkIAbvelo8TmeH8JXEZvOISgavV32IheW7LD8xYhfSbCnn/6u/XBOk5yHNWJqbXlrS4G80r4ZxgqUNvtwX/gbP9pHla1qN7k6oSlHhI8PoDo7JjhTzP6spZhdxYBlWI8ERXPTtVtfwfoDt5qLM1Zwk8kTQvvgEeF2aIQsBAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
       "Type": "String"
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.outputs.json
new file mode 100644
index 00000000000..c01f5a639d0
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.591"
+  },
+  {
+    "OutputKey": "GetAttPostTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.591",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "33zwnmmin5anviw7lh6x2wxanq:GetAtt:PostTable:StreamArn"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name",
+    "OutputValue": "PostTable"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main"
+  },
+  {
+    "OutputKey": "GetAttPostTableName",
+    "OutputValue": "Post-u3jn2qbupzbyhc3h53673wdvim-main",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "33zwnmmin5anviw7lh6x2wxanq:GetAtt:PostTable:Name"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.parameters.json
new file mode 100644
index 00000000000..edd12e2f741
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "ParameterValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "ParameterValue": "33zwnmmin5anviw7lh6x2wxanq"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-7KlxeduafKru"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName",
+    "ParameterValue": "NONE_DS"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.template.json
index 922a665ff72..c5cf9c8fd11 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataPostNestedStackPostNestedStackR-19TBN9UY0LSCB.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Type": "String"
     }
   },
@@ -350,23 +350,12 @@
   },
   "Resources": {
     "PostTable": {
-      "Type": "Custom::AmplifyDynamoDBTable",
+      "Type": "Custom::ImportedAmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6"
-        },
-        "tableName": {
-          "Fn::Join": [
-            "",
-            [
-              "Post-",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-              },
-              "-NONE"
-            ]
-          ]
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112"
         },
+        "tableName": "Post-u3jn2qbupzbyhc3h53673wdvim-main",
         "attributeDefinitions": [
           {
             "attributeName": "id",
@@ -396,20 +385,12 @@
               "projectionType": "ALL"
             },
             "provisionedThroughput": {
-              "Fn::If": [
-                "ShouldUsePayPerRequestBilling",
-                {
-                  "Ref": "AWS::NoValue"
-                },
-                {
-                  "ReadCapacityUnits": {
-                    "Ref": "DynamoDBModelTableReadIOPS"
-                  },
-                  "WriteCapacityUnits": {
-                    "Ref": "DynamoDBModelTableWriteIOPS"
-                  }
-                }
-              ]
+              "readCapacityUnits": {
+                "Ref": "DynamoDBModelTableReadIOPS"
+              },
+              "writeCapacityUnits": {
+                "Ref": "DynamoDBModelTableWriteIOPS"
+              }
             }
           }
         ],
@@ -435,9 +416,10 @@
         "streamSpecification": {
           "streamViewType": "NEW_AND_OLD_IMAGES"
         },
-        "deletionProtectionEnabled": false,
+        "deletionProtectionEnabled": true,
         "allowDestructiveGraphqlSchemaUpdates": true,
         "replaceTableUponGsiUpdate": false,
+        "isImported": true,
         "pointInTimeRecoverySpecification": {
           "Fn::If": [
             "ShouldUsePointInTimeRecovery",
@@ -459,10 +441,10 @@
           ]
         }
       },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/PostTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/PostTable/Default/Default"
       }
     },
     "PostIAMRole83BF708F": {
@@ -505,18 +487,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
                         {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Post-",
-                                {
-                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                                },
-                                "-NONE"
-                              ]
-                            ]
-                          }
+                          "tablename": "Post-u3jn2qbupzbyhc3h53673wdvim-main"
                         }
                       ]
                     },
@@ -524,18 +495,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
                         {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Post-",
-                                {
-                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                                },
-                                "-NONE"
-                              ]
-                            ]
-                          }
+                          "tablename": "Post-u3jn2qbupzbyhc3h53673wdvim-main"
                         }
                       ]
                     }
@@ -553,7 +513,7 @@
             [
               "PostIAMRolebbce9b-",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "-NONE"
             ]
@@ -566,7 +526,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -583,14 +543,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/PostIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/PostIAMRole/Resource"
       }
     },
     "PostDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -636,17 +596,17 @@
         "PostIAMRole83BF708F"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/PostDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/PostDataSource/Resource"
       }
     },
     "QuerygetPostauth0FunctionQuerygetPostauth0FunctionAppSyncFunctionB1D588DF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetPostauth0Function",
@@ -656,17 +616,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/QuerygetPostauth0Function/QuerygetPostauth0Function.AppSyncFunction"
       }
     },
     "QuerygetPostpostAuth0FunctionQuerygetPostpostAuth0FunctionAppSyncFunctionC72E5C0F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetPostpostAuth0Function",
@@ -676,14 +636,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/QuerygetPostpostAuth0Function/QuerygetPostpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetPostDataResolverFnQueryGetPostDataResolverFnAppSyncFunction06724190": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -704,14 +664,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/QueryGetPostDataResolverFn/QueryGetPostDataResolverFn.AppSyncFunction"
       }
     },
     "GetPostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "getPost",
         "Kind": "PIPELINE",
@@ -743,7 +703,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -782,7 +742,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -794,11 +754,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -808,17 +768,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/queryGetPostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/queryGetPostResolver"
       }
     },
     "QuerylistPostsauth0FunctionQuerylistPostsauth0FunctionAppSyncFunctionCDCF8956": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistPostsauth0Function",
@@ -828,17 +788,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/QuerylistPostsauth0Function/QuerylistPostsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistPostspostAuth0FunctionQuerylistPostspostAuth0FunctionAppSyncFunction3585C8F4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistPostspostAuth0Function",
@@ -848,14 +808,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/QuerylistPostspostAuth0Function/QuerylistPostspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListPostsDataResolverFnQueryListPostsDataResolverFnAppSyncFunction3D526AB7": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -876,14 +836,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/QueryListPostsDataResolverFn/QueryListPostsDataResolverFn.AppSyncFunction"
       }
     },
     "ListPostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "listPosts",
         "Kind": "PIPELINE",
@@ -915,7 +875,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listPosts\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -954,7 +914,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -966,11 +926,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -980,17 +940,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/queryListPostsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/queryListPostsResolver"
       }
     },
     "MutationcreatePostinit0FunctionMutationcreatePostinit0FunctionAppSyncFunction9E444A7F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostinit0Function",
@@ -1000,17 +960,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationcreatePostinit0Function/MutationcreatePostinit0Function.AppSyncFunction"
       }
     },
     "MutationcreatePostauth0FunctionMutationcreatePostauth0FunctionAppSyncFunctionF347AB28": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostauth0Function",
@@ -1020,17 +980,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationcreatePostauth0Function/MutationcreatePostauth0Function.AppSyncFunction"
       }
     },
     "MutationcreatePostpostAuth0FunctionMutationcreatePostpostAuth0FunctionAppSyncFunction2C708069": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreatePostpostAuth0Function",
@@ -1040,14 +1000,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationcreatePostpostAuth0Function/MutationcreatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreatePostDataResolverFnMutationCreatePostDataResolverFnAppSyncFunctionE45E2000": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1068,14 +1028,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationCreatePostDataResolverFn/MutationCreatePostDataResolverFn.AppSyncFunction"
       }
     },
     "CreatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "createPost",
         "Kind": "PIPELINE",
@@ -1113,7 +1073,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createPost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1152,7 +1112,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1164,11 +1124,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1178,17 +1138,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/mutationCreatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/mutationCreatePostResolver"
       }
     },
     "MutationupdatePostinit0FunctionMutationupdatePostinit0FunctionAppSyncFunctionBAC7D532": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdatePostinit0Function",
@@ -1198,14 +1158,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationupdatePostinit0Function/MutationupdatePostinit0Function.AppSyncFunction"
       }
     },
     "MutationupdatePostauth0FunctionMutationupdatePostauth0FunctionAppSyncFunction3E057835": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1226,17 +1186,17 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationupdatePostauth0Function/MutationupdatePostauth0Function.AppSyncFunction"
       }
     },
     "MutationupdatePostpostAuth0FunctionMutationupdatePostpostAuth0FunctionAppSyncFunctionB977D8DD": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdatePostpostAuth0Function",
@@ -1246,14 +1206,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationupdatePostpostAuth0Function/MutationupdatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdatePostDataResolverFnMutationUpdatePostDataResolverFnAppSyncFunctionBF7D410D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1274,14 +1234,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationUpdatePostDataResolverFn/MutationUpdatePostDataResolverFn.AppSyncFunction"
       }
     },
     "UpdatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "updatePost",
         "Kind": "PIPELINE",
@@ -1319,7 +1279,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1358,7 +1318,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1370,11 +1330,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1384,14 +1344,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/mutationUpdatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/mutationUpdatePostResolver"
       }
     },
     "MutationdeletePostauth0FunctionMutationdeletePostauth0FunctionAppSyncFunctionFBE21CB7": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1412,17 +1372,17 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationdeletePostauth0Function/MutationdeletePostauth0Function.AppSyncFunction"
       }
     },
     "MutationdeletePostpostAuth0FunctionMutationdeletePostpostAuth0FunctionAppSyncFunctionFF4E884F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeletePostpostAuth0Function",
@@ -1432,14 +1392,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationdeletePostpostAuth0Function/MutationdeletePostpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeletePostDataResolverFnMutationDeletePostDataResolverFnAppSyncFunction45B37C12": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1460,14 +1420,14 @@
         "PostDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/MutationDeletePostDataResolverFn/MutationDeletePostDataResolverFn.AppSyncFunction"
       }
     },
     "DeletePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "deletePost",
         "Kind": "PIPELINE",
@@ -1499,7 +1459,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1538,7 +1498,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1550,11 +1510,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1564,17 +1524,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/mutationDeletePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/mutationDeletePostResolver"
       }
     },
     "SubscriptiononCreatePostauth0FunctionSubscriptiononCreatePostauth0FunctionAppSyncFunction24934FF1": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreatePostauth0Function",
@@ -1584,17 +1544,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptiononCreatePostauth0Function/SubscriptiononCreatePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreatePostpostAuth0FunctionSubscriptiononCreatePostpostAuth0FunctionAppSyncFunction3197D95D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreatePostpostAuth0Function",
@@ -1604,17 +1564,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptiononCreatePostpostAuth0Function/SubscriptiononCreatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreatePostDataResolverFnSubscriptionOnCreatePostDataResolverFnAppSyncFunctionB4572868": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreatePostDataResolverFn",
@@ -1626,14 +1586,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptionOnCreatePostDataResolverFn/SubscriptionOnCreatePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onCreatePost",
         "Kind": "PIPELINE",
@@ -1665,7 +1625,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1677,7 +1637,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1689,11 +1649,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1703,17 +1663,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/subscriptionOnCreatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/subscriptionOnCreatePostResolver"
       }
     },
     "SubscriptiononUpdatePostauth0FunctionSubscriptiononUpdatePostauth0FunctionAppSyncFunction503CE6B6": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdatePostauth0Function",
@@ -1723,17 +1683,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptiononUpdatePostauth0Function/SubscriptiononUpdatePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdatePostpostAuth0FunctionSubscriptiononUpdatePostpostAuth0FunctionAppSyncFunction3D79B6CB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdatePostpostAuth0Function",
@@ -1743,17 +1703,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptiononUpdatePostpostAuth0Function/SubscriptiononUpdatePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdatePostDataResolverFnSubscriptionOnUpdatePostDataResolverFnAppSyncFunction325AAFC9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdatePostDataResolverFn",
@@ -1765,14 +1725,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptionOnUpdatePostDataResolverFn/SubscriptionOnUpdatePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdatePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onUpdatePost",
         "Kind": "PIPELINE",
@@ -1804,7 +1764,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdatePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1816,7 +1776,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1828,11 +1788,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1842,17 +1802,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/subscriptionOnUpdatePostResolver"
       }
     },
     "SubscriptiononDeletePostauth0FunctionSubscriptiononDeletePostauth0FunctionAppSyncFunction79C0574D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeletePostauth0Function",
@@ -1862,17 +1822,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptiononDeletePostauth0Function/SubscriptiononDeletePostauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeletePostpostAuth0FunctionSubscriptiononDeletePostpostAuth0FunctionAppSyncFunction80B1275A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeletePostpostAuth0Function",
@@ -1882,17 +1842,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptiononDeletePostpostAuth0Function/SubscriptiononDeletePostpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeletePostDataResolverFnSubscriptionOnDeletePostDataResolverFnAppSyncFunction9D84E829": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeletePostDataResolverFn",
@@ -1904,14 +1864,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/SubscriptionOnDeletePostDataResolverFn/SubscriptionOnDeletePostDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeletePostResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onDeletePost",
         "Kind": "PIPELINE",
@@ -1943,7 +1903,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeletePost\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1955,7 +1915,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1967,11 +1927,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1981,7 +1941,7 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/subscriptionOnDeletePostResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/subscriptionOnDeletePostResolver"
       }
     },
     "CDKMetadata": {
@@ -1990,7 +1950,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X31OtoD7uuoB63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyA7HGC3wZtsreu2va9h+iBRcpWi7Uze8BdGHEgpLpAHdl59YFOShBQtmTyJhuEPG37OeJPz5O6MQ3A1fGPd0xGFjMcBpjL0Dzv0NBscR7mzhalY9aIuULF6nvxPp8R2KZEHbnybIq6Nfj/3V4qzkf0ZRUgF3pcwsodjsh3pUmBe3M+kY1KzrivF1nM7Gw6O4CIv1yyD1zfYbS7i/TYmVj8QlI/8AVayTVs2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -2010,7 +1970,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "GetAtt:PostTable:StreamArn"
             ]
@@ -2020,25 +1980,14 @@
     },
     "GetAttPostTableName": {
       "Description": "Your DynamoDB table name.",
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "Post-",
-            {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-            },
-            "-NONE"
-          ]
-        ]
-      },
+      "Value": "Post-u3jn2qbupzbyhc3h53673wdvim-main",
       "Export": {
         "Name": {
           "Fn::Join": [
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "GetAtt:PostTable:Name"
             ]
@@ -2046,7 +1995,7 @@
         }
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name": {
       "Value": {
         "Fn::GetAtt": [
           "PostDataSource",
@@ -2054,7 +2003,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn": {
       "Value": {
         "Fn::GetAtt": [
           "PostTable",
@@ -2062,7 +2011,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "PostTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.outputs.json
new file mode 100644
index 00000000000..602fd6e1702
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.outputs.json
@@ -0,0 +1,26 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName",
+    "OutputValue": "TopicTable"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:20:17.537"
+  },
+  {
+    "OutputKey": "GetAttTopicTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:20:17.537",
+    "Description": "Your DynamoDB table StreamArn.",
+    "ExportName": "33zwnmmin5anviw7lh6x2wxanq:GetAtt:TopicTable:StreamArn"
+  },
+  {
+    "OutputKey": "GetAttTopicTableName",
+    "OutputValue": "Topic-u3jn2qbupzbyhc3h53673wdvim-main",
+    "Description": "Your DynamoDB table name.",
+    "ExportName": "33zwnmmin5anviw7lh6x2wxanq:GetAtt:TopicTable:Name"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.parameters.json
new file mode 100644
index 00000000000..edd12e2f741
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.parameters.json
@@ -0,0 +1,46 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "ParameterValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "ParameterValue": "33zwnmmin5anviw7lh6x2wxanq"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112",
+    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-7KlxeduafKru"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName",
+    "ParameterValue": "NONE_DS"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.template.json
index 4de696d0e80..238a9bdbe7d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e-amplifyDataTopicNestedStackTopicNestedStac-DPN73D3I6YDW.template.json
@@ -37,22 +37,22 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Type": "String"
     }
   },
@@ -350,23 +350,12 @@
   },
   "Resources": {
     "TopicTable": {
-      "Type": "Custom::AmplifyDynamoDBTable",
+      "Type": "Custom::ImportedAmplifyDynamoDBTable",
       "Properties": {
         "ServiceToken": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6"
-        },
-        "tableName": {
-          "Fn::Join": [
-            "",
-            [
-              "Topic-",
-              {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-              },
-              "-NONE"
-            ]
-          ]
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112"
         },
+        "tableName": "Topic-u3jn2qbupzbyhc3h53673wdvim-main",
         "attributeDefinitions": [
           {
             "attributeName": "id",
@@ -401,9 +390,10 @@
         "streamSpecification": {
           "streamViewType": "NEW_AND_OLD_IMAGES"
         },
-        "deletionProtectionEnabled": false,
+        "deletionProtectionEnabled": true,
         "allowDestructiveGraphqlSchemaUpdates": true,
         "replaceTableUponGsiUpdate": false,
+        "isImported": true,
         "pointInTimeRecoverySpecification": {
           "Fn::If": [
             "ShouldUsePointInTimeRecovery",
@@ -425,10 +415,10 @@
           ]
         }
       },
-      "UpdateReplacePolicy": "Delete",
-      "DeletionPolicy": "Delete",
+      "UpdateReplacePolicy": "Retain",
+      "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/TopicTable/Default/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/TopicTable/Default/Default"
       }
     },
     "TopicIAMRoleD9B4C845": {
@@ -471,18 +461,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}",
                         {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Topic-",
-                                {
-                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                                },
-                                "-NONE"
-                              ]
-                            ]
-                          }
+                          "tablename": "Topic-u3jn2qbupzbyhc3h53673wdvim-main"
                         }
                       ]
                     },
@@ -490,18 +469,7 @@
                       "Fn::Sub": [
                         "arn:${AWS::Partition}:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*",
                         {
-                          "tablename": {
-                            "Fn::Join": [
-                              "",
-                              [
-                                "Topic-",
-                                {
-                                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-                                },
-                                "-NONE"
-                              ]
-                            ]
-                          }
+                          "tablename": "Topic-u3jn2qbupzbyhc3h53673wdvim-main"
                         }
                       ]
                     }
@@ -519,7 +487,7 @@
             [
               "TopicIAMRole014e70-",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "-NONE"
             ]
@@ -532,7 +500,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -549,14 +517,14 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/TopicIAMRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/TopicIAMRole/Resource"
       }
     },
     "TopicDataSource": {
       "Type": "AWS::AppSync::DataSource",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DynamoDBConfig": {
           "AwsRegion": {
@@ -602,17 +570,17 @@
         "TopicIAMRoleD9B4C845"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/TopicDataSource/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/TopicDataSource/Resource"
       }
     },
     "QuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunction2B9304CA": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetTopicauth0Function",
@@ -622,17 +590,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/QuerygetTopicauth0Function/QuerygetTopicauth0Function.AppSyncFunction"
       }
     },
     "QuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction6FE846B8": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerygetTopicpostAuth0Function",
@@ -642,14 +610,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/QuerygetTopicpostAuth0Function/QuerygetTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "QueryGetTopicDataResolverFnQueryGetTopicDataResolverFnAppSyncFunction82CCA00A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -670,14 +638,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/QueryGetTopicDataResolverFn/QueryGetTopicDataResolverFn.AppSyncFunction"
       }
     },
     "GetTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "getTopic",
         "Kind": "PIPELINE",
@@ -709,7 +677,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"getTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -748,7 +716,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -760,11 +728,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -774,17 +742,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/queryGetTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/queryGetTopicResolver"
       }
     },
     "QuerylistTopicsauth0FunctionQuerylistTopicsauth0FunctionAppSyncFunction1187D7E0": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistTopicsauth0Function",
@@ -794,17 +762,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/QuerylistTopicsauth0Function/QuerylistTopicsauth0Function.AppSyncFunction"
       }
     },
     "QuerylistTopicspostAuth0FunctionQuerylistTopicspostAuth0FunctionAppSyncFunction8BDF1FB2": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "QuerylistTopicspostAuth0Function",
@@ -814,14 +782,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/QuerylistTopicspostAuth0Function/QuerylistTopicspostAuth0Function.AppSyncFunction"
       }
     },
     "QueryListTopicsDataResolverFnQueryListTopicsDataResolverFnAppSyncFunction26E7FF8F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -842,14 +810,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/QueryListTopicsDataResolverFn/QueryListTopicsDataResolverFn.AppSyncFunction"
       }
     },
     "ListTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "listTopics",
         "Kind": "PIPELINE",
@@ -881,7 +849,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Query\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"listTopics\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -920,7 +888,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -932,11 +900,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -946,17 +914,17 @@
         "TypeName": "Query"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/queryListTopicsResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/queryListTopicsResolver"
       }
     },
     "MutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction4DB06436": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicinit0Function",
@@ -966,17 +934,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationcreateTopicinit0Function/MutationcreateTopicinit0Function.AppSyncFunction"
       }
     },
     "MutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction47662DC9": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicauth0Function",
@@ -986,17 +954,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationcreateTopicauth0Function/MutationcreateTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationcreateTopicpostAuth0FunctionMutationcreateTopicpostAuth0FunctionAppSyncFunction43D15A5A": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationcreateTopicpostAuth0Function",
@@ -1006,14 +974,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationcreateTopicpostAuth0Function/MutationcreateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationCreateTopicDataResolverFnMutationCreateTopicDataResolverFnAppSyncFunction3A6C31C4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1034,14 +1002,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationCreateTopicDataResolverFn/MutationCreateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "CreateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "createTopic",
         "Kind": "PIPELINE",
@@ -1079,7 +1047,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"createTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1118,7 +1086,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1130,11 +1098,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1144,17 +1112,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/mutationCreateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/mutationCreateTopicResolver"
       }
     },
     "MutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction64D17734": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateTopicinit0Function",
@@ -1164,14 +1132,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationupdateTopicinit0Function/MutationupdateTopicinit0Function.AppSyncFunction"
       }
     },
     "MutationupdateTopicauth0FunctionMutationupdateTopicauth0FunctionAppSyncFunction56C81857": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1192,17 +1160,17 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationupdateTopicauth0Function/MutationupdateTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationupdateTopicpostAuth0FunctionMutationupdateTopicpostAuth0FunctionAppSyncFunctionE2BE291F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationupdateTopicpostAuth0Function",
@@ -1212,14 +1180,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationupdateTopicpostAuth0Function/MutationupdateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationUpdateTopicDataResolverFnMutationUpdateTopicDataResolverFnAppSyncFunctionDA5D9F2F": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1240,14 +1208,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationUpdateTopicDataResolverFn/MutationUpdateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "UpdateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "updateTopic",
         "Kind": "PIPELINE",
@@ -1285,7 +1253,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"updateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1324,7 +1292,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1336,11 +1304,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1350,14 +1318,14 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/mutationUpdateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/mutationUpdateTopicResolver"
       }
     },
     "MutationdeleteTopicauth0FunctionMutationdeleteTopicauth0FunctionAppSyncFunctionDA9FFFB5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1378,17 +1346,17 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationdeleteTopicauth0Function/MutationdeleteTopicauth0Function.AppSyncFunction"
       }
     },
     "MutationdeleteTopicpostAuth0FunctionMutationdeleteTopicpostAuth0FunctionAppSyncFunction88A19A50": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "MutationdeleteTopicpostAuth0Function",
@@ -1398,14 +1366,14 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationdeleteTopicpostAuth0Function/MutationdeleteTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "MutationDeleteTopicDataResolverFnMutationDeleteTopicDataResolverFnAppSyncFunction13577BCB": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
           "Fn::GetAtt": [
@@ -1426,14 +1394,14 @@
         "TopicDataSource"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/MutationDeleteTopicDataResolverFn/MutationDeleteTopicDataResolverFn.AppSyncFunction"
       }
     },
     "DeleteTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "deleteTopic",
         "Kind": "PIPELINE",
@@ -1465,7 +1433,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Mutation\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"deleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"AMAZON_DYNAMODB\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n$util.qr($ctx.stash.put(\"tableName\", \"",
               {
@@ -1504,7 +1472,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1516,11 +1484,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1530,17 +1498,17 @@
         "TypeName": "Mutation"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/mutationDeleteTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/mutationDeleteTopicResolver"
       }
     },
     "SubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunction1736E1E4": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateTopicauth0Function",
@@ -1550,17 +1518,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptiononCreateTopicauth0Function/SubscriptiononCreateTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononCreateTopicpostAuth0FunctionSubscriptiononCreateTopicpostAuth0FunctionAppSyncFunction373CF368": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononCreateTopicpostAuth0Function",
@@ -1570,17 +1538,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptiononCreateTopicpostAuth0Function/SubscriptiononCreateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionE8F09879": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnCreateTopicDataResolverFn",
@@ -1592,14 +1560,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptionOnCreateTopicDataResolverFn/SubscriptionOnCreateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononCreateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onCreateTopic",
         "Kind": "PIPELINE",
@@ -1631,7 +1599,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onCreateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1643,7 +1611,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1655,11 +1623,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1669,17 +1637,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/subscriptionOnCreateTopicResolver"
       }
     },
     "SubscriptiononUpdateTopicauth0FunctionSubscriptiononUpdateTopicauth0FunctionAppSyncFunction001BB6BF": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateTopicauth0Function",
@@ -1689,17 +1657,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptiononUpdateTopicauth0Function/SubscriptiononUpdateTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateTopicpostAuth0FunctionSubscriptiononUpdateTopicpostAuth0FunctionAppSyncFunctionADC7CEF5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononUpdateTopicpostAuth0Function",
@@ -1709,17 +1677,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptiononUpdateTopicpostAuth0Function/SubscriptiononUpdateTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnUpdateTopicDataResolverFnSubscriptionOnUpdateTopicDataResolverFnAppSyncFunction00E3A612": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnUpdateTopicDataResolverFn",
@@ -1731,14 +1699,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptionOnUpdateTopicDataResolverFn/SubscriptionOnUpdateTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononUpdateTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onUpdateTopic",
         "Kind": "PIPELINE",
@@ -1770,7 +1738,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onUpdateTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1782,7 +1750,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1794,11 +1762,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1808,17 +1776,17 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/subscriptionOnUpdateTopicResolver"
       }
     },
     "SubscriptiononDeleteTopicauth0FunctionSubscriptiononDeleteTopicauth0FunctionAppSyncFunction42E663CA": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteTopicauth0Function",
@@ -1828,17 +1796,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptiononDeleteTopicauth0Function/SubscriptiononDeleteTopicauth0Function.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteTopicpostAuth0FunctionSubscriptiononDeleteTopicpostAuth0FunctionAppSyncFunction3A524E2D": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptiononDeleteTopicpostAuth0Function",
@@ -1848,17 +1816,17 @@
         "ResponseMappingTemplate": "$util.toJson({})"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptiononDeleteTopicpostAuth0Function/SubscriptiononDeleteTopicpostAuth0Function.AppSyncFunction"
       }
     },
     "SubscriptionOnDeleteTopicDataResolverFnSubscriptionOnDeleteTopicDataResolverFnAppSyncFunctionCF6472E5": {
       "Type": "AWS::AppSync::FunctionConfiguration",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "DataSourceName": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName"
         },
         "FunctionVersion": "2018-05-29",
         "Name": "SubscriptionOnDeleteTopicDataResolverFn",
@@ -1870,14 +1838,14 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/SubscriptionOnDeleteTopicDataResolverFn/SubscriptionOnDeleteTopicDataResolverFn.AppSyncFunction"
       }
     },
     "SubscriptiononDeleteTopicResolver": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         },
         "FieldName": "onDeleteTopic",
         "Kind": "PIPELINE",
@@ -1909,7 +1877,7 @@
             [
               "$util.qr($ctx.stash.put(\"typeName\", \"Subscription\"))\n$util.qr($ctx.stash.put(\"fieldName\", \"onDeleteTopic\"))\n$util.qr($ctx.stash.put(\"conditions\", []))\n$util.qr($ctx.stash.put(\"metadata\", {}))\n$util.qr($ctx.stash.metadata.put(\"dataSourceType\", \"NONE\"))\n$util.qr($ctx.stash.metadata.put(\"apiId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"authRole\", \"arn:",
               {
@@ -1921,7 +1889,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1933,11 +1901,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1947,7 +1915,7 @@
         "TypeName": "Subscription"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/subscriptionOnDeleteTopicResolver"
       }
     },
     "CDKMetadata": {
@@ -1956,7 +1924,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/1WOwW6DMAyGn6X31OtoD7uuoB63CXavTGJQCjgodlpViHefoFOnnX5/8if7zyA7HGC3wZtsreu2va9h+iBRcpWi7Uze8BdGHEgpLpAHdl59YFOShBQtmTyJhuEPG37OeJPz5O6MQ3A1fGPd0xGFjMcBpjL0Dzv0NBscR7mzhalY9aIuULF6nvxPp8R2KZEHbnybIq6Nfj/3V4qzkf0ZRUgF3pcwsodjsh3pUmBe3M+kY1KzrivF1nM7Gw6O4CIv1yyD1zfYbS7i/TYmVj8QlI/8AVayTVs2AQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -1976,7 +1944,7 @@
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "GetAtt:TopicTable:StreamArn"
             ]
@@ -1986,25 +1954,14 @@
     },
     "GetAttTopicTableName": {
       "Description": "Your DynamoDB table name.",
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "Topic-",
-            {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
-            },
-            "-NONE"
-          ]
-        ]
-      },
+      "Value": "Topic-u3jn2qbupzbyhc3h53673wdvim-main",
       "Export": {
         "Name": {
           "Fn::Join": [
             ":",
             [
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
               },
               "GetAtt:TopicTable:Name"
             ]
@@ -2012,7 +1969,7 @@
         }
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName": {
       "Value": {
         "Fn::GetAtt": [
           "TopicDataSource",
@@ -2020,7 +1977,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn": {
       "Value": {
         "Fn::GetAtt": [
           "TopicTable",
@@ -2028,7 +1985,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "TopicTable",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.outputs.json
new file mode 100644
index 00000000000..8751be66b92
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.outputs.json
@@ -0,0 +1,22 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref",
+    "OutputValue": "us-east-1_I3YejOBUa"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "OutputValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref",
+    "OutputValue": "3mosah7bsr7412hqq9soj1j2pp"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "OutputValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "OutputValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
similarity index 89%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
index 28bef35cb22..a1e6677587f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
@@ -18,8 +18,8 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Your verification code is {####}",
-        "EmailVerificationSubject": "Verification",
+        "EmailVerificationMessage": "The verification code to your new account is {####}",
+        "EmailVerificationSubject": "Verify your new account",
         "MfaConfiguration": "OFF",
         "Policies": {
           "PasswordPolicy": {
@@ -51,7 +51,7 @@
         },
         "UserPoolTags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "amplify:friendly-name": "amplifyAuth",
           "created-by": "amplify"
@@ -64,15 +64,15 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "Your verification code is {####}",
-          "EmailSubject": "Verification",
+          "EmailMessage": "The verification code to your new account is {####}",
+          "EmailSubject": "Verify your new account",
           "SmsMessage": "The verification code to your new account is {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPool/Resource"
       }
     },
     "amplifyAuthUserPoolNativeAppClient79534448": {
@@ -95,7 +95,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPool/NativeAppClient/Resource"
       }
     },
     "amplifyAuthUserPoolAppClient2626C6F8": {
@@ -129,7 +129,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/UserPoolAppClient/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/UserPoolAppClient/Resource"
       }
     },
     "amplifyAuthIdentityPool3FDE84CC": {
@@ -165,7 +165,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -183,7 +183,7 @@
         "SupportedLoginProviders": {}
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPool"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/IdentityPool"
       }
     },
     "amplifyAuthauthenticatedUserRoleD8DA3689": {
@@ -218,7 +218,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -235,7 +235,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/authenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/authenticatedUserRole/Resource"
       }
     },
     "amplifyAuthunauthenticatedUserRole2B524D9E": {
@@ -270,7 +270,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -287,7 +287,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/unauthenticatedUserRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/unauthenticatedUserRole/Resource"
       }
     },
     "amplifyAuthIdentityPoolRoleAttachment045F17C8": {
@@ -341,7 +341,7 @@
         "amplifyAuthUserPoolAppClient2626C6F8"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/amplifyAuth/IdentityPoolRoleAttachment"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/amplifyAuth/IdentityPoolRoleAttachment"
       }
     },
     "CDKMetadata": {
@@ -350,7 +350,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02LwQrCMBBEv6X3dK2hB6/SkxeRimeJyarbphtoVouE/LsUqXqamTczGnRdQ1WYKZbW9aWnC6Q9RkF3FGN7ZaZ4TjbcmCRAOkUcDyF41Vz56xfTeEKW/+pHdg5ZSF7L+T+3weNWxNj7gCxZkRkgzXAezppzVhwcQhdXT61hvYGq6CJROT5YaEBoP/oGtzQ+/84AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -622,27 +622,27 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref": {
       "Value": {
         "Ref": "amplifyAuthUserPool4BA7F805"
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref": {
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref": {
       "Value": {
         "Ref": "amplifyAuthUserPoolAppClient2626C6F8"
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Value": {
         "Ref": "amplifyAuthIdentityPool3FDE84CC"
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Value": {
         "Ref": "amplifyAuthauthenticatedUserRoleD8DA3689"
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Value": {
         "Ref": "amplifyAuthunauthenticatedUserRole2B524D9E"
       }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.outputs.json
new file mode 100644
index 00000000000..b5834e68f49
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.outputs.json
@@ -0,0 +1,30 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:20:17.537"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21GraphQLUrl",
+    "OutputValue": "https://auprb5ishbhltcshr2palt65ka.appsync-api.us-east-1.amazonaws.com/graphql"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.591"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiBABCA4586DestinationBucketArn",
+    "OutputValue": "arn:aws:s3:::amplify-discussions-ge-amplifydataamplifycodege-jxzg53vmja75"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPIDefaultApiKey467DD7FFApiKey",
+    "OutputValue": "da2-lnrd6z7ejfdg3j23f4ljtb2gaq"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId",
+    "OutputValue": "33zwnmmin5anviw7lh6x2wxanq"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableStreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.630"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.parameters.json
new file mode 100644
index 00000000000..a34e734d7ad
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.parameters.json
@@ -0,0 +1,38 @@
+[
+  {
+    "ParameterKey": "DynamoDBModelTableReadIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref",
+    "ParameterValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
+  },
+  {
+    "ParameterKey": "DynamoDBEnableServerSideEncryption",
+    "ParameterValue": "true"
+  },
+  {
+    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
+    "ParameterValue": "false"
+  },
+  {
+    "ParameterKey": "DynamoDBBillingMode",
+    "ParameterValue": "PAY_PER_REQUEST"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref",
+    "ParameterValue": "us-east-1_I3YejOBUa"
+  },
+  {
+    "ParameterKey": "DynamoDBModelTableWriteIOPS",
+    "ParameterValue": "5"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-iYWdMAuszYuZ"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.template.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.template.json
index 8679d9c9d18..a66398bb3b9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-data7552DF31-O97JQYUH4F0.template.json
@@ -12,7 +12,7 @@
                 "Ref": "AWS::Region"
               },
               "UserPoolId": {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref"
               }
             }
           },
@@ -29,7 +29,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -46,7 +46,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/GraphQLAPI/Resource"
       }
     },
     "amplifyDataGraphQLAPITransformerSchemaFF50A789": {
@@ -59,11 +59,11 @@
           ]
         },
         "DefinitionS3Location": {
-          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9199994c2fc1278c43c8dc8f4f5b81dec0666ee6dbb2bcbc8080f8aa8161eb18.graphql"
+          "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/300f7c12e6b33cf8ae3c81bc9ac9123f7369b5e4b69f14aa10c6e3d2679d5934.graphql"
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/TransformerSchema"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/GraphQLAPI/TransformerSchema"
       }
     },
     "amplifyDataGraphQLAPIDefaultApiKey1C8ED374": {
@@ -75,10 +75,10 @@
             "ApiId"
           ]
         },
-        "Expires": 1774635725
+        "Expires": 1774647640
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/DefaultApiKey"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/GraphQLAPI/DefaultApiKey"
       }
     },
     "amplifyDataGraphQLAPINONEDS684BF699": {
@@ -94,14 +94,14 @@
         "Type": "NONE"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/GraphQLAPI/NONE_DS/Resource"
       }
     },
     "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
@@ -115,7 +115,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -146,7 +146,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/b2bf7e61c06471e8654cdf99ef35b6742f1db64448daf042ed8369d31e485af6.json"
+              "/e3c69ba0bccff572c6027ecfc6f8b77be4c416f58a147b001eec9e73809df6e3.json"
             ]
           ]
         }
@@ -154,8 +154,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerD667C4D4.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyTableManager.NestedStack/AmplifyTableManager.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManager5B4040D6.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -178,32 +178,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent7EFC42D0Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
           }
         },
         "Tags": [
@@ -213,7 +213,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -244,7 +244,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/d9c6f9cb159d5b9df15195d9dac888094b83578e7ddecf630d041d41cfcc49dc.json"
+              "/9319ca98beef079d0ef4fcbe3cd35deef01d6bc89cd4d0a49229659730bd783e.json"
             ]
           ]
         }
@@ -255,8 +255,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopic57E0359B.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Topic.NestedStack/Topic.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopic561410D7.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -279,32 +279,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent7EFC42D0Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
           }
         },
         "Tags": [
@@ -314,7 +314,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -345,7 +345,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/42855889a81a9a095dc34c56bfeba876f491d478f8919bdf18bc0f67af54caf0.json"
+              "/1e2989051deb90bf5c55bf9e60b58427096724724c3f2d447064382acfaa989c.json"
             ]
           ]
         }
@@ -356,8 +356,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPost8962306B.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Post.NestedStack/Post.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostF11F1ED4.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -380,32 +380,32 @@
           "DynamoDBEnableServerSideEncryption": {
             "Ref": "DynamoDBEnableServerSideEncryption"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource72A5C49BOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableMaAF5EF112": {
             "Fn::GetAtt": [
               "amplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResource86290833",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent7EFC42D0Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
           }
         },
         "Tags": [
@@ -415,7 +415,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -446,7 +446,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/b76dcb431dc7be1ffb40c00f3b12ec709c81e20f049ac444aa51314cb259528d.json"
+              "/a06442b2e1fa2f4e8302398dae3ce0e616e16edfaa0217af2001bbe3e1daaf02.json"
             ]
           ]
         }
@@ -457,8 +457,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataComment2D077CC5.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/Comment.NestedStack/Comment.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentB2DD7E34.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -466,22 +466,22 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
@@ -495,7 +495,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -526,7 +526,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/82f884dd46d0dae1ebc23ae8f00d812169d09c1755b1dd3b430f5a34f5f55062.json"
+              "/68b66389d6f98cd6daf0e006132352b38eb0e5dee57e3412434086e4caad2c2e.json"
             ]
           ]
         }
@@ -537,8 +537,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataFunctionDirectiveStack78890689.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/FunctionDirectiveStack.NestedStack/FunctionDirectiveStack.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataFunctionDirectiveStackB704CB4B.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -546,61 +546,61 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPI42A6FA33",
               "ApiId"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPINONEDS8BC5D31EName": {
             "Fn::GetAtt": [
               "amplifyDataGraphQLAPINONEDS684BF699",
               "Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name": {
             "Fn::GetAtt": [
               "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostDataSource1181B975Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn": {
             "Fn::GetAtt": [
               "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name": {
             "Fn::GetAtt": [
               "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentDataSource55E61D91Name"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn": {
             "Fn::GetAtt": [
               "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName": {
             "Fn::GetAtt": [
               "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicDataSource5289BBFCName"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn": {
             "Fn::GetAtt": [
               "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableArn"
             ]
           }
         },
@@ -611,7 +611,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -642,7 +642,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/c3ecaa4ae12655da77e8aa83fed61d5a851c595cda1a766af58d8965667a71e7.json"
+              "/4590498d3bfba11b353430b2c49f8362be26610558c94ec8b6f9a8db1f0457ca.json"
             ]
           ]
         }
@@ -656,8 +656,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataConnectionStack4FB5E041.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ConnectionStack.NestedStack/ConnectionStack.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataConnectionStack83594073.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -689,7 +689,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ActivityIdDataResolverFn/ActivityIdDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityidResolver": {
@@ -734,7 +734,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -746,11 +746,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -763,7 +763,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityIdResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/activityIdResolver"
       }
     },
     "amplifyDataActivityUserIdDataResolverFnActivityUserIdDataResolverFnAppSyncFunction66B67EF4": {
@@ -794,7 +794,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ActivityUserIdDataResolverFn/ActivityUserIdDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityuserIdResolver": {
@@ -839,7 +839,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -851,11 +851,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -868,7 +868,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityUserIdResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/activityUserIdResolver"
       }
     },
     "amplifyDataActivityActivityTypeDataResolverFnActivityActivityTypeDataResolverFnAppSyncFunctionF6BB5E26": {
@@ -899,7 +899,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ActivityActivityTypeDataResolverFn/ActivityActivityTypeDataResolverFn.AppSyncFunction"
       }
     },
     "ActivityactivityTypeResolver": {
@@ -944,7 +944,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -956,11 +956,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -973,7 +973,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityActivityTypeResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/activityActivityTypeResolver"
       }
     },
     "amplifyDataActivityTimestampDataResolverFnActivityTimestampDataResolverFnAppSyncFunctionBFF6218D": {
@@ -1004,7 +1004,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/ActivityTimestampDataResolverFn/ActivityTimestampDataResolverFn.AppSyncFunction"
       }
     },
     "ActivitytimestampResolver": {
@@ -1049,7 +1049,7 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"unauthRole\", \"arn:",
               {
@@ -1061,11 +1061,11 @@
               },
               ":assumed-role/",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
               },
               "/CognitoIdentityCredentials\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"",
               {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
               },
               "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", []))\n$util.toJson({})"
             ]
@@ -1078,7 +1078,7 @@
         "amplifyDataGraphQLAPITransformerSchemaFF50A789"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/activityTimestampResolver"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/activityTimestampResolver"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucket9CCB4ACA": {
@@ -1118,7 +1118,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1133,7 +1133,7 @@
             "Value": "true"
           },
           {
-            "Key": "aws-cdk:cr-owned:ab73d017",
+            "Key": "aws-cdk:cr-owned:02482c28",
             "Value": "true"
           },
           {
@@ -1145,7 +1145,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Resource"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketPolicyF1C1C548": {
@@ -1200,7 +1200,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/Policy/Resource"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsBucketAutoDeleteObjectsCustomResource437F26F5": {
@@ -1222,7 +1222,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsBucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentAwsCliLayerE322F905": {
@@ -1237,7 +1237,7 @@
         "Description": "/opt/awscli/aws"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/AwsCliLayer/Resource",
         "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Content"
@@ -1258,7 +1258,7 @@
           }
         ],
         "SourceObjectKeys": [
-          "a0a824407fa0caea8c02802c3aa86a876467d5ceb99a821544a87a142c0efdf0.zip"
+          "dbf8037d854a25fa34a911a4cc5b6ee0521fe10deca928ac11a880166a3daaa0.zip"
         ],
         "SourceMarkers": [
           {}
@@ -1279,7 +1279,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/amplifyData/AmplifyCodegenAssets/AmplifyCodegenAssetsDeployment/CustomResource-1536MiB/Default"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
@@ -1304,7 +1304,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
@@ -1343,7 +1343,7 @@
         "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
         "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
         "aws:asset:property": "Code"
       }
@@ -1384,7 +1384,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1397,7 +1397,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/Resource"
       }
     },
     "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleDefaultPolicyFF1C635B": {
@@ -1531,7 +1531,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBC5D8AB21": {
@@ -1569,7 +1569,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1587,7 +1587,7 @@
         "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiBServiceRoleA41FC8C2"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C1536MiB/Resource",
         "aws:asset:path": "asset.3423a042b818e31c1e34a19d6689ab2e5f9b70fcbe9e71df66f241b20a200bd9",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -1603,7 +1603,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -1614,7 +1614,7 @@
             "Value": "true"
           },
           {
-            "Key": "aws-cdk:cr-owned:cf03fc68",
+            "Key": "aws-cdk:cr-owned:82204748",
             "Value": "true"
           },
           {
@@ -1626,7 +1626,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucket/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/modelIntrospectionSchemaBucket/Resource"
       }
     },
     "modelIntrospectionSchemaBucketPolicy4DAB0D15": {
@@ -1715,7 +1715,7 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/modelIntrospectionSchemaBucket/Policy/Resource"
       }
     },
     "modelIntrospectionSchemaBucketAutoDeleteObjectsCustomResourceFE57309F": {
@@ -1737,7 +1737,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/modelIntrospectionSchemaBucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "modelIntrospectionSchemaBucketDeploymentAwsCliLayer13C432F7": {
@@ -1752,7 +1752,7 @@
         "Description": "/opt/awscli/aws"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/modelIntrospectionSchemaBucketDeployment/AwsCliLayer/Resource",
         "aws:asset:path": "asset.0cfdecad2260a3a84ad0c2d08a77e03c9d25e26c7b52f26b1e1faf97aef92f18.zip",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Content"
@@ -1788,16 +1788,16 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/modelIntrospectionSchemaBucketDeployment/CustomResource-1536MiB/Default"
       }
     },
     "AMPLIFYDATAGRAPHQLENDPOINTParameter1C2CBB16": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/AMPLIFY_DATA_GRAPHQL_ENDPOINT",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1810,16 +1810,16 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/AMPLIFY_DATA_GRAPHQL_ENDPOINTParameter/Resource"
       }
     },
     "AMPLIFYDATAMODELINTROSPECTIONSCHEMABUCKETNAMEParameter47BF4F44": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAME",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1829,16 +1829,16 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_BUCKET_NAMEParameter/Resource"
       }
     },
     "AMPLIFYDATAMODELINTROSPECTIONSCHEMAKEYParameterB6AEAE8A": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEY",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1846,16 +1846,16 @@
         "Value": "modelIntrospectionSchema.json"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/AMPLIFY_DATA_MODEL_INTROSPECTION_SCHEMA_KEYParameter/Resource"
       }
     },
     "AMPLIFYDATADEFAULTNAMEParameterE7C23CC4": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/AMPLIFY_DATA_DEFAULT_NAME",
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/AMPLIFY_DATA_DEFAULT_NAME",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
@@ -1863,7 +1863,7 @@
         "Value": "amplifyData"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/AMPLIFY_DATA_DEFAULT_NAMEParameter/Resource"
       }
     },
     "CDKMetadata": {
@@ -1872,7 +1872,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/6VSTW/bMAz9Lc1ZUdu0h2E310F3WNFlMdDLUASMzLhM9OGJcjJD8H8fZGVpup6KnshHig+PepzJ2e2tvLqAA09VvZtqWsv4iBywrgKonVgiu84rFHDgVYS25d4qGb95aF9+66KlO2AU5caOlZ8PRUtnqFIvaCAVipa+Yy8encU5BKgyabmxb9F9Z1UgZ0tnN9R0HhJIjaRD79EPgm9WEZgxsCxSEDW22vUGbZB3ndphmJ8K6bWMuToKzWkizNmvODH0h+zk6+T8C9KyfCPHFh9Ziy64OWoM+GO9RRV4MohPTT8f1SycJtW/asr4A8ryQBUgYFr6Y8LeDz8PQoNZ1yBjubEP0KN/Qs/JiIpsozG4k0/ilJyZNwgCI+PS6dHTMb4umbNBMBsZq+DJNgvwYDCgH/v/wDCI0eAqQEO2Sb18k2XHwZnTZR6vY8yz8JVOoldwYKVJFgcuNY17vOH/j2fh3Z5q9OlOBmFdjXLLl/vZTF5/kVcXWyaa+s4GMiiXOf4FCBed+D4DAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -1915,16 +1915,16 @@
       ],
       "Description": "Enable server side encryption powered by KMS."
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
       "Type": "String"
     }
   },
@@ -2195,7 +2195,7 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -2203,7 +2203,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1GraphQLUrl": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21GraphQLUrl": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPI42A6FA33",
@@ -2211,7 +2211,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB44890AA5DestinationBucketArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiBABCA4586DestinationBucketArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB21775929",
@@ -2219,7 +2219,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIDefaultApiKey22C2FDC2ApiKey": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPIDefaultApiKey467DD7FFApiKey": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataGraphQLAPIDefaultApiKey1C8ED374",
@@ -2227,27 +2227,27 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataTopicNestedStackTopicNestedStackResource252EB182",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableStreamArn"
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataPostNestedStackPostNestedStackResourceB65AFCD3",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableStreamArn"
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableStreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "amplifyDataCommentNestedStackCommentNestedStackResource87C7BB35",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableStreamArn"
         ]
       }
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.outputs.json
new file mode 100644
index 00000000000..8059da73fa9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.outputs.json
@@ -0,0 +1,10 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30afunctionfetchuseractivitygen2mainlambda502480EDRef",
+    "OutputValue": "fetchuseractivity-gen2-main"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30afunctionrecorduseractivitygen2mainlambdaE5320324Ref",
+    "OutputValue": "recorduseractivity-gen2-main"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.parameters.json
new file mode 100644
index 00000000000..4fd87d5ced9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.parameters.json
@@ -0,0 +1,26 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z/stream/2026-03-20T21:41:02.189"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref",
+    "ParameterValue": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifyd2l28aset733CD677",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:20:17.537"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifyd2l28483C8589",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.630"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
+  },
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifyd2l28asetq99E749BF8",
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.591"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.template.json
similarity index 63%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.template.json
index 24ea8e4e047..023e58e9e8a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-function1351588B-3VEH789QLSJQ.template.json
@@ -1,7 +1,7 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.17.0\",\"stackType\":\"function-Lambda\",\"metadata\":{}}",
   "Resources": {
-    "fetchuseractivitygen2maintwolambdaServiceRole0B561055": {
+    "fetchuseractivitygen2mainlambdaServiceRoleCC992996": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -37,7 +37,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -45,7 +45,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "fetchuseractivity-gen2-maintwo"
+            "Value": "fetchuseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -54,10 +54,10 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/fetchuseractivity-gen2-maintwo-lambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/fetchuseractivity-gen2-main-lambda/ServiceRole/Resource"
       }
     },
-    "fetchuseractivitygen2maintwolambdaServiceRoleDefaultPolicy752079E1": {
+    "fetchuseractivitygen2mainlambdaServiceRoleDefaultPolicy4BD1E93F": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -75,14 +75,14 @@
               "Effect": "Allow",
               "Resource": [
                 {
-                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+                  "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
                 },
                 {
                   "Fn::Join": [
                     "",
                     [
                       {
-                        "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+                        "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
                       },
                       "/index/*"
                     ]
@@ -93,18 +93,18 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "fetchuseractivitygen2maintwolambdaServiceRoleDefaultPolicy752079E1",
+        "PolicyName": "fetchuseractivitygen2mainlambdaServiceRoleDefaultPolicy4BD1E93F",
         "Roles": [
           {
-            "Ref": "fetchuseractivitygen2maintwolambdaServiceRole0B561055"
+            "Ref": "fetchuseractivitygen2mainlambdaServiceRoleCC992996"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/fetchuseractivity-gen2-maintwo-lambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/fetchuseractivity-gen2-main-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "fetchuseractivitygen2maintwolambda75E37FB2": {
+    "fetchuseractivitygen2mainlambda788E8B44": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -114,33 +114,33 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "64ee581196febc85959027f8318591ccf788a4a57c2f47e0adcce31b6bbb97da.zip"
+          "S3Key": "99d30e131c7136e70f5801d646d20ff27f7fe93960cba5df7904b90132caa856.zip"
         },
         "Environment": {
           "Variables": {
-            "ENV": "gen2-maintwo",
+            "ENV": "gen2-main",
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
             "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn"
+              "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn"
             },
             "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+              "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
             },
             "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref"
+              "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref"
             }
           }
         },
         "EphemeralStorage": {
           "Size": 512
         },
-        "FunctionName": "fetchuseractivity-gen2-maintwo",
+        "FunctionName": "fetchuseractivity-gen2-main",
         "Handler": "index.handler",
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "fetchuseractivitygen2maintwolambdaServiceRole0B561055",
+            "fetchuseractivitygen2mainlambdaServiceRoleCC992996",
             "Arn"
           ]
         },
@@ -152,7 +152,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -160,7 +160,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "fetchuseractivity-gen2-maintwo"
+            "Value": "fetchuseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -170,17 +170,17 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "fetchuseractivitygen2maintwolambdaServiceRoleDefaultPolicy752079E1",
-        "fetchuseractivitygen2maintwolambdaServiceRole0B561055"
+        "fetchuseractivitygen2mainlambdaServiceRoleDefaultPolicy4BD1E93F",
+        "fetchuseractivitygen2mainlambdaServiceRoleCC992996"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/fetchuseractivity-gen2-maintwo-lambda/Resource",
-        "aws:asset:path": "asset.64ee581196febc85959027f8318591ccf788a4a57c2f47e0adcce31b6bbb97da",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/fetchuseractivity-gen2-main-lambda/Resource",
+        "aws:asset:path": "asset.99d30e131c7136e70f5801d646d20ff27f7fe93960cba5df7904b90132caa856",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9": {
+    "recorduseractivitygen2mainlambdaServiceRoleAB2F457C": {
       "Type": "AWS::IAM::Role",
       "Properties": {
         "AssumeRolePolicyDocument": {
@@ -216,7 +216,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -224,7 +224,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-maintwo"
+            "Value": "recorduseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -233,10 +233,10 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/recorduseractivity-gen2-main-lambda/ServiceRole/Resource"
       }
     },
-    "recorduseractivitygen2maintwolambdaServiceRoleDefaultPolicy8FD603AF": {
+    "recorduseractivitygen2mainlambdaServiceRoleDefaultPolicy9501E2A3": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -263,14 +263,14 @@
               "Effect": "Allow",
               "Resource": [
                 {
-                  "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+                  "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
                 },
                 {
                   "Fn::Join": [
                     "",
                     [
                       {
-                        "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+                        "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
                       },
                       "/index/*"
                     ]
@@ -291,7 +291,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifyd2l28aset733CD677"
               }
             },
             {
@@ -302,7 +302,7 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifyd2l28asetq99E749BF8"
               }
             },
             {
@@ -313,24 +313,24 @@
               ],
               "Effect": "Allow",
               "Resource": {
-                "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E"
+                "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifyd2l28483C8589"
               }
             }
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "recorduseractivitygen2maintwolambdaServiceRoleDefaultPolicy8FD603AF",
+        "PolicyName": "recorduseractivitygen2mainlambdaServiceRoleDefaultPolicy9501E2A3",
         "Roles": [
           {
-            "Ref": "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9"
+            "Ref": "recorduseractivitygen2mainlambdaServiceRoleAB2F457C"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/recorduseractivity-gen2-main-lambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
-    "recorduseractivitygen2maintwolambdaFBA585F0": {
+    "recorduseractivitygen2mainlambda641C8AFE": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Architectures": [
@@ -340,33 +340,33 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "0f5f3ad02804e7329f1981c8fc67574bd71c722200b653fcefdd6129eb82aa30.zip"
+          "S3Key": "40212442a88722cfc1748909e61838bde44b6400e94e6b309d1e6f208c06e1b5.zip"
         },
         "Environment": {
           "Variables": {
-            "ENV": "gen2-maintwo",
+            "ENV": "gen2-main",
             "REGION": "us-east-1",
             "AMPLIFY_SSM_ENV_CONFIG": "{}",
             "STORAGE_ACTIVITY_STREAMARN": {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn"
+              "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn"
             },
             "STORAGE_ACTIVITY_ARN": {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+              "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
             },
             "STORAGE_ACTIVITY_NAME": {
-              "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref"
+              "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref"
             }
           }
         },
         "EphemeralStorage": {
           "Size": 512
         },
-        "FunctionName": "recorduseractivity-gen2-maintwo",
+        "FunctionName": "recorduseractivity-gen2-main",
         "Handler": "index.handler",
         "MemorySize": 128,
         "Role": {
           "Fn::GetAtt": [
-            "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9",
+            "recorduseractivitygen2mainlambdaServiceRoleAB2F457C",
             "Arn"
           ]
         },
@@ -378,7 +378,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -386,7 +386,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-maintwo"
+            "Value": "recorduseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -396,25 +396,25 @@
         "Timeout": 25
       },
       "DependsOn": [
-        "recorduseractivitygen2maintwolambdaServiceRoleDefaultPolicy8FD603AF",
-        "recorduseractivitygen2maintwolambdaServiceRole8DB19DE9"
+        "recorduseractivitygen2mainlambdaServiceRoleDefaultPolicy9501E2A3",
+        "recorduseractivitygen2mainlambdaServiceRoleAB2F457C"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/Resource",
-        "aws:asset:path": "asset.0f5f3ad02804e7329f1981c8fc67574bd71c722200b653fcefdd6129eb82aa30",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/recorduseractivity-gen2-main-lambda/Resource",
+        "aws:asset:path": "asset.40212442a88722cfc1748909e61838bde44b6400e94e6b309d1e6f208c06e1b5",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
     },
-    "recorduseractivitygen2maintwolambdaDynamoDBEventSourceamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicCustomTableTopicTable8B3A6ED9ECB61435": {
+    "recorduseractivitygen2mainlambdaDynamoDBEventSourceamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicCustomTableTopicTableE55B550AF3E0087C": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifyd2l28aset733CD677"
         },
         "FunctionName": {
-          "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
+          "Ref": "recorduseractivitygen2mainlambda641C8AFE"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -424,7 +424,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -432,7 +432,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-maintwo"
+            "Value": "recorduseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -441,18 +441,18 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/DynamoDBEventSource:amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicCustomTableTopicTable8B3A6ED9/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/recorduseractivity-gen2-main-lambda/DynamoDBEventSource:amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicCustomTableTopicTableE55B550A/Resource"
       }
     },
-    "recorduseractivitygen2maintwolambdaDynamoDBEventSourceamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostCustomTablePostTable6F127D041B2A119F": {
+    "recorduseractivitygen2mainlambdaDynamoDBEventSourceamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostCustomTablePostTable0DC0D4A00E4DC807": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifyd2l28asetq99E749BF8"
         },
         "FunctionName": {
-          "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
+          "Ref": "recorduseractivitygen2mainlambda641C8AFE"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -462,7 +462,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -470,7 +470,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-maintwo"
+            "Value": "recorduseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -479,18 +479,18 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/DynamoDBEventSource:amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostCustomTablePostTable6F127D04/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/recorduseractivity-gen2-main-lambda/DynamoDBEventSource:amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostCustomTablePostTable0DC0D4A0/Resource"
       }
     },
-    "recorduseractivitygen2maintwolambdaDynamoDBEventSourceamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCustomTableCommentTable7F3A5F9A76CBDA76": {
+    "recorduseractivitygen2mainlambdaDynamoDBEventSourceamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCustomTableCommentTable963074804FFC242E": {
       "Type": "AWS::Lambda::EventSourceMapping",
       "Properties": {
         "BatchSize": 100,
         "EventSourceArn": {
-          "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E"
+          "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifyd2l28483C8589"
         },
         "FunctionName": {
-          "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
+          "Ref": "recorduseractivitygen2mainlambda641C8AFE"
         },
         "StartingPosition": "LATEST",
         "Tags": [
@@ -500,7 +500,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -508,7 +508,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "recorduseractivity-gen2-maintwo"
+            "Value": "recorduseractivity-gen2-main"
           },
           {
             "Key": "created-by",
@@ -517,7 +517,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/recorduseractivity-gen2-maintwo-lambda/DynamoDBEventSource:amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCustomTableCommentTable7F3A5F9A/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/recorduseractivity-gen2-main-lambda/DynamoDBEventSource:amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCustomTableCommentTable96307480/Resource"
       }
     },
     "CDKMetadata": {
@@ -526,7 +526,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/2WOwQ6CMBBEv4V7WRE5eBWiN4mRDyBLWUihtIQtGkP4d1NIvHh6M3N4mRjiJIEowDeHsu5DrSpYcmJHdeFQ9gLfXC4ah6rG0tiaOoZ8w2020ilrhMIBlqfVJLLGbHxYreTH1z2tgk8lMpNjuHgIPkE6y55cikxi18OSNeZnvb7IuMLOk6Q7jqMyrff9r+sqNmXhsPVV+JPQ8eEVx3A8QxR0rFQ4zcapgeC58wtmzoOU9wAAAA=="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -798,34 +798,34 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifyd2l28aset733CD677": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifyd2l28asetq99E749BF8": {
       "Type": "String"
     },
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifyd2l28483C8589": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3functionfetchuseractivitygen2maintwolambda6D9C5EFDRef": {
+    "amplifydiscussionsgen2mainbrancha27e51c30afunctionfetchuseractivitygen2mainlambda502480EDRef": {
       "Value": {
-        "Ref": "fetchuseractivitygen2maintwolambda75E37FB2"
+        "Ref": "fetchuseractivitygen2mainlambda788E8B44"
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3functionrecorduseractivitygen2maintwolambda15FF9A2DRef": {
+    "amplifydiscussionsgen2mainbrancha27e51c30afunctionrecorduseractivitygen2mainlambdaE5320324Ref": {
       "Value": {
-        "Ref": "recorduseractivitygen2maintwolambdaFBA585F0"
+        "Ref": "recorduseractivitygen2mainlambda641C8AFE"
       }
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.outputs.json
new file mode 100644
index 00000000000..8d5fce960da
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.outputs.json
@@ -0,0 +1,6 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef",
+    "OutputValue": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json
new file mode 100644
index 00000000000..db99c1f6430
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.parameters.json
@@ -0,0 +1,6 @@
+[
+  {
+    "ParameterKey": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef",
+    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-fjzgnNdQ7Oe2"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json
similarity index 82%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json
index 2e736a3fe60..23679505a19 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storage0EC3F24A-O1Q835F0QK5N.template.json
@@ -1,7 +1,7 @@
 {
   "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"AmplifyPipelineDeploy\",\"createdWith\":\"1.4.3\",\"stackType\":\"storage-S3\",\"metadata\":{}}",
   "Resources": {
-    "discusavatarsdecb9gen2maintwoBucket5CCF194E": {
+    "discusavatarsc39a5gen2mainBucketB24EA230": {
       "Type": "AWS::S3::Bucket",
       "Properties": {
         "BucketEncryption": {
@@ -47,7 +47,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -55,7 +55,7 @@
           },
           {
             "Key": "amplify:friendly-name",
-            "Value": "discus-avatarsdecb9-gen2-maintwo"
+            "Value": "discus-avatarsc39a5-gen2-main"
           },
           {
             "Key": "aws-cdk:auto-delete-objects",
@@ -70,14 +70,14 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/discus-avatarsdecb9-gen2-maintwo/Bucket/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Resource"
       }
     },
-    "discusavatarsdecb9gen2maintwoBucketPolicy125A25F7": {
+    "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2": {
       "Type": "AWS::S3::BucketPolicy",
       "Properties": {
         "Bucket": {
-          "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+          "Ref": "discusavatarsc39a5gen2mainBucketB24EA230"
         },
         "PolicyDocument": {
           "Statement": [
@@ -95,7 +95,7 @@
               "Resource": [
                 {
                   "Fn::GetAtt": [
-                    "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                    "discusavatarsc39a5gen2mainBucketB24EA230",
                     "Arn"
                   ]
                 },
@@ -105,7 +105,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -134,7 +134,7 @@
               "Resource": [
                 {
                   "Fn::GetAtt": [
-                    "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                    "discusavatarsc39a5gen2mainBucketB24EA230",
                     "Arn"
                   ]
                 },
@@ -144,7 +144,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -159,10 +159,10 @@
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/discus-avatarsdecb9-gen2-maintwo/Bucket/Policy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/Policy/Resource"
       }
     },
-    "discusavatarsdecb9gen2maintwoBucketAutoDeleteObjectsCustomResourceF149C46F": {
+    "discusavatarsc39a5gen2mainBucketAutoDeleteObjectsCustomResource2CB8EFAF": {
       "Type": "Custom::S3AutoDeleteObjects",
       "Properties": {
         "ServiceToken": {
@@ -172,16 +172,16 @@
           ]
         },
         "BucketName": {
-          "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+          "Ref": "discusavatarsc39a5gen2mainBucketB24EA230"
         }
       },
       "DependsOn": [
-        "discusavatarsdecb9gen2maintwoBucketPolicy125A25F7"
+        "discusavatarsc39a5gen2mainBucketPolicy73EB7DB2"
       ],
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/discus-avatarsdecb9-gen2-maintwo/Bucket/AutoDeleteObjectsCustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/discus-avatarsc39a5-gen2-main/Bucket/AutoDeleteObjectsCustomResource/Default"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": {
@@ -206,7 +206,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role"
       }
     },
     "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": {
@@ -234,7 +234,7 @@
             [
               "Lambda function for auto-deleting objects in ",
               {
-                "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+                "Ref": "discusavatarsc39a5gen2mainBucketB24EA230"
               },
               " S3 bucket."
             ]
@@ -245,31 +245,31 @@
         "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
         "aws:asset:path": "asset.faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6",
         "aws:asset:property": "Code"
       }
     },
-    "DISCUSAVATARSDECB9GEN2MAINTWOBUCKETNAMEParameter04623971": {
+    "DISCUSAVATARSC39A5GEN2MAINBUCKETNAMEParameter7EBC4CDD": {
       "Type": "AWS::SSM::Parameter",
       "Properties": {
-        "Name": "/amplify/resource_reference/discussions/gen2maintwo-branch-a0081fe3b3/DISCUS_AVATARSDECB_9_GEN_2_MAINTWO_BUCKET_NAME",
+        "Name": "/amplify/resource_reference/discussions/gen2main-branch-a27e51c30a/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAME",
         "Tags": {
           "amplify:app-id": "discussions",
-          "amplify:branch-name": "gen2-maintwo",
+          "amplify:branch-name": "gen2-main",
           "amplify:deployment-type": "branch",
           "created-by": "amplify"
         },
         "Type": "String",
         "Value": {
-          "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+          "Ref": "discusavatarsc39a5gen2mainBucketB24EA230"
         }
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/DISCUS_AVATARSDECB_9_GEN_2_MAINTWO_BUCKET_NAMEParameter/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/DISCUS_AVATARSC_39_A_5_GEN_2_MAIN_BUCKET_NAMEParameter/Resource"
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageAccess3106BBB91": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C": {
       "Type": "AWS::IAM::Policy",
       "Properties": {
         "PolicyDocument": {
@@ -284,7 +284,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -298,7 +298,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -312,7 +312,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -332,7 +332,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -346,7 +346,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -360,7 +360,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -387,7 +387,7 @@
               "Effect": "Allow",
               "Resource": {
                 "Fn::GetAtt": [
-                  "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                  "discusavatarsc39a5gen2mainBucketB24EA230",
                   "Arn"
                 ]
               }
@@ -402,7 +402,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -416,7 +416,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -430,7 +430,7 @@
                     [
                       {
                         "Fn::GetAtt": [
-                          "discusavatarsdecb9gen2maintwoBucket5CCF194E",
+                          "discusavatarsc39a5gen2mainBucketB24EA230",
                           "Arn"
                         ]
                       },
@@ -443,15 +443,15 @@
           ],
           "Version": "2012-10-17"
         },
-        "PolicyName": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageAccess3106BBB91",
+        "PolicyName": "amplifydiscussionsgen2mainbrancha27e51c30astorageAccess342E15B6C",
         "Roles": [
           {
-            "Ref": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+            "Ref": "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
           }
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/amplify-discussions-gen2maintwo-branch-a0081fe3b3--storageAccess3/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/amplify-discussions-gen2main-branch-a27e51c30a--storageAccess3/Resource"
       }
     },
     "CDKMetadata": {
@@ -460,7 +460,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/5WNy07DMBBFv6VZO0NJu0Ds2rKGqFkihFxniCaJbckz6UOW/x2llggsWc0dnfuooNpuYb3SFy5NO5QjnSC+Igu2jWgzKH3hz8gbiPvJDCjq8OWyeo+FpSu54rn4HZ79vIE7YsjW3ST+BUcUfDv1aISL9KEyqv1I5ra05v8f3TnQiBa06O7VSTFbiI0Ecl2tg7YoGOaNnycp0hbisp5VSuowsXh7RPZTMDijRf9BdfBnajHsNaPaMaM0ojtyXVLOtwg9P5yrCh6fYL3qmagMkxOyCMd8vwGr7NONegEAAA=="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -732,14 +732,14 @@
     }
   },
   "Parameters": {
-    "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+    "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
       "Type": "String"
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef": {
       "Value": {
-        "Ref": "discusavatarsdecb9gen2maintwoBucket5CCF194E"
+        "Ref": "discusavatarsc39a5gen2mainBucketB24EA230"
       }
     }
   }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.outputs.json
new file mode 100644
index 00000000000..cc675d591de
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.outputs.json
@@ -0,0 +1,14 @@
+[
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref",
+    "OutputValue": "amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z"
+  },
+  {
+    "OutputKey": "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1-activity1E902D9C-QYW2OKZ2EU7Z/stream/2026-03-20T21:41:02.189"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json
similarity index 94%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json
index cc272781e62..f9454d3aee7 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storageactivityA346F297-6KCEOSFCBCK1.template.json
@@ -64,7 +64,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -79,7 +79,7 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/activity/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/activity/Resource"
       }
     },
     "CDKMetadata": {
@@ -88,7 +88,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
@@ -360,7 +360,7 @@
     }
   },
   "Outputs": {
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn": {
       "Value": {
         "Fn::GetAtt": [
           "activity1E902D9C",
@@ -368,7 +368,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn": {
       "Value": {
         "Fn::GetAtt": [
           "activity1E902D9C",
@@ -376,7 +376,7 @@
         ]
       }
     },
-    "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
+    "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref": {
       "Value": {
         "Ref": "activity1E902D9C"
       }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json
index 002324e944a..f0838f73760 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storagebookmarks210DAF62-6NUUN10S5348.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-storagebookmarks210DAF62-135V889SZ0ORT.template.json
@@ -56,7 +56,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -71,7 +71,7 @@
       "UpdateReplacePolicy": "Retain",
       "DeletionPolicy": "Retain",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/bookmarks/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/bookmarks/Resource"
       }
     },
     "CDKMetadata": {
@@ -80,7 +80,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/yXGOwqEMBAA0LPYJ7MaLOztt1B7mWRGiJ8EnERZxLsvaPWeAVPXUBZ4ina06NVbuL4sialP6BaFp4z0C7hFsnANaFdW7RSe3KpjiXl3fKsQiWGWz2EMVA2UxSze6z2H5DeG7vUPAxTDOW4AAAA="
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.outputs.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.outputs.json
index c7f9d67a1d1..db292e1091d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "webClientId",
-    "OutputValue": "1c1vf5gnunutele7c45m171n11"
+    "OutputValue": "3mosah7bsr7412hqq9soj1j2pp"
   },
   {
     "OutputKey": "socialProviders",
@@ -13,7 +13,7 @@
   },
   {
     "OutputKey": "bucketName",
-    "OutputValue": "amplify-discussions-ge-discusavatarsdecb9gen2ma-2na4arzi4tor"
+    "OutputValue": "amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4"
   },
   {
     "OutputKey": "signupAttributes",
@@ -21,7 +21,7 @@
   },
   {
     "OutputKey": "oauthClientId",
-    "OutputValue": "1c1vf5gnunutele7c45m171n11"
+    "OutputValue": "3mosah7bsr7412hqq9soj1j2pp"
   },
   {
     "OutputKey": "allowUnauthenticatedIdentities",
@@ -61,7 +61,7 @@
   },
   {
     "OutputKey": "awsAppsyncApiKey",
-    "OutputValue": "da2-g2kwwpglwnakbe2n4gy375uyxy"
+    "OutputValue": "da2-lnrd6z7ejfdg3j23f4ljtb2gaq"
   },
   {
     "OutputKey": "awsAppsyncAuthenticationType",
@@ -77,11 +77,11 @@
   },
   {
     "OutputKey": "awsAppsyncApiEndpoint",
-    "OutputValue": "https://reebkadyw5e47aagqne7csre5m.appsync-api.us-east-1.amazonaws.com/graphql"
+    "OutputValue": "https://auprb5ishbhltcshr2palt65ka.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
     "OutputKey": "awsAppsyncApiId",
-    "OutputValue": "d4mt7tdvurcczil4a5eoajtsxy"
+    "OutputValue": "33zwnmmin5anviw7lh6x2wxanq"
   },
   {
     "OutputKey": "authRegion",
@@ -89,11 +89,11 @@
   },
   {
     "OutputKey": "buckets",
-    "OutputValue": "[\"{\\\"name\\\":\\\"discus-avatarsdecb9-gen2-maintwo\\\",\\\"bucketName\\\":\\\"amplify-discussions-ge-discusavatarsdecb9gen2ma-2na4arzi4tor\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
+    "OutputValue": "[\"{\\\"name\\\":\\\"discus-avatarsc39a5-gen2-main\\\",\\\"bucketName\\\":\\\"amplify-discussions-ge-discusavatarsc39a5gen2ma-tofeojsv2jx4\\\",\\\"storageRegion\\\":\\\"us-east-1\\\",\\\"paths\\\":{\\\"public/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"protected/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]},\\\"private/*\\\":{\\\"authenticated\\\":[\\\"write\\\",\\\"get\\\",\\\"list\\\",\\\"delete\\\"]}}}\"]"
   },
   {
     "OutputKey": "amplifyApiModelSchemaS3Uri",
-    "OutputValue": "s3://amplify-discussions-ge-amplifydataamplifycodege-eouy18dnw0i5/model-schema.graphql"
+    "OutputValue": "s3://amplify-discussions-ge-amplifydataamplifycodege-jxzg53vmja75/model-schema.graphql"
   },
   {
     "OutputKey": "groups",
@@ -101,7 +101,7 @@
   },
   {
     "OutputKey": "definedFunctions",
-    "OutputValue": "[\"fetchuseractivity-gen2-maintwo\",\"recorduseractivity-gen2-maintwo\"]"
+    "OutputValue": "[\"fetchuseractivity-gen2-main\",\"recorduseractivity-gen2-main\"]"
   },
   {
     "OutputKey": "passwordlessOptions",
@@ -125,11 +125,11 @@
   },
   {
     "OutputKey": "userPoolId",
-    "OutputValue": "us-east-1_fU7jrxvo5"
+    "OutputValue": "us-east-1_I3YejOBUa"
   },
   {
     "OutputKey": "identityPoolId",
-    "OutputValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
+    "OutputValue": "us-east-1:d48cd035-0397-46c6-b39a-19514b421022"
   },
   {
     "OutputKey": "verificationMechanisms",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.parameters.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.parameters.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.template.json
similarity index 75%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.template.json
index 81f1bfe358a..23860e1f724 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a.template.json
@@ -74,7 +74,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref"
         ]
       }
     },
@@ -82,7 +82,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref"
         ]
       }
     },
@@ -90,7 +90,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
         ]
       }
     },
@@ -148,7 +148,7 @@
       "Value": {
         "Fn::GetAtt": [
           "auth179371D7",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPoolAppClientFFCC03B0Ref"
         ]
       }
     },
@@ -159,7 +159,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21ApiId"
         ]
       }
     },
@@ -167,7 +167,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1GraphQLUrl"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPI5BB21C21GraphQLUrl"
         ]
       }
     },
@@ -200,7 +200,7 @@
                             {
                               "Fn::GetAtt": [
                                 "data7552DF31",
-                                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB44890AA5DestinationBucketArn"
+                                "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiBABCA4586DestinationBucketArn"
                               ]
                             }
                           ]
@@ -220,7 +220,7 @@
       "Value": {
         "Fn::GetAtt": [
           "data7552DF31",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIDefaultApiKey22C2FDC2ApiKey"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataGraphQLAPIDefaultApiKey467DD7FFApiKey"
         ]
       }
     },
@@ -236,14 +236,14 @@
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3functionfetchuseractivitygen2maintwolambda6D9C5EFDRef"
+                "Outputs.amplifydiscussionsgen2mainbrancha27e51c30afunctionfetchuseractivitygen2mainlambda502480EDRef"
               ]
             },
             "\",\"",
             {
               "Fn::GetAtt": [
                 "function1351588B",
-                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3functionrecorduseractivitygen2maintwolambda15FF9A2DRef"
+                "Outputs.amplifydiscussionsgen2mainbrancha27e51c30afunctionrecorduseractivitygen2mainlambdaE5320324Ref"
               ]
             },
             "\"]"
@@ -260,7 +260,7 @@
       "Value": {
         "Fn::GetAtt": [
           "storage0EC3F24A",
-          "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref"
+          "Outputs.amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef"
         ]
       }
     },
@@ -269,11 +269,11 @@
         "Fn::Join": [
           "",
           [
-            "[\"{\\\"name\\\":\\\"discus-avatarsdecb9-gen2-maintwo\\\",\\\"bucketName\\\":\\\"",
+            "[\"{\\\"name\\\":\\\"discus-avatarsc39a5-gen2-main\\\",\\\"bucketName\\\":\\\"",
             {
               "Fn::GetAtt": [
                 "storage0EC3F24A",
-                "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref"
+                "Outputs.amplifydiscussionsgen2mainbrancha27e51c30astoragediscusavatarsc39a5gen2mainBucket0721E25ERef"
               ]
             },
             "\\\",\\\"storageRegion\\\":\\\"",
@@ -323,7 +323,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -336,7 +336,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceLambdaServiceRoleDefaultPolicy86099CA1": {
@@ -350,7 +350,7 @@
                 "amplify:UpdateBranch"
               ],
               "Effect": "Allow",
-              "Resource": "arn:aws:amplify:*:*:apps/discussions/branches/gen2-maintwo"
+              "Resource": "arn:aws:amplify:*:*:apps/discussions/branches/gen2-main"
             }
           ],
           "Version": "2012-10-17"
@@ -363,7 +363,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceLambda/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceLambda582AC093": {
@@ -373,7 +373,7 @@
           "S3Bucket": {
             "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
           },
-          "S3Key": "67425b9f14cfe4a196e61f870e9cabfc0b94dee9b5b91bbeccbb9c69b3bc2993.zip"
+          "S3Key": "889af25ec144539aa0fa352adcac1ecdc237551e2d7fd49b6a87f2c064029c34.zip"
         },
         "Handler": "index.handler",
         "Role": {
@@ -390,7 +390,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -408,8 +408,8 @@
         "AmplifyBranchLinkerCustomResourceLambdaServiceRole3DDCBC03"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceLambda/Resource",
-        "aws:asset:path": "asset.67425b9f14cfe4a196e61f870e9cabfc0b94dee9b5b91bbeccbb9c69b3bc2993",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceLambda/Resource",
+        "aws:asset:path": "asset.889af25ec144539aa0fa352adcac1ecdc237551e2d7fd49b6a87f2c064029c34",
         "aws:asset:is-bundled": true,
         "aws:asset:property": "Code"
       }
@@ -450,7 +450,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -463,7 +463,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRoleDefaultPolicy38AAE412": {
@@ -518,7 +518,7 @@
         ]
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
       }
     },
     "AmplifyBranchLinkerCustomResourceProviderframeworkonEvent3B23F900": {
@@ -530,7 +530,7 @@
           },
           "S3Key": "07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57.zip"
         },
-        "Description": "AWS CDK resource provider framework - onEvent (amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider)",
+        "Description": "AWS CDK resource provider framework - onEvent (amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceProvider)",
         "Environment": {
           "Variables": {
             "USER_ON_EVENT_FUNCTION_ARN": {
@@ -560,7 +560,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -578,7 +578,7 @@
         "AmplifyBranchLinkerCustomResourceProviderframeworkonEventServiceRole92A035EB"
       ],
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResourceProvider/framework-onEvent/Resource",
         "aws:asset:path": "asset.07a90cc3efdfc34da22208dcd9d211f06f5b0e01b21e778edc7c3966b1f61d57",
         "aws:asset:is-bundled": false,
         "aws:asset:property": "Code"
@@ -594,12 +594,12 @@
           ]
         },
         "appId": "discussions",
-        "branchName": "gen2-maintwo"
+        "branchName": "gen2-main"
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/AmplifyBranchLinker/CustomResource/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/AmplifyBranchLinker/CustomResource/Default"
       }
     },
     "auth179371D7": {
@@ -612,7 +612,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -639,7 +639,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/3165d37962f3c936a61898d88ff7df6a61ee55bb5a15d5c6e5d22797439b68b0.json"
+              "/daf4782e478bdbb27b14ab26abb3ca51fde0b4d74e9212d1043bc20ec3ac5304.json"
             ]
           ]
         }
@@ -647,8 +647,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/auth.NestedStack/auth.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3authE55A333D.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/auth.NestedStack/auth.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30aauthD6CBADCF.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -656,28 +656,28 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthUserPool82221E95Ref"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthunauthenticatedUserRole2C26C54ERef"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthIdentityPool08912074Ref"
             ]
           }
         },
@@ -688,7 +688,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -715,7 +715,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/86f88508166e592fe54f8777f9fe0baff54a789b8177fb10b8f9fd3663f5104e.json"
+              "/975bf6a4f97ff716b6749507d5a204e67ad45474b432cd75995292f4f65c9262.json"
             ]
           ]
         }
@@ -723,8 +723,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/data.NestedStack/data.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataC1492795.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/data.NestedStack/data.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30adata4AF9D6B5.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -732,10 +732,10 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30aauthNestedStackauthNestedStackResource71073350Outputsamplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef": {
             "Fn::GetAtt": [
               "auth179371D7",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30aauthamplifyAuthauthenticatedUserRoleF8A310BARef"
             ]
           }
         },
@@ -746,7 +746,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -773,7 +773,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/48f663d645afd5420b43aef0928872002d3f2f9f78f650528e81320079bb6df0.json"
+              "/6f22820c0563e73d1bfcf4720f745189c60ae2dac2d11e9bcfa01144267be7af.json"
             ]
           ]
         }
@@ -781,8 +781,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storage.NestedStack/storage.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageEFBED291.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storage.NestedStack/storage.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30astorageB84219BD.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -790,40 +790,40 @@
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
         "Parameters": {
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Arn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97StreamArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30astorageactivityNestedStackstorageactivityNestedStackResource59CA300COutputsamplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref": {
             "Fn::GetAtt": [
               "storageactivityA346F297",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30astorageactivity9EDFFE97Ref"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifyd2l28aset733CD677": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicNestedStackTopicNestedStackResourceBD3B6C61Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataTopicTopicTable0F7B351ATableStreamArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifyd2l28asetq99E749BF8": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostNestedStackPostNestedStackResource3E8F8B99Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataPostPostTable3FE3EB5DTableStreamArn"
             ]
           },
-          "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E": {
+          "referencetoamplifydiscussionsgen2mainbrancha27e51c30adataNestedStackdataNestedStackResource907A4719Outputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifyd2l28483C8589": {
             "Fn::GetAtt": [
               "data7552DF31",
-              "Outputs.amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn"
+              "Outputs.amplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentNestedStackCommentNestedStackResource06709DCDOutputsamplifydiscussionsgen2mainbrancha27e51c30adataamplifyDataCommentCommentTable4FC8AE39TableStreamArn"
             ]
           }
         },
@@ -834,7 +834,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -861,7 +861,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/eca94e4abd9336d5a4e172550c856d29f2270e1c01ce9da49a0ae9e563807891.json"
+              "/87e64a9e5b21a0af9a383e57c3ad1d013a6c707331cd88c36cd6ce17686b28c0.json"
             ]
           ]
         }
@@ -869,8 +869,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/function.NestedStack/function.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3function1E08C893.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/function.NestedStack/function.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30afunction7E969D51.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -884,7 +884,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -911,7 +911,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/bf47b0dd2f6e2e217d594cb4a09f7fd1c2713723e6ed3712212ee2b5ebb44cb2.json"
+              "/01043e56eedbce9a74251932d63eb813766d6a0ed9ed954db4b2f83a31d5eafe.json"
             ]
           ]
         }
@@ -919,8 +919,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storageactivity.NestedStack/storageactivity.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivity997FBF27.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storageactivity.NestedStack/storageactivity.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30astorageactivity2888AFDE.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -934,7 +934,7 @@
           },
           {
             "Key": "amplify:branch-name",
-            "Value": "gen2-maintwo"
+            "Value": "gen2-main"
           },
           {
             "Key": "amplify:deployment-type",
@@ -961,7 +961,7 @@
               {
                 "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
               },
-              "/a81a43a8edbe65c9a0a780bf184736317634b82a82d34463ce17daa624f6fd80.json"
+              "/9cbbbb078a8e121c1410532826d4a8e3fb61f187472031710c8ff6faf6470328.json"
             ]
           ]
         }
@@ -969,8 +969,8 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
-        "aws:asset:path": "amplifydiscussionsgen2maintwobrancha0081fe3b3storagebookmarks047699E9.nested.template.json",
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/storagebookmarks.NestedStack/storagebookmarks.NestedStackResource",
+        "aws:asset:path": "amplifydiscussionsgen2mainbrancha27e51c30astoragebookmarksB9393E78.nested.template.json",
         "aws:asset:property": "TemplateURL"
       }
     },
@@ -980,7 +980,7 @@
         "Analytics": "v2:deflate64:H4sIAAAAAAAA/02PzWrDQAyEnyV3WU2dHHJtDD22wXkAo6yVIP/slpU2oRi/e/C6LT19I4YZNCWW+z1uN/TQwrV9McgFp7OR66G6+s9kX8mAHtpMA42XlhofWu4UPzLek3cmwYPQiFMdBl5SmacwiPtezlXNoLuGVNkU3xaA7vCYXM92JGVY63Gqrv6v9VfMM+TI2egm/gYuqYWxiawhRceKpxju0nKEKjv1j5Gf+afzrhmWCdjpy70s8fWA202nIkVM3mRkrFc+AXlCmgwZAQAA"
       },
       "Metadata": {
-        "aws:cdk:path": "amplify-discussions-gen2maintwo-branch-a0081fe3b3/CDKMetadata/Default"
+        "aws:cdk:path": "amplify-discussions-gen2main-branch-a27e51c30a/CDKMetadata/Default"
       },
       "Condition": "CDKMetadataAvailable"
     }
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json
deleted file mode 100644
index f034308b8ef..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.outputs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerTableManagerCustomProviderframeworkonEvent4BEDCA73Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json
deleted file mode 100644
index 9c722b649d4..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataAmplifyTableManagerNestedStackA-OQJNODUL69WQ.parameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json
deleted file mode 100644
index 2715cda9474..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttCommentTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:CommentTable:StreamArn"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619"
-  },
-  {
-    "OutputKey": "GetAttCommentTableName",
-    "OutputValue": "Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:CommentTable:Name"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName",
-    "OutputValue": "CommentTable"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json
deleted file mode 100644
index 6f1a0e80991..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataCommentNestedStackCommentNested-RTBK7X4W3WZ5.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json
deleted file mode 100644
index 1662c408b2e..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataConnectionStackNestedStackConne-786MWSCGWATV.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName",
-    "ParameterValue": "PostTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentDataSource6D10D95BName",
-    "ParameterValue": "CommentTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name",
-    "ParameterValue": "TopicTable"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json
deleted file mode 100644
index 2a1991c3dfb..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataFunctionDirectiveStackNestedSta-1DIRT0QDIWBFM.parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json
deleted file mode 100644
index 5a3cd2687d1..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostDataSource598A5BBCName",
-    "OutputValue": "PostTable"
-  },
-  {
-    "OutputKey": "GetAttPostTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:PostTable:StreamArn"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE"
-  },
-  {
-    "OutputKey": "GetAttPostTableName",
-    "OutputValue": "Post-d4mt7tdvurcczil4a5eoajtsxy-NONE",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:PostTable:Name"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json
deleted file mode 100644
index 6f1a0e80991..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataPostNestedStackPostNestedStackR-1DFTLBBEXN9CL.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json
deleted file mode 100644
index 886ca432f35..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.outputs.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "OutputKey": "GetAttTopicTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285",
-    "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:TopicTable:StreamArn"
-  },
-  {
-    "OutputKey": "GetAttTopicTableName",
-    "OutputValue": "Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE",
-    "Description": "Your DynamoDB table name.",
-    "ExportName": "d4mt7tdvurcczil4a5eoajtsxy:GetAtt:TopicTable:Name"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicDataSource34A9A2C4Name",
-    "OutputValue": "TopicTable"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json
deleted file mode 100644
index 6f1a0e80991..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a-amplifyDataTopicNestedStackTopicNestedStac-YH948UOUEKFY.parameters.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerNestedStackAmplifyTableManagerNestedStackResourceA90E75FEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyTableManagerT2D7EA9F6",
-    "ParameterValue": "arn:aws:lambda:us-east-1:123456789012:function:amplify-discussions-ge-TableManagerCustomProvid-CrR4967sk72K"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPINONEDS8B2E9B9AName",
-    "ParameterValue": "NONE_DS"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "ParameterValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json
deleted file mode 100644
index 97c0bd1c796..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-auth179371D7-2NLVKCUURH94.outputs.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "OutputValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolAppClient352F77A7Ref",
-    "OutputValue": "1c1vf5gnunutele7c45m171n11"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "OutputValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "OutputValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef",
-    "OutputValue": "us-east-1_fU7jrxvo5"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json
deleted file mode 100644
index 590cbe37cf7..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.outputs.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIDefaultApiKey22C2FDC2ApiKey",
-    "OutputValue": "da2-g2kwwpglwnakbe2n4gy375uyxy"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1GraphQLUrl",
-    "OutputValue": "https://reebkadyw5e47aagqne7csre5m.appsync-api.us-east-1.amazonaws.com/graphql"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataGraphQLAPIACC393F1ApiId",
-    "OutputValue": "d4mt7tdvurcczil4a5eoajtsxy"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentCommentTable1026D4FDTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicTopicTable34AB9B96TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostPostTableBB75EB93TableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataAmplifyCodegenAssetsAmplifyCodegenAssetsDeploymentCustomResource1536MiB44890AA5DestinationBucketArn",
-    "OutputValue": "arn:aws:s3:::amplify-discussions-ge-amplifydataamplifycodege-eouy18dnw0i5"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json
deleted file mode 100644
index f4cb686fa23..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-data7552DF31-1UMPATHK2POAL.parameters.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "ParameterKey": "DynamoDBModelTableReadIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "DynamoDBEnableServerSideEncryption",
-    "ParameterValue": "true"
-  },
-  {
-    "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
-    "ParameterValue": "false"
-  },
-  {
-    "ParameterKey": "DynamoDBBillingMode",
-    "ParameterValue": "PAY_PER_REQUEST"
-  },
-  {
-    "ParameterKey": "DynamoDBModelTableWriteIOPS",
-    "ParameterValue": "5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthunauthenticatedUserRole34FE07AERef",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthunauthenticate-BWzo2uNpmsGb"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthIdentityPool98DD83B7Ref",
-    "ParameterValue": "us-east-1:ae327679-b135-4e18-afcd-ea1b463c0546"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthUserPoolE50A596BRef",
-    "ParameterValue": "us-east-1_fU7jrxvo5"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json
deleted file mode 100644
index a521acd65cf..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.outputs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3functionrecorduseractivitygen2maintwolambda15FF9A2DRef",
-    "OutputValue": "recorduseractivity-gen2-maintwo"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3functionfetchuseractivitygen2maintwolambda6D9C5EFDRef",
-    "OutputValue": "fetchuseractivity-gen2-maintwo"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json
deleted file mode 100644
index f583c02ee47..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-function1351588B-1M6WNJD1W2J5X.parameters.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref",
-    "ParameterValue": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityNestedStackstorageactivityNestedStackResource7E13FBAEOutputsamplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataTopicNestedStackTopicNestedStackResourceDF824BE0Outputsamplifyd2l67DFE00D",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.285"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataCommentNestedStackCommentNestedStackResourceB5C7283DOutputsamplif487BF11E",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.619"
-  },
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3dataNestedStackdataNestedStackResourceEDF06937Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3dataamplifyDataPostNestedStackPostNestedStackResource357388A6Outputsamplifyd2l28A326AA64",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-d4mt7tdvurcczil4a5eoajtsxy-NONE/stream/2026-03-20T18:24:46.378"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json
deleted file mode 100644
index 771feb56f0b..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.outputs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storagediscusavatarsdecb9gen2maintwoBucketF8281B37Ref",
-    "OutputValue": "amplify-discussions-ge-discusavatarsdecb9gen2ma-2na4arzi4tor"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json
deleted file mode 100644
index f8b3c41e71c..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storage0EC3F24A-TNJDP7TV84DW.parameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ParameterKey": "referencetoamplifydiscussionsgen2maintwobrancha0081fe3b3authNestedStackauthNestedStackResourceD7AECC99Outputsamplifydiscussionsgen2maintwobrancha0081fe3b3authamplifyAuthauthenticatedUserRoleAEA32B43Ref",
-    "ParameterValue": "amplify-discussions-ge-amplifyAuthauthenticatedU-kLFK0nhRssqJ"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json
deleted file mode 100644
index 55a58612680..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX.outputs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Ref",
-    "OutputValue": "amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO"
-  },
-  {
-    "OutputKey": "amplifydiscussionsgen2maintwobrancha0081fe3b3storageactivityBCEEF9A7StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/amplify-discussions-gen2maintwo-branch-a0081fe3b3-storageactivityA346F297-URG4H1Y2NQLX-activity1E902D9C-18I4HWXN0C1KO/stream/2026-03-20T18:22:26.543"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.outputs.json
similarity index 62%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.outputs.json
index 1c2bceac333..6923c7856d4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.outputs.json
@@ -3,13 +3,13 @@
     "OutputKey": "GetAttCommentDataSourceName",
     "OutputValue": "CommentTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:CommentDataSource:Name"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:CommentDataSource:Name"
   },
   {
     "OutputKey": "GetAttCommentTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-st35wex2drhe5piowtinjea47y-maintwo/stream/2026-01-29T19:51:34.005",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Comment-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.630",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:CommentTable:StreamArn"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:CommentTable:StreamArn"
   },
   {
     "OutputKey": "transformerrootstackCommentCommentDataSourceA0E54655Name",
@@ -17,12 +17,12 @@
   },
   {
     "OutputKey": "transformerrootstackCommentCommentTable5427FDE2Ref",
-    "OutputValue": "Comment-st35wex2drhe5piowtinjea47y-maintwo"
+    "OutputValue": "Comment-u3jn2qbupzbyhc3h53673wdvim-main"
   },
   {
     "OutputKey": "GetAttCommentTableName",
-    "OutputValue": "Comment-st35wex2drhe5piowtinjea47y-maintwo",
+    "OutputValue": "Comment-u3jn2qbupzbyhc3h53673wdvim-main",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:CommentTable:Name"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:CommentTable:Name"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.parameters.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.parameters.json
index 2b2abf43553..562b4a2a1f9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "ParameterValue": "cthbhhlyd5gwrjmbn2oe3mmzpe"
+    "ParameterValue": "stocrj6wmnfwdc4rdkdv7z5t2u"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
@@ -13,7 +13,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "ParameterValue": "qd7jydnwobcfvanwmjhvrbpwhm"
+    "ParameterValue": "e4yi7ioceze5riv7y2vaozdoqu"
   },
   {
     "ParameterKey": "DynamoDBBillingMode",
@@ -21,15 +21,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "ParameterValue": "j3guc4443jaurd5t57uyfjrzoe"
+    "ParameterValue": "gsc7uhamufgixefq3v5ucyfwua"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "ParameterValue": "knbxu4bubjg6fnww57kmgtvdpa"
+    "ParameterValue": "gb77pqdsqvfxlf43gz2ay4ll7a"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -37,7 +37,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "ParameterValue": "mzwd7p5cufaxpjscvvjhpvu42y"
+    "ParameterValue": "27xllzlwpve67blxdyydbpfvzm"
   },
   {
     "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
@@ -45,11 +45,11 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "ParameterValue": "fv2vfbtkeff2bmihzfq7ruoqqi"
+    "ParameterValue": "xpl3pgeq4fhwji3vgpzje5i7ky"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "ParameterValue": "fe6mxc5oa5afdm65jz72xihooi"
+    "ParameterValue": "k6fcuyzzyja75po4s3jdi2odwe"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -57,10 +57,10 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.template.json
index 3af2c09b2f6..e8e12e1a51b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Comment-136Y5UD1LM95X.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Comment-1R56B3L2EK68O.template.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "CommentTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.parameters.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.parameters.json
index 27bd26ffe73..f4d0c5e7dbd 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.parameters.json
@@ -1,7 +1,7 @@
 [
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref",
-    "ParameterValue": "Topic-st35wex2drhe5piowtinjea47y-maintwo"
+    "ParameterValue": "Topic-u3jn2qbupzbyhc3h53673wdvim-main"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
@@ -13,15 +13,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef",
-    "ParameterValue": "Post-st35wex2drhe5piowtinjea47y-maintwo"
+    "ParameterValue": "Post-u3jn2qbupzbyhc3h53673wdvim-main"
   },
   {
     "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref",
-    "ParameterValue": "Comment-st35wex2drhe5piowtinjea47y-maintwo"
+    "ParameterValue": "Comment-u3jn2qbupzbyhc3h53673wdvim-main"
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentDataSourceA0E54655Name",
@@ -29,7 +29,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostDataSource6998E105Name",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.template.json
similarity index 94%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.template.json
index 660f4be4274..6ee1390d259 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-ConnectionStack-RYPW32RBHMM8.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-ConnectionStack-1D7MI9B5PWZI9.template.json
@@ -111,7 +111,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -200,7 +200,7 @@
               {
                 "Ref": "referencetotransformerrootstackCommentNestedStackCommentNestedStackResource199283FBOutputstransformerrootstackCommentCommentTable5427FDE2Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -289,7 +289,7 @@
               {
                 "Ref": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicTopicTableFD91FB92Ref"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -378,7 +378,7 @@
               {
                 "Ref": "referencetotransformerrootstackPostNestedStackPostNestedStackResource45FCAC5EOutputstransformerrootstackPostPostTable34CAE87BRef"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.parameters.json
similarity index 70%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.parameters.json
index cadffe01b82..3e97829645f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.parameters.json
@@ -1,15 +1,15 @@
 [
   {
     "ParameterKey": "S3DeploymentBucket",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "AppSyncApiId",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "S3DeploymentRootKey",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-CustomResourcesjson-1DY9IV2DRTOM5.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-CustomResourcesjson-2UYKNHZR1DQ9.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.outputs.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.outputs.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.parameters.json
similarity index 78%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.parameters.json
index 35126b8a742..c43d6f9a38b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.parameters.json
@@ -9,14 +9,14 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-FunctionDirectiveStack-TN93GL5RGSP.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-FunctionDirectiveStack-XXYDFRMQMROV.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.outputs.json
similarity index 61%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.outputs.json
index 54398177034..b0508190c7e 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.outputs.json
@@ -3,13 +3,13 @@
     "OutputKey": "GetAttPostDataSourceName",
     "OutputValue": "PostTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:PostDataSource:Name"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:PostDataSource:Name"
   },
   {
     "OutputKey": "GetAttPostTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-st35wex2drhe5piowtinjea47y-maintwo/stream/2026-01-29T19:51:33.824",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Post-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:21:05.591",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:PostTable:StreamArn"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:PostTable:StreamArn"
   },
   {
     "OutputKey": "transformerrootstackPostPostDataSource6998E105Name",
@@ -17,12 +17,12 @@
   },
   {
     "OutputKey": "GetAttPostTableName",
-    "OutputValue": "Post-st35wex2drhe5piowtinjea47y-maintwo",
+    "OutputValue": "Post-u3jn2qbupzbyhc3h53673wdvim-main",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:PostTable:Name"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:PostTable:Name"
   },
   {
     "OutputKey": "transformerrootstackPostPostTable34CAE87BRef",
-    "OutputValue": "Post-st35wex2drhe5piowtinjea47y-maintwo"
+    "OutputValue": "Post-u3jn2qbupzbyhc3h53673wdvim-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.parameters.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.parameters.json
index 2b2abf43553..562b4a2a1f9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "ParameterValue": "cthbhhlyd5gwrjmbn2oe3mmzpe"
+    "ParameterValue": "stocrj6wmnfwdc4rdkdv7z5t2u"
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentRootKeyA71EA735Ref",
@@ -13,7 +13,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "ParameterValue": "qd7jydnwobcfvanwmjhvrbpwhm"
+    "ParameterValue": "e4yi7ioceze5riv7y2vaozdoqu"
   },
   {
     "ParameterKey": "DynamoDBBillingMode",
@@ -21,15 +21,15 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "ParameterValue": "j3guc4443jaurd5t57uyfjrzoe"
+    "ParameterValue": "gsc7uhamufgixefq3v5ucyfwua"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "ParameterValue": "knbxu4bubjg6fnww57kmgtvdpa"
+    "ParameterValue": "gb77pqdsqvfxlf43gz2ay4ll7a"
   },
   {
     "ParameterKey": "DynamoDBEnableServerSideEncryption",
@@ -37,7 +37,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "ParameterValue": "mzwd7p5cufaxpjscvvjhpvu42y"
+    "ParameterValue": "27xllzlwpve67blxdyydbpfvzm"
   },
   {
     "ParameterKey": "DynamoDBEnablePointInTimeRecovery",
@@ -45,11 +45,11 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "ParameterValue": "fv2vfbtkeff2bmihzfq7ruoqqi"
+    "ParameterValue": "xpl3pgeq4fhwji3vgpzje5i7ky"
   },
   {
     "ParameterKey": "referencetotransformerrootstackTopicNestedStackTopicNestedStackResource792C4229OutputstransformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "ParameterValue": "fe6mxc5oa5afdm65jz72xihooi"
+    "ParameterValue": "k6fcuyzzyja75po4s3jdi2odwe"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -57,10 +57,10 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.template.json
index 1340edb7eec..d2b9164124f 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Post-3HS6CAU8A7BV.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Post-1M7ZECDZE6HW1.template.json
@@ -500,7 +500,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -595,7 +595,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -693,7 +693,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -845,7 +845,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -994,7 +994,7 @@
               {
                 "Ref": "PostTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1031,7 +1031,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1068,7 +1068,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1105,7 +1105,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.outputs.json
similarity index 70%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.outputs.json
index 26284d78aed..f59c6bce1d9 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.outputs.json
@@ -1,37 +1,37 @@
 [
   {
     "OutputKey": "GetAttTopicTableStreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-st35wex2drhe5piowtinjea47y-maintwo/stream/2026-01-29T19:50:46.476",
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/Topic-u3jn2qbupzbyhc3h53673wdvim-main/stream/2026-03-20T21:20:17.537",
     "Description": "Your DynamoDB table StreamArn.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:TopicTable:StreamArn"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:TopicTable:StreamArn"
   },
   {
     "OutputKey": "GetAttTopicTableName",
-    "OutputValue": "Topic-st35wex2drhe5piowtinjea47y-maintwo",
+    "OutputValue": "Topic-u3jn2qbupzbyhc3h53673wdvim-main",
     "Description": "Your DynamoDB table name.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:TopicTable:Name"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:TopicTable:Name"
   },
   {
     "OutputKey": "transformerrootstackTopicQuerygetTopicauth0FunctionQuerygetTopicauth0FunctionAppSyncFunctionEC4A6DABFunctionId",
-    "OutputValue": "fv2vfbtkeff2bmihzfq7ruoqqi"
+    "OutputValue": "xpl3pgeq4fhwji3vgpzje5i7ky"
   },
   {
     "OutputKey": "transformerrootstackTopicSubscriptiononCreateTopicauth0FunctionSubscriptiononCreateTopicauth0FunctionAppSyncFunctionA56CE4F0FunctionId",
-    "OutputValue": "fe6mxc5oa5afdm65jz72xihooi"
+    "OutputValue": "k6fcuyzzyja75po4s3jdi2odwe"
   },
   {
     "OutputKey": "transformerrootstackTopicQuerygetTopicpostAuth0FunctionQuerygetTopicpostAuth0FunctionAppSyncFunction821534EDFunctionId",
-    "OutputValue": "knbxu4bubjg6fnww57kmgtvdpa"
+    "OutputValue": "gb77pqdsqvfxlf43gz2ay4ll7a"
   },
   {
     "OutputKey": "GetAttTopicDataSourceName",
     "OutputValue": "TopicTable",
     "Description": "Your model DataSource name.",
-    "ExportName": "st35wex2drhe5piowtinjea47y:GetAtt:TopicDataSource:Name"
+    "ExportName": "u3jn2qbupzbyhc3h53673wdvim:GetAtt:TopicDataSource:Name"
   },
   {
     "OutputKey": "transformerrootstackTopicTopicTableFD91FB92Ref",
-    "OutputValue": "Topic-st35wex2drhe5piowtinjea47y-maintwo"
+    "OutputValue": "Topic-u3jn2qbupzbyhc3h53673wdvim-main"
   },
   {
     "OutputKey": "transformerrootstackTopicTopicDataSource63D2F34BName",
@@ -39,18 +39,18 @@
   },
   {
     "OutputKey": "transformerrootstackTopicMutationcreateTopicinit0FunctionMutationcreateTopicinit0FunctionAppSyncFunction3ECD028CFunctionId",
-    "OutputValue": "mzwd7p5cufaxpjscvvjhpvu42y"
+    "OutputValue": "27xllzlwpve67blxdyydbpfvzm"
   },
   {
     "OutputKey": "transformerrootstackTopicSubscriptionOnCreateTopicDataResolverFnSubscriptionOnCreateTopicDataResolverFnAppSyncFunctionA25E598AFunctionId",
-    "OutputValue": "cthbhhlyd5gwrjmbn2oe3mmzpe"
+    "OutputValue": "stocrj6wmnfwdc4rdkdv7z5t2u"
   },
   {
     "OutputKey": "transformerrootstackTopicMutationcreateTopicauth0FunctionMutationcreateTopicauth0FunctionAppSyncFunction2E1A1C86FunctionId",
-    "OutputValue": "j3guc4443jaurd5t57uyfjrzoe"
+    "OutputValue": "gsc7uhamufgixefq3v5ucyfwua"
   },
   {
     "OutputKey": "transformerrootstackTopicMutationupdateTopicinit0FunctionMutationupdateTopicinit0FunctionAppSyncFunction16C763FFFunctionId",
-    "OutputValue": "qd7jydnwobcfvanwmjhvrbpwhm"
+    "OutputValue": "e4yi7ioceze5riv7y2vaozdoqu"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.parameters.json
similarity index 87%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.parameters.json
index 81d1f203be1..50ae86858b8 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.parameters.json
@@ -25,7 +25,7 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackGraphQLAPI20497F53ApiId",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -33,10 +33,10 @@
   },
   {
     "ParameterKey": "referencetotransformerrootstackS3DeploymentBucket7592718ARef",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "referencetotransformerrootstackenv10C5A902Ref",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.template.json
index 206fa8ec0f5..3f62c10608d 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN-Topic-964U4TM6BHFI.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4-Topic-1Y1P33HAY8NE1.template.json
@@ -503,7 +503,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -604,7 +604,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -771,7 +771,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -959,7 +959,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1111,7 +1111,7 @@
               {
                 "Ref": "TopicTable"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1232,7 +1232,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1278,7 +1278,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1324,7 +1324,7 @@
               {
                 "Ref": "referencetotransformerrootstackGraphQLAPI20497F53ApiId"
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.description.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.outputs.json
new file mode 100644
index 00000000000..0c96f5b4cd9
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.outputs.json
@@ -0,0 +1,20 @@
+[
+  {
+    "OutputKey": "GraphQLAPIIdOutput",
+    "OutputValue": "u3jn2qbupzbyhc3h53673wdvim",
+    "Description": "Your GraphQL API ID.",
+    "ExportName": "amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4:GraphQLApiId"
+  },
+  {
+    "OutputKey": "GraphQLAPIEndpointOutput",
+    "OutputValue": "https://jsm5ex363jcy5fm2reylyox4te.appsync-api.us-east-1.amazonaws.com/graphql",
+    "Description": "Your GraphQL API endpoint.",
+    "ExportName": "amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4:GraphQLApiEndpoint"
+  },
+  {
+    "OutputKey": "GraphQLAPIKeyOutput",
+    "OutputValue": "da2-fakeapikey00000000000000",
+    "Description": "Your GraphQL API ID.",
+    "ExportName": "amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4:GraphQLApiKey"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.parameters.json
similarity index 88%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.parameters.json
index bbaa3d0cce4..29f8b68a501 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.parameters.json
@@ -17,7 +17,7 @@
   },
   {
     "ParameterKey": "S3DeploymentBucket",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "DynamoDBModelTableWriteIOPS",
@@ -25,7 +25,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "S3DeploymentRootKey",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.template.json
similarity index 97%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.template.json
index e702f6821aa..d6d8952134a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-apidiscussions-ZIHO40IAIPU4.template.json
@@ -111,7 +111,7 @@
             "ApiId"
           ]
         },
-        "Expires": 1770321021
+        "Expires": 1774646894
       }
     },
     "GraphQLAPINONEDS95A13CF0": {
@@ -641,7 +641,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -738,7 +738,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -835,7 +835,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -932,7 +932,7 @@
                   "ApiId"
                 ]
               },
-              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-maintwo\"]))\n$util.toJson({})"
+              "\"))\n$util.qr($ctx.stash.put(\"connectionAttributes\", {}))\n\n$util.qr($ctx.stash.put(\"identityPoolId\", \"us-east-1:d588cc58-4459-4b1b-ac91-307079a54464\"))\n$util.qr($ctx.stash.put(\"adminRoles\", [\"recorduseractivity-main\"]))\n$util.toJson({})"
             ]
           ]
         },
@@ -1061,6 +1061,5 @@
         }
       }
     }
-  },
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"api-AppSync\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}"
+  }
 }
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.description.txt
new file mode 100644
index 00000000000..8b558f82186
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"auth-Cognito","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.outputs.json
similarity index 71%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.outputs.json
index 4cf42c946d5..a9d191bba1c 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.outputs.json
@@ -1,37 +1,37 @@
 [
   {
     "OutputKey": "CreatedSNSRole",
-    "OutputValue": "arn:aws:iam::123456789012:role/snsc578c16edecb9-maintwo",
+    "OutputValue": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main",
     "Description": "role arn"
   },
   {
     "OutputKey": "UserPoolId",
-    "OutputValue": "us-east-1_RCPurfiEw",
+    "OutputValue": "us-east-1_vv2HFjwRK",
     "Description": "Id for the user pool"
   },
   {
     "OutputKey": "AppClientIDWeb",
-    "OutputValue": "2kictuhtu6967eqd0qhtsv5roh",
+    "OutputValue": "7nhjrv5jepqc7kacqiknlj0siu",
     "Description": "The user pool app client id for web"
   },
   {
     "OutputKey": "AppClientID",
-    "OutputValue": "35iqavrc56jmhttprdv2frl8qf",
+    "OutputValue": "7tbnnc27p4edfrp7m6bqqkh0gq",
     "Description": "The user pool app client id"
   },
   {
     "OutputKey": "IdentityPoolId",
-    "OutputValue": "us-east-1:d3542be7-d73b-443b-bd5c-416f98683f8e",
+    "OutputValue": "us-east-1:d588cc58-4459-4b1b-ac91-307079a54464",
     "Description": "Id for the identity pool"
   },
   {
     "OutputKey": "UserPoolArn",
-    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_RCPurfiEw",
+    "OutputValue": "arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_vv2HFjwRK",
     "Description": "Arn for the user pool"
   },
   {
     "OutputKey": "IdentityPoolName",
-    "OutputValue": "discussionsc578c16e_identitypool_c578c16e__maintwo"
+    "OutputValue": "discussionsc578c16e_identitypool_c578c16e__main"
   },
   {
     "OutputKey": "UserPoolName",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
similarity index 97%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index 9f2b0c0d239..74fcae6c0f2 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "authRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole"
   },
   {
     "ParameterKey": "autoVerifiedAttributes",
@@ -117,7 +117,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "triggers",
@@ -141,7 +141,7 @@
   },
   {
     "ParameterKey": "unauthRoleArn",
-    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole"
+    "ParameterValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole"
   },
   {
     "ParameterKey": "requiredAttributes",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
index 50d85ddc94f..3f10aeedb88 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"auth-Cognito\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.description.txt
new file mode 100644
index 00000000000..e0ba9d9ec0a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.outputs.json
similarity index 69%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.outputs.json
index 6f5507529a4..4397bba2a99 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "LambdaExecutionRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-maintwo"
+    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole44bd86bc-main"
   },
   {
     "OutputKey": "Region",
@@ -9,14 +9,14 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-maintwo"
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:fetchuseractivity-main"
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "fetchuseractivity-maintwo"
+    "OutputValue": "fetchuseractivity-main"
   },
   {
     "OutputKey": "LambdaExecutionRole",
-    "OutputValue": "discussionsLambdaRole44bd86bc-maintwo"
+    "OutputValue": "discussionsLambdaRole44bd86bc-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.parameters.json
similarity index 72%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.parameters.json
index 0072850d21f..f32103ffad4 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "storageactivityName",
-    "ParameterValue": "activity-maintwo"
+    "ParameterValue": "activity-main"
   },
   {
     "ParameterKey": "s3Key",
@@ -13,18 +13,18 @@
   },
   {
     "ParameterKey": "deploymentBucketName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "storageactivityStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "storageactivityArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.template.json
similarity index 96%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.template.json
index 9297a858679..e44e73d93aa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionfetchuseractivity-KCGDT7S68U6K.template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.description.txt
new file mode 100644
index 00000000000..e0ba9d9ec0a
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.outputs.json
similarity index 68%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.outputs.json
index b6d7eb874af..03a445ee775 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "LambdaExecutionRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-maintwo"
+    "OutputValue": "arn:aws:iam::123456789012:role/discussionsLambdaRole62a425ae-main"
   },
   {
     "OutputKey": "Region",
@@ -9,14 +9,14 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-maintwo"
+    "OutputValue": "arn:aws:lambda:us-east-1:123456789012:function:recorduseractivity-main"
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "recorduseractivity-maintwo"
+    "OutputValue": "recorduseractivity-main"
   },
   {
     "OutputKey": "LambdaExecutionRole",
-    "OutputValue": "discussionsLambdaRole62a425ae-maintwo"
+    "OutputValue": "discussionsLambdaRole62a425ae-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.parameters.json
similarity index 69%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.parameters.json
index f266a452908..18ae7b35efa 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.parameters.json
@@ -5,7 +5,7 @@
   },
   {
     "ParameterKey": "storageactivityName",
-    "ParameterValue": "activity-maintwo"
+    "ParameterValue": "activity-main"
   },
   {
     "ParameterKey": "s3Key",
@@ -13,26 +13,26 @@
   },
   {
     "ParameterKey": "deploymentBucketName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
   },
   {
     "ParameterKey": "apidiscussionsGraphQLAPIEndpointOutput",
-    "ParameterValue": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql"
+    "ParameterValue": "https://jsm5ex363jcy5fm2reylyox4te.appsync-api.us-east-1.amazonaws.com/graphql"
   },
   {
     "ParameterKey": "apidiscussionsGraphQLAPIIdOutput",
-    "ParameterValue": "st35wex2drhe5piowtinjea47y"
+    "ParameterValue": "u3jn2qbupzbyhc3h53673wdvim"
   },
   {
     "ParameterKey": "storageactivityStreamArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516"
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "storageactivityArn",
-    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
+    "ParameterValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.template.json
index 0a05f67e87a..34511d0c3c6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-functionrecorduseractivity-1343ZMSQE34K3.template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"function-Lambda\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "Parameters": {
     "CloudWatchRule": {
       "Type": "String",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.outputs.json
similarity index 84%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.outputs.json
index 1f8a5f4401f..c5a4e1de68c 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.outputs.json
@@ -17,11 +17,11 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo"
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main"
   },
   {
     "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-maintwo/stream/2026-01-29T19:50:35.748"
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/activity-main/stream/2026-03-20T21:19:57.516"
   },
   {
     "OutputKey": "PartitionKeyType",
@@ -29,6 +29,6 @@
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "activity-maintwo"
+    "OutputValue": "activity-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json
index 029f443974a..d4a8a1d9363 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json
similarity index 94%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json
index ca188b6e7fb..17ea25a0a60 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageactivity-138JAQS8Q4D3V.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-DynamoDB\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "partitionKeyName": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.description.txt
new file mode 100644
index 00000000000..a01eec73151
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-S3","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.outputs.json
similarity index 76%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.outputs.json
index 6622bd76b8f..825ded20ca6 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.outputs.json
@@ -1,7 +1,7 @@
 [
   {
     "OutputKey": "BucketName",
-    "OutputValue": "discus-avatarsdecb9-maintwo",
+    "OutputValue": "discus-avatarsc39a5-main",
     "Description": "Bucket name for the S3 bucket"
   },
   {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json
new file mode 100644
index 00000000000..4e3d2a6b496
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.parameters.json
@@ -0,0 +1,86 @@
+[
+  {
+    "ParameterKey": "s3PermissionsGuestPublic",
+    "ParameterValue": "DISALLOW"
+  },
+  {
+    "ParameterKey": "bucketName",
+    "ParameterValue": "discus-avatars"
+  },
+  {
+    "ParameterKey": "s3PublicPolicy",
+    "ParameterValue": "Public_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "AuthenticatedAllowList",
+    "ParameterValue": "ALLOW"
+  },
+  {
+    "ParameterKey": "unauthRoleName",
+    "ParameterValue": "amplify-discussions-main-c39a5-unauthRole"
+  },
+  {
+    "ParameterKey": "s3PrivatePolicy",
+    "ParameterValue": "Private_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "selectedGuestPermissions",
+    "ParameterValue": ""
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedPublic",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:DeleteObject"
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedPrivate",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:DeleteObject"
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedUploads",
+    "ParameterValue": "s3:PutObject"
+  },
+  {
+    "ParameterKey": "s3UploadsPolicy",
+    "ParameterValue": "Uploads_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "env",
+    "ParameterValue": "main"
+  },
+  {
+    "ParameterKey": "unauthPolicyName",
+    "ParameterValue": "s3_amplify_bf41454d"
+  },
+  {
+    "ParameterKey": "authRoleName",
+    "ParameterValue": "amplify-discussions-main-c39a5-authRole"
+  },
+  {
+    "ParameterKey": "GuestAllowList",
+    "ParameterValue": "DISALLOW"
+  },
+  {
+    "ParameterKey": "authPolicyName",
+    "ParameterValue": "s3_amplify_bf41454d"
+  },
+  {
+    "ParameterKey": "s3ProtectedPolicy",
+    "ParameterValue": "Protected_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "s3PermissionsAuthenticatedProtected",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:DeleteObject"
+  },
+  {
+    "ParameterKey": "s3PermissionsGuestUploads",
+    "ParameterValue": "DISALLOW"
+  },
+  {
+    "ParameterKey": "s3ReadPolicy",
+    "ParameterValue": "read_policy_bf41454d"
+  },
+  {
+    "ParameterKey": "selectedAuthenticatedPermissions",
+    "ParameterValue": "s3:PutObject,s3:GetObject,s3:ListBucket,s3:DeleteObject"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json
similarity index 98%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json
index 49679c245fc..81494e78af7 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storageavatars-1BVCGXECPBEMB.template.json
@@ -1,5 +1,5 @@
 {
-  "Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.3\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"14.2.5\",\"stackType\":\"storage-S3\",\"metadata\":{\"whyContinueWithGen1\":\"Prefer not to answer\"}}",
   "AWSTemplateFormatVersion": "2010-09-09",
   "Parameters": {
     "env": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.description.txt
new file mode 100644
index 00000000000..85c7bf4fcc3
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.description.txt
@@ -0,0 +1 @@
+{"createdOn":"Linux","createdBy":"Amplify","createdWith":"14.2.5","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.outputs.json
similarity index 83%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.outputs.json
index d15c94260d9..07877991944 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.outputs.json
@@ -17,11 +17,11 @@
   },
   {
     "OutputKey": "Arn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo"
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main"
   },
   {
     "OutputKey": "StreamArn",
-    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-maintwo/stream/2026-03-20T18:01:05.305"
+    "OutputValue": "arn:aws:dynamodb:us-east-1:123456789012:table/bookmarks-main/stream/2026-03-20T21:19:57.495"
   },
   {
     "OutputKey": "PartitionKeyType",
@@ -29,6 +29,6 @@
   },
   {
     "OutputKey": "Name",
-    "OutputValue": "bookmarks-maintwo"
+    "OutputValue": "bookmarks-main"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json
similarity index 92%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json
index 357002d677e..5862fff0861 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.parameters.json
@@ -9,7 +9,7 @@
   },
   {
     "ParameterKey": "env",
-    "ParameterValue": "maintwo"
+    "ParameterValue": "main"
   },
   {
     "ParameterKey": "sortKeyName",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storagebookmarks-1V93G5ZM6SPOX.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-storagebookmarks-B7BEMLBCHV3W.template.json
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.description.txt
similarity index 100%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.description.txt
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.description.txt
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.outputs.json
similarity index 55%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.outputs.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.outputs.json
index dcc754b32a9..9d805d94994 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.outputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.outputs.json
@@ -1,42 +1,42 @@
 [
   {
     "OutputKey": "AuthRoleName",
-    "OutputValue": "amplify-discussions-maintwo-decb9-authRole"
+    "OutputValue": "amplify-discussions-main-c39a5-authRole"
   },
   {
     "OutputKey": "UnauthRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-unauthRole"
+    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-unauthRole"
   },
   {
     "OutputKey": "AuthRoleArn",
-    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-maintwo-decb9-authRole"
+    "OutputValue": "arn:aws:iam::123456789012:role/amplify-discussions-main-c39a5-authRole"
   },
   {
     "OutputKey": "Region",
     "OutputValue": "us-east-1",
     "Description": "CloudFormation provider root stack Region",
-    "ExportName": "amplify-discussions-maintwo-decb9-Region"
+    "ExportName": "amplify-discussions-main-c39a5-Region"
   },
   {
     "OutputKey": "DeploymentBucketName",
-    "OutputValue": "amplify-discussions-maintwo-decb9-deployment",
+    "OutputValue": "amplify-discussions-main-c39a5-deployment",
     "Description": "CloudFormation provider root stack deployment bucket name",
-    "ExportName": "amplify-discussions-maintwo-decb9-DeploymentBucketName"
+    "ExportName": "amplify-discussions-main-c39a5-DeploymentBucketName"
   },
   {
     "OutputKey": "UnauthRoleName",
-    "OutputValue": "amplify-discussions-maintwo-decb9-unauthRole"
+    "OutputValue": "amplify-discussions-main-c39a5-unauthRole"
   },
   {
     "OutputKey": "StackName",
-    "OutputValue": "amplify-discussions-maintwo-decb9",
+    "OutputValue": "amplify-discussions-main-c39a5",
     "Description": "CloudFormation provider root stack ID",
-    "ExportName": "amplify-discussions-maintwo-decb9-StackName"
+    "ExportName": "amplify-discussions-main-c39a5-StackName"
   },
   {
     "OutputKey": "StackId",
-    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-maintwo-decb9/d54a1f50-fd49-11f0-918d-126c95e1eb8f",
+    "OutputValue": "arn:aws:cloudformation:us-east-1:123456789012:stack/amplify-discussions-main-c39a5/0e9a6f60-24a2-11f1-8462-0afffd2fb801",
     "Description": "CloudFormation provider root stack name",
-    "ExportName": "amplify-discussions-maintwo-decb9-StackId"
+    "ExportName": "amplify-discussions-main-c39a5-StackId"
   }
 ]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.parameters.json
new file mode 100644
index 00000000000..5b0c8b7318d
--- /dev/null
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.parameters.json
@@ -0,0 +1,14 @@
+[
+  {
+    "ParameterKey": "AuthRoleName",
+    "ParameterValue": "amplify-discussions-main-c39a5-authRole"
+  },
+  {
+    "ParameterKey": "DeploymentBucketName",
+    "ParameterValue": "amplify-discussions-main-c39a5-deployment"
+  },
+  {
+    "ParameterKey": "UnauthRoleName",
+    "ParameterValue": "amplify-discussions-main-c39a5-unauthRole"
+  }
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
similarity index 94%
rename from amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.template.json
rename to amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
index 30ad934f79d..433a496539b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
@@ -202,21 +202,21 @@
     "apidiscussions": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/api/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/api/cloudformation-template.json",
         "Parameters": {
           "AppSyncApiName": "discussions",
           "DynamoDBBillingMode": "PAY_PER_REQUEST",
           "DynamoDBEnableServerSideEncryption": false,
-          "S3DeploymentBucket": "amplify-discussions-maintwo-decb9-deployment",
+          "S3DeploymentBucket": "amplify-discussions-main-c39a5-deployment",
           "S3DeploymentRootKey": "amplify-appsync-files/db92bad357b2590353e82db2f2ec7d0fc9cfd30d",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "authdiscussionsc578c16ec578c16e": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/auth/discussionsc578c16ec578c16e-cloudformation-template.json",
         "Parameters": {
           "identityPoolName": "discussionsc578c16e_identitypool_c578c16e",
           "allowUnauthenticatedIdentities": false,
@@ -268,16 +268,16 @@
           },
           "breakCircularDependency": true,
           "dependsOn": "",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionfetchuseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/fetchuseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/fetchuseractivity-6e523036545438726f37-build.zip",
           "storageactivityName": {
             "Fn::GetAtt": [
@@ -297,16 +297,16 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "functionrecorduseractivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/function/recorduseractivity-cloudformation-template.json",
         "Parameters": {
-          "deploymentBucketName": "amplify-discussions-maintwo-decb9-deployment",
+          "deploymentBucketName": "amplify-discussions-main-c39a5-deployment",
           "s3Key": "amplify-builds/recorduseractivity-433947686f7145754543-build.zip",
           "apidiscussionsGraphQLAPIIdOutput": {
             "Fn::GetAtt": [
@@ -338,28 +338,28 @@
               "Outputs.StreamArn"
             ]
           },
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageactivity": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/activity-cloudformation-template.json",
         "Parameters": {
           "tableName": "activity",
           "partitionKeyName": "id",
           "partitionKeyType": "S",
           "sortKeyName": "userId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storageavatars": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/cloudformation-template.json",
         "Parameters": {
           "bucketName": "discus-avatars",
           "selectedGuestPermissions": "",
@@ -385,21 +385,21 @@
           "s3PermissionsAuthenticatedUploads": "s3:PutObject",
           "s3PermissionsGuestPublic": "DISALLOW",
           "s3PermissionsGuestUploads": "DISALLOW",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
     "storagebookmarks": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-maintwo-decb9-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
+        "TemplateURL": "https://s3.amazonaws.com/amplify-discussions-main-c39a5-deployment/amplify-cfn-templates/storage/bookmarks-cloudformation-template.json",
         "Parameters": {
           "tableName": "bookmarks",
           "partitionKeyName": "userId",
           "partitionKeyType": "S",
           "sortKeyName": "postId",
           "sortKeyType": "S",
-          "env": "maintwo"
+          "env": "main"
         }
       }
     },
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt
deleted file mode 100644
index 8951597b908..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"api-AppSync","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json
deleted file mode 100644
index fabe366a8cf..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN.outputs.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "OutputKey": "GraphQLAPIIdOutput",
-    "OutputValue": "st35wex2drhe5piowtinjea47y",
-    "Description": "Your GraphQL API ID.",
-    "ExportName": "amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN:GraphQLApiId"
-  },
-  {
-    "OutputKey": "GraphQLAPIEndpointOutput",
-    "OutputValue": "https://jkfltrgtw5elhjkoylcybhva4y.appsync-api.us-east-1.amazonaws.com/graphql",
-    "Description": "Your GraphQL API endpoint.",
-    "ExportName": "amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN:GraphQLApiEndpoint"
-  },
-  {
-    "OutputKey": "GraphQLAPIKeyOutput",
-    "OutputValue": "da2-fakeapikey00000000000000",
-    "Description": "Your GraphQL API ID.",
-    "ExportName": "amplify-discussions-maintwo-decb9-apidiscussions-OIVY6UM866SN:GraphQLApiKey"
-  }
-]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt
deleted file mode 100644
index aaebecdf2a7..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-authdiscussionsc578c16ec578c16e-1IQSRWBM9RZF3.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"auth-Cognito","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt
deleted file mode 100644
index 90219dbf396..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionfetchuseractivity-P1L2V5FTFCQW.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt
deleted file mode 100644
index 90219dbf396..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-functionrecorduseractivity-7TS57MXKFC36.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"function-Lambda","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt
deleted file mode 100644
index 42c7da6ff2d..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageactivity-197RFHHQU9L6N.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"storage-DynamoDB","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt
deleted file mode 100644
index eae70debfb9..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9-storageavatars-5MXLESJM1SP0.description.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"createdOn":"Mac","createdBy":"Amplify","createdWith":"14.2.3","stackType":"storage-S3","metadata":{"whyContinueWithGen1":"Prefer not to answer"}}
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json
deleted file mode 100644
index c9362564858..00000000000
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-maintwo-decb9.parameters.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "ParameterKey": "AuthRoleName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-authRole"
-  },
-  {
-    "ParameterKey": "DeploymentBucketName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-deployment"
-  },
-  {
-    "ParameterKey": "UnauthRoleName",
-    "ParameterValue": "amplify-discussions-maintwo-decb9-unauthRole"
-  }
-]
\ No newline at end of file
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts
index 1f950b26145..5d7e9bfa6e4 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts
@@ -40,10 +40,10 @@ const gen2StorageTemplate: CFNTemplate = {
 
 function setupStorageMocks(cfnMock: ReturnType<typeof mockClient>) {
   cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen1-root' }).resolves({
-    StackResources: [nestedStack('storageGen1', 'gen1-storage-stack')],
+    StackResources: [nestedStack('storageavatars', 'gen1-storage-stack')],
   });
   cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-root' }).resolves({
-    StackResources: [nestedStack('storageGen2', 'gen2-storage-stack')],
+    StackResources: [nestedStack('storage0EC3F24A', 'gen2-storage-stack')],
   });
   cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen1-storage-stack' }).resolves({ StackResources: [] });
   cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-storage-stack' }).resolves({ StackResources: [] });
@@ -77,18 +77,18 @@ describe('CategoryRefactorer.plan() orchestration — via StorageS3ForwardRefact
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-root' }).resolves({ StackResources: [] });
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
-    const ops = await new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123').plan();
+    const ops = await new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan();
     expect(ops).toEqual([]);
   });
 
   it('throws when source exists but destination does not (Path B)', async () => {
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen1-root' }).resolves({
-      StackResources: [nestedStack('storageGen1', 'gen1-storage-stack')],
+      StackResources: [nestedStack('storageavatars', 'gen1-storage-stack')],
     });
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-root' }).resolves({ StackResources: [] });
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
-    await expect(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123').plan()).rejects.toThrow(
+    await expect(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan()).rejects.toThrow(
       'Category exists in source but not destination',
     );
   });
@@ -96,11 +96,11 @@ describe('CategoryRefactorer.plan() orchestration — via StorageS3ForwardRefact
   it('throws when destination exists but source does not (Path B reversed)', async () => {
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen1-root' }).resolves({ StackResources: [] });
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-root' }).resolves({
-      StackResources: [nestedStack('storageGen2', 'gen2-storage-stack')],
+      StackResources: [nestedStack('storage0EC3F24A', 'gen2-storage-stack')],
     });
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
-    await expect(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123').plan()).rejects.toThrow(
+    await expect(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan()).rejects.toThrow(
       'Category exists in destination but not source',
     );
   });
@@ -116,7 +116,7 @@ describe('CategoryRefactorer.plan() orchestration — via StorageS3ForwardRefact
     cfnMock.on(GetTemplateCommand, { StackName: 'gen1-storage-stack' }).resolves({ TemplateBody: JSON.stringify(noStorageTemplate) });
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
-    const ops = await new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123').plan();
+    const ops = await new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan();
     expect(ops).toEqual([]);
   });
 
@@ -124,7 +124,7 @@ describe('CategoryRefactorer.plan() orchestration — via StorageS3ForwardRefact
     setupStorageMocks(cfnMock);
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
-    const ops = await new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123').plan();
+    const ops = await new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan();
     const descriptions = (await Promise.all(ops.map((o) => o.describe()))).flat();
 
     expect(descriptions).toHaveLength(4);
@@ -148,11 +148,11 @@ describe('StorageS3RollbackRefactorer.plan() — rollback without holding stack'
 
     // Gen2 nested stacks (source for rollback)
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-root' }).resolves({
-      StackResources: [nestedStack('storageGen2', 'gen2-storage-stack')],
+      StackResources: [nestedStack('storage0EC3F24A', 'gen2-storage-stack')],
     });
     // Gen1 nested stacks (destination for rollback)
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen1-root' }).resolves({
-      StackResources: [nestedStack('storageGen1', 'gen1-storage-stack')],
+      StackResources: [nestedStack('storageavatars', 'gen1-storage-stack')],
     });
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-storage-stack' }).resolves({ StackResources: [] });
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen1-storage-stack' }).resolves({ StackResources: [] });
@@ -170,7 +170,7 @@ describe('StorageS3RollbackRefactorer.plan() — rollback without holding stack'
     cfnMock.on(GetTemplateCommand, { StackName: 'gen1-storage-stack' }).resolves({ TemplateBody: JSON.stringify(gen1StorageTemplate) });
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
-    const ops = await new StorageS3RollbackRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123').plan();
+    const ops = await new StorageS3RollbackRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan();
     const descriptions = (await Promise.all(ops.map((o) => o.describe()))).flat();
 
     // Rollback: no updateSource/updateTarget, just move
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
index 2afc72a339a..73027c9950d 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
@@ -227,12 +227,12 @@ describe('AmplifyMigrationRefactorStep', () => {
     it('throws on multiple resources in the same refactor category', async () => {
       infraSpy = mockCreateInfrastructure();
       createSpy = mockDiscover([
-        { category: 'storage', resourceName: 'bucket1', service: 'S3', key: 'storage:S3' },
-        { category: 'storage', resourceName: 'bucket2', service: 'S3', key: 'storage:S3' },
+        { category: 'storage', resourceName: 'avatars', service: 'S3', key: 'storage:S3' },
+        { category: 'storage', resourceName: 'avatars', service: 'S3', key: 'storage:S3' },
       ]);
 
       const step = createStep();
-      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storage'/);
+      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storageavatars'/);
     });
   });
 
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
index 0213b4177b9..8e36e8a102f 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
@@ -83,7 +83,7 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
           );
           break;
         case 'storage:S3':
-          refactorers.push(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
+          refactorers.push(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId, resource.resourceName));
           break;
         case 'storage:DynamoDB':
           refactorers.push(new StorageDynamoForwardRefactorer(gen1Env, gen2Branch, clients, this.region, accountId, resource.resourceName));
@@ -125,7 +125,7 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
           refactorers.push(new AuthCognitoRollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
           break;
         case 'storage:S3':
-          refactorers.push(new StorageS3RollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId));
+          refactorers.push(new StorageS3RollbackRefactorer(gen1Env, gen2Branch, clients, this.region, accountId, resource.resourceName));
           break;
         case 'storage:DynamoDB':
           refactorers.push(
@@ -197,9 +197,10 @@ export class AmplifyMigrationRefactorStep extends AmplifyMigrationStep {
 /**
  * Throws if any two discovered resources would produce the same stack name.
  *
- * DDB resources use 'storage' + resourceName as their stack prefix. Other
- * stateful categories (auth, analytics) use the bare category name. If two
- * resources would map to the same stack name, the refactor would be ambiguous.
+ * Storage resources (both S3 and DDB) use 'storage' + resourceName as their
+ * Gen1 stack prefix. Other stateful categories (auth, analytics) use the bare
+ * category name. If two resources would map to the same stack name, the
+ * refactor would be ambiguous.
  */
 function validateSingleResourcePerStack(discovered: readonly DiscoveredResource[]): void {
   const stackNameCounts = new Map<string, number>();
@@ -207,14 +208,12 @@ function validateSingleResourcePerStack(discovered: readonly DiscoveredResource[
     let stackName: string;
     switch (r.key) {
       case 'storage:DynamoDB':
+      case 'storage:S3':
         stackName = 'storage' + r.resourceName;
         break;
       case 'auth:Cognito':
         stackName = 'auth';
         break;
-      case 'storage:S3':
-        stackName = 'storage';
-        break;
       case 'analytics:Kinesis':
         stackName = 'analytics';
         break;
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts
index 7b0305d0ff5..11cb022e3df 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts
@@ -1,21 +1,49 @@
 import { ForwardCategoryRefactorer } from '../workflow/forward-category-refactorer';
+import { StackFacade } from '../stack-facade';
+import { AwsClients } from '../../aws-clients';
 
 export const STORAGE_RESOURCE_TYPES = ['AWS::S3::Bucket', 'AWS::DynamoDB::Table'];
 
 /**
  * Forward refactorer for S3 storage resources.
  * Moves S3 buckets from Gen1 to Gen2.
+ *
+ * Gen1 names S3 stacks as 'storage' + resourceName (e.g. 'storageavatars').
+ * Gen2 names the built-in storage stack as 'storage' + CDK hash (e.g. 'storage0EC3F24A'),
+ * while per-DDB-table stacks use 'storage' + lowercase resourceName + CDK hash.
  */
 export class StorageS3ForwardRefactorer extends ForwardCategoryRefactorer {
+  private readonly resourceName: string;
+
+  constructor(gen1Env: StackFacade, gen2Branch: StackFacade, clients: AwsClients, region: string, accountId: string, resourceName: string) {
+    super(gen1Env, gen2Branch, clients, region, accountId);
+    this.resourceName = resourceName;
+  }
+
   protected async fetchSourceStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen1Env, 'storage');
+    return this.findNestedStack(this.gen1Env, 'storage' + this.resourceName);
   }
 
   protected async fetchDestStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen2Branch, 'storage');
+    return this.findS3NestedStack(this.gen2Branch);
   }
 
   protected resourceTypes(): string[] {
     return ['AWS::S3::Bucket'];
   }
+
+  /**
+   * Finds the Gen2 S3 nested stack by distinguishing it from per-DDB-table stacks.
+   * The built-in Amplify storage construct produces 'storage' + CDK hash ([0-9A-F]),
+   * while DDB stacks use 'storage' + resourceName (lowercase first char) + CDK hash.
+   */
+  private async findS3NestedStack(facade: StackFacade): Promise<string | undefined> {
+    const stacks = await facade.fetchNestedStacks();
+    return stacks.find((s) => {
+      const id = s.LogicalResourceId ?? '';
+      if (!id.startsWith('storage')) return false;
+      const afterStorage = id.charAt('storage'.length);
+      return afterStorage !== '' && !/^[a-z]/.test(afterStorage);
+    })?.PhysicalResourceId;
+  }
 }
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts
index 9288875e266..94858178eb2 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts
@@ -1,21 +1,49 @@
 import { RollbackCategoryRefactorer } from '../workflow/rollback-category-refactorer';
+import { StackFacade } from '../stack-facade';
+import { AwsClients } from '../../aws-clients';
 
 /**
  * Rollback refactorer for S3 storage resources.
  * Moves S3 buckets from Gen2 back to Gen1.
+ *
+ * Gen1 names S3 stacks as 'storage' + resourceName (e.g. 'storageavatars').
+ * Gen2 names the built-in storage stack as 'storage' + CDK hash (e.g. 'storage0EC3F24A'),
+ * while per-DDB-table stacks use 'storage' + lowercase resourceName + CDK hash.
  */
 export class StorageS3RollbackRefactorer extends RollbackCategoryRefactorer {
   protected override readonly gen1LogicalIds = new Map<string, string>([['AWS::S3::Bucket', 'S3Bucket']]);
 
+  private readonly resourceName: string;
+
+  constructor(gen1Env: StackFacade, gen2Branch: StackFacade, clients: AwsClients, region: string, accountId: string, resourceName: string) {
+    super(gen1Env, gen2Branch, clients, region, accountId);
+    this.resourceName = resourceName;
+  }
+
   protected async fetchSourceStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen2Branch, 'storage');
+    return this.findS3NestedStack(this.gen2Branch);
   }
 
   protected async fetchDestStackId(): Promise<string | undefined> {
-    return this.findNestedStack(this.gen1Env, 'storage');
+    return this.findNestedStack(this.gen1Env, 'storage' + this.resourceName);
   }
 
   protected resourceTypes(): string[] {
     return ['AWS::S3::Bucket'];
   }
+
+  /**
+   * Finds the Gen2 S3 nested stack by distinguishing it from per-DDB-table stacks.
+   * The built-in Amplify storage construct produces 'storage' + CDK hash ([0-9A-F]),
+   * while DDB stacks use 'storage' + resourceName (lowercase first char) + CDK hash.
+   */
+  private async findS3NestedStack(facade: StackFacade): Promise<string | undefined> {
+    const stacks = await facade.fetchNestedStacks();
+    return stacks.find((s) => {
+      const id = s.LogicalResourceId ?? '';
+      if (!id.startsWith('storage')) return false;
+      const afterStorage = id.charAt('storage'.length);
+      return afterStorage !== '' && !/^[a-z]/.test(afterStorage);
+    })?.PhysicalResourceId;
+  }
 }

From 6e65d9c7b950caaf3fd8371527c2d4925644f4bb Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Mon, 23 Mar 2026 20:02:58 +0000
Subject: [PATCH 09/20] fix(cli): address PR review comments for per-table
 stacks

- Replace fragile char-based findS3NestedStack with template-based S3
  detection (fetch template, check for AWS::S3::Bucket resource)
- Export findS3NestedStack from storage-forward.ts, import in rollback
- Remove dead STORAGE_RESOURCE_TYPES export
- Remove storage:S3 from validateSingleResourcePerStack (only one
  defineStorage() possible)
- Make scopeVarName required (no default) in DynamoDBRenderer
- Set Outputs default empty object in cfn-output-resolver, use
  templateOutputs consistently
- Add comments for optional Outputs in cfn-template.ts and resolver
---
 .../amplify/storage/dynamodb.renderer.test.ts | 41 ++++---------------
 .../category-plan-orchestration.test.ts       |  1 +
 .../gen2-migration/refactor/refactor.test.ts  |  6 +--
 .../commands/gen2-migration/cfn-template.ts   |  1 +
 .../amplify/storage/dynamodb.renderer.ts      |  2 +-
 .../gen2-migration/refactor/refactor.ts       |  1 -
 .../refactor/resolvers/cfn-output-resolver.ts |  7 ++--
 .../refactor/storage/storage-forward.ts       | 37 ++++++++---------
 .../refactor/storage/storage-rollback.ts      | 22 +---------
 9 files changed, 38 insertions(+), 80 deletions(-)

diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts
index 0ba5ebea3ca..70c7b771022 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.test.ts
@@ -32,7 +32,7 @@ describe('DynamoDBRenderer', () => {
         partitionKey: { name: 'id', type: 'STRING' },
         billingMode: 'PAY_PER_REQUEST',
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).toMatchInlineSnapshot(`
         "new Table(storageStack, "MyTable", { partitionKey: { name: "id", type: AttributeType.STRING }, billingMode: BillingMode.PAY_PER_REQUEST });
@@ -50,7 +50,7 @@ describe('DynamoDBRenderer', () => {
         readCapacity: 10,
         writeCapacity: 5,
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).toMatchInlineSnapshot(`
         "new Table(storageStack, "MyTable", { partitionKey: { name: "pk", type: AttributeType.STRING }, billingMode: BillingMode.PROVISIONED, readCapacity: 10, writeCapacity: 5, sortKey: { name: "sk", type: AttributeType.NUMBER } });
@@ -66,7 +66,7 @@ describe('DynamoDBRenderer', () => {
         streamEnabled: true,
         streamViewType: 'NEW_AND_OLD_IMAGES',
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).toMatchInlineSnapshot(`
         "new Table(storageStack, "StreamTable", { partitionKey: { name: "id", type: AttributeType.STRING }, billingMode: BillingMode.PROVISIONED, readCapacity: 5, writeCapacity: 5, stream: StreamViewType.NEW_AND_OLD_IMAGES });
@@ -81,7 +81,7 @@ describe('DynamoDBRenderer', () => {
         partitionKey: { name: 'id', type: 'STRING' },
         streamEnabled: false,
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).not.toContain('StreamViewType');
     });
@@ -102,7 +102,7 @@ describe('DynamoDBRenderer', () => {
           },
         ],
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).toMatchInlineSnapshot(`
         "const GsiTable = new Table(storageStack, "GsiTable", { partitionKey: { name: "id", type: AttributeType.STRING }, billingMode: BillingMode.PROVISIONED, readCapacity: 5, writeCapacity: 5 });
@@ -118,7 +118,7 @@ describe('DynamoDBRenderer', () => {
         tableName: 'SimpleTable-abc',
         partitionKey: { name: 'id', type: 'STRING' },
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).not.toContain('const SimpleTable');
       expect(output).toContain('new Table');
@@ -132,7 +132,7 @@ describe('DynamoDBRenderer', () => {
         readCapacity: 10,
         writeCapacity: 5,
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).not.toContain('readCapacity');
       expect(output).not.toContain('writeCapacity');
@@ -143,7 +143,7 @@ describe('DynamoDBRenderer', () => {
         tableName: 'my-special.table-abc',
         partitionKey: { name: 'id', type: 'STRING' },
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).toMatchInlineSnapshot(`
         "new Table(storageStack, "my_special_table", { partitionKey: { name: "id", type: AttributeType.STRING }, billingMode: BillingMode.PROVISIONED, readCapacity: 5, writeCapacity: 5 });
@@ -152,35 +152,12 @@ describe('DynamoDBRenderer', () => {
       `);
     });
 
-    it('uses custom scope variable name when provided', () => {
-      const table: DynamoDBTableDefinition = {
-        tableName: 'MyTable-abc123',
-        partitionKey: { name: 'id', type: 'STRING' },
-        billingMode: 'PAY_PER_REQUEST',
-      };
-      const output = printStatements(renderer.renderTable(table, 'storageActivityStack'));
-
-      expect(output).toContain('storageActivityStack');
-      expect(output).not.toContain('storageStack');
-    });
-
-    it('defaults to storageStack scope when no scope provided', () => {
-      const table: DynamoDBTableDefinition = {
-        tableName: 'MyTable-abc123',
-        partitionKey: { name: 'id', type: 'STRING' },
-        billingMode: 'PAY_PER_REQUEST',
-      };
-      const output = printStatements(renderer.renderTable(table));
-
-      expect(output).toContain('storageStack');
-    });
-
     it('handles BINARY attribute type', () => {
       const table: DynamoDBTableDefinition = {
         tableName: 'BinaryTable-abc',
         partitionKey: { name: 'data', type: 'BINARY' },
       };
-      const output = printStatements(renderer.renderTable(table));
+      const output = printStatements(renderer.renderTable(table, 'storageStack'));
 
       expect(output).toMatchInlineSnapshot(`
         "new Table(storageStack, "BinaryTable", { partitionKey: { name: "data", type: AttributeType.BINARY }, billingMode: BillingMode.PROVISIONED, readCapacity: 5, writeCapacity: 5 });
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts
index 5d7e9bfa6e4..c0d8c819e49 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/category-plan-orchestration.test.ts
@@ -98,6 +98,7 @@ describe('CategoryRefactorer.plan() orchestration — via StorageS3ForwardRefact
     cfnMock.on(DescribeStackResourcesCommand, { StackName: 'gen2-root' }).resolves({
       StackResources: [nestedStack('storage0EC3F24A', 'gen2-storage-stack')],
     });
+    cfnMock.on(GetTemplateCommand, { StackName: 'gen2-storage-stack' }).resolves({ TemplateBody: JSON.stringify(gen2StorageTemplate) });
 
     const { clients, gen1Env, gen2Branch } = makeInstances();
     await expect(new StorageS3ForwardRefactorer(gen1Env, gen2Branch, clients, 'us-east-1', '123', 'avatars').plan()).rejects.toThrow(
diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
index 73027c9950d..ada295e842b 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
@@ -227,12 +227,12 @@ describe('AmplifyMigrationRefactorStep', () => {
     it('throws on multiple resources in the same refactor category', async () => {
       infraSpy = mockCreateInfrastructure();
       createSpy = mockDiscover([
-        { category: 'storage', resourceName: 'avatars', service: 'S3', key: 'storage:S3' },
-        { category: 'storage', resourceName: 'avatars', service: 'S3', key: 'storage:S3' },
+        { category: 'storage', resourceName: 'activity', service: 'DynamoDB', key: 'storage:DynamoDB' },
+        { category: 'storage', resourceName: 'activity', service: 'DynamoDB', key: 'storage:DynamoDB' },
       ]);
 
       const step = createStep();
-      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storageavatars'/);
+      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storageactivity'/);
     });
   });
 
diff --git a/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts b/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts
index b56844b98b5..5d544c44f80 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/cfn-template.ts
@@ -53,6 +53,7 @@ export interface CFNTemplate {
   // Resources and Outputs are mutable: resolvers clone templates then transform them in place.
   // The clone-then-mutate pattern is the standard way to produce modified templates.
   Resources: Record<string, CFNResource>;
+  // Optional because CDK omits Outputs when a stack has no cross-stack references.
   Outputs?: Record<string, CFNOutput>;
 }
 
diff --git a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts
index 4a2324eba4e..38b6faf9ff8 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/generate/amplify/storage/dynamodb.renderer.ts
@@ -52,7 +52,7 @@ export class DynamoDBRenderer {
   /**
    * Produces CDK Table construct statements for a single DynamoDB table.
    */
-  public renderTable(table: DynamoDBTableDefinition, scopeVarName = 'storageStack'): ts.Statement[] {
+  public renderTable(table: DynamoDBTableDefinition, scopeVarName: string): ts.Statement[] {
     const statements: ts.Statement[] = [];
     const baseTableName = table.tableName.replace(/-[^-]+$/, '');
     const sanitizedName = sanitizeVariableName(baseTableName);
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
index 8e36e8a102f..14a79869c51 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
@@ -208,7 +208,6 @@ function validateSingleResourcePerStack(discovered: readonly DiscoveredResource[
     let stackName: string;
     switch (r.key) {
       case 'storage:DynamoDB':
-      case 'storage:S3':
         stackName = 'storage' + r.resourceName;
         break;
       case 'auth:Cognito':
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts
index bad580e1a91..ed16ccdce88 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/resolvers/cfn-output-resolver.ts
@@ -25,7 +25,8 @@ export function resolveOutputs(params: {
 }): CFNTemplate {
   const { template, stackOutputs, stackResources, region, accountId } = params;
   const cloned = JSON.parse(JSON.stringify(template)) as CFNTemplate;
-  const templateOutputs = cloned.Outputs;
+  // CDK omits Outputs when a stack has no cross-stack references (e.g. a standalone DDB table).
+  const templateOutputs = cloned.Outputs ?? {};
   const templateResources = cloned.Resources;
 
   if (!templateResources) {
@@ -37,7 +38,7 @@ export function resolveOutputs(params: {
   // Build separate lookups for Ref-based and GetAtt-based outputs.
   // A single resource can appear in both (e.g., UserPool has Ref → pool ID, GetAtt → ARN).
   // Conflating them into one map would overwrite the Ref value with the GetAtt value.
-  const { refLookup, getAttLookup } = buildOutputLookup(templateOutputs ?? {}, stackOutputs);
+  const { refLookup, getAttLookup } = buildOutputLookup(templateOutputs, stackOutputs);
 
   // Phase 1: Resolve Ref/GetAtt in Resources using stack outputs
   cloned.Resources = walkCfnTree(templateResources, (node) => {
@@ -101,7 +102,7 @@ export function resolveOutputs(params: {
   }) as Record<string, CFNResource>;
 
   // Phase 3: Replace Output values with runtime stack output values
-  for (const [outputKey, outputDef] of Object.entries(cloned.Outputs ?? {})) {
+  for (const [outputKey, outputDef] of Object.entries(templateOutputs)) {
     const runtimeOutput = stackOutputs.find((o) => o.OutputKey === outputKey);
     if (!runtimeOutput?.OutputValue) {
       throw new AmplifyError('InvalidStackError', {
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts
index 11cb022e3df..e1aa4144e6b 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-forward.ts
@@ -2,15 +2,9 @@ import { ForwardCategoryRefactorer } from '../workflow/forward-category-refactor
 import { StackFacade } from '../stack-facade';
 import { AwsClients } from '../../aws-clients';
 
-export const STORAGE_RESOURCE_TYPES = ['AWS::S3::Bucket', 'AWS::DynamoDB::Table'];
-
 /**
  * Forward refactorer for S3 storage resources.
  * Moves S3 buckets from Gen1 to Gen2.
- *
- * Gen1 names S3 stacks as 'storage' + resourceName (e.g. 'storageavatars').
- * Gen2 names the built-in storage stack as 'storage' + CDK hash (e.g. 'storage0EC3F24A'),
- * while per-DDB-table stacks use 'storage' + lowercase resourceName + CDK hash.
  */
 export class StorageS3ForwardRefactorer extends ForwardCategoryRefactorer {
   private readonly resourceName: string;
@@ -25,25 +19,28 @@ export class StorageS3ForwardRefactorer extends ForwardCategoryRefactorer {
   }
 
   protected async fetchDestStackId(): Promise<string | undefined> {
-    return this.findS3NestedStack(this.gen2Branch);
+    return findS3NestedStack(this.gen2Branch);
   }
 
   protected resourceTypes(): string[] {
     return ['AWS::S3::Bucket'];
   }
+}
 
-  /**
-   * Finds the Gen2 S3 nested stack by distinguishing it from per-DDB-table stacks.
-   * The built-in Amplify storage construct produces 'storage' + CDK hash ([0-9A-F]),
-   * while DDB stacks use 'storage' + resourceName (lowercase first char) + CDK hash.
-   */
-  private async findS3NestedStack(facade: StackFacade): Promise<string | undefined> {
-    const stacks = await facade.fetchNestedStacks();
-    return stacks.find((s) => {
-      const id = s.LogicalResourceId ?? '';
-      if (!id.startsWith('storage')) return false;
-      const afterStorage = id.charAt('storage'.length);
-      return afterStorage !== '' && !/^[a-z]/.test(afterStorage);
-    })?.PhysicalResourceId;
+/**
+ * Finds the Gen2 S3 nested stack by fetching the template of each 'storage'-prefixed
+ * nested stack and checking whether it contains an AWS::S3::Bucket resource.
+ */
+export async function findS3NestedStack(facade: StackFacade): Promise<string | undefined> {
+  const stacks = await facade.fetchNestedStacks();
+  for (const s of stacks) {
+    const id = s.LogicalResourceId ?? '';
+    if (!id.startsWith('storage')) continue;
+    const stackId = s.PhysicalResourceId;
+    if (!stackId) continue;
+    const template = await facade.fetchTemplate(stackId);
+    const hasS3 = Object.values(template.Resources).some((r) => r.Type === 'AWS::S3::Bucket');
+    if (hasS3) return stackId;
   }
+  return undefined;
 }
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts
index 94858178eb2..cfe0e39dae3 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/storage/storage-rollback.ts
@@ -1,14 +1,11 @@
 import { RollbackCategoryRefactorer } from '../workflow/rollback-category-refactorer';
 import { StackFacade } from '../stack-facade';
 import { AwsClients } from '../../aws-clients';
+import { findS3NestedStack } from './storage-forward';
 
 /**
  * Rollback refactorer for S3 storage resources.
  * Moves S3 buckets from Gen2 back to Gen1.
- *
- * Gen1 names S3 stacks as 'storage' + resourceName (e.g. 'storageavatars').
- * Gen2 names the built-in storage stack as 'storage' + CDK hash (e.g. 'storage0EC3F24A'),
- * while per-DDB-table stacks use 'storage' + lowercase resourceName + CDK hash.
  */
 export class StorageS3RollbackRefactorer extends RollbackCategoryRefactorer {
   protected override readonly gen1LogicalIds = new Map<string, string>([['AWS::S3::Bucket', 'S3Bucket']]);
@@ -21,7 +18,7 @@ export class StorageS3RollbackRefactorer extends RollbackCategoryRefactorer {
   }
 
   protected async fetchSourceStackId(): Promise<string | undefined> {
-    return this.findS3NestedStack(this.gen2Branch);
+    return findS3NestedStack(this.gen2Branch);
   }
 
   protected async fetchDestStackId(): Promise<string | undefined> {
@@ -31,19 +28,4 @@ export class StorageS3RollbackRefactorer extends RollbackCategoryRefactorer {
   protected resourceTypes(): string[] {
     return ['AWS::S3::Bucket'];
   }
-
-  /**
-   * Finds the Gen2 S3 nested stack by distinguishing it from per-DDB-table stacks.
-   * The built-in Amplify storage construct produces 'storage' + CDK hash ([0-9A-F]),
-   * while DDB stacks use 'storage' + resourceName (lowercase first char) + CDK hash.
-   */
-  private async findS3NestedStack(facade: StackFacade): Promise<string | undefined> {
-    const stacks = await facade.fetchNestedStacks();
-    return stacks.find((s) => {
-      const id = s.LogicalResourceId ?? '';
-      if (!id.startsWith('storage')) return false;
-      const afterStorage = id.charAt('storage'.length);
-      return afterStorage !== '' && !/^[a-z]/.test(afterStorage);
-    })?.PhysicalResourceId;
-  }
 }

From ed1fc150a0e55b11c5cd6e804beba64f2d68010a Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Mon, 23 Mar 2026 20:51:56 +0000
Subject: [PATCH 10/20] fix(cli): restore storage:S3 case in
 validateSingleResourcePerStack

Keep S3 validation as a defensive spot check even though the collision
can't happen in practice (JSON key uniqueness prevents same-name
resources within a category).
---
 .../commands/gen2-migration/refactor/refactor.test.ts       | 6 +++---
 .../src/commands/gen2-migration/refactor/refactor.ts        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
index ada295e842b..73027c9950d 100644
--- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
+++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/refactor.test.ts
@@ -227,12 +227,12 @@ describe('AmplifyMigrationRefactorStep', () => {
     it('throws on multiple resources in the same refactor category', async () => {
       infraSpy = mockCreateInfrastructure();
       createSpy = mockDiscover([
-        { category: 'storage', resourceName: 'activity', service: 'DynamoDB', key: 'storage:DynamoDB' },
-        { category: 'storage', resourceName: 'activity', service: 'DynamoDB', key: 'storage:DynamoDB' },
+        { category: 'storage', resourceName: 'avatars', service: 'S3', key: 'storage:S3' },
+        { category: 'storage', resourceName: 'avatars', service: 'S3', key: 'storage:S3' },
       ]);
 
       const step = createStep();
-      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storageactivity'/);
+      await expect(step.execute()).rejects.toThrow(/Multiple resources map to stack 'storageavatars'/);
     });
   });
 
diff --git a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
index 14a79869c51..8e36e8a102f 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/refactor/refactor.ts
@@ -208,6 +208,7 @@ function validateSingleResourcePerStack(discovered: readonly DiscoveredResource[
     let stackName: string;
     switch (r.key) {
       case 'storage:DynamoDB':
+      case 'storage:S3':
         stackName = 'storage' + r.resourceName;
         break;
       case 'auth:Cognito':

From d207e682f847d1e74882bd2a5b42e1def63b544e Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Mon, 23 Mar 2026 22:00:09 +0000
Subject: [PATCH 11/20] feat(cli): add S3 avatars and bookmarks DDB tests to
 discussions test script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extends the discussions gen1 test script to cover all stateful resources
that get refactored during migration: S3 avatars bucket (upload/getUrl/remove)
and bookmarks DynamoDB table (put/get/delete via AWS SDK). Verified with
full forward→rollback→forward round-trip on live app.
---
 .../discussions/gen1-test-script.ts           |  30 +++-
 .../discussions/package.json                  |   2 +
 .../discussions/test-utils.ts                 | 166 +++++++++++++++++-
 3 files changed, 192 insertions(+), 6 deletions(-)

diff --git a/amplify-migration-apps/discussions/gen1-test-script.ts b/amplify-migration-apps/discussions/gen1-test-script.ts
index 9d4c973c019..322b36d468e 100644
--- a/amplify-migration-apps/discussions/gen1-test-script.ts
+++ b/amplify-migration-apps/discussions/gen1-test-script.ts
@@ -7,7 +7,9 @@
  * 3. Post CRUD Operations
  * 4. Comment CRUD Operations
  * 5. User Activity Tracking
- * 6. Cleanup (Delete Test Data)
+ * 6. S3 Storage (Avatars)
+ * 7. Bookmarks DDB
+ * 8. Cleanup (Delete Test Data)
  *
  * Credentials are provisioned automatically via Cognito AdminCreateUser + AdminSetUserPassword.
  */
@@ -40,7 +42,9 @@ async function runAllTests(): Promise<void> {
   console.log('  3. Post CRUD Operations');
   console.log('  4. Comment CRUD Operations');
   console.log('  5. User Activity Tracking');
-  console.log('  6. Cleanup (Delete Test Data)');
+  console.log('  6. S3 Storage (Avatars)');
+  console.log('  7. Bookmarks DDB');
+  console.log('  8. Cleanup (Delete Test Data)');
 
   // Provision user via admin APIs, then sign in here so tokens stay in this module's Amplify scope
   const { signinValue, testUser } = await provisionTestUser(amplifyconfig);
@@ -57,8 +61,16 @@ async function runAllTests(): Promise<void> {
 
   const runner = new TestRunner();
   const testFunctions = createTestFunctions();
-  const { runQueryTests, runTopicMutationTests, runPostMutationTests, runCommentMutationTests, runActivityTests, runCleanupTests } =
-    createTestOrchestrator(testFunctions, runner);
+  const {
+    runQueryTests,
+    runTopicMutationTests,
+    runPostMutationTests,
+    runCommentMutationTests,
+    runActivityTests,
+    runStorageTests,
+    runBookmarksTests,
+    runCleanupTests,
+  } = createTestOrchestrator(testFunctions, runner);
 
   // Get current user ID for activity tests
   const currentUser = await getCurrentUser();
@@ -84,7 +96,15 @@ async function runAllTests(): Promise<void> {
   // Part 5: Activity tests
   await runActivityTests(currentUser.userId);
 
-  // Part 6: Cleanup
+  // Part 6: S3 Storage (Avatars)
+  await runStorageTests();
+
+  // Part 7: Bookmarks DDB (requires a post to bookmark)
+  if (postId) {
+    await runBookmarksTests(currentUser.userId, postId);
+  }
+
+  // Part 8: Cleanup
   await runCleanupTests(topicId, postId, commentId);
 
   // Sign out
diff --git a/amplify-migration-apps/discussions/package.json b/amplify-migration-apps/discussions/package.json
index 1f4874f0128..a43104ec77a 100644
--- a/amplify-migration-apps/discussions/package.json
+++ b/amplify-migration-apps/discussions/package.json
@@ -20,6 +20,8 @@
     "vite": "^7.2.2"
   },
   "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.936.0",
+    "@aws-sdk/lib-dynamodb": "^3.936.0",
     "aws-amplify": "^6.15.8"
   }
 }
diff --git a/amplify-migration-apps/discussions/test-utils.ts b/amplify-migration-apps/discussions/test-utils.ts
index e22c019c12b..58d3a17f90c 100644
--- a/amplify-migration-apps/discussions/test-utils.ts
+++ b/amplify-migration-apps/discussions/test-utils.ts
@@ -3,6 +3,9 @@
 import { Amplify } from 'aws-amplify';
 import { generateClient } from 'aws-amplify/api';
 import { getCurrentUser } from 'aws-amplify/auth';
+import { uploadData, getUrl, remove } from 'aws-amplify/storage';
+import { DynamoDBClient, ListTablesCommand } from '@aws-sdk/client-dynamodb';
+import { DynamoDBDocumentClient, PutCommand, GetCommand, DeleteCommand } from '@aws-sdk/lib-dynamodb';
 import { getTopic, listTopics, getPost, listPosts, getComment, listComments, fetchUserActivity } from './src/graphql/queries';
 import {
   createTopic,
@@ -319,6 +322,115 @@ export function createTestFunctions() {
     console.log('✅ Deleted comment:', deleted.content?.substring(0, 30) + '...');
   }
 
+  // ============================================================
+  // S3 Avatar Test Functions
+  // ============================================================
+
+  async function testUploadAvatar(): Promise<string | null> {
+    console.log('\n📤 Testing uploadData (S3 avatar upload)...');
+    // 1x1 transparent PNG
+    const testImageBase64 =
+      'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==';
+    const imageBuffer = Buffer.from(testImageBase64, 'base64');
+    const fileName = `test-avatar-${Date.now()}.png`;
+
+    console.log(`   Uploading to: ${fileName}`);
+    console.log(`   File size: ${imageBuffer.length} bytes`);
+
+    const result = await uploadData({
+      key: fileName,
+      data: imageBuffer,
+      options: { contentType: 'image/png' },
+    }).result;
+
+    console.log('✅ Upload successful!');
+    console.log('   Key:', result.key);
+    return result.key;
+  }
+
+  async function testGetAvatarUrl(avatarKey: string): Promise<string | null> {
+    console.log(`\n🔗 Testing getUrl (S3 signed URL)...`);
+    console.log(`   Avatar key: ${avatarKey}`);
+
+    const result = await getUrl({
+      key: avatarKey,
+      options: { expiresIn: 3600 },
+    });
+    console.log('✅ Got signed URL!');
+    console.log('   URL:', result.url.toString().substring(0, 80) + '...');
+    return result.url.toString();
+  }
+
+  async function testRemoveAvatar(avatarKey: string): Promise<void> {
+    console.log(`\n🗑️ Testing remove (S3 avatar delete)...`);
+    console.log(`   Avatar key: ${avatarKey}`);
+
+    await remove({ key: avatarKey });
+    console.log('✅ Avatar removed successfully!');
+  }
+
+  // ============================================================
+  // Bookmarks DDB Test Functions
+  // ============================================================
+
+  async function testCreateBookmark(tableName: string, userId: string, postId: string): Promise<void> {
+    console.log('\n🔖 Testing PutItem (create bookmark)...');
+    console.log(`   Table: ${tableName}`);
+    console.log(`   userId: ${userId.substring(0, 8)}..., postId: ${postId.substring(0, 8)}...`);
+
+    const ddbClient = DynamoDBDocumentClient.from(
+      new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
+    );
+    await ddbClient.send(
+      new PutCommand({
+        TableName: tableName,
+        Item: { userId, postId, createdAt: new Date().toISOString() },
+      }),
+    );
+    console.log('✅ Bookmark created!');
+  }
+
+  async function testGetBookmark(tableName: string, userId: string, postId: string): Promise<void> {
+    console.log('\n🔖 Testing GetItem (read bookmark)...');
+    console.log(`   Table: ${tableName}`);
+    console.log(`   userId: ${userId.substring(0, 8)}..., postId: ${postId.substring(0, 8)}...`);
+
+    const ddbClient = DynamoDBDocumentClient.from(
+      new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
+    );
+    const result = await ddbClient.send(
+      new GetCommand({
+        TableName: tableName,
+        Key: { userId, postId },
+      }),
+    );
+    if (!result.Item) {
+      throw new Error('Bookmark not found');
+    }
+    console.log('✅ Bookmark found:', {
+      userId: result.Item.userId.substring(0, 8) + '...',
+      postId: result.Item.postId.substring(0, 8) + '...',
+      createdAt: result.Item.createdAt,
+    });
+  }
+
+  async function testDeleteBookmark(tableName: string, userId: string, postId: string): Promise<void> {
+    console.log('\n🗑️ Testing DeleteItem (remove bookmark)...');
+    console.log(`   Table: ${tableName}`);
+    console.log(`   userId: ${userId.substring(0, 8)}..., postId: ${postId.substring(0, 8)}...`);
+
+    const ddbClient = DynamoDBDocumentClient.from(
+      new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
+    );
+    await ddbClient.send(
+      new DeleteCommand({
+        TableName: tableName,
+        Key: { userId, postId },
+      }),
+    );
+    console.log('✅ Bookmark deleted!');
+  }
+
   return {
     testListTopics,
     testGetTopic,
@@ -336,9 +448,33 @@ export function createTestFunctions() {
     testCreateComment,
     testUpdateComment,
     testDeleteComment,
+    testUploadAvatar,
+    testGetAvatarUrl,
+    testRemoveAvatar,
+    testCreateBookmark,
+    testGetBookmark,
+    testDeleteBookmark,
   };
 }
 
+// ============================================================
+// Bookmarks Table Discovery
+// ============================================================
+
+export async function discoverBookmarksTable(region: string): Promise<string> {
+  const client = new DynamoDBClient({ region });
+  const result = await client.send(new ListTablesCommand({}));
+  const tables = result.TableNames ?? [];
+  const bookmarksTables = tables.filter((t) => t.startsWith('bookmarks-'));
+  if (bookmarksTables.length === 0) {
+    throw new Error('No bookmarks table found. Expected a DynamoDB table starting with "bookmarks-".');
+  }
+  if (bookmarksTables.length > 1) {
+    console.log(`⚠️ Found multiple bookmarks tables: ${bookmarksTables.join(', ')}. Using first one.`);
+  }
+  return bookmarksTables[0];
+}
+
 // ============================================================
 // Shared Test Orchestration Functions
 // ============================================================
@@ -440,9 +576,35 @@ export function createTestOrchestrator(testFunctions: ReturnType<typeof createTe
     await runner.runTest('fetchUserActivity', () => testFunctions.testFetchUserActivity(userId));
   }
 
+  async function runStorageTests(): Promise<void> {
+    console.log('\n' + '='.repeat(60));
+    console.log('📸 PART 6: S3 Storage (Avatars)');
+    console.log('='.repeat(60));
+
+    const avatarKey = await runner.runTest('uploadAvatar', testFunctions.testUploadAvatar);
+    if (avatarKey) {
+      await runner.runTest('getAvatarUrl', () => testFunctions.testGetAvatarUrl(avatarKey));
+      await runner.runTest('removeAvatar', () => testFunctions.testRemoveAvatar(avatarKey));
+    }
+  }
+
+  async function runBookmarksTests(userId: string, postId: string): Promise<void> {
+    console.log('\n' + '='.repeat(60));
+    console.log('🔖 PART 7: Bookmarks DDB');
+    console.log('='.repeat(60));
+
+    const region = (amplifyconfig as any).aws_project_region || 'us-east-1';
+    const tableName = await discoverBookmarksTable(region);
+    console.log(`   Discovered bookmarks table: ${tableName}`);
+
+    await runner.runTest('createBookmark', () => testFunctions.testCreateBookmark(tableName, userId, postId));
+    await runner.runTest('getBookmark', () => testFunctions.testGetBookmark(tableName, userId, postId));
+    await runner.runTest('deleteBookmark', () => testFunctions.testDeleteBookmark(tableName, userId, postId));
+  }
+
   async function runCleanupTests(topicId: string | null, postId: string | null, commentId: string | null): Promise<void> {
     console.log('\n' + '='.repeat(60));
-    console.log('🧹 PART 6: Cleanup (Delete Test Data)');
+    console.log('🧹 PART 8: Cleanup (Delete Test Data)');
     console.log('='.repeat(60));
 
     // Delete in reverse order of creation (comments -> posts -> topics)
@@ -457,6 +619,8 @@ export function createTestOrchestrator(testFunctions: ReturnType<typeof createTe
     runPostMutationTests,
     runCommentMutationTests,
     runActivityTests,
+    runStorageTests,
+    runBookmarksTests,
     runCleanupTests,
   };
 }

From 6b794c1029abc963f7af6e63f2f193b5764343ce Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Mon, 23 Mar 2026 22:24:06 +0000
Subject: [PATCH 12/20] refactor(cli): clean up bookmarks test - shared DDB
 client, config-based table lookup

Remove ListTablesCommand discovery in favor of reading table name from
amplifyconfiguration.json. Share a single DynamoDBDocumentClient across
all bookmark test functions instead of creating one per call.
---
 .../discussions/test-utils.ts                 | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/amplify-migration-apps/discussions/test-utils.ts b/amplify-migration-apps/discussions/test-utils.ts
index 58d3a17f90c..df02dbed4ce 100644
--- a/amplify-migration-apps/discussions/test-utils.ts
+++ b/amplify-migration-apps/discussions/test-utils.ts
@@ -4,7 +4,7 @@ import { Amplify } from 'aws-amplify';
 import { generateClient } from 'aws-amplify/api';
 import { getCurrentUser } from 'aws-amplify/auth';
 import { uploadData, getUrl, remove } from 'aws-amplify/storage';
-import { DynamoDBClient, ListTablesCommand } from '@aws-sdk/client-dynamodb';
+import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient, PutCommand, GetCommand, DeleteCommand } from '@aws-sdk/lib-dynamodb';
 import { getTopic, listTopics, getPost, listPosts, getComment, listComments, fetchUserActivity } from './src/graphql/queries';
 import {
@@ -373,14 +373,15 @@ export function createTestFunctions() {
   // Bookmarks DDB Test Functions
   // ============================================================
 
+  const ddbClient = DynamoDBDocumentClient.from(
+    new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
+  );
+
   async function testCreateBookmark(tableName: string, userId: string, postId: string): Promise<void> {
     console.log('\n🔖 Testing PutItem (create bookmark)...');
     console.log(`   Table: ${tableName}`);
     console.log(`   userId: ${userId.substring(0, 8)}..., postId: ${postId.substring(0, 8)}...`);
 
-    const ddbClient = DynamoDBDocumentClient.from(
-      new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
-    );
     await ddbClient.send(
       new PutCommand({
         TableName: tableName,
@@ -395,9 +396,6 @@ export function createTestFunctions() {
     console.log(`   Table: ${tableName}`);
     console.log(`   userId: ${userId.substring(0, 8)}..., postId: ${postId.substring(0, 8)}...`);
 
-    const ddbClient = DynamoDBDocumentClient.from(
-      new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
-    );
     const result = await ddbClient.send(
       new GetCommand({
         TableName: tableName,
@@ -419,9 +417,6 @@ export function createTestFunctions() {
     console.log(`   Table: ${tableName}`);
     console.log(`   userId: ${userId.substring(0, 8)}..., postId: ${postId.substring(0, 8)}...`);
 
-    const ddbClient = DynamoDBDocumentClient.from(
-      new DynamoDBClient({ region: (amplifyconfig as any).aws_project_region }),
-    );
     await ddbClient.send(
       new DeleteCommand({
         TableName: tableName,
@@ -457,22 +452,13 @@ export function createTestFunctions() {
   };
 }
 
-// ============================================================
-// Bookmarks Table Discovery
-// ============================================================
-
-export async function discoverBookmarksTable(region: string): Promise<string> {
-  const client = new DynamoDBClient({ region });
-  const result = await client.send(new ListTablesCommand({}));
-  const tables = result.TableNames ?? [];
-  const bookmarksTables = tables.filter((t) => t.startsWith('bookmarks-'));
-  if (bookmarksTables.length === 0) {
-    throw new Error('No bookmarks table found. Expected a DynamoDB table starting with "bookmarks-".');
-  }
-  if (bookmarksTables.length > 1) {
-    console.log(`⚠️ Found multiple bookmarks tables: ${bookmarksTables.join(', ')}. Using first one.`);
+function getBookmarksTableName(): string {
+  const schemas = (amplifyconfig as any).aws_dynamodb_table_schemas ?? [];
+  const entry = schemas.find((s: any) => s.tableName?.startsWith('bookmarks-'));
+  if (!entry) {
+    throw new Error('No bookmarks table found in amplifyconfiguration.json');
   }
-  return bookmarksTables[0];
+  return entry.tableName;
 }
 
 // ============================================================
@@ -593,9 +579,8 @@ export function createTestOrchestrator(testFunctions: ReturnType<typeof createTe
     console.log('🔖 PART 7: Bookmarks DDB');
     console.log('='.repeat(60));
 
-    const region = (amplifyconfig as any).aws_project_region || 'us-east-1';
-    const tableName = await discoverBookmarksTable(region);
-    console.log(`   Discovered bookmarks table: ${tableName}`);
+    const tableName = getBookmarksTableName();
+    console.log(`   Bookmarks table: ${tableName}`);
 
     await runner.runTest('createBookmark', () => testFunctions.testCreateBookmark(tableName, userId, postId));
     await runner.runTest('getBookmark', () => testFunctions.testGetBookmark(tableName, userId, postId));

From 1aceadbac3396aca677da6abe73fa0b64452011b Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Mon, 23 Mar 2026 22:41:16 +0000
Subject: [PATCH 13/20] chore(cli): remove dev-only .gitignore from amplify-cli
 package

Remove .gitignore that ignored local dev helper scripts
(add-bookmarks.ts, deploy-gen1.ts) that no longer exist.
---
 packages/amplify-cli/.gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 packages/amplify-cli/.gitignore

diff --git a/packages/amplify-cli/.gitignore b/packages/amplify-cli/.gitignore
deleted file mode 100644
index fe995be1500..00000000000
--- a/packages/amplify-cli/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-add-bookmarks.ts
-deploy-gen1.ts

From a514ec7541fb7efdb131d11ca66d454b7d708a2e Mon Sep 17 00:00:00 2001
From: Benjamin Pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 00:58:52 +0000
Subject: [PATCH 14/20] fix(cli): add typescript devDep to fix typecheck for
 bundler moduleResolution

backend-only and discussions were missing typescript as a
devDependency, causing npx tsc to fall back to the root
tsc v4.9.5 which doesn't support moduleResolution:"bundler".
Also restores monorepo metadata in discussions snapshot
package.json files.
---
 .../backend-only/package.json                 |  3 ++
 .../_snapshot.post.generate/package.json      |  9 +++-
 .../_snapshot.pre.generate/package.json       |  9 +++-
 .../discussions/package.json                  |  1 +
 yarn.lock                                     | 44 +++++++++----------
 5 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/amplify-migration-apps/backend-only/package.json b/amplify-migration-apps/backend-only/package.json
index e52d3e6f7b3..db477981041 100644
--- a/amplify-migration-apps/backend-only/package.json
+++ b/amplify-migration-apps/backend-only/package.json
@@ -9,5 +9,8 @@
   "scripts": {
     "sanitize": "tsx ../sanitize.ts",
     "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
+  },
+  "devDependencies": {
+    "typescript": "~5.9.3"
   }
 }
diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/package.json b/amplify-migration-apps/discussions/_snapshot.post.generate/package.json
index c99943e5d1a..b5b67a4accd 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/package.json
@@ -1,15 +1,20 @@
 {
-  "name": "discussions",
+  "name": "@amplify-migration-apps/discussions",
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
     "configure": "./configure.sh",
     "configure-schema": "./configure-schema.sh",
-    "configure-functions": "./configure-functions.sh"
+    "configure-functions": "./configure-functions.sh",
+    "sanitize": "tsx ../sanitize.ts",
+    "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
   },
   "devDependencies": {
     "@aws-amplify/backend": "^1.18.0",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json
index 1d3628a1639..a43104ec77a 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/package.json
@@ -1,15 +1,20 @@
 {
-  "name": "discussions",
+  "name": "@amplify-migration-apps/discussions",
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
     "configure": "./configure.sh",
     "configure-schema": "./configure-schema.sh",
-    "configure-functions": "./configure-functions.sh"
+    "configure-functions": "./configure-functions.sh",
+    "sanitize": "tsx ../sanitize.ts",
+    "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
   },
   "devDependencies": {
     "vite": "^7.2.2"
diff --git a/amplify-migration-apps/discussions/package.json b/amplify-migration-apps/discussions/package.json
index a43104ec77a..27308b2a7a6 100644
--- a/amplify-migration-apps/discussions/package.json
+++ b/amplify-migration-apps/discussions/package.json
@@ -17,6 +17,7 @@
     "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
   },
   "devDependencies": {
+    "typescript": "~5.9.3",
     "vite": "^7.2.2"
   },
   "dependencies": {
diff --git a/yarn.lock b/yarn.lock
index 2ca1f1adb52..14b3730a9c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38,6 +38,28 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@amplify-migration-apps/discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate":
+  version: 0.0.0-use.local
+  resolution: "@amplify-migration-apps/discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate"
+  dependencies:
+    "@aws-amplify/backend": ^1.18.0
+    "@aws-amplify/backend-cli": ^1.8.0
+    "@aws-amplify/backend-data": ^1.6.2
+    "@aws-sdk/client-dynamodb": ^3.936.0
+    "@aws-sdk/lib-dynamodb": ^3.936.0
+    "@types/aws-lambda": ^8.10.92
+    "@types/node": "*"
+    aws-amplify: ^6.15.8
+    aws-cdk: ^2
+    aws-cdk-lib: ^2
+    ci-info: ^4.3.1
+    constructs: ^10.0.0
+    esbuild: ^0.27.0
+    tsx: ^4.20.6
+    vite: ^7.2.2
+  languageName: unknown
+  linkType: soft
+
 "@amplify-migration-apps/fitness-goal-tracker@workspace:amplify-migration-apps/fitness-tracker/_snapshot.post.generate":
   version: 0.0.0-use.local
   resolution: "@amplify-migration-apps/fitness-goal-tracker@workspace:amplify-migration-apps/fitness-tracker/_snapshot.post.generate"
@@ -26674,28 +26696,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate":
-  version: 0.0.0-use.local
-  resolution: "discussions@workspace:amplify-migration-apps/discussions/_snapshot.post.generate"
-  dependencies:
-    "@aws-amplify/backend": ^1.18.0
-    "@aws-amplify/backend-cli": ^1.8.0
-    "@aws-amplify/backend-data": ^1.6.2
-    "@aws-sdk/client-dynamodb": ^3.936.0
-    "@aws-sdk/lib-dynamodb": ^3.936.0
-    "@types/aws-lambda": ^8.10.92
-    "@types/node": "*"
-    aws-amplify: ^6.15.8
-    aws-cdk: ^2
-    aws-cdk-lib: ^2
-    ci-info: ^4.3.1
-    constructs: ^10.0.0
-    esbuild: ^0.27.0
-    tsx: ^4.20.6
-    vite: ^7.2.2
-  languageName: unknown
-  linkType: soft
-
 "dlv@npm:^1.1.3":
   version: 1.1.3
   resolution: "dlv@npm:1.1.3"

From 51ad9c87e99d56881e90d40cfe11c724a4458b01 Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 10:14:08 -0400
Subject: [PATCH 15/20] fix: use README-specified emailVerificationMessage in
 discussions snapshots

Replace "Your verification code is {####}" with "Here is your verification code
{####}" to match the discussions README instructions, preventing drift when
snapshots are regenerated.
---
 ...ch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json | 2 +-
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 2 +-
 ...-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json | 2 +-
 .../auth/discussionsc578c16ec578c16e/build/parameters.json      | 2 +-
 .../auth/discussionsc578c16ec578c16e/cli-inputs.json            | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 .../auth/discussionsc578c16ec578c16e/build/parameters.json      | 2 +-
 .../backend/auth/discussionsc578c16ec578c16e/cli-inputs.json    | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 2 +-
 .../amplify-discussions-main-c39a5.template.json                | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
index 64a7404cb13..ed4aeff95d6 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
@@ -117,7 +117,7 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Your verification code is {####}",
+        "EmailVerificationMessage": "Here is your verification code {####}",
         "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index 74fcae6c0f2..f6d5bcb1506 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -129,7 +129,7 @@
   },
   {
     "ParameterKey": "emailVerificationMessage",
-    "ParameterValue": "Your verification code is {####}"
+    "ParameterValue": "Here is your verification code {####}"
   },
   {
     "ParameterKey": "userpoolClientRefreshTokenValidity",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
index 402c761bf8d..bd2a9006e68 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
@@ -204,7 +204,7 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "Your verification code is {####}",
+        "EmailVerificationMessage": "Here is your verification code {####}",
         "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index 550944a39ff..b5be0ad54f8 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -13,7 +13,7 @@
   "smsAuthenticationMessage": "Your authentication code is {####}",
   "smsVerificationMessage": "Your verification code is {####}",
   "emailVerificationSubject": "Verification",
-  "emailVerificationMessage": "Your verification code is {####}",
+  "emailVerificationMessage": "Here is your verification code {####}",
   "defaultPasswordPolicy": false,
   "passwordPolicyMinLength": 8,
   "passwordPolicyCharacters": [],
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index a065fe386cc..c8b670350c3 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -15,7 +15,7 @@
     "smsAuthenticationMessage": "Your authentication code is {####}",
     "smsVerificationMessage": "Your verification code is {####}",
     "emailVerificationSubject": "Verification",
-    "emailVerificationMessage": "Your verification code is {####}",
+    "emailVerificationMessage": "Here is your verification code {####}",
     "defaultPasswordPolicy": false,
     "passwordPolicyMinLength": 8,
     "passwordPolicyCharacters": [],
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 433a496539b..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -228,7 +228,7 @@
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Your verification code is {####}",
+          "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 433a496539b..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -228,7 +228,7 @@
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Your verification code is {####}",
+          "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index 550944a39ff..b5be0ad54f8 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -13,7 +13,7 @@
   "smsAuthenticationMessage": "Your authentication code is {####}",
   "smsVerificationMessage": "Your verification code is {####}",
   "emailVerificationSubject": "Verification",
-  "emailVerificationMessage": "Your verification code is {####}",
+  "emailVerificationMessage": "Here is your verification code {####}",
   "defaultPasswordPolicy": false,
   "passwordPolicyMinLength": 8,
   "passwordPolicyCharacters": [],
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index a065fe386cc..c8b670350c3 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -15,7 +15,7 @@
     "smsAuthenticationMessage": "Your authentication code is {####}",
     "smsVerificationMessage": "Your verification code is {####}",
     "emailVerificationSubject": "Verification",
-    "emailVerificationMessage": "Your verification code is {####}",
+    "emailVerificationMessage": "Here is your verification code {####}",
     "defaultPasswordPolicy": false,
     "passwordPolicyMinLength": 8,
     "passwordPolicyCharacters": [],
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 433a496539b..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -228,7 +228,7 @@
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Your verification code is {####}",
+          "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
index 433a496539b..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
@@ -228,7 +228,7 @@
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Your verification code is {####}",
+          "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index 74fcae6c0f2..f6d5bcb1506 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -129,7 +129,7 @@
   },
   {
     "ParameterKey": "emailVerificationMessage",
-    "ParameterValue": "Your verification code is {####}"
+    "ParameterValue": "Here is your verification code {####}"
   },
   {
     "ParameterKey": "userpoolClientRefreshTokenValidity",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
index 433a496539b..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
@@ -228,7 +228,7 @@
           "smsAuthenticationMessage": "Your authentication code is {####}",
           "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
-          "emailVerificationMessage": "Your verification code is {####}",
+          "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
           "passwordPolicyMinLength": 8,
           "passwordPolicyCharacters": "",

From 9c4665bd52692d128afbcbbbf692ecb6719169ae Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 13:40:26 -0400
Subject: [PATCH 16/20] fix: replace remaining old verification message in
 discussions snapshots

---
 .../_snapshot.post.generate/amplify/auth/resource.ts            | 2 +-
 ...ch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json | 2 +-
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 2 +-
 ...-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json | 2 +-
 .../auth/discussionsc578c16ec578c16e/build/parameters.json      | 2 +-
 .../auth/discussionsc578c16ec578c16e/cli-inputs.json            | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 .../auth/discussionsc578c16ec578c16e/build/parameters.json      | 2 +-
 .../backend/auth/discussionsc578c16ec578c16e/cli-inputs.json    | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json      | 2 +-
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 2 +-
 .../amplify-discussions-main-c39a5.template.json                | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts
index 74c8f81185f..8d4df714fde 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts
+++ b/amplify-migration-apps/discussions/_snapshot.post.generate/amplify/auth/resource.ts
@@ -4,7 +4,7 @@ export const auth = defineAuth({
   loginWith: {
     email: {
       verificationEmailSubject: 'Verification',
-      verificationEmailBody: () => 'Your verification code is {####}',
+      verificationEmailBody: () => 'Here is your verification code {####}',
     },
   },
   userAttributes: {
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
index ed4aeff95d6..d10d4623d33 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
@@ -146,7 +146,7 @@
           "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
         },
-        "SmsVerificationMessage": "Your verification code is {####}",
+        "SmsVerificationMessage": "Here is your verification code {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index f6d5bcb1506..03c5009e385 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -21,7 +21,7 @@
   },
   {
     "ParameterKey": "smsVerificationMessage",
-    "ParameterValue": "Your verification code is {####}"
+    "ParameterValue": "Here is your verification code {####}"
   },
   {
     "ParameterKey": "userpoolClientReadAttributes",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
index bd2a9006e68..256361b7c91 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
@@ -233,7 +233,7 @@
           "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
         },
-        "SmsVerificationMessage": "Your verification code is {####}",
+        "SmsVerificationMessage": "Here is your verification code {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index b5be0ad54f8..c987448f9b2 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -11,7 +11,7 @@
     "SMS Text Message"
   ],
   "smsAuthenticationMessage": "Your authentication code is {####}",
-  "smsVerificationMessage": "Your verification code is {####}",
+  "smsVerificationMessage": "Here is your verification code {####}",
   "emailVerificationSubject": "Verification",
   "emailVerificationMessage": "Here is your verification code {####}",
   "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index c8b670350c3..310ea962f25 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -13,7 +13,7 @@
       "SMS Text Message"
     ],
     "smsAuthenticationMessage": "Your authentication code is {####}",
-    "smsVerificationMessage": "Your verification code is {####}",
+    "smsVerificationMessage": "Here is your verification code {####}",
     "emailVerificationSubject": "Verification",
     "emailVerificationMessage": "Here is your verification code {####}",
     "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 7d427d24e55..7eb76a229cb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Your verification code is {####}",
+          "smsVerificationMessage": "Here is your verification code {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 7d427d24e55..7eb76a229cb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Your verification code is {####}",
+          "smsVerificationMessage": "Here is your verification code {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index b5be0ad54f8..c987448f9b2 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -11,7 +11,7 @@
     "SMS Text Message"
   ],
   "smsAuthenticationMessage": "Your authentication code is {####}",
-  "smsVerificationMessage": "Your verification code is {####}",
+  "smsVerificationMessage": "Here is your verification code {####}",
   "emailVerificationSubject": "Verification",
   "emailVerificationMessage": "Here is your verification code {####}",
   "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index c8b670350c3..310ea962f25 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -13,7 +13,7 @@
       "SMS Text Message"
     ],
     "smsAuthenticationMessage": "Your authentication code is {####}",
-    "smsVerificationMessage": "Your verification code is {####}",
+    "smsVerificationMessage": "Here is your verification code {####}",
     "emailVerificationSubject": "Verification",
     "emailVerificationMessage": "Here is your verification code {####}",
     "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 7d427d24e55..7eb76a229cb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Your verification code is {####}",
+          "smsVerificationMessage": "Here is your verification code {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
index 7d427d24e55..7eb76a229cb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Your verification code is {####}",
+          "smsVerificationMessage": "Here is your verification code {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index f6d5bcb1506..03c5009e385 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -21,7 +21,7 @@
   },
   {
     "ParameterKey": "smsVerificationMessage",
-    "ParameterValue": "Your verification code is {####}"
+    "ParameterValue": "Here is your verification code {####}"
   },
   {
     "ParameterKey": "userpoolClientReadAttributes",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
index 7d427d24e55..7eb76a229cb 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Your verification code is {####}",
+          "smsVerificationMessage": "Here is your verification code {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,

From 91af8a420818d9fb03d987bbe4e66c8b651f9f09 Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 13:45:49 -0400
Subject: [PATCH 17/20] fix: align gen2 branch verification messages with
 README

---
 ...79371D7-6NIMXK30VQKX-holding.target.template.json | 12 ++++++------
 ...27e51c30a-auth179371D7-6NIMXK30VQKX.template.json | 12 ++++++------
 ...27e51c30a-auth179371D7-6NIMXK30VQKX.template.json | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
index 189983e370e..289b221ab0b 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
@@ -19,8 +19,8 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "The verification code to your new account is {####}",
-        "EmailVerificationSubject": "Verify your new account",
+        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
           "PasswordPolicy": {
@@ -44,7 +44,7 @@
             "Required": true
           }
         ],
-        "SmsVerificationMessage": "The verification code to your new account is {####}",
+        "SmsVerificationMessage": "Here is your verification code {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
@@ -65,9 +65,9 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "The verification code to your new account is {####}",
-          "EmailSubject": "Verify your new account",
-          "SmsMessage": "The verification code to your new account is {####}"
+          "EmailMessage": "Here is your verification code {####}",
+          "EmailSubject": "Verification",
+          "SmsMessage": "Here is your verification code {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
index f86184ab2f8..3f635da5049 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
@@ -18,8 +18,8 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "The verification code to your new account is {####}",
-        "EmailVerificationSubject": "Verify your new account",
+        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
           "PasswordPolicy": {
@@ -43,7 +43,7 @@
             "Required": true
           }
         ],
-        "SmsVerificationMessage": "The verification code to your new account is {####}",
+        "SmsVerificationMessage": "Here is your verification code {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
@@ -64,9 +64,9 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "The verification code to your new account is {####}",
-          "EmailSubject": "Verify your new account",
-          "SmsMessage": "The verification code to your new account is {####}"
+          "EmailMessage": "Here is your verification code {####}",
+          "EmailSubject": "Verification",
+          "SmsMessage": "Here is your verification code {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
index a1e6677587f..e098ac26ce1 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
@@ -18,8 +18,8 @@
         "AutoVerifiedAttributes": [
           "email"
         ],
-        "EmailVerificationMessage": "The verification code to your new account is {####}",
-        "EmailVerificationSubject": "Verify your new account",
+        "EmailVerificationMessage": "Here is your verification code {####}",
+        "EmailVerificationSubject": "Verification",
         "MfaConfiguration": "OFF",
         "Policies": {
           "PasswordPolicy": {
@@ -43,7 +43,7 @@
             "Required": true
           }
         ],
-        "SmsVerificationMessage": "The verification code to your new account is {####}",
+        "SmsVerificationMessage": "Here is your verification code {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
@@ -64,9 +64,9 @@
         },
         "VerificationMessageTemplate": {
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
-          "EmailMessage": "The verification code to your new account is {####}",
-          "EmailSubject": "Verify your new account",
-          "SmsMessage": "The verification code to your new account is {####}"
+          "EmailMessage": "Here is your verification code {####}",
+          "EmailSubject": "Verification",
+          "SmsMessage": "Here is your verification code {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",

From 3552a55dda3cac49e10f9c53f02cb1a63d664ac2 Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 13:50:44 -0400
Subject: [PATCH 18/20] fix: revert SMS verification messages to original
 values

Only email verification fields should use the README-specified message.
SMS fields should retain their original values.
---
 ...30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json | 4 ++--
 ...-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json | 2 +-
 ...-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json | 4 ++--
 ...hdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 4 ++--
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json | 2 +-
 .../auth/discussionsc578c16ec578c16e/build/parameters.json    | 2 +-
 .../auth/discussionsc578c16ec578c16e/cli-inputs.json          | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json    | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json    | 2 +-
 .../auth/discussionsc578c16ec578c16e/build/parameters.json    | 2 +-
 .../backend/auth/discussionsc578c16ec578c16e/cli-inputs.json  | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json    | 2 +-
 .../awscloudformation/build/root-cloudformation-stack.json    | 2 +-
 ...-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json | 4 ++--
 ...hdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 4 ++--
 .../amplify-discussions-main-c39a5.template.json              | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
index 289b221ab0b..5a533e7e419 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX-holding.target.template.json
@@ -44,7 +44,7 @@
             "Required": true
           }
         ],
-        "SmsVerificationMessage": "Here is your verification code {####}",
+        "SmsVerificationMessage": "The verification code to your new account is {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
@@ -67,7 +67,7 @@
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
           "EmailMessage": "Here is your verification code {####}",
           "EmailSubject": "Verification",
-          "SmsMessage": "Here is your verification code {####}"
+          "SmsMessage": "The verification code to your new account is {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
index d10d4623d33..ed4aeff95d6 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/refactor.__from__.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.__to__.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.target.template.json
@@ -146,7 +146,7 @@
           "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
         },
-        "SmsVerificationMessage": "Here is your verification code {####}",
+        "SmsVerificationMessage": "Your verification code is {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
index 3f635da5049..60395f860ba 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
@@ -43,7 +43,7 @@
             "Required": true
           }
         ],
-        "SmsVerificationMessage": "Here is your verification code {####}",
+        "SmsVerificationMessage": "The verification code to your new account is {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
@@ -66,7 +66,7 @@
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
           "EmailMessage": "Here is your verification code {####}",
           "EmailSubject": "Verification",
-          "SmsMessage": "Here is your verification code {####}"
+          "SmsMessage": "The verification code to your new account is {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index 03c5009e385..ceadb038979 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -21,7 +21,7 @@
   },
   {
     "ParameterKey": "smsVerificationMessage",
-    "ParameterValue": "Here is your verification code {####}"
+    "ParameterValue": "Your verification code is {####}"
   },
   {
     "ParameterKey": "userpoolClientReadAttributes",
@@ -163,4 +163,4 @@
     "ParameterKey": "defaultPasswordPolicy",
     "ParameterValue": "false"
   }
-]
\ No newline at end of file
+]
diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
index 256361b7c91..bd2a9006e68 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.template.json
@@ -233,7 +233,7 @@
           "ExternalId": "discusc578c16e_role_external_id",
           "SnsCallerArn": "arn:aws:iam::123456789012:role/snsc578c16ec39a5-main"
         },
-        "SmsVerificationMessage": "Here is your verification code {####}",
+        "SmsVerificationMessage": "Your verification code is {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index c987448f9b2..b5be0ad54f8 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -11,7 +11,7 @@
     "SMS Text Message"
   ],
   "smsAuthenticationMessage": "Your authentication code is {####}",
-  "smsVerificationMessage": "Here is your verification code {####}",
+  "smsVerificationMessage": "Your verification code is {####}",
   "emailVerificationSubject": "Verification",
   "emailVerificationMessage": "Here is your verification code {####}",
   "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index 310ea962f25..c8b670350c3 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -13,7 +13,7 @@
       "SMS Text Message"
     ],
     "smsAuthenticationMessage": "Your authentication code is {####}",
-    "smsVerificationMessage": "Here is your verification code {####}",
+    "smsVerificationMessage": "Your verification code is {####}",
     "emailVerificationSubject": "Verification",
     "emailVerificationMessage": "Here is your verification code {####}",
     "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 7eb76a229cb..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Here is your verification code {####}",
+          "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
index 7eb76a229cb..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/#current-cloud-backend/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Here is your verification code {####}",
+          "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
index c987448f9b2..b5be0ad54f8 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/build/parameters.json
@@ -11,7 +11,7 @@
     "SMS Text Message"
   ],
   "smsAuthenticationMessage": "Your authentication code is {####}",
-  "smsVerificationMessage": "Here is your verification code {####}",
+  "smsVerificationMessage": "Your verification code is {####}",
   "emailVerificationSubject": "Verification",
   "emailVerificationMessage": "Here is your verification code {####}",
   "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
index 310ea962f25..c8b670350c3 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/auth/discussionsc578c16ec578c16e/cli-inputs.json
@@ -13,7 +13,7 @@
       "SMS Text Message"
     ],
     "smsAuthenticationMessage": "Your authentication code is {####}",
-    "smsVerificationMessage": "Here is your verification code {####}",
+    "smsVerificationMessage": "Your verification code is {####}",
     "emailVerificationSubject": "Verification",
     "emailVerificationMessage": "Here is your verification code {####}",
     "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
index 7eb76a229cb..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Here is your verification code {####}",
+          "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
index 7eb76a229cb..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.generate/amplify/backend/awscloudformation/build/root-cloudformation-stack.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Here is your verification code {####}",
+          "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
index e098ac26ce1..41c5875225b 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-gen2main-branch-a27e51c30a-auth179371D7-6NIMXK30VQKX.template.json
@@ -43,7 +43,7 @@
             "Required": true
           }
         ],
-        "SmsVerificationMessage": "Here is your verification code {####}",
+        "SmsVerificationMessage": "The verification code to your new account is {####}",
         "UserAttributeUpdateSettings": {
           "AttributesRequireVerificationBeforeUpdate": [
             "email"
@@ -66,7 +66,7 @@
           "DefaultEmailOption": "CONFIRM_WITH_CODE",
           "EmailMessage": "Here is your verification code {####}",
           "EmailSubject": "Verification",
-          "SmsMessage": "Here is your verification code {####}"
+          "SmsMessage": "The verification code to your new account is {####}"
         }
       },
       "UpdateReplacePolicy": "Delete",
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index 03c5009e385..ceadb038979 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -21,7 +21,7 @@
   },
   {
     "ParameterKey": "smsVerificationMessage",
-    "ParameterValue": "Here is your verification code {####}"
+    "ParameterValue": "Your verification code is {####}"
   },
   {
     "ParameterKey": "userpoolClientReadAttributes",
@@ -163,4 +163,4 @@
     "ParameterKey": "defaultPasswordPolicy",
     "ParameterValue": "false"
   }
-]
\ No newline at end of file
+]
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
index 7eb76a229cb..7d427d24e55 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5.template.json
@@ -226,7 +226,7 @@
           "mfaConfiguration": "OFF",
           "mfaTypes": "SMS Text Message",
           "smsAuthenticationMessage": "Your authentication code is {####}",
-          "smsVerificationMessage": "Here is your verification code {####}",
+          "smsVerificationMessage": "Your verification code is {####}",
           "emailVerificationSubject": "Verification",
           "emailVerificationMessage": "Here is your verification code {####}",
           "defaultPasswordPolicy": false,

From 46cc7a8c5f61385607a4c0d78ebd48236e7268f1 Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 14:08:39 -0400
Subject: [PATCH 19/20] fix: remove trailing newlines from parameters files

---
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 2 +-
 ...uthdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index ceadb038979..f6d5bcb1506 100644
--- a/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.post.refactor/update.amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -163,4 +163,4 @@
     "ParameterKey": "defaultPasswordPolicy",
     "ParameterValue": "false"
   }
-]
+]
\ No newline at end of file
diff --git a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
index ceadb038979..f6d5bcb1506 100644
--- a/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
+++ b/amplify-migration-apps/discussions/_snapshot.pre.refactor/amplify-discussions-main-c39a5-authdiscussionsc578c16ec578c16e-1XF3OX52Z0KBB.parameters.json
@@ -163,4 +163,4 @@
     "ParameterKey": "defaultPasswordPolicy",
     "ParameterValue": "false"
   }
-]
+]
\ No newline at end of file

From b3fe56e728b7b68d45a5fe77c38ac58230ac6128 Mon Sep 17 00:00:00 2001
From: 9pace <paceben@amazon.com>
Date: Tue, 24 Mar 2026 14:13:33 -0400
Subject: [PATCH 20/20] fix: remove unnecessary typescript devDependency from
 migration apps

---
 amplify-migration-apps/backend-only/package.json | 3 ---
 amplify-migration-apps/discussions/package.json  | 1 -
 2 files changed, 4 deletions(-)

diff --git a/amplify-migration-apps/backend-only/package.json b/amplify-migration-apps/backend-only/package.json
index db477981041..e52d3e6f7b3 100644
--- a/amplify-migration-apps/backend-only/package.json
+++ b/amplify-migration-apps/backend-only/package.json
@@ -9,8 +9,5 @@
   "scripts": {
     "sanitize": "tsx ../sanitize.ts",
     "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
-  },
-  "devDependencies": {
-    "typescript": "~5.9.3"
   }
 }
diff --git a/amplify-migration-apps/discussions/package.json b/amplify-migration-apps/discussions/package.json
index 27308b2a7a6..a43104ec77a 100644
--- a/amplify-migration-apps/discussions/package.json
+++ b/amplify-migration-apps/discussions/package.json
@@ -17,7 +17,6 @@
     "typecheck": "cd _snapshot.post.generate/amplify && npx tsc --noEmit"
   },
   "devDependencies": {
-    "typescript": "~5.9.3",
     "vite": "^7.2.2"
   },
   "dependencies": {