From 773c580e77bfae4df9732f572b2e3fba632a863b Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Wed, 17 Nov 2021 14:08:34 -0500
Subject: [PATCH] Fix FleetDM SA Creation for SOUP

---
 salt/common/tools/sbin/soup | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index a27ed88d9..708c29cf4 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -447,19 +447,17 @@ post_to_2.3.90() {
   FLEET_HASH=$(docker exec so-soctopus python -c "import bcrypt; print(bcrypt.hashpw('$FLEET_SA_PW'.encode('utf-8'), bcrypt.gensalt()).decode('utf-8'));" 2>&1)
 
   if [[ $? -ne 0 ]]; then
-    echo "Failed to generate Fleet password hash"
-    exit 2
-  fi
-
-  MYSQL_OUTPUT=$(docker exec so-mysql mysql -u root --password=$MYSQL_PW fleet -e \
-     "INSERT INTO users (password,salt,email,name,global_role) VALUES ('$FLEET_HASH','','$FLEET_USER','$FLEET_USER','admin')" 2>&1)
-
-  if [[ $? -eq 0 ]]; then
-      echo "Successfully added service account to Fleet"
+    echo "Failed to generate Fleet password hash, unable to add service account to Fleet"
   else
-      echo "Unable to add service account to Fleet"
-      echo "$MYSQL_OUTPUT"
-      exit 2
+    MYSQL_OUTPUT=$(docker exec so-mysql mysql -u root --password=$MYSQL_PW fleet -e \
+    "INSERT INTO users (password,salt,email,name,global_role) VALUES ('$FLEET_HASH','','$FLEET_SA_EMAIL','$FLEET_SA_EMAIL','admin')" 2>&1)
+
+    if [[ $? -eq 0 ]]; then
+        echo "Successfully added service account to Fleet"
+    else
+        echo "Unable to add service account to Fleet"
+        echo "$MYSQL_OUTPUT"
+    fi
   fi
 
   POSTVERSION=2.3.90