fix(store): verify that the s3Client has a region before attempting t…

…o resolve the bucket
compasjs · Jun 7, 2023 · 4d25a94 · 4d25a94
1 parent 55df944
commit 4d25a94
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/store/src/object-storage.d.ts b/packages/store/src/object-storage.d.ts
@@ -24,15 +24,15 @@ export function objectStorageCreateClient(
  * @param {import("@aws-sdk/client-s3").S3Client} s3Client
  * @param {{
  *   bucketName: string,
- *   locationConstraint: import("@aws-sdk/client-s3").BucketLocationConstraint,
+ *   locationConstraint?: import("@aws-sdk/client-s3").BucketLocationConstraint
  * }} options
  * @returns {Promise<void>}
  */
 export function objectStorageEnsureBucket(
   s3Client: import("@aws-sdk/client-s3").S3Client,
   options: {
     bucketName: string;
-    locationConstraint: import("@aws-sdk/client-s3").BucketLocationConstraint;
+    locationConstraint?: import("@aws-sdk/client-s3").BucketLocationConstraint;
   },
 ): Promise<void>;
 /**

diff --git a/packages/store/src/object-storage.js b/packages/store/src/object-storage.js
@@ -45,7 +45,7 @@ export function objectStorageCreateClient(config) {
  * @param {import("@aws-sdk/client-s3").S3Client} s3Client
  * @param {{
  *   bucketName: string,
- *   locationConstraint: import("@aws-sdk/client-s3").BucketLocationConstraint,
+ *   locationConstraint?: import("@aws-sdk/client-s3").BucketLocationConstraint
  * }} options
  * @returns {Promise<void>}
  */
@@ -56,6 +56,17 @@ export async function objectStorageEnsureBucket(s3Client, options) {
     });
   }
 
+  if (
+    isNil(s3Client.config.region) ||
+    (typeof s3Client.config.region === "function" &&
+      isNil(await s3Client.config.region()))
+  ) {
+    throw AppError.serverError({
+      message:
+        "The S3 client is created without a region, make sure to set a region in your environment, the config object or config/credentials files.",
+    });
+  }
+
   try {
     const headBucketResult = await s3Client.send(
       new HeadBucketCommand({ Bucket: options.bucketName }),