Merge pull request #10 from jembi/CU-86c13wh47_Utilize-OpenHIMs-Media…

…tors-configuration-to-set-buckets

CU-86c13wh47_Utilize-OpenHIMs-Mediators-configuration-to-set-buckets

docker-compose.yml

@@ -5,6 +5,7 @@ services:
       - 9000:9000
       - 9001:9001
     command: server /data --console-address ":9001"
+    network_mode: host
 
   clickhouse:
     image: clickhouse/clickhouse-server:23.8.14.6
@@ -13,6 +14,7 @@ services:
       - 9002:9000
     environment:
       - CLICKHOUSE_PASSWORD=dev_password_only
+    network_mode: host
 
   openhim-console:
     image: jembi/openhim-console:v1.18.2
@@ -35,6 +37,8 @@ services:
   mongo-db:
     container_name: mongo-db
     image: mongo:4.0
+    ports:
+      - 27017:27017
     networks:
       - openhim
     restart: unless-stopped

package.json

@@ -41,6 +41,7 @@
   },
   "dependencies": {
     "@clickhouse/client": "^1.8.0",
+    "axios": "^1.7.7",
     "dotenv": "^16.4.5",
     "express": "^4.18.2",
     "express-async-handler": "^1.2.0",

src/index.ts

@@ -3,22 +3,27 @@ import path from 'path';
 import { getConfig } from './config/config';
 import logger from './logger';
 import routes from './routes/index';
-import { setupMediator } from './openhim/openhim';
-import {
-  createMinioBucketListeners,
-} from './utils/minioClient';
+import { getRegisteredBuckets, setupMediator } from './openhim/openhim';
+import { createMinioBucketListeners, ensureBucketExists } from './utils/minioClient';
 
 const app = express();
 
 app.use('/', routes);
 
-createMinioBucketListeners();
-
-app.listen(getConfig().port, () => {
+app.listen(getConfig().port, async () => {
   logger.info(`Server is running on port - ${getConfig().port}`);
 
   if (getConfig().runningMode !== 'testing' && getConfig().registerMediator) {
-    setupMediator(path.resolve(__dirname, './openhim/mediatorConfig.json'));
+    await setupMediator();
   }
-});
 
+  const buckets = await getRegisteredBuckets();
+
+  buckets.length === 0 && logger.warn('No buckets specified in the configuration');
+
+  for await (const { bucket, region } of buckets) {
+    await ensureBucketExists(bucket, region);
+  }
+
+  createMinioBucketListeners(buckets.map((bucket) => bucket.bucket));
+});

src/openhim/mediatorConfig.json

@@ -20,7 +20,8 @@
         "instant"
       ],
       "methods": [
-        "POST", "GET"
+        "POST",
+        "GET"
       ],
       "type": "http"
     }
@@ -35,5 +36,29 @@
       "type": "http"
     }
   ],
-  "configDefs": []
-}
+  "configDefs": [
+    {
+      "param": "minio_buckets_registry",
+      "displayName": "Minio Buckets Registry",
+      "description": "The available Minio buckets and their configurations",
+      "type": "struct",
+      "array": true,
+      "template": [
+        {
+          "param": "bucket",
+          "displayName": "Bucket",
+          "type": "string"
+        },
+        {
+          "param": "region",
+          "displayName": "Region (optional)",
+          "type": "string",
+          "optional": true
+        }
+      ]
+    }
+  ],
+  "config": {
+    "minio_buckets_registry": []
+  }
+}