From 19e25f9e0a7ab711711f298d743c225d23cd7789 Mon Sep 17 00:00:00 2001
From: "86.LAK" <lakshan392@gmail.com>
Date: Tue, 30 Apr 2024 19:41:10 +1000
Subject: [PATCH] ammended workflows for easier parsing in of creds

---
 .github/workflows/deploy.yml   | 19 +++++--------------
 .github/workflows/teardown.yml | 22 ++++++----------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 651ab07..28207f7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,14 +3,8 @@ name: Manual AWS Deployment
 on:
   workflow_dispatch:
     inputs:
-      awsAccessKeyId:
-        description: 'AWS Access Key ID'
-        required: true
-      awsSecretAccessKey:
-        description: 'AWS Secret Access Key'
-        required: true
-      awsSessionToken:
-        description: 'AWS Session Token'
+      awsCredentials:
+        description: 'AWS Credentials'
         required: true
 
 jobs:
@@ -28,10 +22,7 @@ jobs:
         
     - name: Deploy to AWS
       run: |
-        echo "::add-mask::${{ github.event.inputs.awsAccessKeyId }}"
-        echo "::add-mask::${{ github.event.inputs.awsSecretAccessKey }}"
-        echo "::add-mask::${{ github.event.inputs.awsSessionToken }}"
-        export AWS_ACCESS_KEY_ID=${{ github.event.inputs.awsAccessKeyId }}
-        export AWS_SECRET_ACCESS_KEY=${{ github.event.inputs.awsSecretAccessKey }}
-        export AWS_SESSION_TOKEN=${{ github.event.inputs.awsSessionToken }}
+        echo "${{ github.event.inputs.awsCredentials }}" > credentials.txt
+        export $(cat credentials.txt | xargs)
+        rm credentials.txt
         ./deploy.sh
\ No newline at end of file
diff --git a/.github/workflows/teardown.yml b/.github/workflows/teardown.yml
index e12334a..f3b0388 100644
--- a/.github/workflows/teardown.yml
+++ b/.github/workflows/teardown.yml
@@ -3,14 +3,8 @@ name: Manual AWS Teardown
 on:
   workflow_dispatch:
     inputs:
-      awsAccessKeyId:
-        description: 'AWS Access Key ID'
-        required: true
-      awsSecretAccessKey:
-        description: 'AWS Secret Access Key'
-        required: true
-      awsSessionToken:
-        description: 'AWS Session Token'
+      awsCredentials:
+        description: 'AWS Credentials'
         required: true
 
 jobs:
@@ -25,14 +19,10 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: 20.x
-
+        
     - name: Teardown to AWS
       run: |
-      run: |
-        echo "::add-mask::${{ github.event.inputs.awsAccessKeyId }}"
-        echo "::add-mask::${{ github.event.inputs.awsSecretAccessKey }}"
-        echo "::add-mask::${{ github.event.inputs.awsSessionToken }}"
-        export AWS_ACCESS_KEY_ID=${{ github.event.inputs.awsAccessKeyId }}
-        export AWS_SECRET_ACCESS_KEY=${{ github.event.inputs.awsSecretAccessKey }}
-        export AWS_SESSION_TOKEN=${{ github.event.inputs.awsSessionToken }}
+        echo "${{ github.event.inputs.awsCredentials }}" > credentials.txt
+        export $(cat credentials.txt | xargs)
+        rm credentials.txt
         ./teardown.sh
\ No newline at end of file