chore: Add baseURL configuration option to S3 modules

Signed-off-by: Naoki Fujisawa <[email protected]>
hackmdio · Jul 10, 2024 · bfe7a59 · bfe7a59
1 parent f00df50
commit bfe7a59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/config/default.js b/lib/config/default.js
@@ -74,7 +74,8 @@ module.exports = {
     accessKeyId: undefined,
     secretAccessKey: undefined,
     region: undefined,
-    endpoint: undefined
+    endpoint: undefined,
+    baseURL: undefined
   },
   minio: {
     accessKey: undefined,

diff --git a/lib/config/environment.js b/lib/config/environment.js
@@ -44,7 +44,8 @@ module.exports = {
     accessKeyId: process.env.CMD_S3_ACCESS_KEY_ID,
     secretAccessKey: process.env.CMD_S3_SECRET_ACCESS_KEY,
     region: process.env.CMD_S3_REGION,
-    endpoint: process.env.CMD_S3_ENDPOINT
+    endpoint: process.env.CMD_S3_ENDPOINT,
+    baseURL: process.env.CMD_S3_BASEURL
   },
   minio: {
     accessKey: process.env.CMD_MINIO_ACCESS_KEY,

diff --git a/lib/imageRouter/s3.js b/lib/imageRouter/s3.js
@@ -57,7 +57,11 @@ exports.uploadImage = function (imagePath, callback) {
       if (config.s3.endpoint) {
         s3Endpoint = config.s3.endpoint
       }
-      callback(null, `${s3Endpoint}/${config.s3bucket}/${params.Key}`)
+      if (config.s3.baseURL) {
+        callback(null, `${config.s3.baseURL}/${params.Key}`)
+      } else {
+        callback(null, `${s3Endpoint}/${config.s3bucket}/${params.Key}`)
+      }
     }).catch(err => {
       if (err) {
         callback(new Error(err), null)