wirejs-deploy-amplify-basic 0.0.147-payments → 0.0.149-payments

package/amplify-backend-assets/backend.ts

@@ -70,6 +70,8 @@ backend.api.resources.lambda.role?.addToPrincipalPolicy(new PolicyStatement({
   ],
 }));
 
+const allLambdas = [ backend.api.resources.lambda ];
+
 /**
  * CDK resources
  */
@@ -80,6 +82,30 @@ const bucket = new Bucket(backend.stack, 'data', {
 });
 bucket.grantReadWrite(backend.api.resources.lambda);
 
+function isRealtimeService(resource: any): resource is {
+  type: 'RealtimeService';
+  options: { namespace: string; };
+} {
+  return resource.type === 'RealtimeService';
+}
+
+if (generated.some(isRealtimeService)) {
+  const realtimeStack = new NestedStack(backend.stack, 'realtime', {
+    description: 'Realtime service for distributed resources',
+  });
+  const realtime = new RealtimeService(realtimeStack, 'realtime', {
+    appId: APP_ID!,
+    branchId: BRANCH_ID,
+    publisher: backend.api,
+    bucket: bucket.bucketName,
+    namespaces: generated
+      .filter(isRealtimeService)
+      .map(r => r.options.namespace),
+  });
+  bucket.grantReadWrite(realtime.authHandler);
+  allLambdas.push(realtime.authHandler);
+}
+
 /**
  * DDB Tables
  */
@@ -141,53 +167,27 @@ for (const resource of generated) {
       }
     );
 
-    table.grantReadWriteData(backend.api.resources.lambda);
-
-    // indexes created by custom resource and require explicit
-    // permissions to be added to the lambda role (apparently).
-    backend.api.resources.lambda.addToRolePolicy(new PolicyStatement({
-      actions: [
-        "dynamodb:Query",
-        "dynamodb:Scan",
-        "dynamodb:GetItem",
-        "dynamodb:BatchGetItem",
-      ],
-      resources: [
-        table.tableArn,
-        `${table.tableArn}/index/*`,
-      ],
-    }))
+    for (const lambda of allLambdas) {
+      table.grantReadWriteData(lambda);
+
+      // indexes created by custom resource and require explicit
+      // permissions to be added to the lambda role (apparently).
+      lambda.addToRolePolicy(new PolicyStatement({
+        actions: [
+          "dynamodb:Query",
+          "dynamodb:Scan",
+          "dynamodb:GetItem",
+          "dynamodb:BatchGetItem",
+        ],
+        resources: [
+          table.tableArn,
+          `${table.tableArn}/index/*`,
+        ],
+      }));
+    }
   }
 }
 
-function isRealtimeService(resource: any): resource is {
-  type: 'RealtimeService';
-  options: { namespace: string; };
-} {
-  return resource.type === 'RealtimeService';
-}
-
-if (generated.some(isRealtimeService)) {
-  const realtimeStack = new NestedStack(backend.stack, 'realtime', {
-    description: 'Realtime service for distributed resources',
-  });
-  const realtime = new RealtimeService(realtimeStack, 'realtime', {
-    appId: APP_ID!,
-    branchId: BRANCH_ID,
-    publisher: backend.api,
-    bucket: bucket.bucketName,
-    namespaces: generated
-      .filter(isRealtimeService)
-      .map(r => r.options.namespace),
-  });
-  // TODO: is there a better way to ensure we grant access specifically
-  // to what `Secret` uses to store its creds without creating N places to
-  // map this?
-  // Longer term: Secrets will be stored either in DDB, parameter store, something
-  // else that is more appropriate than S3.
-  bucket.grantReadWrite(realtime.authHandler);
-}
-
 /**
  * Lambda environment vars
  */

package/amplify-backend-assets/constructs/realtime-service/index.ts

@@ -39,12 +39,17 @@ export class RealtimeService extends Construct {
 			entry: path.join(__dirname, 'authorizer-lambda.ts'),
 			timeout: Duration.seconds(30),
 			environment: {
-				// global storage bucket currently used by `Secret` resource
+				// global storage bucket. TODO: remove?
 				BUCKET: props.bucket,
 
+				// TODO: refactor. set env variables ... better.
+				// must match TABLE_NAME_PREFIX from outer scope.
+				TABLE_NAME_PREFIX: `${props.appId}-${props.branchId}-`,
+
 				// NOTE: These MUST equal those defined in RealtimeService resource.
 				SECRET_SCOPE: 'wirejs-global',
 				SECRET_ID: 'realtime-secret',
+
 			}
 		});
 

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

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.115-payments"
+		"wirejs-resources": "^0.1.117-payments"
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.147-payments",
+	"version": "0.0.149-payments",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -42,7 +42,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.115-payments"
+		"wirejs-resources": "^0.1.117-payments"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",