From 78628b0aa5eb47de6a8fd0e9bc88ba0816613ea2 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 30 Jun 2023 20:27:43 -0400 Subject: [PATCH] remove ziti-router that was missed and remove stray text from test --- quickstart/docker/image/run-router.sh | 2 +- ziti/cmd/helpers/helpers_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh index 5e2a57051..0b3e25cd3 100755 --- a/quickstart/docker/image/run-router.sh +++ b/quickstart/docker/image/run-router.sh @@ -57,7 +57,7 @@ else "${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_NAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.jwt" -t -a "${ZITI_EDGE_ROUTER_ROLES}" sleep 1 echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_NAME}...." - "${ZITI_BIN_DIR}/ziti-router" enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.jwt" + "${ZITI_BIN_DIR}/ziti" router enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.jwt" echo "" fi diff --git a/ziti/cmd/helpers/helpers_test.go b/ziti/cmd/helpers/helpers_test.go index 36f5405ca..5e0ec1989 100644 --- a/ziti/cmd/helpers/helpers_test.go +++ b/ziti/cmd/helpers/helpers_test.go @@ -86,7 +86,7 @@ func TestGetCtrlEdgeAdvertisedAddressWhenSet(t *testing.T) { // Set the env variable _ = os.Setenv(varName, expectedValue) - a := get + // Check that the value matches actualValue := GetCtrlEdgeAdvertisedAddress() assert.Equal(t, expectedValue, actualValue)