Merge pull request #2396 from openziti/test-zac-deployments

test zac deployments
openziti · Sep 11, 2024 · 8d59ad0 · 8d59ad0
2 parents 738ddfb + 85aec67
commit 8d59ad0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/dist/dist-packages/linux/linux.test.bash b/dist/dist-packages/linux/linux.test.bash
@@ -32,6 +32,10 @@ cleanup(){
             fi
         )||true
     done
+    if [[ -d "${ZITI_CONSOLE_LOCATION}" ]]
+    then
+        sudo rm -rf "${ZITI_CONSOLE_LOCATION}"
+    fi
     echo "DEBUG: cleanup complete"
 }
 
@@ -58,7 +62,7 @@ BASEDIR="$(cd "$(dirname "${0}")" && pwd)"
 REPOROOT="$(cd "${BASEDIR}/../../.." && pwd)"
 cd "${REPOROOT}"
 
-declare -a BINS=(grep go nc nfpm)
+declare -a BINS=(grep go nc nfpm curl unzip)
 for BIN in "${BINS[@]}"; do
     checkCommand "$BIN"
 done
@@ -73,6 +77,7 @@ done
 : "${ZITI_ROUTER_NAME:="linux-router1"}"
 : "${ZITI_ROUTER_ADVERTISED_ADDRESS:="${ZITI_ROUTER_NAME}.127.0.0.1.sslip.io"}"
 : "${ZITI_ENROLL_TOKEN:="${TMPDIR}/${ZITI_ROUTER_NAME}.jwt"}"
+: "${ZITI_CONSOLE_LOCATION:="/opt/openziti/share/consoletest"}"
 
 export \
 ZITI_GO_VERSION \
@@ -115,6 +120,7 @@ ZITI_ENROLL_TOKEN=/tmp/${ZITI_ROUTER_NAME}.jwt \
 sudo /opt/openziti/etc/controller/bootstrap.bash << CTRL
 ZITI_CTRL_ADVERTISED_ADDRESS="${ZITI_CTRL_ADVERTISED_ADDRESS}"
 ZITI_CTRL_ADVERTISED_PORT="${ZITI_CTRL_ADVERTISED_PORT}"
+ZITI_CONSOLE_LOCATION="${ZITI_CONSOLE_LOCATION}"
 ZITI_USER="admin"
 ZITI_PWD="${ZITI_PWD}"
 CTRL
@@ -141,6 +147,11 @@ do
 done
 ziti edge create edge-router "${ZITI_ROUTER_NAME}" -to "${ZITI_ENROLL_TOKEN}"
 
+# fetch and install ziti console
+sudo mkdir -p "${ZITI_CONSOLE_LOCATION}"
+sudo tee "${ZITI_CONSOLE_LOCATION}/index.html" <<< "I am ZAC"
+sudo chmod -R +rX "${ZITI_CONSOLE_LOCATION}"
+
 sudo /opt/openziti/etc/router/bootstrap.bash << ROUTER
 ZITI_CTRL_ADVERTISED_ADDRESS="${ZITI_CTRL_ADVERTISED_ADDRESS}"
 ZITI_CTRL_ADVERTISED_PORT="${ZITI_CTRL_ADVERTISED_PORT}"
@@ -175,4 +186,17 @@ ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
 ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
 go test -v -count=1 -tags="quickstart manual" ./ziti/cmd/edge/...
 
+ATTEMPTS=5
+DELAY=3
+
+# verify console is available
+curl_cmd="curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null \"https://${ZITI_CTRL_ADVERTISED_ADDRESS}:${ZITI_CTRL_ADVERTISED_PORT}/zac/\""
+until ! ((ATTEMPTS)) || eval "${curl_cmd}" &> /dev/null
+do
+    (( ATTEMPTS-- ))
+    echo "Waiting for zac"
+    sleep ${DELAY}
+done
+eval "${curl_cmd}"
+
 cleanup
diff --git a/dist/docker-images/compose.test.bash b/dist/docker-images/compose.test.bash
@@ -40,7 +40,7 @@ BASEDIR="$(cd "$(dirname "${0}")" && pwd)"
 REPOROOT="$(cd "${BASEDIR}/../.." && pwd)"
 cd "${REPOROOT}"
 
-declare -a BINS=(grep docker go nc)
+declare -a BINS=(grep docker go nc curl)
 for BIN in "${BINS[@]}"; do
     checkCommand "$BIN"
 done
@@ -128,4 +128,17 @@ ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
 ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
 go test -v -count=1 -tags="quickstart manual" ./ziti/cmd/edge/...
 
+ATTEMPTS=5
+DELAY=3
+
+# verify console is available
+curl_cmd="curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null \"https://${ZITI_CTRL_ADVERTISED_ADDRESS}:${ZITI_CTRL_ADVERTISED_PORT}/zac/\""
+until ! ((ATTEMPTS)) || eval "${curl_cmd}" &> /dev/null
+do
+    (( ATTEMPTS-- ))
+    echo "Waiting for zac"
+    sleep ${DELAY}
+done
+eval "${curl_cmd}"
+
 cleanup