code cleanup

This commit is contained in:
Josh Bradley 2024-07-31 00:14:04 -04:00
parent fcea32eeb1
commit 4ba4056d7e

View File

@ -29,7 +29,7 @@ requiredParams=(
errorBanner () {
#https://cowsay-svelte.vercel.app
echo '
cat << "EOF"
________________________________
/ Uh oh - an error has occurred. \
\ Please see the message below. /
@ -49,8 +49,44 @@ errorBanner () {
[]|[]
| | |
/_]_[_\
EOF
printf "\n"
}
'
successBanner () {
cat << "EOF"
_____ __ _
/ ____| / _| | |
| (___ _ _ ___ ___ ___ ___ ___| |_ _ _| |
\___ \| | | |/ __/ __/ _ / __/ __| _| | | | |
____) | |_| | (_| (_| __\__ \__ | | | |_| | |
|_____/ \__,_|\___\___\___|___|___|_| \__,_|_| _ _
| | | | | | | |
__| | ___ _ __ | | ___ _ _ _ __ ___ ___ _ __ | |_| |
/ _` |/ _ | '_ \| |/ _ \| | | | '_ ` _ \ / _ | '_ \| __| |
| (_| | __| |_) | | (_) | |_| | | | | | | __| | | | |_|_|
\__,_|\___| .__/|_|\___/ \__, |_| |_| |_|\___|_| |_|\__(_)
| | __/ |
|_| |___/
EOF
printf "\n\n"
}
startBanner () {
cat << "EOF"
_____ _ _____ _____
/ ____| | | | __ \ /\ / ____|
| | __ _ __ __ _ _ __ | |__ | |__) | / \ | | __
| | |_ | '__/ _` | '_ \| '_ \| _ / / /\ \| | |_ |
| |__| | | | (_| | |_) | | | | | \ \ / ____ | |__| |
\_____|_| \__,_| .__/|_| |_|_| \_/_/_ \_\_____|
/\ | | | | | |
/ \ ___ ___|_|_| | ___ _ __ __ _| |_ ___ _ __
/ /\ \ / __/ __/ _ | |/ _ | '__/ _` | __/ _ \| '__|
/ ____ | (_| (_| __| | __| | | (_| | || (_) | |
/_/ \_\___\___\___|_|\___|_| \__,_|\__\___/|_|
EOF
printf "\n\n"
}
exitIfCommandFailed () {
@ -371,7 +407,6 @@ waitForGraphragExternalIp () {
local available="false"
printf "Checking for GraphRAG external IP"
for ((i=0;i < $maxTries; i++)); do
# TMP_GRAPHRAG_SERVICE_IP=$(kubectl get ingress --namespace $aksNamespace graphrag --template "{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}" 2> /dev/null)
TMP_GRAPHRAG_SERVICE_IP=$(kubectl get ingress --namespace graphrag graphrag -o json | jq .status.loadBalancer.ingress[0].ip)
# jq returns "null" if the value is not found
if [[ "$TMP_GRAPHRAG_SERVICE_IP" != "null" ]]; then
@ -562,20 +597,7 @@ fi
################################################################################
# Main Program #
################################################################################
cat <<\EOF
_____ _ _____ _____
/ ____| | | | __ \ /\ / ____|
| | __ _ __ __ _ _ __ | |__ | |__) | / \ | | __
| | |_ | '__/ _` | '_ \| '_ \| _ / / /\ \| | |_ |
| |__| | | | (_| | |_) | | | | | \ \ / ____ | |__| |
\_____|_| \__,_| .__/|_| |_|_| \_/_/_ \_\_____|
/\ | | | | | |
/ \ ___ ___|_|_| | ___ _ __ __ _| |_ ___ _ __
/ /\ \ / __/ __/ _ | |/ _ | '__/ _` | __/ _ \| '__|
/ ____ | (_| (_| __| | __| | | (_| | || (_) | |
/_/ \_\___\___\___|_|\___|_| \__,_|\__\___/|_|
EOF
printf "\n\n"
startBanner
checkRequiredTools
populateParams $PARAMS_FILE
@ -615,19 +637,4 @@ if [ $GRANT_DEV_ACCESS -eq 1 ]; then
grantDevAccessToAzureResources
fi
cat <<\EOF
_____ __ _
/ ____| / _| | |
| (___ _ _ ___ ___ ___ ___ ___| |_ _ _| |
\___ \| | | |/ __/ __/ _ / __/ __| _| | | | |
____) | |_| | (_| (_| __\__ \__ | | | |_| | |
|_____/ \__,_|\___\___\___|___|___|_| \__,_|_| _ _
| | | | | | | |
__| | ___ _ __ | | ___ _ _ _ __ ___ ___ _ __ | |_| |
/ _` |/ _ | '_ \| |/ _ \| | | | '_ ` _ \ / _ | '_ \| __| |
| (_| | __| |_) | | (_) | |_| | | | | | | __| | | | |_|_|
\__,_|\___| .__/|_|\___/ \__, |_| |_| |_|\___|_| |_|\__(_)
| | __/ |
|_| |___/
EOF
printf "\n"
successBanner