fix cleanup script

Author: thomast1906

scripts/cleanup-all.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # DevOps The Hard Way - Azure - Cleanup Script
-# This script destroys all resources created by the deployment
+# This script deletes the resource groups which removes all resources
 
 set -e  # Exit on any error
 
@@ -13,147 +13,80 @@ BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
 # Configuration
-PROJECT_NAME="${PROJECT_NAME:-devopsthehardwayjuly25}"
+PROJECT_NAME="${PROJECT_NAME:-devopsthehardway}"
 LOCATION="${LOCATION:-uksouth}"
 RESOURCE_GROUP="${PROJECT_NAME}-rg"
 TERRAFORM_RG="${PROJECT_NAME}-terraform-rg"
 
 echo -e "${RED}🗑️  DevOps The Hard Way - Azure - CLEANUP${NC}"
-echo -e "${RED}⚠️  WARNING: This will DELETE ALL resources created by this project!${NC}"
+echo -e "${RED}⚠️  WARNING: This will DELETE ALL resources by removing resource groups!${NC}"
 echo -e "${YELLOW}Project: ${PROJECT_NAME}${NC}"
-echo -e "${YELLOW}Location: ${LOCATION}${NC}"
+echo -e "${YELLOW}Resource Groups to Delete:${NC}"
+echo -e "${YELLOW}  • ${RESOURCE_GROUP}${NC}"
+echo -e "${YELLOW}  • ${PROJECT_NAME}-node-rg${NC}"
+echo -e "${YELLOW}  • ${TERRAFORM_RG} (optional)${NC}"
 echo ""
 
 # Confirmation prompt
-read -p "Are you sure you want to delete all resources? Type 'DELETE' to confirm: " confirmation
+read -p "Are you sure you want to delete all resource groups? Type 'DELETE' to confirm: " confirmation
 if [ "$confirmation" != "DELETE" ]; then
     echo -e "${GREEN}✅ Cleanup cancelled${NC}"
     exit 0
 fi
 
 echo ""
-echo -e "${RED}🗑️  Starting cleanup process...${NC}"
-
-# Function to print step headers
-print_step() {
-    echo -e "${YELLOW}📋 Step $1: $2${NC}"
-    echo "----------------------------------------"
-}
+echo -e "${RED}🗑️  Starting resource group deletion...${NC}"
 
 # Check if logged into Azure
 if ! az account show &> /dev/null; then
     echo -e "${RED}❌ Not logged into Azure. Please login first.${NC}"
     az login
 fi
 
-print_step "1" "Cleaning up Kubernetes resources"
-if kubectl config current-context &> /dev/null; then
-    echo -e "${YELLOW}📋 Deleting application deployment...${NC}"
-    kubectl delete -f ../4-kubernetes_manifest/deployment.yml --ignore-not-found=true
-    
-    echo -e "${YELLOW}📋 Deleting gateway resources...${NC}"
-    kubectl delete gateway gateway-01 -n thomasthorntoncloud --ignore-not-found=true
-    kubectl delete httproute traffic-thomasthorntoncloud -n thomasthorntoncloud --ignore-not-found=true
-    
-    echo -e "${YELLOW}📋 Deleting ALB Controller...${NC}"
-    helm uninstall alb-controller -n azure-alb-system --ignore-not-found
-    kubectl delete namespace azure-alb-system --ignore-not-found=true
-    kubectl delete namespace thomasthorntoncloud --ignore-not-found=true
-    
-    echo -e "${GREEN}✅ Kubernetes resources cleaned up${NC}"
-else
-    echo -e "${YELLOW}⚠️  No Kubernetes context found, skipping Kubernetes cleanup${NC}"
-fi
-echo ""
-
-print_step "2" "Cleaning up Resource Groups (All Infrastructure)"
-echo -e "${BLUE}ℹ️  Deleting resource groups will remove ALL resources including Terraform-managed infrastructure${NC}"
-echo -e "${YELLOW}📋 Deleting main resource group...${NC}"
+echo -e "${YELLOW}📋 Deleting main resource group: ${RESOURCE_GROUP}${NC}"
 az group delete --name "$RESOURCE_GROUP" --yes --no-wait 2>/dev/null || echo -e "${YELLOW}⚠️  Resource group may not exist${NC}"
 
-echo -e "${YELLOW}📋 Deleting AKS node resource group...${NC}"
+echo -e "${YELLOW}📋 Deleting AKS node resource group: ${PROJECT_NAME}-node-rg${NC}"
 az group delete --name "${PROJECT_NAME}-node-rg" --yes --no-wait 2>/dev/null || echo -e "${YELLOW}⚠️  Node resource group may not exist${NC}"
 
+# Optional: Delete Terraform state storage
 echo ""
