From c937e92cf0f04106990fef41a2298f12116a5097 Mon Sep 17 00:00:00 2001
From: Lachlan Hurst <lachlan.hurst@gmail.com>
Date: Mon, 20 May 2024 16:19:57 +1000
Subject: [PATCH] ci; tidy up

---
 .github/workflows/build-on-push.yml     |  8 +++----
 .github/workflows/build-push-to-ecr.yml | 28 ++++++++++---------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-on-push.yml b/.github/workflows/build-on-push.yml
index 54a4f7e..df7ad70 100644
--- a/.github/workflows/build-on-push.yml
+++ b/.github/workflows/build-on-push.yml
@@ -12,8 +12,8 @@ jobs:
     with:
       path: server
       image-name: ausseabed-staging-sct-api
-      aws-region: ap-southeast-2
-      aws-account-id: 288871573946
     secrets:
-      AWS_ACCESS_KEY_ID: ${{ secrets.STAGING_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_SECRET_ACCESS_KEY }}
+      aws-access-key-id: ${{ secrets.STAGING_ACCESS_KEY_ID }}
+      aws-secret-access-key: ${{ secrets.STAGING_SECRET_ACCESS_KEY }}
+      aws-region: ${{ secrets.STAGING_AWS_REGION }}
+      aws-account-id: ${{ secrets.STAGING_AWS_ACCOUNT_ID }}
diff --git a/.github/workflows/build-push-to-ecr.yml b/.github/workflows/build-push-to-ecr.yml
index 9236f1f..d2b1f9f 100644
--- a/.github/workflows/build-push-to-ecr.yml
+++ b/.github/workflows/build-push-to-ecr.yml
@@ -11,22 +11,16 @@ on:
       image-name:
         required: true
         type: string
-      aws-region:
+    secrets:
+      aws-access-key-id:
         required: true
-        type: string
-      aws-account-id:
+      aws-secret-access-key:
         required: true
-        type: string
-    secrets:
-      AWS_ACCESS_KEY_ID:
+      aws-region:
         required: true
-      AWS_SECRET_ACCESS_KEY:
+      aws-account-id:
         required: true
 
-env:
-  AWS_REGION: ${{ inputs.aws-region }}
-  AWS_ACCOUNT_ID: ${{ inputs.aws-account-id }}
-
 jobs:
   build-and-push:
     name: Build Docker image and push to ECR
@@ -71,17 +65,17 @@ jobs:
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v1
       with: 
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: ${{ inputs.aws-region }}
+        aws-access-key-id: ${{ secrets.aws-access-key-id }}
+        aws-secret-access-key: ${{ secrets.aws-secret-access-key }}
+        aws-region: ${{ secrets.aws-region }}
     
     - name: Login to Amazon ECR
       id: login-ecr
-      run: aws ecr get-login-password --region ${{ inputs.aws-region }} | docker login --username AWS --password-stdin ${{ inputs.aws-account-id }}.dkr.ecr.${{ inputs.aws-region }}.amazonaws.com
+      run: aws ecr get-login-password --region ${{ secrets.aws-region }} | docker login --username AWS --password-stdin ${{ secrets.aws-account-id }}.dkr.ecr.${{ secrets.aws-region }}.amazonaws.com
 
     - name: Tag and Push Docker image to ECR
       env: 
         NEW_TAG: ${{ steps.tag_docker_image.outputs.NEW_TAG }}
       run: |
-        docker tag ${{ inputs.image-name }}:${NEW_TAG} ${{ inputs.aws-account-id }}.dkr.ecr.${{ inputs.aws-region }}.amazonaws.com/${{ inputs.image-name }}:${NEW_TAG}
-        docker push ${{ inputs.aws-account-id }}.dkr.ecr.${{ inputs.aws-region }}.amazonaws.com/${{ inputs.image-name }}:${NEW_TAG}
\ No newline at end of file
+        docker tag ${{ inputs.image-name }}:${NEW_TAG} ${{ secrets.aws-account-id }}.dkr.ecr.${{ secrets.aws-region }}.amazonaws.com/${{ inputs.image-name }}:${NEW_TAG}
+        docker push ${{ secrets.aws-account-id }}.dkr.ecr.${{ secrets.aws-region }}.amazonaws.com/${{ inputs.image-name }}:${NEW_TAG}
\ No newline at end of file