Merge branch 'main' into fetch-conn-record

hyperledger · Dec 18, 2021 · 8233fef · 8233fef
2 parents 5d1c6a9 + bdd625b
commit 8233fef
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/aries_cloudagent/protocols/discovery/v1_0/models/discovery_record.py b/aries_cloudagent/protocols/discovery/v1_0/models/discovery_record.py
@@ -27,7 +27,7 @@ class Meta:
 
     RECORD_TYPE = "discovery_exchange_v10"
     RECORD_ID_NAME = "discovery_exchange_id"
-    RECORD_TOPIC = "dicover_feature"
+    RECORD_TOPIC = "discover_feature"
     TAG_NAMES = {"~thread_id" if UNENCRYPTED_TAGS else "thread_id", "connection_id"}
 
     def __init__(

diff --git a/aries_cloudagent/protocols/discovery/v2_0/models/discovery_record.py b/aries_cloudagent/protocols/discovery/v2_0/models/discovery_record.py
@@ -27,7 +27,7 @@ class Meta:
 
     RECORD_TYPE = "discovery_exchange_v20"
     RECORD_ID_NAME = "discovery_exchange_id"
-    RECORD_TOPIC = "dicover_feature"
+    RECORD_TOPIC = "discover_feature_v2_0"
     TAG_NAMES = {"~thread_id" if UNENCRYPTED_TAGS else "thread_id", "connection_id"}
 
     def __init__(

diff --git a/demo/run_bdd b/demo/run_bdd
@@ -133,7 +133,9 @@ if [ ! -z "$DOCKERHOST" ]; then
   # provided via APPLICATION_URL environment variable
   export RUNMODE="docker"
 elif [ -z "${PWD_HOST_FQDN}" ]; then
-  DOCKERHOST=`docker run --rm --net=host eclipse/che-ip`
+  # getDockerHost; for details refer to https://github.com/bcgov/DITP-DevOps/tree/main/code/snippets#getdockerhost
+  . /dev/stdin <<<"$(cat <(curl -s --raw https://raw.githubusercontent.com/bcgov/DITP-DevOps/main/code/snippets/getDockerHost))" 
+  export DOCKERHOST=$(getDockerHost)
   export RUNMODE="docker"
 else
   PWD_HOST="${PWD_HOST_FQDN}"

diff --git a/demo/run_demo b/demo/run_demo
@@ -153,7 +153,9 @@ if [ ! -z "$DOCKERHOST" ]; then
   # provided via APPLICATION_URL environment variable
   export RUNMODE="docker"
 elif [ -z "${PWD_HOST_FQDN}" ]; then
-  DOCKERHOST=`docker run --rm --net=host eclipse/che-ip`
+  # getDockerHost; for details refer to https://github.com/bcgov/DITP-DevOps/tree/main/code/snippets#getdockerhost
+  . /dev/stdin <<<"$(cat <(curl -s --raw https://raw.githubusercontent.com/bcgov/DITP-DevOps/main/code/snippets/getDockerHost))" 
+  export DOCKERHOST=$(getDockerHost)
   export RUNMODE="docker"
 else
   PWD_HOST="${PWD_HOST_FQDN}"

diff --git a/docker/manage b/docker/manage
@@ -1,6 +1,8 @@
 #!/bin/bash
 export MSYS_NO_PATHCONV=1
-export DOCKERHOST=${APPLICATION_URL-$(docker run --rm --net=host eclipse/che-ip)}
+# getDockerHost; for details refer to https://github.com/bcgov/DITP-DevOps/tree/main/code/snippets#getdockerhost
+. /dev/stdin <<<"$(cat <(curl -s --raw https://raw.githubusercontent.com/bcgov/DITP-DevOps/main/code/snippets/getDockerHost))" 
+export DOCKERHOST=$(getDockerHost)
 set -e
 
 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)"