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

Update Login in Config function
Update SSH Keys Sign feature
2026-01-22 01:44:41 +02:00 · 2026-01-22 01:30:42 +02:00 · 2026-01-18 19:01:40 +02:00
6 changed files with 73 additions and 30 deletions
--- a/src/commands/auth/login.sh
+++ b/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']} ]]
@@ -66,7 +66,7 @@ wx-login(){
        fi

        TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
        ;;
      token)
        echo -n "Token: "
@@ -76,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
@@ -107,13 +107,18 @@ wx-login(){
        then
          wxi-content status "Login" "Failed"
          wxi-footer
+
+          if [[ $(wxi-config login read) ]]
+          then
            wx-logout &> /dev/null
            wx-login
-          #wxi-stop
+          else
+            wxi-stop
+          fi
        fi

        TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
        ;;
      *)
        wxi-content status "Login Type" "Unsupported"
--- a/src/commands/auth/logout.sh
+++ b/src/commands/auth/logout.sh
@@ -14,8 +14,7 @@ wx-logout(){
  then
    wxi-header "$ORG_HEADER" h3
    echo "Logging Out..."
-    TOKEN=""
-    wxi-config login
+    wxi-config login erase
    wxi-footer
  fi

--- a/src/commands/infra.sh
+++ b/src/commands/infra.sh
@@ -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']}
--- a/src/commands/ssh/keys/sign.sh
+++ b/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
 }
--- a/src/functions/config.sh
+++ b/src/functions/config.sh
@@ -1,8 +1,24 @@
 wxi-config(){
  case $1 in
    login)
+      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 ""
    ;;
--- a/42
+++ b/42
@@ -12,8 +12,24 @@ declare -Ax messages
 wxi-config(){
  case $1 in
    login)
+      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 ""
    ;;
@@ -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']} ]]
@@ -460,7 +478,7 @@ wx-login(){
        fi

        TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
        ;;
      token)
        echo -n "Token: "
@@ -470,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
@@ -501,13 +519,18 @@ wx-login(){
        then
          wxi-content status "Login" "Failed"
          wxi-footer
+
+          if [[ $(wxi-config login read) ]]
+          then
            wx-logout &> /dev/null
            wx-login
-          #wxi-stop
+          else
+            wxi-stop
+          fi
        fi

        TOKEN=$VAULT_LOGIN
-        wxi-config login
+        wxi-config login write
        ;;
      *)
        wxi-content status "Login Type" "Unsupported"
@@ -553,8 +576,7 @@ wx-logout(){
  then
    wxi-header "$ORG_HEADER" h3
    echo "Logging Out..."
-    TOKEN=""
-    wxi-config login
+    wxi-config login erase
    wxi-footer
  fi

@@ -838,8 +860,6 @@ 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
Author	SHA1	Message	Date
Christer Warén	869a22cb73	Add extra-vars parameter to use with Build tasks on Manager playbook in Infra command	2026-01-22 01:44:41 +02:00
Christer Warén	21db6ac4e9	Update Login in Config function	2026-01-22 01:30:42 +02:00
Christer Warén	7dd2a07186	Update SSH Keys Sign feature	2026-01-18 19:01:40 +02:00