Merge pull request #39 from playground/append-support

correct version
playground · Feb 15, 2022 · c7628b2 · c7628b2
2 parents 67a1f40 + 1848ef0
commit c7628b2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/build/common/src/config/mms/service.json b/build/common/src/config/mms/service.json
@@ -12,7 +12,8 @@
     {
       "org": "$HZN_ORG_ID",
       "url": "$SERVICE_NAME",
-      "version": "$SERVICE_VERSION",
+      "version": "$SERVICE_VERSION_RANGE_UPPER",
+      "versionRange": "$SERVICE_VERSION_RANGE_LOWER",
       "arch": "$ARCH"
     }
   ],

diff --git a/build/common/src/config/service/pattern.json b/build/common/src/config/service/pattern.json
@@ -1,11 +1,13 @@
 {
-  "name": "$PATTERN_NAME",
+  "name": "pattern-${SERVICE_NAME}-$ARCH",
+  "label": "Edge $SERVICE_NAME Service Pattern for $ARCH",
+  "description": "Pattern for $SERVICE_NAME for $ARCH",
   "services": [
     {
-      "serviceUrl": "$SERVICE_NAME",
+      "serviceUrl": "$MMS_SERVICE_NAME",
       "serviceOrgid": "$HZN_ORG_ID",
       "serviceArch": "$ARCH",
-      "serviceVersions": [ { "version": "$SERVICE_VERSION" } ]
+      "serviceVersions": [ { "version": "$MMS_SERVICE_VERSION" } ]
     }
   ]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hzn-cli",
-  "version": "0.2.23",
+  "version": "0.2.22",
   "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/config/mms/service.json b/src/config/mms/service.json
@@ -12,7 +12,8 @@
     {
       "org": "$HZN_ORG_ID",
       "url": "$SERVICE_NAME",
-      "version": "$SERVICE_VERSION",
+      "version": "$SERVICE_VERSION_RANGE_UPPER",
+      "versionRange": "$SERVICE_VERSION_RANGE_LOWER",
       "arch": "$ARCH"
     }
   ],

diff --git a/src/config/service/pattern.json b/src/config/service/pattern.json
@@ -1,11 +1,13 @@
 {
-  "name": "$PATTERN_NAME",
+  "name": "pattern-${SERVICE_NAME}-$ARCH",
+  "label": "Edge $SERVICE_NAME Service Pattern for $ARCH",
+  "description": "Pattern for $SERVICE_NAME for $ARCH",
   "services": [
     {
-      "serviceUrl": "$SERVICE_NAME",
+      "serviceUrl": "$MMS_SERVICE_NAME",
       "serviceOrgid": "$HZN_ORG_ID",
       "serviceArch": "$ARCH",
-      "serviceVersions": [ { "version": "$SERVICE_VERSION" } ]
+      "serviceVersions": [ { "version": "$MMS_SERVICE_VERSION" } ]
     }
   ]
 }