Refactoring Code

2025-11-10 12:40:35 +02:00
parent 5a666e6f60
commit fbaa5780d9
39 changed files with 1559 additions and 1223 deletions
--- a/src/commands/infra.sh
+++ b/src/commands/infra.sh
@@ -1,75 +1,77 @@
 wx-infra(){
-    wx-login
-    wx-auto &> /dev/null
+  wx-login &> /dev/null
+  wx-auto &> /dev/null

-    wx-header "Infra"
-    wx-restricted
+  wxi-header "Infra"
+  wxi-restricted

-    case $USERNAME in
-        cwchristerw)
-            if [[ -d "$HOME/Desktop/Work in Progress/Programming/warengroup/infra" ]]
-            then
-                INFRA_PATH="$HOME/Desktop/Work in Progress/Programming/warengroup/infra"
-            else
-                if [[ -d "$HOME/.warengroup/infra" ]]
-                then
-                    INFRA_PATH="$HOME/.warengroup/infra"
-                else
-                    INFRA_PATH="$HOME/.warengroup/infra"
-                    mkdir -p "$INFRA_PATH" &> /dev/null
-                    git clone ssh://git@git.waren.io:2222/warengroup-private/infra.git --config core.sshCommand="ssh -i $HOME/.ssh/keys/warengroup-legacy -o ProxyJump=none" "$INFRA_PATH" &> /dev/null
-                fi
-            fi
+  case $USERNAME in
+    cwchristerw)
+      if [[ -d "$HOME/.warengroup/infra" ]]
+      then
+        INFRA_PATH="$HOME/.warengroup/infra"
+      else
+        INFRA_PATH="$HOME/.warengroup/infra"
+        mkdir -p "$INFRA_PATH" &> /dev/null
+        git clone ssh://git@git.waren.io:2222/warengroup-private/infra.git --config core.sshCommand="ssh -i $HOME/.ssh/keys/warengroup-legacy -o ProxyJump=none" "$INFRA_PATH" &> /dev/null
+      fi

-            if [[ ! -f "$INFRA_PATH/vault/cwchristerw" || ! -f "$INFRA_PATH/vault/warengroup" ]]
-            then
-                mkdir -p "$INFRA_PATH/vault" &> /dev/null
+      if [[ ! -f "$INFRA_PATH/vault/cwchristerw" || ! -f "$INFRA_PATH/vault/warengroup" ]]
+      then
+        mkdir -p "$INFRA_PATH/vault" &> /dev/null

-                curl \
-                    -H "X-Vault-Token: ${config["login",$ORG]}" \
-                    -X GET \
-                    https://$VAULT_DOMAIN/v1/cli/data/cwchristerw/settings/infra -s | jq -r '.data.data.cwchristerw' > "$INFRA_PATH/vault/cwchristerw"
+        curl \
+          -H "X-Vault-Token: $VAULT_TOKEN" \
+          -X GET \
+          https://$VAULT_DOMAIN/v1/cli/data/cwchristerw/settings/infra -s | jq -r '.data.data.cwchristerw' > "$INFRA_PATH/vault/cwchristerw"

-                curl \
-                    -H "X-Vault-Token: ${config["login",$ORG]}" \
-                    -X GET \
-                    https://$VAULT_DOMAIN/v1/cli/data/cwchristerw/settings/infra -s | jq -r '.data.data.warengroup' > "$INFRA_PATH/vault/warengroup"
-            fi
+        curl \
+          -H "X-Vault-Token: $VAULT_TOKEN" \
+          -X GET \
+          https://$VAULT_DOMAIN/v1/cli/data/cwchristerw/settings/infra -s | jq -r '.data.data.warengroup' > "$INFRA_PATH/vault/warengroup"
+      fi

-            if [[ -z $1 ]]
-            then
-                echo "Tag Required"
-            else
-                if [[ $1 == "init" ]]
-                then
-                    if [[ -z $2 ]]
-                    then
-                        2=init
-                    fi
+      INFRA_VAULT="--vault-id warengroup@vault/warengroup --vault-id cwchristerw@vault/cwchristerw"
+      ;;
+    *)
+      wxi-content status "User" "Unsupported"
+      wxi-footer
+      wxi-stop
+      INFRA_PATH="$HOME/.warengroup/infra"
+      INFRA_VAULT="--vault-id warengroup@vault/warengroup"
+      ;;
+  esac

-                    cd "$INFRA_PATH"
-                    git pull &> /dev/null
-                    ansible-galaxy collection install -r requirements.yml --upgrade &> /dev/null
-                    ansible-playbook --vault-id warengroup@vault/warengroup --vault-id cwchristerw@vault/cwchristerw playbooks/init.yml -t $2 $3 $4 $5 $6 $7 $8 $9
-                    cd "$OLDPWD"
-                elif [[ $1 == "manager" ]]
-                then
-                    cd "$INFRA_PATH"
-                    git pull &> /dev/null
-                    ansible-galaxy collection install -r requirements.yml --upgrade &> /dev/null
-                    ansible-playbook --vault-id warengroup@vault/warengroup --vault-id cwchristerw@vault/cwchristerw manager.yml $2 $3 $4 $5 $6 $7 $8 $9
-                    cd "$OLDPWD"
-                else
-                    cd "$INFRA_PATH"
-                    git pull &> /dev/null
-                    ansible-galaxy collection install -r requirements.yml --upgrade &> /dev/null
-                    ansible-playbook --vault-id warengroup@vault/warengroup --vault-id cwchristerw@vault/cwchristerw playbooks.yml -t $1 $2 $3 $4 $5 $6 $7 $8 $9
-                    cd "$OLDPWD"
-                fi
-            fi
-            ;;
-        *)
-            echo "User Unsupported"
-            ;;
-    esac
+  if [[ -z ${args['2']} ]]
+  then
+    echo "Tag Required"
+  else
+    cd "$INFRA_PATH"
+    #git pull &> /dev/null
+    #ansible-galaxy collection install -r requirements.yml --upgrade &> /dev/null
+
+    if [[ ${args['2']} == "init" ]]
+    then
+      wxi-header "Init" h3
+
+      if [[ -z ${args['3']} ]]
+      then
+        tags=init
+      else
+        tags=${args['3']}
+      fi
+
+      ansible-playbook $INFRA_VAULT playbooks/init.yml -t $tags --limit "${args['limit']}"
+    elif [[ ${args['2']} == "manager" ]]
+    then
+      wxi-header "Manager" h3
+      ansible-playbook $INFRA_VAULT manager.yml --extra-vars "${args['extra-vars']}"
+    else
+      wxi-header "Playbooks" h3
+      tags=${args['2']}
+      ansible-playbook $INFRA_VAULT playbooks.yml -t $tags --limit "${args['limit']}"
+    fi
+    cd "$OLDPWD"
+  fi
+  wxi-footer
 }