Add env variable and modify the registration script

jembi · Jul 30, 2024 · 0b92608 · 0b92608
1 parent c647d39
commit 0b92608
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 6 deletions.
diff --git a/fhir-ig-importer/importer/docker-compose.config.yml b/fhir-ig-importer/importer/docker-compose.config.yml
@@ -12,6 +12,7 @@ services:
       OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD}
       # Reject unauthorised is only needed if the OpenHIM's SSL is not setup
       NODE_TLS_REJECT_UNAUTHORIZED: 0
+      OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL}
     command: sh -c "node openhimConfig.js"
     configs:
       - source: fhir-ig-importer-config-importer-openhimConfig.js

diff --git a/fhir-ig-importer/importer/volume/openhimConfig.js b/fhir-ig-importer/importer/volume/openhimConfig.js
@@ -43,6 +43,16 @@ const appJsonData = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "ig-importer-app.json"))
 );
 
+//Substitute the url with environ variable
+
+let url = appJsonData.url;
+let newUrl = url.replace(
+  "<openhim-console-url>",
+  process.env.OPENHIM_CONSOLE_BASE_URL
+);
+
+appJsonData.url = newUrl;
+
 const data = JSON.stringify(jsonData);
 const appData = JSON.stringify(appJsonData);
 

diff --git a/fhir-ig-importer/package-metadata.json b/fhir-ig-importer/package-metadata.json
@@ -16,6 +16,6 @@
     "FHIR_IG_IMPORTER_CORE_URL": "http://0.0.0.0:3001/fhir/ig/v1.0",
     "FHIR_IG_IMPORTER_UI_VERSION": "latest",
     "FHIR_IG_IMPORTER_CORE_VERSION": "latest",
-    "OPENHIM_CONSOLE_URL": "http://localhost:9000"
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000"
   }
 }
diff --git a/interoperability-layer-openhim/package-metadata.json b/interoperability-layer-openhim/package-metadata.json
@@ -44,7 +44,7 @@
     "KC_OPENHIM_ROOT_URL": "http://localhost:9000",
     "KC_API_URL": "http://identity-access-manager-keycloak:8080",
     "OPENHIM_SUBDOMAIN": "openhim",
-    "OPENHIM_CONSOLE_BASE_URL": "localhost:9000",
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000",
     "OPENHIM_API_HOST": "localhost",
     "OPENHIM_API_PORT": "5001"
   }

diff --git a/kafka-mapper-consumer/consumer-ui-app.json b/kafka-mapper-consumer/consumer-ui-app.json
@@ -3,7 +3,7 @@
   "description": "Kafka mapper consumer microfrontends app",
   "category": "HIE Configuration",
   "type": "esmodule",
-  "url": "<openhim-console-url>/jembi-kafka-mapper-consumer-ui.js",
+  "url": "<openhim-console-url>/kafka-mapper-consumer-ui",
   "showInPortal": true,
   "showInSideBar": false,
   "access_roles": ["admin"],

diff --git a/kafka-mapper-consumer/docker-compose.config.yml b/kafka-mapper-consumer/docker-compose.config.yml
@@ -12,6 +12,7 @@ services:
       OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD}
       # Reject unauthorised is only needed if the OpenHIM's SSL is not setup
       NODE_TLS_REJECT_UNAUTHORIZED: 0
+      OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL}
     command: sh -c "node openhimConfig.js"
     configs:
       - source: kafka-mapper-consumer-openhimConfig.js

diff --git a/kafka-mapper-consumer/openhimConfig.js b/kafka-mapper-consumer/openhimConfig.js
@@ -37,6 +37,16 @@ function makeRequest(options, data) {
 const appJsonData = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "consumer-ui-app.json"))
 );
+//Substitute the url with environ variable
+
+let url = appJsonData.url;
+let newUrl = url.replace(
+  "<openhim-console-url>",
+  process.env.OPENHIM_CONSOLE_BASE_URL
+);
+
+appJsonData.url = newUrl;
+
 const appData = JSON.stringify(appJsonData);
 
 const options = {

diff --git a/kafka-mapper-consumer/package-metadata.json b/kafka-mapper-consumer/package-metadata.json
@@ -19,6 +19,6 @@
     "CLICKHOUSE_PORT": "8123",
     "KAFKA_CONSUMER_MAPPER_MEDIATOR_VERSION": "jembi/kafka-mapper-consumer:v0.0.1",
     "KAFKA_CONSUMER_MAPPER_UI_VERSION": "jembi/kafka-mapper-consumer-ui:v0.0.1",
-    "OPENHIM_CONSOLE_URL": "http://localhost:9000"
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000"
   }
 }
diff --git a/reprocess-mediator/docker-compose.config.yml b/reprocess-mediator/docker-compose.config.yml
@@ -12,6 +12,7 @@ services:
       OPENHIM_API_PASSWORD: ${OPENHIM_PASSWORD}
       # Reject unauthorised is only needed if the OpenHIM's SSL is not setup
       NODE_TLS_REJECT_UNAUTHORIZED: 0
+      OPENHIM_CONSOLE_BASE_URL: ${OPENHIM_CONSOLE_BASE_URL}
     command: sh -c "node openhimConfig.js"
     configs:
       - source: reprocess-openhimConfig.js

diff --git a/reprocess-mediator/openhimConfig.js b/reprocess-mediator/openhimConfig.js
@@ -37,6 +37,15 @@ function makeRequest(options, data) {
 const appJsonData = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, "reprocess-ui-app.json"))
 );
+//Substitute the url with environ variable
+
+let url = appJsonData.url;
+let newUrl = url.replace(
+  "<openhim-console-url>",
+  process.env.OPENHIM_CONSOLE_BASE_URL
+);
+
+appJsonData.url = newUrl;
 const appData = JSON.stringify(appJsonData);
 
 const options = {

diff --git a/reprocess-mediator/package-metadata.json b/reprocess-mediator/package-metadata.json
@@ -16,6 +16,6 @@
     "REPROCESS_MEDIATOR_UI_VERSION": "jembi/reprocess-mediator-ui:v0.1.0",
     "MONGODB_CONNECTION_STRING": "mongodb://mongo-1:27017/openhim",
     "MONGODB_DIRECT_CONNECTION": false,
-    "OPENHIM_CONSOLE_URL": "http://localhost:9000"
+    "OPENHIM_CONSOLE_BASE_URL": "http://localhost:9000"
   }
 }
diff --git a/reprocess-mediator/reprocess-ui-app.json b/reprocess-mediator/reprocess-ui-app.json
@@ -3,7 +3,7 @@
   "description": "Reprocess microfrontends app",
   "category": "HIE Configuration",
   "type": "esmodule",
-  "url": "<openhim-console-url>/jembi-reprocessor-mediator-microfrontend.js",
+  "url": "<openhim-console-url>/reprocess-mediator-ui",
   "showInPortal": true,
   "showInSideBar": false,
   "access_roles": ["admin"],