backend: allow configuring S3_REGION

See: getodk/central#870
alxndrsn · Jan 13, 2025 · 90d1886 · 90d1886
1 parent 7574030
commit 90d1886
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/bin/s3-create-bucket.js b/lib/bin/s3-create-bucket.js
@@ -9,7 +9,7 @@
 
 const Minio = require('minio');
 
-const { server, bucketName, accessKey, secretKey } = require('config').get('default.external.s3blobStore');
+const { server, region, bucketName, accessKey, secretKey } = require('config').get('default.external.s3blobStore');
 
 const minioClient = (() => {
   const url = new URL(server);
@@ -29,8 +29,8 @@ minioClient.bucketExists(bucketName)
       return;
     }
 
-    log('Creating bucket:', bucketName);
-    return minioClient.makeBucket(bucketName)
+    log('Creating bucket:', bucketName, 'in', region ?? 'default region');
+    return minioClient.makeBucket(bucketName, region)
       .then(() => log('Bucket created OK.'));
   })
   .catch(err => {

diff --git a/lib/external/s3.js b/lib/external/s3.js
@@ -12,7 +12,7 @@ const disabled = { enabled: false };
 const init = (config) => {
   if (!config) return disabled;
 
-  const { server, accessKey, secretKey, bucketName, requestTimeout, objectPrefix } = config;
+  const { server, accessKey, secretKey, bucketName, region, requestTimeout, objectPrefix } = config;
   if (!(server && accessKey && secretKey && bucketName)) return disabled;
 
   const http = require('node:http');
@@ -83,7 +83,7 @@ const init = (config) => {
       return req;
     };
 
-    const clientConfig = { endPoint, port, useSSL, accessKey, secretKey, transport: { request } };
+    const clientConfig = { endPoint, port, useSSL, accessKey, secretKey, region, transport: { request } };
 
     return new Minio.Client(clientConfig);
   })();