From fbe9d3701b49b5bda4cb3470f8375aa22ae527df Mon Sep 17 00:00:00 2001
From: lenape <jacquesingram.online>
Date: Tue, 5 Aug 2025 20:17:34 +0000
Subject: [PATCH] automated terminal push

---
 infrastructure/services/Jenkinsfile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/infrastructure/services/Jenkinsfile b/infrastructure/services/Jenkinsfile
index 9d05d5e..ccc4c7d 100644
--- a/infrastructure/services/Jenkinsfile
+++ b/infrastructure/services/Jenkinsfile
@@ -121,7 +121,7 @@ pipeline {
                         secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'],
                         string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'),
                         string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION')
-                    ])
+                    ]) {
                         sh '''
                             echo "AWS CLI version:"
                             aws --version
@@ -241,7 +241,7 @@ with app.test_client() as client:
                     secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'],
                     string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'),
                     string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION')
-                ])
+                ]) {
                     script {
                         sh '''
                             echo "=== Docker Build & Push ==="
@@ -345,7 +345,7 @@ EOF
                         secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'],
                         string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'),
                         string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION')
-                    ])
+                    ]) {
                         script {
                             sh '''
                                 echo "=== Terraform Initialization ==="
@@ -411,7 +411,7 @@ EOF
                         secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'],
                         string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'),
                         string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION')
-                    ])
+                    ]) {
                         script {
                             sh '''
                                 echo "=== Terraform Plan ==="
@@ -616,22 +616,21 @@ EOF
                                 submitterParameter: 'DESTROYER'
                             )
                             
-                            sh '''
+                            sh """
                                 echo "=== Terraform Destroy ==="
-                                echo "🔥 Approved by: ''' + approver + '''"
+                                echo "🔥 Approved by: ${approver}"
                                 
                                 # Initialize if needed
                                 terraform init
                                 
                                 # Destroy
                                 terraform destroy -auto-approve \
-                                    -var="project_name=${PROJECT_NAME}" \
-                                    -var="environment=${ENVIRONMENT}" \
-                                    -var="aws_region=$AWS_REGION"
+                                    -var="project_name=\${PROJECT_NAME}" \
+                                    -var="environment=\${ENVIRONMENT}" \
+                                    -var="aws_region=\$AWS_REGION"
                                 
                                 echo "💥 Infrastructure destroyed"
-                            '''
-                        }
+                            """                        }
                     }
                 }
             }