From 9aac8e949af6e3e8c83049eb5cb97f5673a594c1 Mon Sep 17 00:00:00 2001
From: Harry <harryryu@amazon.com>
Date: Thu, 26 Sep 2024 11:52:57 -0700
Subject: [PATCH] Update variable name for java ecr build (#256)

*Issue description:*
Issue with the PR

*Description of changes:*
Updated ECR URI to point to the correct URI

*Rollback procedure:*
Revert

*Test Run:*

https://github.com/aws-observability/aws-application-signals-test-framework/actions/runs/11058416897

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
---
 .github/workflows/java-sample-app-ecr-deploy.yml  | 4 ++--
 .github/workflows/python-sample-app-s3-deploy.yml | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/java-sample-app-ecr-deploy.yml b/.github/workflows/java-sample-app-ecr-deploy.yml
index c9822e2bb..2f945beb1 100644
--- a/.github/workflows/java-sample-app-ecr-deploy.yml
+++ b/.github/workflows/java-sample-app-ecr-deploy.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Build and Upload Main Service Image
         working-directory: sample-apps/java/springboot-main-service
         run: |
-          sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
+          sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
           gradle jib -P javaVersion=11
 
   java-v11-remote:
@@ -93,7 +93,7 @@ jobs:
       - name: Build and Upload Remote Service Image
         working-directory: sample-apps/java/springboot-remote-service
         run: |
-          sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.E2E_TEST_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
+          sed -i 's#"{{ECR_IMAGE_URI}}"#"${{ env.ACCOUNT_ID }}.dkr.ecr.${{ matrix.aws-region }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v11"#g' build.gradle.kts
           gradle jib -P javaVersion=11
 
   java-main:
diff --git a/.github/workflows/python-sample-app-s3-deploy.yml b/.github/workflows/python-sample-app-s3-deploy.yml
index 4bca1e128..d08500e7f 100644
--- a/.github/workflows/python-sample-app-s3-deploy.yml
+++ b/.github/workflows/python-sample-app-s3-deploy.yml
@@ -42,8 +42,6 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ secrets.E2E_TEST_ROLE_ARN }}
           aws-region: ${{ matrix.aws-region }}
 
-
-
       - name: Build Sample App Zip
         working-directory: sample-apps/python
         run: zip -r python-sample-app.zip .