wirejs-deploy-amplify-basic 0.0.78-table-resource → 0.0.80-table-resource

package/amplify-backend-assets/backend.ts

@@ -8,9 +8,11 @@ import { Table, AttributeType, BillingMode } from 'aws-cdk-lib/aws-dynamodb';
 import { api } from './functions/api/resource';
 import { auth } from './auth/resource';
 import { TableDefinition, indexName } from 'wirejs-resources';
+import { TableIndexes } from './constructs/table-indexes';
 
 // @ts-ignore
 import generated from './generated-resources';
+import { Key } from 'aws-cdk-lib/aws-kms';
 
 const APP_ID = process.env.AWS_APP_ID ?? process.env.PWD?.replace(/[^a-zA-Z0-9-_]/g, '_');
 const BRANCH_ID = process.env.AWS_BRANCH ?? process.env.USER ?? 'anonymous';
@@ -72,8 +74,10 @@ const PKFieldTypes = {
 for (const resource of generated) {
   if (isDistributedTable(resource)) {
     const sanitizedId = resource.options.absoluteId.replace(/[^a-zA-Z0-9-_]/g, '_');
+    const tableName = `${TABLE_NAME_PREFIX}${sanitizedId}`
 
     const table = new Table(backend.stack, sanitizedId, {
+      tableName,
       partitionKey: {
         name: resource.options.partitionKey.field,
         type: PKFieldTypes[resource.options.partitionKey.type],
@@ -83,25 +87,26 @@ for (const resource of generated) {
         type: PKFieldTypes[resource.options.sortKey.type],
       } : undefined,
       removalPolicy: RemovalPolicy.RETAIN,
-      tableName: `${TABLE_NAME_PREFIX}${sanitizedId}`,
       billingMode: BillingMode.PAY_PER_REQUEST,
       pointInTimeRecovery: true,
     });
 
-    for (const index of resource.options.indexes ?? []) {
-      const gsi = table.addGlobalSecondaryIndex({
-        indexName: indexName(index),
-        partitionKey: {
-          name: index.partition.field,
-          type: PKFieldTypes[index.partition.type],
-        },
-        sortKey: index.sort ? {
-          name: index.sort.field,
-          type: PKFieldTypes[index.sort.type],
-        } : undefined,
-      })
-      
-    }
+    new TableIndexes(backend.stack, `${tableName}Indexes`,
+      {
+        tableName,
+        indexes: (resource.options.indexes ?? []).map((index) => ({
+          indexName: indexName(index as any),
+          partitionKey: {
+            name: index.partition.field,
+            type: PKFieldTypes[index.partition.type as keyof typeof PKFieldTypes],
+          },
+          sortKey: index.sort ? {
+            name: index.sort.field,
+            type: PKFieldTypes[index.sort.type as keyof typeof PKFieldTypes],
+          } : undefined,
+        }))
+      }
+    );
 
     table.grantReadWriteData(backend.api.resources.lambda);
   }

package/amplify-backend-assets/constructs/table-indexes/handler.ts

@@ -0,0 +1,115 @@
+import {
+	DynamoDBClient,
+	UpdateTableCommand,
+	DescribeTableCommand,
+} from '@aws-sdk/client-dynamodb';
+import { GlobalSecondaryIndexProps } from 'aws-cdk-lib/aws-dynamodb';
+import { CloudFormationCustomResourceEvent } from 'aws-lambda';
+
+const ddb = new DynamoDBClient({});
+
+function sleep(ms: number) {
+	return new Promise((res) => setTimeout(res, ms));
+}
+
+/**
+ * Polls DDB until status matches the desired status.
+ * 
+ * @param tableName 
+ * @param indexName 
+ * @param desiredStatus 
+ */
+async function waitForGsiStatus(
+	tableName: string,
+	indexName: string,
+	desiredStatus: string
+) {
+	while (true) {
+		const table = await ddb.send(new DescribeTableCommand({ TableName: tableName }));
+		const gsis = table.Table?.GlobalSecondaryIndexes ?? [];
+		const index = gsis.find((gsi) => gsi.IndexName === indexName);
+		if (!index && desiredStatus === 'DELETED') break;
+		if (index?.IndexStatus === desiredStatus) break;
+		await sleep(5000);
+	}
+}
+
+export const handler = async (event: CloudFormationCustomResourceEvent) => {
+	console.log('Event:', JSON.stringify(event));
+
+	const tableName = event.ResourceProperties.TableName;
+	const desiredGsis: GlobalSecondaryIndexProps[] =
+		event.ResourceProperties.GlobalSecondaryIndexes || [];
+	const desiredNames = new Set(desiredGsis.map((gsi) => gsi.indexName));
+
+	const tableDesc = await ddb.send(new DescribeTableCommand({ TableName: tableName }));
+	const existingGsis = tableDesc.Table?.GlobalSecondaryIndexes ?? [];
+	const existingNames = new Set(existingGsis.map((gsi) => gsi.IndexName));
+
+	if (event.RequestType === 'Delete') {
+		// table-level delete will take care of deleting everything.
+		return { PhysicalResourceId: tableName };
+	}
+
+	// Delete unwanted GSIs first.
+	for (const gsi of existingGsis) {
+		if (!gsi.IndexName) {
+			console.warn('"Existing" GSI without IndexName found (1)', gsi);
+			continue;
+		}
+		if (!desiredNames.has(gsi.IndexName)) {
+			console.log(`Deleting GSI: ${gsi.IndexName}`);
+			await ddb.send(new UpdateTableCommand({
+				TableName: tableName,
+				GlobalSecondaryIndexUpdates: [
+					{ Delete: { IndexName: gsi.IndexName } },
+				],
+			}));
+			await waitForGsiStatus(tableName, gsi.IndexName, 'DELETED');
+		}
+	}
+
+	// Add new GSIs
+	for (const gsi of desiredGsis) {
+		if (!existingNames.has(gsi.indexName)) {
+			console.log(`Creating GSI: ${gsi.indexName}`);
+			await ddb.send(new UpdateTableCommand({
+				TableName: tableName,
+				AttributeDefinitions: [
+					{
+						AttributeName: gsi.partitionKey.name,
+						AttributeType: gsi.partitionKey.type,
+					},
+					...(gsi.sortKey ? [{
+						AttributeName: gsi.sortKey.name,
+						AttributeType: gsi.sortKey.type,
+					}] : []),
+				],
+				GlobalSecondaryIndexUpdates: [{
+					Create: {
+						IndexName: gsi.indexName,
+						KeySchema: [
+							{
+								AttributeName: gsi.partitionKey.name,
+								KeyType: 'HASH'
+							},
+							...(gsi.sortKey ? [{
+								AttributeName: gsi.sortKey.name,
+								KeyType: 'RANGE' as const
+							}] : []),
+						],
+						Projection: {
+							ProjectionType: gsi.projectionType,
+						}
+					}
+				}],
+			}));
+			await waitForGsiStatus(tableName, gsi.indexName, 'ACTIVE');
+		}
+	}
+
+	return {
+		PhysicalResourceId: tableName,
+		Data: { Message: 'GSIs synced successfully' },
+	};
+};

package/amplify-backend-assets/constructs/table-indexes/index.ts

@@ -0,0 +1,36 @@
+import { Duration, CustomResource } from 'aws-cdk-lib';
+import * as path from 'path';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
+import * as cr from 'aws-cdk-lib/custom-resources';
+import { GlobalSecondaryIndexProps } from 'aws-cdk-lib/aws-dynamodb';
+import { Construct } from 'constructs';
+
+export interface TableIndexesProps {
+  tableName: string;
+  indexes: GlobalSecondaryIndexProps[];
+}
+
+export class TableIndexes extends Construct {
+  constructor(scope: Construct, id: string, props: TableIndexesProps) {
+    super(scope, id);
+
+    const onEvent = new lambda.Function(this, 'TableIndexesHandler', {
+      runtime: lambda.Runtime.NODEJS_22_X,
+      handler: 'index.handler',
+      code: lambda.Code.fromAsset(path.join(__dirname, 'handler')),
+      timeout: Duration.minutes(15),
+    });
+
+    const provider = new cr.Provider(this, 'TableIndexesProvider', {
+      onEventHandler: onEvent,
+    });
+
+    new CustomResource(this, 'TableIndexesCustomResource', {
+      serviceToken: provider.serviceToken,
+      properties: {
+        TableName: props.tableName,
+        GlobalSecondaryIndexes: props.indexes,
+      },
+    });
+  }
+}

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.38",
-		"wirejs-resources": "^0.1.46-table-resource"
+		"wirejs-resources": "^0.1.48-table-resource"
 	}
 }

package/build.js

@@ -55,6 +55,7 @@ async function installDeps() {
 		...{
 			'@aws-amplify/backend': '^1.14.0',
 			'@aws-amplify/backend-cli': '^1.4.8',
+			"@aws-sdk/client-dynamodb": "^3.799.0",
 			'aws-cdk': '^2.177.0',
 			'aws-cdk-lib': '^2.177.0',
 			'constructs': '^10.4.2',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.78-table-resource",
+	"version": "0.0.80-table-resource",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -32,7 +32,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.38",
-		"wirejs-resources": "^0.1.46-table-resource"
+		"wirejs-resources": "^0.1.48-table-resource"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",