add HZN_MGMT_HUB_CERT_PATH to horizon file

playground · Jul 6, 2023 · 8011926 · 8011926
1 parent 76198f8
commit 8011926
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 17 deletions.
diff --git a/build/common/src/env.js b/build/common/src/env.js
diff --git a/build/common/src/env.js.map b/build/common/src/env.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hzn-cli",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "description": "Open Horizon CLI toolkit helps streamline the process of preparing node agents and perform tasks between orgs environments",
   "main": "./build/index.js",
   "bin": {

diff --git a/src/common/src/env.ts b/src/common/src/env.ts
@@ -72,16 +72,18 @@ export class Env {
     });
   }
   setAdditionalEnv() {
-    let mmsContainer = pEnv.MMS_CONTAINER_NAME || pEnv.MMS_SERVICE_NAME;
-    let container = pEnv.SERVICE_CONTAINER_NAME || pEnv.SERVICE_NAME;
-    let registry = '';
-    if(this.getDockerRegistry() == 'quay.io') {
-      registry = 'quay.io/';
+    if(pEnv.SERVICE_CONTAINER_NAME == pEnv.SERVICE_NAME) {
+      let mmsContainer = pEnv.MMS_CONTAINER_NAME || pEnv.MMS_SERVICE_NAME;
+      let container = pEnv.SERVICE_CONTAINER_NAME || pEnv.SERVICE_NAME;
+      let registry = '';
+      if(this.getDockerRegistry() == 'quay.io') {
+        registry = 'quay.io/';
+      }
+      pEnv.MMS_PATTERN_NAME = `pattern-${pEnv.MMS_SERVICE_NAME}-${pEnv.ARCH}`;
+      pEnv.MMS_CONTAINER = `${registry}${pEnv.YOUR_DOCKERHUB_ID}/${mmsContainer}_${pEnv.ARCH}:${pEnv.MMS_SERVICE_VERSION}`.replace(/\r?\n|\r/g, '')
+      pEnv.PATTERN_NAME = `pattern-${pEnv.SERVICE_NAME}`;
+      pEnv.SERVICE_CONTAINER = `${registry}${pEnv.YOUR_DOCKERHUB_ID}/${container}_${pEnv.ARCH}:${pEnv.SERVICE_VERSION}`.replace(/\r?\n|\r/g, '')  
     }
-    pEnv.MMS_PATTERN_NAME = `pattern-${pEnv.MMS_SERVICE_NAME}-${pEnv.ARCH}`;
-    pEnv.MMS_CONTAINER = `${registry}${pEnv.YOUR_DOCKERHUB_ID}/${mmsContainer}_${pEnv.ARCH}:${pEnv.MMS_SERVICE_VERSION}`.replace(/\r?\n|\r/g, '')
-    pEnv.PATTERN_NAME = `pattern-${pEnv.SERVICE_NAME}`;
-    pEnv.SERVICE_CONTAINER = `${registry}${pEnv.YOUR_DOCKERHUB_ID}/${container}_${pEnv.ARCH}:${pEnv.SERVICE_VERSION}`.replace(/\r?\n|\r/g, '')
   }
   updateContainerAndServiceNames() {
     console.log('update', this.getEdgeDeploy(), this.getEdgeOwner(), this.getServiceContainerName(), this.getServiceContainerName())

diff --git a/src/common/src/utils.ts b/src/common/src/utils.ts
@@ -152,6 +152,9 @@ export class Utils {
           if(key == 'HZN_NODE_ID') {
             content += `${key}=${pEnv.HZN_DEVICE_ID}` 
           }
+          if(key == 'HZN_MGMT_HUB_CERT_PATH') {
+            content += `${key}=${pEnv.CONFIG_CERT_PATH}`
+          }
         }    
       })
       console.log(content)