testing workflows 1

Author: git-user-9

scripts/deploy.sh

@@ -1,104 +1,92 @@
 #!/bin/bash
 
-set -e  # Exit on error
 
-# Check for environment argument
+# ----------------------------
+# ✅ Input Validation
+# ----------------------------
 if [ -z "$1" ]; then
   echo "[Error] Usage: $0 <environment>"
   exit 1
 fi
 
-# ----------------------------
-# ✅ Path Setup
-# ----------------------------
 ENV="$1"
 ENV_LOWER=$(echo "$ENV" | tr '[:upper:]' '[:lower:]')
 
+# ----------------------------
+# ✅ Paths
+# ----------------------------
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 ROOT_DIR="$(realpath "$SCRIPT_DIR/..")"
 TERRAFORM_DIR="$ROOT_DIR/terraform"
 LOGS_DIR="$ROOT_DIR/mylogs"
 CONFIG_FILE="${ENV_LOWER}_config.tfvars"
 
 # ----------------------------
-# ✅ Terraform Apply
+# ✅ Terraform: App EC2
 # ----------------------------
-cd "$TERRAFORM_DIR" || {
-  echo "[Error] Failed to change directory to Terraform folder."
-  exit 1
-}
-
+cd "$TERRAFORM_DIR"
 echo "[+] Initializing Terraform..."
 terraform init
 
-echo "[+] Applying configuration for environment: $ENV"
+echo "[+] Applying config for environment: $ENV"
 terraform apply -var-file="$CONFIG_FILE" -auto-approve
 
-echo "[+] Waiting 30 seconds for app to deploy in EC2 instance..."
+echo "[+] Waiting for EC2 instance to boot..."
 sleep 30
 
 RAW_INSTANCE_IP=$(terraform output -raw instance_public_ip)
 echo "[+] Instance Public IP: $RAW_INSTANCE_IP"
 
-echo -e "\n[+] Testing app on http://$RAW_INSTANCE_IP:80\n"
-curl "http://$RAW_INSTANCE_IP:80"
-echo -e "\n"
+echo "[+] Testing app at: http://$RAW_INSTANCE_IP"
+curl -s "http://$RAW_INSTANCE_IP:80" || echo "[Warning] App not responding yet."
 
 # ----------------------------
-# ✅ Deploy Log Verifier EC2
+# ✅ Terraform: Log Verifier EC2
 # ----------------------------
-echo "[+] Deploying Log Verification EC2 instance..."
+echo "[+] Deploying log verifier EC2..."
 terraform apply -var-file="$CONFIG_FILE" -target=aws_instance.log_verifier -auto-approve
 
 VERIFIER_IP=$(terraform output -raw verifier_instance_public_ip)
-echo "[+] Verified Public IP: $VERIFIER_IP"
+echo "[+] Verifier Public IP: $VERIFIER_IP"
 
 # ----------------------------
 # ✅ Wait for Logs to Sync
 # ----------------------------
-echo "[+] Waiting 100 seconds for log sync (S3 → EC2)..."
+echo "[+] Waiting 100s for EC2-2 to sync logs from S3..."
 sleep 100
 
 # ----------------------------
-# ✅ Setup SSH Key Path
+# ✅ Setup SSH Key
 # ----------------------------
 if [ -n "$GITHUB_ACTIONS" ]; then
   PRIVATE_KEY_PATH="$ROOT_DIR/ec2_key.pem"
 else
-  PRIVATE_KEY_PATH="/Users/default/CS/DevOps/AWS/ssh-key-ec2.pem"  # Change for your local setup
+  PRIVATE_KEY_PATH="$HOME/.ssh/your-local-ec2-key.pem"  # Change this locally
 fi
 
 # ----------------------------
-# ✅ SCP Logs from Verifier EC2
+# ✅ Pull Logs from Verifier EC2
 # ----------------------------
-echo "[+] Checking SSH access..."
+echo "[+] Checking SSH connection..."
 ssh -i "$PRIVATE_KEY_PATH" -o StrictHostKeyChecking=no -q ubuntu@$VERIFIER_IP "echo 'SSH OK'" || {
-  echo "[❌] SSH failed. Check key or user."
+  echo "[❌] SSH connection failed!"
   exit 1
 }
 
-echo "[+] Pulling logs to: $LOGS_DIR"
+echo "[+] Pulling logs from EC2-2..."
 mkdir -p "$LOGS_DIR"
 scp -i "$PRIVATE_KEY_PATH" -o StrictHostKeyChecking=no -r ubuntu@$VERIFIER_IP:/mylogs/* "$LOGS_DIR/"
 
 # ----------------------------
-# ✅ Re-Test Application (optional)
+# ✅ Re-test app (Optional)
 # ----------------------------
-echo "[+] Retesting application..."
-curl "http://$RAW_INSTANCE_IP:80"
-echo -e "\n"
+echo "[+] Rechecking application availability..."
+curl -s "http://$RAW_INSTANCE_IP:80" || echo "[Warning] App still not responding."
 
 # ----------------------------
-# ✅ GitHub Output Export
+# ✅ Export Outputs to GitHub Actions
 # ----------------------------
 if [ -n "$GITHUB_ACTIONS" ]; then
   echo "verifier_ip=$VERIFIER_IP" >> "$GITHUB_OUTPUT"
   echo "instance_ip=$RAW_INSTANCE_IP" >> "$GITHUB_OUTPUT"
 fi
-
-# ----------------------------
-# ❌ Destroy Step (Optional)
-# ----------------------------
-# echo "Terraform destroy will run after 5 minutes..."
-# sleep 120
-# terraform destroy -var-file="$CONFIG_FILE" -auto-approve