From b5940221940078d6bf6c7b1a921426a057c0ecdd Mon Sep 17 00:00:00 2001 From: pedro Date: Thu, 28 Sep 2023 17:39:16 +0200 Subject: [PATCH] make API_RESOLVER more resilient (normalize urls) --- docker/devicehub.entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/devicehub.entrypoint.sh b/docker/devicehub.entrypoint.sh index 220cdef6..2678f8be 100755 --- a/docker/devicehub.entrypoint.sh +++ b/docker/devicehub.entrypoint.sh @@ -73,7 +73,8 @@ handle_federated_id() { # devicehub host and id federated checker - EXPECTED_ID_FEDERATED="$(curl -s "${API_RESOLVER}/getAll" \ + # //getAll queries are not accepted by this service, so we remove them + EXPECTED_ID_FEDERATED="$(curl -s "${API_RESOLVER%/}/getAll" \ | jq -r '.url | to_entries | .[] | select(.value == "'"${DEVICEHUB_HOST}"'") | .key' \ | head -n 1)" @@ -93,7 +94,7 @@ handle_federated_id() { fi # not needed, but reserved - # EXPECTED_DEVICEHUB_HOST="$(curl -s "${API_RESOLVER}/getAll" \ + # EXPECTED_DEVICEHUB_HOST="$(curl -s "${API_RESOLVER%/}/getAll" \ # | jq -r '.url | to_entries | .[] | select(.key == "'"${ID_FEDERATED}"'") | .value' \ # | head -n 1)" # if [ ! "${EXPECTED_DEVICEHUB_HOST}" = "${DEVICEHUB_HOST}" ]; then