feat: account region unique bucket name (#472)

sam-goodwin · Oct 19, 2023 · 3388882 · 3388882
1 parent 87db126
commit 3388882
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/packages/@eventual/aws-cdk/src/bucket-service.ts b/packages/@eventual/aws-cdk/src/bucket-service.ts
@@ -98,6 +98,7 @@ export class BucketService<Service> {
   }
 
   public grantReadWriteBuckets(grantee: IGrantable) {
+    const stack = Stack.of(this.props.systemScope);
     // find any bucket names that were provided by the service and not computed
     const bucketNameOverrides = this.props.bucketOverrides
       ? Object.values(
@@ -114,7 +115,7 @@ export class BucketService<Service> {
         resources: [
           serviceBucketArn(
             this.props.serviceName,
-            bucketServiceBucketSuffix("*"),
+            bucketServiceBucketSuffix("*", stack.account, stack.region),
             false
           ),
           ...bucketNameOverrides.map(formatBucketArn),
@@ -133,7 +134,7 @@ export class BucketService<Service> {
         resources: [
           `${serviceBucketArn(
             this.props.serviceName,
-            bucketServiceBucketSuffix("*"),
+            bucketServiceBucketSuffix("*", stack.account, stack.region),
             false
           )}/*`,
           ...bucketNameOverrides.map((s) => formatBucketArn(`${s}/*`)),
@@ -173,6 +174,8 @@ class Bucket extends Construct implements IBucket {
   constructor(scope: Construct, props: BucketProps) {
     super(scope, props.bucket.name);
 
+    const stack = Stack.of(this);
+
     const bucketOverrides =
       props.serviceProps.bucketOverrides?.[props.bucket.name];
 
@@ -212,7 +215,9 @@ class Bucket extends Construct implements IBucket {
         bucketOverrides?.bucketName ??
         bucketServiceBucketName(
           props.serviceProps.serviceName,
-          props.bucket.name
+          props.bucket.name,
+          stack.account,
+          stack.region
         ),
       autoDeleteObjects: bucketOverrides?.autoDeleteObjects ?? true,
       removalPolicy: bucketOverrides?.removalPolicy ?? RemovalPolicy.DESTROY,

diff --git a/packages/@eventual/aws-runtime/src/create.ts b/packages/@eventual/aws-runtime/src/create.ts
@@ -264,6 +264,8 @@ export const createBucketStore = memoize(
       s3: s3(),
       serviceName: env.serviceName,
       bucketOverrides: env.bucketOverrides,
+      accountID: env.awsAccount,
+      region: env.awsRegion,
     })
 );
 

diff --git a/packages/@eventual/aws-runtime/src/stores/bucket-store.ts b/packages/@eventual/aws-runtime/src/stores/bucket-store.ts
@@ -45,6 +45,8 @@ export interface AWSBucketStoreProps {
   s3: S3Client;
   serviceName: LazyValue<string>;
   bucketOverrides: LazyValue<Record<string, BucketRuntimeOverrides>>;
+  accountID: LazyValue<string>;
+  region: LazyValue<string>;
 }
 
 export class AWSBucketStore implements BucketStore {
@@ -244,7 +246,12 @@ export class AWSBucketStore implements BucketStore {
     const nameOverride = overrides[bucketName]?.bucketName;
     return (
       nameOverride ??
-      bucketServiceBucketName(getLazy(this.props.serviceName), bucketName)
+      bucketServiceBucketName(
+        getLazy(this.props.serviceName),
+        bucketName,
+        getLazy(this.props.accountID),
+        getLazy(this.props.region)
+      )
     );
   }
 }
diff --git a/packages/@eventual/aws-runtime/src/utils.ts b/packages/@eventual/aws-runtime/src/utils.ts
@@ -283,8 +283,12 @@ export function entityServiceTableSuffix(entityName: string) {
   return `entity-${entityName}`;
 }
 
-export function bucketServiceBucketSuffix(bucketName: string) {
-  return `bucket-${bucketName}`;
+export function bucketServiceBucketSuffix(
+  bucketName: string,
+  accountID: string,
+  region: string
+) {
+  return `${bucketName}-${accountID}-${region}`;
 }
 
 export function queueServiceQueueSuffix(queueName: string) {
@@ -314,9 +318,14 @@ export function entityServiceTableName(
  */
 export function bucketServiceBucketName(
   serviceName: string,
-  bucketName: string
+  bucketName: string,
+  accountID: string,
+  region: string
 ): string {
-  return serviceBucketName(serviceName, bucketServiceBucketSuffix(bucketName));
+  return serviceBucketName(
+    serviceName,
+    bucketServiceBucketSuffix(bucketName, accountID, region)
+  );
 }
 
 export function socketServiceSocketName(