From d1b22d2bd87958fad9f1f5d6105178230670ce72 Mon Sep 17 00:00:00 2001
From: Phil Snyder <subfivemile@gmail.com>
Date: Thu, 14 Nov 2024 11:40:22 -0800
Subject: [PATCH] upgrade to v2 of ecr login action

---
 .github/workflows/upload-and-deploy.yaml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/upload-and-deploy.yaml b/.github/workflows/upload-and-deploy.yaml
index ea8b877..f4357be 100755
--- a/.github/workflows/upload-and-deploy.yaml
+++ b/.github/workflows/upload-and-deploy.yaml
@@ -193,14 +193,9 @@ jobs:
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v1
+        with:
+          mask-password: 'false'
 
-      - name: Get ECR secret names
-        id: ecr
-        run: |
-          usernameKey=docker_username_$(echo ${{ steps.login-ecr.outputs.registry }} | tr '.-' _)
-          echo "username-key=$usernameKey" >> $GITHUB_OUTPUT
-          passwordKey=docker_password_$(echo ${{ steps.login-ecr.outputs.registry }} | tr '.-' _)
-          echo "password-key=$passwordKey" >> $GITHUB_OUTPUT
       - uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
@@ -215,10 +210,11 @@ jobs:
           file: ${{ matrix.dockerfile }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+
     outputs:
       ecr-registry: ${{ steps.login-ecr.outputs.registry }}
-      ecr-username: ${{ steps.login-ecr.outputs[steps.ecr.outputs.username-key] }}
-      ecr-password: ${{ steps.login-ecr.outputs[steps.ecr.outputs.password-key] }}
+      ecr-username: ${{ steps.login-ecr.outputs["docker_username_914833433684.dkr.ecr.us-east-1.amazonaws.com"] }}
+      ecr-password: ${{ steps.login-ecr.outputs["docker_password_914833433684.dkr.ecr.us-east-1.amazonaws.com"] }}
 
   glue-unit-tests:
     name: Run Pytest unit tests for AWS glue