From c93794a4022543ea3883db29c9ab21f20979ab52 Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Wed, 17 Nov 2021 18:22:34 -0500
Subject: [PATCH] Fix soup - fleetdm SA user

---
 salt/common/tools/sbin/soup | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 708c29cf4..0a01cbacf 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -445,21 +445,17 @@ post_to_2.3.90() {
   MYSQL_PW=$(lookup_pillar_secret mysql)
 
   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)
+  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 [[ $? -ne 0 ]]; then
-    echo "Failed to generate Fleet password hash, unable to add service account to Fleet"
+  if [[ $? -eq 0 ]]; then
+      echo "Successfully added service account to Fleet"
   else
-    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
+      echo "Unable to add service account to Fleet"
+      echo "$MYSQL_OUTPUT"
   fi
 
+
   POSTVERSION=2.3.90
 }