From 2a4f45432c3e1c5795963b4489c1b1eb4519983c Mon Sep 17 00:00:00 2001 From: lenape Date: Tue, 5 Aug 2025 19:37:59 +0000 Subject: [PATCH] automated terminal push --- infrastructure/services/Jenkinsfile | 90 +++++++++++++++++++---------- 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/infrastructure/services/Jenkinsfile b/infrastructure/services/Jenkinsfile index d622a48..9d05d5e 100644 --- a/infrastructure/services/Jenkinsfile +++ b/infrastructure/services/Jenkinsfile @@ -37,6 +37,7 @@ pipeline { environment { PROJECT_NAME = 'nvhi-atsila-microservice' AWS_CREDENTIALS = 'aws-ci' + AWS_ACCOUNT_ID_CREDENTIAL = 'AWS_ACCOUNT_ID' AWS_REGION_CREDENTIAL = 'AWS_REGION' SONAR_PROJECT_KEY = 'nvhi-atsila-microservice-services' DOCKER_BUILDKIT = '1' @@ -114,10 +115,13 @@ pipeline { // Verify AWS credentials withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') - ]) { + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + 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 @@ -231,10 +235,13 @@ with app.test_client() as client: } steps { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') - ]) { + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + 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 ===" @@ -294,9 +301,12 @@ with app.test_client() as client: steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'], + string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'), + string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION') ]) { script { sh ''' @@ -329,10 +339,13 @@ EOF steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') - ]) { + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + 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 ===" @@ -392,10 +405,13 @@ EOF steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') - ]) { + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + 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 ===" @@ -469,9 +485,12 @@ EOF steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'], + string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'), + string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION') ]) { script { sh ''' @@ -503,9 +522,12 @@ EOF steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'], + string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'), + string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION') ]) { script { sh ''' @@ -580,9 +602,12 @@ EOF steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'], + string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'), + string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION') ]) { script { def approver = input( @@ -619,9 +644,12 @@ EOF steps { dir('infrastructure/services') { withCredentials([ - string(credentialsId: env.AWS_CREDENTIALS, variable: 'AWS_ACCESS_KEY_ID'), - string(credentialsId: 'aws-secret', variable: 'AWS_SECRET_ACCESS_KEY'), - string(credentialsId: env.AWS_REGION_CREDENTIAL, variable: 'AWS_REGION') + [$class: 'AmazonWebServicesCredentialsBinding', + credentialsId: 'aws-ci', + accessKeyVariable: 'AWS_ACCESS_KEY_ID', + secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'], + string(credentialsId: 'AWS_ACCOUNT_ID', variable: 'AWS_ACCOUNT_ID'), + string(credentialsId: 'AWS_REGION', variable: 'AWS_REGION') ]) { script { sh '''