From 327744e6e87a40199d16ae155ca03f09c2d27ba9 Mon Sep 17 00:00:00 2001
From: jjllee <jjllee@amazon.com>
Date: Mon, 25 Nov 2024 13:07:02 -0800
Subject: [PATCH] temp test in us-east-1 via push

---
 .github/workflows/java-eks-otlp-ocb-canary.yml   | 10 +++++-----
 .github/workflows/java-eks-otlp-ocb-test.yml     | 16 ++++++++++------
 .../eks-otlp-ocb/util/appsignals-collector.yaml  |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/java-eks-otlp-ocb-canary.yml b/.github/workflows/java-eks-otlp-ocb-canary.yml
index 39b78253..7dd9e2db 100644
--- a/.github/workflows/java-eks-otlp-ocb-canary.yml
+++ b/.github/workflows/java-eks-otlp-ocb-canary.yml
@@ -9,12 +9,12 @@
 name: Java EKS OTLP/OCB Enablement Canary Test
 on:
   # TODO: Reintroduce cron-job
-  schedule:
-    - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
+  # schedule:
+  #   - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
   workflow_dispatch: # be able to run the workflow on demand
-  # push:
-  #   branches:
-  #     - otlp-ocb
+  push:
+    branches:
+      - otlp-ocb
 
 permissions:
   id-token: write
diff --git a/.github/workflows/java-eks-otlp-ocb-test.yml b/.github/workflows/java-eks-otlp-ocb-test.yml
index 64fc92f2..e4d0051f 100644
--- a/.github/workflows/java-eks-otlp-ocb-test.yml
+++ b/.github/workflows/java-eks-otlp-ocb-test.yml
@@ -194,9 +194,7 @@ jobs:
       - name: Install OTel Collector
         uses: ./.github/workflows/actions/execute_and_retry
         with:
-          command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/java/eks-otlp-ocb/util && \
-            sed -i -e 's/${E2E_TEST_AWS_REGION}/${{ env.E2E_TEST_AWS_REGION }}/g' ./appsignals-collector.yaml && \
-            kubectl apply -f ./appsignals-collector.yaml -n ${{ env.SAMPLE_APP_NAMESPACE }}"
+          command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/java/eks-otlp-ocb/util && kubectl apply -f ./appsignals-collector.yaml -n ${{ env.SAMPLE_APP_NAMESPACE }}"
           cleanup: "kubectl delete -f ./appsignals-collector.yaml -n ${{ env.SAMPLE_APP_NAMESPACE }} && \
             aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}"
           max_retry: 3
@@ -265,7 +263,7 @@ jobs:
         run: ./gradlew validator:run --args='-c java/eks-otlp-ocb/log-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.APP_ENDPOINT }}
-          --region ${{ env.E2E_TEST_AWS_REGION }}
+          --region us-east-1
           --account-id ${{ env.ACCOUNT_ID }}
           --metric-namespace ${{ env.METRIC_NAMESPACE }}
           --log-group ${{ env.LOG_GROUP_NAME }}
@@ -276,6 +274,8 @@ jobs:
           --remote-service-ip ${{ env.REMOTE_SERVICE_POD_IP }}
           --query-string ip=${{ env.REMOTE_SERVICE_POD_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
+        # TODO: Undo hardcode
+        # --region ${{ env.E2E_TEST_AWS_REGION }}
 
       - name: Call endpoints and validate generated metrics
         id: metric-validation
@@ -283,7 +283,7 @@ jobs:
         run: ./gradlew validator:run --args='-c java/eks-otlp-ocb/metric-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.APP_ENDPOINT }}
-          --region ${{ env.E2E_TEST_AWS_REGION }}
+          --region us-east-1
           --account-id ${{ env.ACCOUNT_ID }}
           --metric-namespace ${{ env.METRIC_NAMESPACE }}
           --log-group ${{ env.LOG_GROUP_NAME }}
@@ -295,6 +295,8 @@ jobs:
           --remote-service-ip ${{ env.REMOTE_SERVICE_POD_IP }}
           --query-string ip=${{ env.REMOTE_SERVICE_POD_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
+        # TODO: Undo hardcodes:
+        # --region ${{ env.E2E_TEST_AWS_REGION }}
 
       - name: Call endpoints and validate generated traces
         id: trace-validation
@@ -302,7 +304,7 @@ jobs:
         run: ./gradlew validator:run --args='-c java/eks-otlp-ocb/trace-validation.yml
           --testing-id ${{ env.TESTING_ID }}
           --endpoint http://${{ env.APP_ENDPOINT }}
-          --region ${{ env.E2E_TEST_AWS_REGION }}
+          --region us-east-1
           --account-id ${{ env.ACCOUNT_ID }}
           --metric-namespace ${{ env.METRIC_NAMESPACE }}
           --log-group ${{ env.LOG_GROUP_NAME }}
@@ -313,6 +315,8 @@ jobs:
           --remote-service-ip ${{ env.REMOTE_SERVICE_POD_IP }}
           --query-string ip=${{ env.REMOTE_SERVICE_POD_IP }}&testingId=${{ env.TESTING_ID }}
           --rollup'
+        # TODO: Undo hardcode
+        # --region ${{ env.E2E_TEST_AWS_REGION }}
 
       - name: Refresh AWS Credentials
         if: ${{ github.event.repository.name == 'aws-application-signals-test-framework' }}
diff --git a/terraform/java/eks-otlp-ocb/util/appsignals-collector.yaml b/terraform/java/eks-otlp-ocb/util/appsignals-collector.yaml
index 6ac398a6..a0688b5c 100644
--- a/terraform/java/eks-otlp-ocb/util/appsignals-collector.yaml
+++ b/terraform/java/eks-otlp-ocb/util/appsignals-collector.yaml
@@ -50,7 +50,7 @@ spec:
   config: |
     extensions:
       sigv4auth:
-        region: "${E2E_TEST_AWS_REGION}"
+        region: "us-east-1"
         service: "xray"     
 
     receivers:
@@ -137,7 +137,7 @@ spec:
 
     exporters:
       otlphttp:
-        traces_endpoint: https://xray.${E2E_TEST_AWS_REGION}.amazonaws.com/v1/traces
+        traces_endpoint: https://xray.us-east-1.amazonaws.com/v1/traces
         auth:
           authenticator: sigv4auth