From f6098d43aeb72dab9650ae6957e3d63489e2c29a Mon Sep 17 00:00:00 2001
From: Simon Beal <simobeal@amazon.com>
Date: Thu, 19 Dec 2024 15:24:10 +0000
Subject: [PATCH] Address PR feedback

---
 .github/workflows/e2e-test-trusted.yaml   | 2 +-
 .github/workflows/e2e-test-untrusted.yaml | 2 +-
 .github/workflows/e2e-tests.yaml          | 2 +-
 .github/workflows/release.yaml            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-test-trusted.yaml b/.github/workflows/e2e-test-trusted.yaml
index 718b3e92..8156581f 100644
--- a/.github/workflows/e2e-test-trusted.yaml
+++ b/.github/workflows/e2e-test-trusted.yaml
@@ -16,5 +16,5 @@ jobs:
     uses: ./.github/workflows/e2e-tests.yaml
     with:
       environment: "trusted"
-      ref: ${{ github.sha }}
+      ref: ${{ github.event_name == 'push' && github.sha || github.event.pull_request.head.sha }}
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/e2e-test-untrusted.yaml b/.github/workflows/e2e-test-untrusted.yaml
index 70daabb7..6ce0570c 100644
--- a/.github/workflows/e2e-test-untrusted.yaml
+++ b/.github/workflows/e2e-test-untrusted.yaml
@@ -13,5 +13,5 @@ jobs:
     uses: ./.github/workflows/e2e-tests.yaml
     with:
       environment: "untrusted"
-      ref: ${{ github.sha }}
+      ref: ${{ github.event.pull_request.head.sha }}
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 72a87c82..c293d99c 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -109,7 +109,7 @@ jobs:
       ARCH: "${{ matrix.arch }}"
       AMI_FAMILY: "${{ matrix.family }}"
       K8S_VERSION: "${{ matrix.kubernetes-version }}"
-      TAG: "untested_${{ inputs.ref }}"
+      TAG: "${{ env.TAG_UNTESTED }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 42896262..f86551e4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up crane
         uses: imjasonh/setup-crane@v0.1
 
-      - name: Configure AWS Credentials from CI Trusted acccount
+      - name: Configure AWS Credentials from CI Trusted account
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.CI_TRUSTED_IAM_ROLE }}
@@ -74,7 +74,7 @@ jobs:
           SOURCE_REGISTRY: ${{ steps.login-ecr-trusted.outputs.registry }}
         run: |
           crane copy ${SOURCE_REGISTRY}/${IMAGE_NAME}:${TAG_PASSED} ${ARS_REGISTRY}:${GIT_TAG}
-          if [ -n "$VAR" ]; then
+          if [ -n "${PUBLIC_REGISTRY}" ]; then
             crane copy ${SOURCE_REGISTRY}/${IMAGE_NAME}:${TAG_PASSED} ${PUBLIC_REGISTRY}:${GIT_TAG}
           fi