Fix help messages

Author: smyrick

scripts/test-utils.sh

@@ -13,8 +13,15 @@
 if [ -z "$SCRIPT_DIR" ]; then
     SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 fi
-source "$SCRIPT_DIR/utils.sh"
-source "$SCRIPT_DIR/config.sh"
+
+# If SCRIPT_DIR is the root directory, we need to source from scripts subdirectory
+if [ "$(basename "$SCRIPT_DIR")" = "scripts" ]; then
+    source "$SCRIPT_DIR/utils.sh"
+    source "$SCRIPT_DIR/config.sh"
+else
+    source "$SCRIPT_DIR/scripts/utils.sh"
+    source "$SCRIPT_DIR/scripts/config.sh"
+fi
 
 # Default values (now from config)
 ROUTER_URL=$(get_router_graphql_url | sed 's|/graphql$||')

setup-env.sh

@@ -16,6 +16,46 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/scripts/utils.sh"
 
+# Help function
+show_help() {
+    cat << EOF
+Usage: $0 [OPTIONS]
+
+Setup Apollo Studio environment for the Apollo Router.
+
+OPTIONS:
+    -h, --help    Show this help message and exit
+
+EXAMPLES:
+    $0              # Setup environment with default settings
+    $0 --help       # Show this help message
+
+DESCRIPTION:
+    This script sets up the Apollo Studio environment by:
+    - Creating router/.env from router/env.example template
+    - Providing instructions for getting Apollo Studio credentials
+    - Only creates the file if it doesn't already exist
+    
+    After setup, you'll need to add your actual Apollo Studio credentials
+    to the router/.env file.
+
+EOF
+    exit 0
+}
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -h|--help)
+            show_help
+            ;;
+        *)
+            echo "Unknown option: $1"
+            show_help
+            ;;
+    esac
+done
+
 ENV_FILE="router/.env"
 TEMPLATE_FILE="router/env.example"
 

setup-minikube.sh

@@ -6,6 +6,45 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/scripts/utils.sh"
 
+# Help function
+show_help() {
+    cat << EOF
+Usage: $0 [OPTIONS]
+
+Setup minikube for Apollo Supergraph deployment.
+
+OPTIONS:
+    -h, --help    Show this help message and exit
+
+EXAMPLES:
+    $0              # Setup minikube with default settings
+    $0 --help       # Show this help message
+
+DESCRIPTION:
+    This script sets up a minikube cluster with:
+    - 4GB memory, 2 CPUs, 20GB disk
+    - Ingress controller enabled
+    - Metrics server enabled
+    
+    After setup, you can run ./run-k8s.sh to deploy the supergraph.
+
+EOF
+    exit 0
+}
+
+# Parse command line arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -h|--help)
+            show_help
+            ;;
+        *)
+            echo "Unknown option: $1"
+            show_help
+            ;;
+    esac
+done
+
 show_script_header "Minikube Setup" "Setting up minikube for Apollo Supergraph deployment"
 
 # Validate required tools