fix(sys): fix #96

labring · May 16, 2022 · 95e2df6 · 95e2df6
1 parent f0383db
commit 95e2df6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/instance-controller/src/config.ts b/packages/instance-controller/src/config.ts
@@ -1,4 +1,5 @@
 import * as dotenv from 'dotenv'
+import { URL } from 'node:url'
 dotenv.config()
 
 /**
@@ -96,9 +97,12 @@ export default class Config {
    * Minio configuration
    */
   static get MINIO_CONFIG() {
-    const internal_endpoint: string = process.env.MINIO_INTERNAL_ENDPOINT
-    const external_endpoint: string = process.env.MINIO_EXTERNAL_ENDPOINT
+    // use URL().origin to get the pure hostname, because the hostname may contain port number 
+    // this is to resolve bug of https://github.com/labring/laf/issues/96
+    const internal_endpoint: string = new URL(process.env.MINIO_INTERNAL_ENDPOINT).origin
+    const external_endpoint: string = new URL(process.env.MINIO_EXTERNAL_ENDPOINT).origin
     const region: string = process.env.MINIO_REGION_NAME
+
     return {
       endpoint: {
         internal: internal_endpoint,

diff --git a/packages/system-server/src/config.ts b/packages/system-server/src/config.ts
@@ -1,5 +1,6 @@
 import * as assert from 'assert'
 import * as dotenv from 'dotenv'
+import { URL } from 'url'
 dotenv.config()
 
 /**
@@ -116,9 +117,13 @@ export default class Config {
   static get MINIO_CONFIG() {
     const access_key: string = process.env.MINIO_ACCESS_KEY
     const access_secret: string = process.env.MINIO_ACCESS_SECRET
-    const internal_endpoint: string = process.env.MINIO_INTERNAL_ENDPOINT
-    const external_endpoint: string = process.env.MINIO_EXTERNAL_ENDPOINT
+
+    // use URL().origin to get the pure hostname, because the hostname may contain port number 
+    // this is to resolve bug of https://github.com/labring/laf/issues/96
+    const internal_endpoint: string = new URL(process.env.MINIO_INTERNAL_ENDPOINT).origin
+    const external_endpoint: string = new URL(process.env.MINIO_EXTERNAL_ENDPOINT).origin
     const region: string = process.env.MINIO_REGION_NAME
+
     return {
       access_key,
       access_secret,