Add extra-vars parameter to use with Build tasks on Manager playbook in Infra command

src/commands/auth/login.sh

@@ -12,7 +12,7 @@ wx-login(){
   elif [[ ! -z ${args['token']} ]]
   then
     AUTH_METHOD=token
-  elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
+  elif [[ $(wxi-config login read) ]]
   then
     AUTH_METHOD=token
   elif [[ ! -z ${args['username']} ]]
@@ -61,11 +61,12 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
+          wxi-footer
           wxi-stop
         fi
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       token)
         echo -n "Token: "
@@ -75,9 +76,9 @@ wx-login(){
           then
             TOKEN=${args['token']}
           fi
-        elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
+        elif [[ $(wxi-config login read) ]]
         then
-          TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)
+          TOKEN=$(wxi-config login read)
         else
           read -s TOKEN
         fi
@@ -105,11 +106,19 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
-          wxi-stop
+          wxi-footer
+
+          if [[ $(wxi-config login read) ]]
+          then
+            wx-logout &> /dev/null
+            wx-login
+          else
+            wxi-stop
+          fi
         fi
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       *)
         wxi-content status "Login Type" "Unsupported"

src/commands/auth/logout.sh

@@ -14,10 +14,8 @@ wx-logout(){
   then
     wxi-header "$ORG_HEADER" h3
     echo "Logging Out..."
-    TOKEN=""
+    wxi-config login erase
-    wxi-config login
     wxi-footer
-    wxi-stop
   fi
 
 }

src/commands/infra.sh

@@ -1,5 +1,5 @@
 wx-infra(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Infra"
@@ -72,10 +72,12 @@ wx-infra(){
       else
         host=${args['host']}
       fi
+
       operation=${args['operation']}
+      extra_vars=${args['extra-vars']}
 
       wxi-header "Manager" h3
-      ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host"
+      ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host" --extra-vars="$extra_vars"
     else
       wxi-header "Infra" h3
       host=${args['host']}

src/commands/management/auto.sh

@@ -1,5 +1,5 @@
 wx-auto(){
-  wx-login &> /dev/null
+  wx-login
 
   wxi-header "Auto"
   wxi-restricted

src/commands/management/settings.sh

@@ -1,5 +1,5 @@
 wx-settings(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Settings"

src/commands/ssh/keys/sign.sh

@@ -2,11 +2,12 @@ wxi-ssh-keys-sign(){
   wxi-header "SSH / Keys / Sign"
   wxi-restricted
 
-  wxi-ssh-keys-sign-create $ORG sysadmin 3600
-
   if [[ $USERNAME == "cwchristerw" ]]
   then
+    wxi-ssh-keys-sign-create cwchristerw sysadmin 3600
     wxi-ssh-keys-sign-create warengroup sysadmin 3600
+  else
+    wxi-ssh-keys-sign-create $ORG sysadmin 3600
   fi
   wxi-footer
 }

src/functions/config.sh

@@ -1,8 +1,24 @@
 wxi-config(){
   case $1 in
     login)
-      jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+      case $2 in
-      ;;
+        write)
+          jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+        ;;
+        read)
+          if [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
+          then
+            cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token
+          else
+            return 1
+          fi
+        ;;
+        erase)
+          TOKEN=""
+          wxi-config login write
+        ;;
+      esac
+    ;;
     *)
       echo -n ""
     ;;

wx

@@ -12,8 +12,24 @@ declare -Ax messages
 wxi-config(){
   case $1 in
     login)
-      jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+      case $2 in
-      ;;
+        write)
+          jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
+        ;;
+        read)
+          if [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
+          then
+            cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token
+          else
+            return 1
+          fi
+        ;;
+        erase)
+          TOKEN=""
+          wxi-config login write
+        ;;
+      esac
+    ;;
     *)
       echo -n ""
     ;;
@@ -271,7 +287,7 @@ wxi-footer
 }
 
 wx-infra(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Infra"
@@ -344,10 +360,12 @@ wx-infra(){
       else
         host=${args['host']}
       fi
+
       operation=${args['operation']}
+      extra_vars=${args['extra-vars']}
 
       wxi-header "Manager" h3
-      ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host"
+      ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host" --extra-vars="$extra_vars"
     else
       wxi-header "Infra" h3
       host=${args['host']}
@@ -406,7 +424,7 @@ wx-login(){
   elif [[ ! -z ${args['token']} ]]
   then
     AUTH_METHOD=token
-  elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
+  elif [[ $(wxi-config login read) ]]
   then
     AUTH_METHOD=token
   elif [[ ! -z ${args['username']} ]]
@@ -455,11 +473,12 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
+          wxi-footer
           wxi-stop
         fi
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       token)
         echo -n "Token: "
@@ -469,9 +488,9 @@ wx-login(){
           then
             TOKEN=${args['token']}
           fi
-        elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
+        elif [[ $(wxi-config login read) ]]
         then
-          TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)
+          TOKEN=$(wxi-config login read)
         else
           read -s TOKEN
         fi
@@ -499,11 +518,19 @@ wx-login(){
         if [[ -z $VAULT_LOGIN || ${#VAULT_LOGIN} -lt 95 || ${#VAULT_LOGIN} -gt 95 ]]
         then
           wxi-content status "Login" "Failed"
-          wxi-stop
+          wxi-footer
+
+          if [[ $(wxi-config login read) ]]
+          then
+            wx-logout &> /dev/null
+            wx-login
+          else
+            wxi-stop
+          fi
         fi
 
         TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
         ;;
       *)
         wxi-content status "Login Type" "Unsupported"
@@ -549,10 +576,8 @@ wx-logout(){
   then
     wxi-header "$ORG_HEADER" h3
     echo "Logging Out..."
-    TOKEN=""
+    wxi-config login erase
-    wxi-config login
     wxi-footer
-    wxi-stop
   fi
 
 }
@@ -621,7 +646,7 @@ wx-update(){
 }
 
 wx-auto(){
-  wx-login &> /dev/null
+  wx-login
 
   wxi-header "Auto"
   wxi-restricted
@@ -642,7 +667,7 @@ wx-clean(){
 }
 
 wx-settings(){
-  wx-login &> /dev/null
+  wx-login
   wx-auto &> /dev/null
 
   wxi-header "Settings"
@@ -835,11 +860,12 @@ wxi-ssh-keys-sign(){
   wxi-header "SSH / Keys / Sign"
   wxi-restricted
 
-  wxi-ssh-keys-sign-create $ORG sysadmin 3600
-
   if [[ $USERNAME == "cwchristerw" ]]
   then
+    wxi-ssh-keys-sign-create cwchristerw sysadmin 3600
     wxi-ssh-keys-sign-create warengroup sysadmin 3600
+  else
+    wxi-ssh-keys-sign-create $ORG sysadmin 3600
   fi
   wxi-footer
 }