warengroup/wx
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: warengroup:7dd2a07186151e96992d4815583a4380272448ae
Branches Tags
warengroup:master warengroup:develop
...
compare: warengroup:869a22cb73d1b1baf1dedcd777a5e373c1e6c920
Branches Tags
warengroup:develop warengroup:master

2 Commits
7dd2a07186 ... 869a22cb73

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
5 changed files with 70 additions and 26 deletions
Expand all files Collapse all files

21
src/commands/auth/login.sh
View File

@@ -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
wx-logout &> /dev/null
wx-login
#wxi-stop
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"

3
src/commands/auth/logout.sh
View File

@@ -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

4
src/commands/infra.sh
View File

@@ -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']}

20
src/functions/config.sh
View File

@@ -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 ""
;;

48
wx
View File

@@ -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 ""
;;
@@ -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
wx-logout &> /dev/null
wx-login
#wxi-stop
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"
@@ -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