Added push to trigger

Author: git-user-9

.github/workflows/deploy.yml

@@ -6,7 +6,6 @@ on:
       - devops/a3
     tags:
       - deploy-dev
-      - deploy-qa
       - deploy-prod
 
   workflow_dispatch:
@@ -18,7 +17,6 @@ on:
         type: choice
         options:
           - dev
-          - qa
           - prod
 
 env:
@@ -47,23 +45,21 @@ jobs:
     - name: Setup Terraform
       uses: hashicorp/setup-terraform@v3
 
-    # Determin Stage - dev/prod/qa defaults to dev
-    # - name: Determine Stage
-    #   id: set_stage
-    #   run: |
-    #     if [[ "${GITHUB_REF}" == "refs/tags/deploy-dev" ]]; then
-    #       echo "STAGE=dev" >> $GITHUB_ENV
-    #     elif [[ "${GITHUB_REF}" == "refs/tags/deploy-qa" ]]; then
-    #       echo "STAGE=qa" >> $GITHUB_ENV
-    #     elif [[ "${GITHUB_REF}" == "refs/tags/deploy-prod" ]]; then
-    #       echo "STAGE=prod" >> $GITHUB_ENV
-    #     elif [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
-    #       echo "STAGE=${{ github.event.inputs.stage }}" >> $GITHUB_ENV
-    #     else
-    #       echo "STAGE=dev" >> $GITHUB_ENV  # default fallback
-    #     fi
-
-    #     echo "🛠️ Deployment stage: $STAGE"
+    #Determine Stage - dev/prod defaults to dev
+    - name: Determine Stage
+      id: set_stage
+      run: |
+        if [[ "${GITHUB_REF}" == "refs/tags/deploy-dev" ]]; then
+          echo "STAGE=dev" >> $GITHUB_ENV
+        elif [[ "${GITHUB_REF}" == "refs/tags/deploy-prod" ]]; then
+          echo "STAGE=prod" >> $GITHUB_ENV
+        elif [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
+          echo "STAGE=${{ github.event.inputs.stage }}" >> $GITHUB_ENV
+        else
+          echo "STAGE=dev" >> $GITHUB_ENV  # default fallback
+        fi
+
+        echo "🛠️ Deployment stage: $STAGE"
 
     # Terraform Init & Workspace
     - name: Terraform Init & Workspace
@@ -87,6 +83,8 @@ jobs:
         # echo "INSTANCE_IP=$(terraform output -raw instance_public_ip)" >> $GITHUB_ENV
         # echo "VERIFIER_IP=$(terraform output -raw verifier_instance_public_ip)" >> $GITHUB_ENV
         # echo "S3_BUCKET=$(terraform output -raw s3_log_bucket)" >> $GITHUB_ENV
+
+
         # Assign to local shell variables
         INSTANCE_IP=$(terraform output -raw instance_public_ip)
         VERIFIER_IP=$(terraform output -raw verifier_instance_public_ip)
@@ -112,9 +110,12 @@ jobs:
     # Validate App Health
     - name: Validate App Health
       run: |
+        echo -e "\n📦 Full Response from App:\n"
+        curl -s http://${{ env.INSTANCE_IP }}:80 || echo "❌ Failed to get response"
+        echo -e "\n"
         echo "Checking app health at http://${{ env.INSTANCE_IP }}:80"
         for i in {1..10}; do
-          STATUS=$(curl -o /dev/null -s -w "%{http_code}" http://$INSTANCE_IP:80)
+          STATUS=$(curl -o /dev/null -s -w "%{http_code}" http://${{ env.INSTANCE_IP }}:80)
           if [[ "$STATUS" == "200" ]]; then
             echo "✅ App is healthy (HTTP 200)"
             exit 0
@@ -126,19 +127,16 @@ jobs:
         echo "❌ App failed health check"
         exit 1
 
-        echo -e "\n📦 Full Response from App:\n"
-        curl -s http://${{ env.INSTANCE_IP }}:80 || echo "❌ Failed to get response"
-        echo -e "\n"
 
     # Verify Logs in S3
     - name: Verify Logs in S3
       run: |
         echo "📦 Checking for logs in S3 bucket: $S3_BUCKET"
-        aws s3 ls s3://$S3_BUCKET/system/cloud-init.log || { echo "❌ system logs missing"; exit 1; }
-        aws s3 ls s3://$S3_BUCKET/app/my-app.log || { echo "❌ app logs missing"; exit 1; }
+        aws s3 ls s3://$S3_BUCKET/${{ github.event.inputs.stage }}/system/cloud-init.log || { echo "❌ system logs missing"; exit 1; }
+        aws s3 ls s3://$S3_BUCKET/${{ github.event.inputs.stage }}/app/my-app.log || { echo "❌ app logs missing"; exit 1; }
         echo "✅ Logs found in S3 bucket"
 
-    # Destroy (disabled by default)
+    # Destroy (automatically always to avoid manual deletion)
     - name: Destroy infrastructure
       if: always() 
       working-directory: ${{ env.TF_WORKING_DIR }}

scripts/dev_script.sh

@@ -30,8 +30,8 @@ nohup java -jar target/*.jar --server.port=80 > /var/log/my-app.log 2>&1 &
 sleep 5
 
 # Upload Logs to S3
-sudo aws s3 cp /var/log/cloud-init.log s3://${s3_bucket_name}/system/
-sudo aws s3 cp /var/log/my-app.log s3://${s3_bucket_name}/app/
+sudo aws s3 cp /var/log/cloud-init.log s3://${s3_bucket_name}/dev/system/
+sudo aws s3 cp /var/log/my-app.log s3://${s3_bucket_name}/dev/app/
 
 # Shutdown after timeout
 sudo shutdown -h +${shutdown_minutes}

scripts/prod_script.sh

@@ -29,8 +29,8 @@ nohup java -jar target/*.jar --server.port=80 > /var/log/my-app.log 2>&1 &
 sleep 5
 
 # Upload Logs to S3
-aws s3 cp /var/log/cloud-init.log s3://${s3_bucket_name}/system/
-aws s3 cp /var/log/my-app.log s3://${s3_bucket_name}/app/
+aws s3 cp /var/log/cloud-init.log s3://${s3_bucket_name}/prod/system/
+aws s3 cp /var/log/my-app.log s3://${s3_bucket_name}/prod/app/
 
 # Shutdown after timeout
 sudo shutdown -h +${shutdown_minutes}

terraform/dev_config.tfvars

@@ -1,7 +1,7 @@
 instance_type = "t2.micro"
 key_name      = "ssh-key-ec2" #change this to your key-pair name
 # ami_id            = "ami-0f918f7e67a3323f0"
-stage             = "Dev"
+stage             = "dev"
 shutdown_minutes  = 30
 s3_bucket_name    = "techeazy-logs-dev-unique123ss" # Change this!
 aws_region        = "ap-south-1"

terraform/prod_config.tfvars

@@ -3,7 +3,7 @@ key_name      = "ssh-key-ec2" #change this to your key-pair name
 # ami_id            = "ami-0f918f7e67a3323f0"
 stage             = "prod"
 shutdown_minutes  = 25
-s3_bucket_name    = "techeazy-logs-dev-unique123ss" # Change this!
+s3_bucket_name    = "techeazy-logs-prod-unique123ss" # Change this!
 aws_region        = "ap-south-1"
 repo_url          = "https://github.com/techeazy-consulting/techeazy-devops"
 verifier_lifetime = 25