From bf6a83ddbee6c3989991d7f146b49688703edf2a Mon Sep 17 00:00:00 2001
From: Thirumalesh Aaraveti <97395760+athiruma@users.noreply.github.com>
Date: Wed, 19 Jul 2023 00:00:25 +0530
Subject: [PATCH] Added concurrency feature to main.yml (#639)

---
 .github/workflows/Build.yml                              | 4 ++++
 jenkins/clouds/aws/daily/org_cost_explorer/Jenkinsfile   | 2 +-
 .../aws/daily/org_cost_explorer/run_org_upload_es.py     | 9 +++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 75c72296..4544a957 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -7,6 +7,10 @@ on:
   push:
     branches: [ main ]
 
+concurrency:
+  group: merge-queue
+  cancel-in-progress: false
+
 jobs:
   unittest:
     name: unittest
diff --git a/jenkins/clouds/aws/daily/org_cost_explorer/Jenkinsfile b/jenkins/clouds/aws/daily/org_cost_explorer/Jenkinsfile
index dddb7545..5ccc1b1e 100644
--- a/jenkins/clouds/aws/daily/org_cost_explorer/Jenkinsfile
+++ b/jenkins/clouds/aws/daily/org_cost_explorer/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
         COST_CENTER_OWNER = credentials('cloud-governance-cost-center-owner')
         REPLACE_ACCOUNT_NAME = credentials('cloud-governance-replace-account-names')
         PAYER_SUPPORT_FEE_CREDIT = credentials('cloud-governance-aws-payer-support-fee-credit')
-        AWS_SECRET_ACCESS_KEY_DELETE_ATHIRUMA_BOT = credentials('AWS_SECRET_ACCESS_KEY_DELETE_ATHIRUMA_BOT')
+        AWS_SECRET_ACCESS_KEY_ATHIRUMA_BOT = credentials('AWS_SECRET_ACCESS_KEY_ATHIRUMA_BOT')
         AWS_ACCESS_KEY_ID_ATHIRUMA_BOT = credentials('AWS_ACCESS_KEY_ID_ATHIRUMA_BOT')
         S3_RESULTS_PATH = credentials('S3_RESULTS_PATH')
         ATHENA_DATABASE_NAME = credentials('ATHENA_DATABASE_NAME')
diff --git a/jenkins/clouds/aws/daily/org_cost_explorer/run_org_upload_es.py b/jenkins/clouds/aws/daily/org_cost_explorer/run_org_upload_es.py
index 892064be..f9660ccc 100644
--- a/jenkins/clouds/aws/daily/org_cost_explorer/run_org_upload_es.py
+++ b/jenkins/clouds/aws/daily/org_cost_explorer/run_org_upload_es.py
@@ -13,12 +13,12 @@
 REPLACE_ACCOUNT_NAME = os.environ['REPLACE_ACCOUNT_NAME']
 PAYER_SUPPORT_FEE_CREDIT = os.environ['PAYER_SUPPORT_FEE_CREDIT']
 AWS_ACCESS_KEY_ID_ATHIRUMA_BOT = os.environ['AWS_ACCESS_KEY_ID_ATHIRUMA_BOT']
-AWS_SECRET_ACCESS_KEY_DELETE_ATHIRUMA_BOT = os.environ['AWS_SECRET_ACCESS_KEY_DELETE_ATHIRUMA_BOT']
+AWS_SECRET_ACCESS_KEY_ATHIRUMA_BOT = os.environ['AWS_SECRET_ACCESS_KEY_ATHIRUMA_BOT']
 S3_RESULTS_PATH = os.environ['S3_RESULTS_PATH']
 ATHENA_DATABASE_NAME = os.environ['ATHENA_DATABASE_NAME']
 ATHENA_TABLE_NAME = os.environ['ATHENA_TABLE_NAME']
 
-print("Updating the Org level cost billing reports")
+os.system('echo "Updating the Org level cost billing reports"')
 
 # Cost Explorer upload to ElasticSearch
 cost_metric = 'UnblendedCost'  # UnblendedCost/BlendedCost
@@ -35,8 +35,9 @@
 
 os.system('echo "Run the Spot Analysis report over the account using AWS Athena"')
 os.system(f"""podman run --rm --name cloud-governance -e policy="spot_savings_analysis" -e account="pnt-payer" \
--e AWS_ACCESS_KEY_ID="{AWS_ACCESS_KEY_ID_ATHIRUMA_BOT}" -e AWS_SECRET_ACCESS_KEY=" \
-{AWS_SECRET_ACCESS_KEY_DELETE_ATHIRUMA_BOT}" -e es_host="{ES_HOST}" -e es_port="{ES_PORT}" \
+-e AWS_ACCESS_KEY_ID="{AWS_ACCESS_KEY_ID_ATHIRUMA_BOT}" \
+-e AWS_SECRET_ACCESS_KEY="{AWS_SECRET_ACCESS_KEY_ATHIRUMA_BOT}" \
+-e es_host="{ES_HOST}" -e es_port="{ES_PORT}" \
 -e es_index="cloud-governance-clouds-billing-reports" \
 -e S3_RESULTS_PATH="{S3_RESULTS_PATH}" \
 -e ATHENA_DATABASE_NAME="{ATHENA_DATABASE_NAME}" \