Add Minio Integration

dfpc-coe · Dec 13, 2024 · 9709a16 · 9709a16
1 parent 13e31b3
commit 9709a16
Show file tree

Hide file tree

Showing 4 changed files with 1,452 additions and 1,347 deletions.
diff --git a/api/index.ts b/api/index.ts
@@ -235,7 +235,13 @@ export default async function server(config: Config) {
 
     return new Promise((resolve) => {
         const srv = app.listen(5001, () => {
-            if (!config.silent) console.log('ok - http://localhost:5001');
+            if (!config.silent) {
+                if (process.env.CLOUDTAK_Mode === 'docker-compose') {
+                    console.log('ok - http://localhost:5000');
+                } else {
+                    console.log('ok - http://localhost:5001');
+                }
+            }
             return resolve(srv);
         });
 

diff --git a/api/lib/aws/s3.ts b/api/lib/aws/s3.ts
@@ -1,3 +1,4 @@
+import type { S3ClientConfig } from '@aws-sdk/client-s3'
 import * as S3AWS from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
 import Err from '@openaddresses/batch-error';
@@ -8,11 +9,35 @@ import process from 'node:process';
  * @class
  */
 export default class S3 {
+    static #client() {
+        if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
+
+        const config: S3ClientConfig = {
+            region: process.env.AWS_REGION
+        };
+
+        if (process.env.AWS_S3_Endpoint) {
+            config.endpoint = process.env.AWS_S3_Endpoint;
+            config.s3ForcePathStyle = true;
+            config.sslEnabled = false;
+
+            if (!process.env.AWS_S3_AccessKeyId || !process.env.AWS_S3_SecretAccessKey) {
+                throw new Error('Cannot use custom S3 Endpoint without providing AWS_S3_AccessKeyId & AWS_S3_SecretAccessKey');
+            }
+
+            config.credentials = {
+                accessKeyId: process.env.AWS_S3_AccessKeyId,
+                secretAccessKey: process.env.AWS_S3_SecretAccessKey
+            }
+        }
+
+        return new S3AWS.S3Client(config);
+    }
+
     static async head(key: string): Promise<S3AWS.HeadObjectCommandOutput> {
         try {
-            if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
+            const s3 = this.#client();
 
-            const s3 = new S3AWS.S3Client({ region: process.env.AWS_REGION });
             const head = await s3.send(new S3AWS.HeadObjectCommand({
                 Bucket: process.env.ASSET_BUCKET,
                 Key: key
@@ -26,9 +51,7 @@ export default class S3 {
 
     static async put(key: string, body: Readable | string): Promise<void> {
         try {
-            if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
-
-            const s3 = new S3AWS.S3Client({ region: process.env.AWS_REGION });
+            const s3 = this.#client();
 
             const upload = new Upload({
                 client: s3,
@@ -47,9 +70,7 @@ export default class S3 {
 
     static async get(key: string): Promise<Readable> {
         try {
-            if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
-
-            const s3 = new S3AWS.S3Client({ region: process.env.AWS_REGION });
+            const s3 = this.#client();
 
             const res = await s3.send(new S3AWS.GetObjectCommand({
                 Bucket: process.env.ASSET_BUCKET,
@@ -65,9 +86,8 @@ export default class S3 {
 
     static async exists(key: string): Promise<boolean> {
         try {
-            if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
+            const s3 = this.#client();
 
-            const s3 = new S3AWS.S3Client({ region: process.env.AWS_REGION });
             await s3.send(new S3AWS.HeadObjectCommand({
                 Bucket: process.env.ASSET_BUCKET,
                 Key: key
@@ -86,9 +106,8 @@ export default class S3 {
      */
     static async list(fragment: string): Promise<Array<S3AWS._Object>> {
         try {
-            if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
+            const s3 = this.#client();
 
-            const s3 = new S3AWS.S3Client({ region: process.env.AWS_REGION });
             const list = await s3.send(new S3AWS.ListObjectsV2Command({
                 Bucket: process.env.ASSET_BUCKET,
                 Prefix: fragment
@@ -110,20 +129,15 @@ export default class S3 {
     static async del(key: string, opts: {
         recurse: boolean
     } = { recurse: false }): Promise<void> {
-        if (!process.env.ASSET_BUCKET) return;
-        const s3 = new S3AWS.S3Client({ region: process.env.AWS_REGION });
+        try {
+            const s3 = this.#client();
 
-        if (!opts.recurse) {
-            try {
+            if (!opts.recurse) {
                 await s3.send(new S3AWS.DeleteObjectCommand({
                     Bucket: process.env.ASSET_BUCKET,
                     Key: key
                 }));
-            } catch (err) {
-                throw new Err(500, new Error(err instanceof Error ? err.message : String(err)), 'Failed to delete file');
-            }
-        } else {
-            try {
+            } else {
                 const list = await this.list(key);
 
                 if (!list.length) return;
@@ -138,9 +152,9 @@ export default class S3 {
                         })
                     }
                 }));
-            } catch (err) {
-                throw new Err(500, new Error(err instanceof Error ? err.message : String(err)), 'Failed to delete files');
             }
+        } catch (err) {
+            throw new Err(500, new Error(err instanceof Error ? err.message : String(err)), 'Failed to delete files');
         }
     }
 }