-
-print_step "3" "Cleaning up Terraform State Files (Optional)"
-echo -e "${YELLOW}⚠️  Do you want to clean up local Terraform state files?${NC}"
-echo -e "${YELLOW}This will remove .terraform directories and state files from all modules${NC}"
-read -p "Clean up Terraform state files locally? (y/N): " clean_tf_state
-
-if [[ "$clean_tf_state" =~ ^[Yy]$ ]]; then
-    echo -e "${YELLOW}📋 Cleaning up Terraform state files...${NC}"
-    find ../2-Terraform-AZURE-Services-Creation -name ".terraform" -type d -exec rm -rf {} + 2>/dev/null || true
-    find ../2-Terraform-AZURE-Services-Creation -name "terraform.tfstate*" -type f -delete 2>/dev/null || true
-    find ../2-Terraform-AZURE-Services-Creation -name "tfplan" -type f -delete 2>/dev/null || true
-    echo -e "${GREEN}✅ Local Terraform state files cleaned up${NC}"
-else
-    echo -e "${BLUE}ℹ️  Local Terraform state files preserved${NC}"
-fi
-
-echo ""
-
-print_step "4" "Cleaning up Terraform Remote State Storage (Optional)"
 echo -e "${YELLOW}⚠️  Do you want to delete the Terraform state storage as well?${NC}"
-echo -e "${YELLOW}This will remove: ${TERRAFORM_RG} resource group and ${PROJECT_NAME}tfstate storage account${NC}"
+echo -e "${YELLOW}This will remove: ${TERRAFORM_RG}${NC}"
 read -p "Delete Terraform state storage? (y/N): " delete_state
 
 if [[ "$delete_state" =~ ^[Yy]$ ]]; then
-    echo -e "${YELLOW}📋 Deleting Terraform state storage...${NC}"
+    echo -e "${YELLOW}📋 Deleting Terraform state resource group: ${TERRAFORM_RG}${NC}"
     az group delete --name "$TERRAFORM_RG" --yes --no-wait 2>/dev/null || echo -e "${YELLOW}⚠️  Terraform state resource group may not exist${NC}"
     echo -e "${GREEN}✅ Terraform state storage cleanup initiated${NC}"
 else
     echo -e "${BLUE}ℹ️  Terraform state storage preserved${NC}"
 fi
 
 echo ""
-
-print_step "5" "Cleaning up Local Docker Images (Optional)"
-echo -e "${YELLOW}⚠️  Do you want to clean up local Docker images?${NC}"
-read -p "Remove local Docker images for this project? (y/N): " clean_docker
-
-if [[ "$clean_docker" =~ ^[Yy]$ ]]; then
-    echo -e "${YELLOW}📋 Removing local Docker images...${NC}"
-    docker rmi "${PROJECT_NAME}azurecr.azurecr.io/thomasthorntoncloud:v2" 2>/dev/null || echo -e "${YELLOW}⚠️  Image may not exist locally${NC}"
-    docker rmi "${PROJECT_NAME}azurecr.azurecr.io/thomasthorntoncloud:v1" 2>/dev/null || echo -e "${YELLOW}⚠️  Image may not exist locally${NC}"
-    echo -e "${GREEN}✅ Local Docker images cleaned up${NC}"
-else
-    echo -e "${BLUE}ℹ️  Local Docker images preserved${NC}"
-fi
-
-echo ""
-
-print_step "6" "Cleanup Summary"
-echo -e "${GREEN}✅ Cleanup process completed!${NC}"
+echo -e "${GREEN}✅ Resource group deletion initiated!${NC}"
 echo ""
-echo -e "${BLUE}📋 What was cleaned up:${NC}"
-echo "• Kubernetes deployments, services, and namespaces"
-echo "• ALB Controller and Gateway resources"
-echo "• ALL Azure resources via resource group deletion:"
-echo "  - AKS cluster and all associated resources"
+echo -e "${BLUE}📋 What's being deleted:${NC}"
+echo "• Main resource group: $RESOURCE_GROUP"
+echo "  - AKS cluster and all nodes"
 echo "  - Virtual Network and subnets"
 echo "  - Log Analytics workspace"
 echo "  - Azure Container Registry"
-echo "  - Load balancers, public IPs, and networking"
-echo "• Resource groups (deletion in progress)"
-if [[ "$clean_tf_state" =~ ^[Yy]$ ]]; then
-    echo "• Local Terraform state files and directories"
-fi
+echo "  - Load balancers and public IPs"
+echo "  - All networking components"
+echo "• AKS node resource group: ${PROJECT_NAME}-node-rg"
+echo "  - AKS node VMs and disks"
+echo "  - Load balancers and networking"
 if [[ "$delete_state" =~ ^[Yy]$ ]]; then
-    echo "• Terraform state storage (deletion in progress)"
-fi
-if [[ "$clean_docker" =~ ^[Yy]$ ]]; then
-    echo "• Local Docker images"
+    echo "• Terraform state storage: $TERRAFORM_RG"
 fi
 
 echo ""
 echo -e "${BLUE}📋 Notes:${NC}"
 echo "• Resource group deletions are running in the background"
 echo "• It may take 10-15 minutes for all resources to be fully removed"
-echo "• Deleting resource groups is faster than individual Terraform destroys"
+echo "• Check deletion progress: az group list --query \"[?contains(name,'$PROJECT_NAME')]\""
 echo "• Check Azure Portal to confirm all resources are deleted"
-echo "• Azure AD groups and service principals may need manual cleanup"
-echo "• Terraform state files preserved locally unless you chose to clean them"
 
 echo ""
 echo -e "${GREEN}🎉 DevOps The Hard Way - Azure cleanup completed!${NC}"