feat(gen2-migration): generate per-table stacks for multiple DDB tables

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, multiple DynamoDB storage tables (activity + bookmarks), and S3.
 
 > [!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,59 @@ 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
+```
+
+### 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 +334,10 @@ amplify push
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Storage  │ activity                    │ Create    │ awscloudformation │
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
+│ Storage  │ bookmarks                   │ Create    │ awscloudformation │
+├──────────┼─────────────────────────────┼───────────┼───────────────────┤
+│ Storage  │ avatars                     │ Create    │ awscloudformation │
+├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Function │ fetchuseractivity           │ Create    │ awscloudformation │
 ├──────────┼─────────────────────────────┼───────────┼───────────────────┤
 │ Function │ recorduseractivity          │ Create    │ awscloudformation │
@@ -332,7 +390,7 @@ this process for any number of users.
 
 > Based on https://github.com/aws-amplify/amplify-cli/blob/gen2-migration/GEN2_MIGRATION_GUIDE.md
 
-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 +477,3 @@ git push origin gen2-main
 ```
 
 Wait for the deployment to finish successfully.
-

amplify-migration-apps/discussions/_snapshot.post.generate/amplify/backend.ts

@@ -1,26 +1,28 @@
 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,
 });
-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 +38,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 = {
@@ -125,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-avatarsc39a5-main';
+s3Bucket.bucketEncryption = {
+  serverSideEncryptionConfiguration: [
+    {
+      serverSideEncryptionByDefault: {
+        sseAlgorithm: 'AES256',
+      },
+      bucketKeyEnabled: false,
+    },
+  ],
+};

amplify-migration-apps/discussions/_snapshot.post.generate/amplify/data/resource.ts

@@ -41,9 +41,9 @@ export const data = defineData({
       //The "branchname" variable needs to be the same as your deployment branch if you want to reuse your Gen1 app tables
       branchName: 'main',
       modelNameToTableNameMapping: {
-        Topic: 'Topic-ruiylk7rjnb4ziygno3jh4wrsq-main',
-        Post: 'Post-ruiylk7rjnb4ziygno3jh4wrsq-main',
-        Comment: 'Comment-ruiylk7rjnb4ziygno3jh4wrsq-main',
+        Topic: 'Topic-u3jn2qbupzbyhc3h53673wdvim-main',
+        Post: 'Post-u3jn2qbupzbyhc3h53673wdvim-main',
+        Comment: 'Comment-u3jn2qbupzbyhc3h53673wdvim-main',
       },
     },
   ],

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-avatarsc39a5-${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']),
+    ],
+  }),
+});

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"
+    }
+  }
+]