From 00c7cdb4a1105f21acfca2b020cbafda9d35b578 Mon Sep 17 00:00:00 2001
From: gberl002 <geoff.berl@netfoundry.io>
Date: Tue, 5 Sep 2023 16:17:11 -0400
Subject: [PATCH 1/2] Using router config file existence to determine whether
 or not to create a new config file.

Signed-off-by: gberl002 <geoff.berl@netfoundry.io>
---
 CHANGELOG.md                          | 11 +++++++++
 quickstart/docker/image/run-router.sh | 34 +++++++++++++--------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e369dc5da..a011208d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# Release 0.30.4
+
+## What's New
+
+* Bugfixes
+
+## Component Updates and Bug Fixes
+
+* github.com/openziti/ziti: [v0.30.3 -> v0.30.4](https://github.com/openziti/ziti/compare/v0.30.3...v0.30.4)
+    * Fixed an issue causing router configs to be rewritten when docker compose was brought up with existing configs
+
 # Release 0.30.3
 
 ## What's New
diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh
index f38bfc664..7fe3c6685 100755
--- a/quickstart/docker/image/run-router.sh
+++ b/quickstart/docker/image/run-router.sh
@@ -30,10 +30,11 @@ if [[ "${_ZITI_ROUTER_NAME}" != "" ]]; then
   export ZITI_ROUTER_NAME="${_ZITI_ROUTER_NAME}"
   echo "ZITI_ROUTER_NAME set to: ${ZITI_ROUTER_NAME}"
 fi
-_UNIQUE_NAME="${ZITI_HOME}/${ZITI_ROUTER_NAME}-${HOSTNAME}.init"
-if [ ! -f "${_UNIQUE_NAME}" ]; then
-  echo "system has not been initialized. initializing..."
-  "${ZITI_BIN_DIR-}/ziti" edge login ${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS}:${ZITI_CTRL_EDGE_ADVERTISED_PORT} -u $ZITI_USER -p $ZITI_PWD -y
+
+"${ZITI_BIN_DIR-}/ziti" edge login ${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS}:${ZITI_CTRL_EDGE_ADVERTISED_PORT} -u $ZITI_USER -p $ZITI_PWD -y
+_CONFIG_PATH="${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml"
+if [ ! -f "${_CONFIG_PATH}" ]; then
+  echo "config has not been generated, generating config..."
 
   echo "----------  Creating edge-router ${ZITI_ROUTER_NAME}...."
 
@@ -53,21 +54,20 @@ if [ ! -f "${_UNIQUE_NAME}" ]; then
     echo "CREATING PRIVATE ROUTER CONFIG: ${ZITI_ROUTER_NAME}"
     createPrivateRouterConfig "${ZITI_ROUTER_NAME}"
   fi
-
-  found=$("${ZITI_BIN_DIR-}/ziti" edge list edge-routers 'name = "'"${ZITI_ROUTER_NAME}"'"' | grep -c "${ZITI_ROUTER_NAME}")
-  if [[ found -gt 0 ]]; then
-    echo "----------  Found existing edge-router ${ZITI_ROUTER_NAME}...."
   else
-    "${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_ROUTER_NAME}" -o "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt" -t -a "${ZITI_ROUTER_ROLES}"
-    sleep 1
-    echo "---------- Enrolling edge-router ${ZITI_ROUTER_NAME}...."
-    "${ZITI_BIN_DIR}/ziti" router enroll "${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt"
-    echo ""
-  fi
-  echo "system initialized. writing marker file"
-  echo "system initialized" > "${_UNIQUE_NAME}"
+    echo " Found existing config file ${_CONFIG_PATH}, not creating a new config."
+    echo " If you would like to overwrite this config, delete the file and restart the container."
+fi
+
+found=$("${ZITI_BIN_DIR-}/ziti" edge list edge-routers 'name = "'"${ZITI_ROUTER_NAME}"'"' | grep -c "${ZITI_ROUTER_NAME}")
+if [[ found -gt 0 ]]; then
+  echo "----------  Found existing edge-router ${ZITI_ROUTER_NAME}...."
 else
-  echo "system has been initialized. starting the process."
+  "${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_ROUTER_NAME}" -o "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt" -t -a "${ZITI_ROUTER_ROLES}"
+  sleep 1
+  echo "---------- Enrolling edge-router ${ZITI_ROUTER_NAME}...."
+  "${ZITI_BIN_DIR}/ziti" router enroll "${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt"
+  echo ""
 fi
 
 unset ZITI_USER

From 2b2244d770295f67edd462b239728809a8bb1681 Mon Sep 17 00:00:00 2001
From: gberl002 <geoff.berl@netfoundry.io>
Date: Tue, 12 Sep 2023 14:49:19 -0400
Subject: [PATCH 2/2] Reverting logic back to a nested if

Signed-off-by: gberl002 <geoff.berl@netfoundry.io>
---
 quickstart/docker/image/run-router.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh
index 7fe3c6685..eb25c4fc1 100755
--- a/quickstart/docker/image/run-router.sh
+++ b/quickstart/docker/image/run-router.sh
@@ -31,10 +31,10 @@ if [[ "${_ZITI_ROUTER_NAME}" != "" ]]; then
   echo "ZITI_ROUTER_NAME set to: ${ZITI_ROUTER_NAME}"
 fi
 
-"${ZITI_BIN_DIR-}/ziti" edge login ${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS}:${ZITI_CTRL_EDGE_ADVERTISED_PORT} -u $ZITI_USER -p $ZITI_PWD -y
 _CONFIG_PATH="${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml"
 if [ ! -f "${_CONFIG_PATH}" ]; then
   echo "config has not been generated, generating config..."
+  "${ZITI_BIN_DIR-}/ziti" edge login ${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS}:${ZITI_CTRL_EDGE_ADVERTISED_PORT} -u $ZITI_USER -p $ZITI_PWD -y
 
   echo "----------  Creating edge-router ${ZITI_ROUTER_NAME}...."
 
@@ -54,20 +54,19 @@ if [ ! -f "${_CONFIG_PATH}" ]; then
     echo "CREATING PRIVATE ROUTER CONFIG: ${ZITI_ROUTER_NAME}"
     createPrivateRouterConfig "${ZITI_ROUTER_NAME}"
   fi
-  else
-    echo " Found existing config file ${_CONFIG_PATH}, not creating a new config."
-    echo " If you would like to overwrite this config, delete the file and restart the container."
-fi
 
-found=$("${ZITI_BIN_DIR-}/ziti" edge list edge-routers 'name = "'"${ZITI_ROUTER_NAME}"'"' | grep -c "${ZITI_ROUTER_NAME}")
-if [[ found -gt 0 ]]; then
-  echo "----------  Found existing edge-router ${ZITI_ROUTER_NAME}...."
+  found=$("${ZITI_BIN_DIR-}/ziti" edge list edge-routers 'name = "'"${ZITI_ROUTER_NAME}"'"' | grep -c "${ZITI_ROUTER_NAME}")
+  if [[ found -gt 0 ]]; then
+    echo "----------  Found existing edge-router ${ZITI_ROUTER_NAME}...."
+  else
+    "${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_ROUTER_NAME}" -o "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt" -t -a "${ZITI_ROUTER_ROLES}"
+    sleep 1
+    echo "---------- Enrolling edge-router ${ZITI_ROUTER_NAME}...."
+    "${ZITI_BIN_DIR}/ziti" router enroll "${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt"
+    echo ""
+  fi
 else
-  "${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_ROUTER_NAME}" -o "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt" -t -a "${ZITI_ROUTER_ROLES}"
-  sleep 1
-  echo "---------- Enrolling edge-router ${ZITI_ROUTER_NAME}...."
-  "${ZITI_BIN_DIR}/ziti" router enroll "${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt"
-  echo ""
+    echo " Found existing config file ${_CONFIG_PATH}, not creating a new config."
 fi
 
 unset ZITI_USER