From cc1a9a75a3253d7504916febae45dbd30a7f5dfe Mon Sep 17 00:00:00 2001
From: Thomas Pierce <thp@amazon.com>
Date: Fri, 13 Feb 2026 22:58:12 -0800
Subject: [PATCH] Fix SC2129 shellcheck errors: use brace group redirects

Replace multiple individual redirects (>> file) with brace group redirects
({ cmd1; cmd2; } >> file) to improve code quality and follow shellcheck
best practices.

Changes:
- Converted all instances of multiple echo >> $GITHUB_ENV to brace groups
- Removed SC2129 from actionlint ignore list in pr-build.yml

Files modified:
- .github/workflows/pr-build.yml (removed SC2129 from ignore list)
- .github/workflows/dotnet-ec2-adot-sigv4-test.yml (line 144-147)
- .github/workflows/dotnet-ec2-asg-test.yml (line 193-197)
- .github/workflows/dotnet-ec2-default-test.yml (line 183-186)
- .github/workflows/dotnet-ec2-nuget-test.yml (line 165-168)
- .github/workflows/dotnet-ec2-windows-test.yml (line 182-186)
- .github/workflows/java-ec2-adaptive-sampling-test.yml (line 135-139)
- .github/workflows/java-ec2-adot-sigv4-test.yml (line 166-169)
- .github/workflows/java-ec2-asg-test.yml (line 213-217)
- .github/workflows/java-ec2-default-test.yml (line 204-207)
- .github/workflows/java-ec2-ubuntu-test.yml (line 176-179)
- .github/workflows/node-ec2-adot-sigv4-test.yml (line 159-162)
- .github/workflows/node-ec2-asg-test.yml (line 196-200)
- .github/workflows/node-ec2-default-test.yml (line 197-200)
- .github/workflows/python-ec2-adaptive-sampling-test.yml (line 142-146)
- .github/workflows/python-ec2-asg-test.yml (line 216-220)
- .github/workflows/python-ec2-default-test.yml (line 206-209)
- .github/workflows/python-ec2-genesis-test.yml (line 71-79)

Testing: Comprehensive behavioral tests confirm identical functionality.
---
 .github/workflows/dotnet-ec2-adot-sigv4-test.yml       |  8 +++++---
 .github/workflows/dotnet-ec2-asg-test.yml              | 10 ++++++----
 .github/workflows/dotnet-ec2-default-test.yml          |  8 +++++---
 .github/workflows/dotnet-ec2-nuget-test.yml            |  8 +++++---
 .github/workflows/dotnet-ec2-windows-test.yml          | 10 ++++++----
 .github/workflows/java-ec2-adaptive-sampling-test.yml  | 10 ++++++----
 .github/workflows/java-ec2-adot-sigv4-test.yml         |  8 +++++---
 .github/workflows/java-ec2-asg-test.yml                | 10 ++++++----
 .github/workflows/java-ec2-default-test.yml            |  8 +++++---
 .github/workflows/java-ec2-ubuntu-test.yml             |  8 +++++---
 .github/workflows/node-ec2-adot-sigv4-test.yml         |  8 +++++---
 .github/workflows/node-ec2-asg-test.yml                | 10 ++++++----
 .github/workflows/node-ec2-default-test.yml            |  8 +++++---
 .github/workflows/pr-build.yml                         |  2 --
 .../workflows/python-ec2-adaptive-sampling-test.yml    | 10 ++++++----
 .github/workflows/python-ec2-asg-test.yml              | 10 ++++++----
 .github/workflows/python-ec2-default-test.yml          |  8 +++++---
 .github/workflows/python-ec2-genesis-test.yml          |  8 +++++---
 18 files changed, 92 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/dotnet-ec2-adot-sigv4-test.yml b/.github/workflows/dotnet-ec2-adot-sigv4-test.yml
index 88e4cffbc..c8b0ad596 100644
--- a/.github/workflows/dotnet-ec2-adot-sigv4-test.yml
+++ b/.github/workflows/dotnet-ec2-adot-sigv4-test.yml
@@ -142,9 +142,11 @@ jobs:
       - name: Get the sample app endpoint
         working-directory: terraform/dotnet/ec2/adot-sigv4
         run: |
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/dotnet-ec2-asg-test.yml b/.github/workflows/dotnet-ec2-asg-test.yml
index acc3d6c8b..16825e092 100644
--- a/.github/workflows/dotnet-ec2-asg-test.yml
+++ b/.github/workflows/dotnet-ec2-asg-test.yml
@@ -192,10 +192,12 @@ jobs:
         working-directory: terraform/dotnet/ec2/asg
         run: |
           main_service_private_dns_name=$(aws ec2 describe-instances --instance-ids ${{ env.MAIN_SERVICE_INSTANCE_ID }} --region ${{ env.E2E_TEST_AWS_REGION }} --query "Reservations[].Instances[].PrivateDnsName" --output text)
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "PRIVATE_DNS_NAME=$main_service_private_dns_name" >> $GITHUB_ENV
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "PRIVATE_DNS_NAME=$main_service_private_dns_name"
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/dotnet-ec2-default-test.yml b/.github/workflows/dotnet-ec2-default-test.yml
index b2554551a..a68369b74 100644
--- a/.github/workflows/dotnet-ec2-default-test.yml
+++ b/.github/workflows/dotnet-ec2-default-test.yml
@@ -181,9 +181,11 @@ jobs:
 
       - name: Get the sample app endpoint
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
         working-directory: terraform/dotnet/ec2/default
 
       - name: Initiate Gradlew Daemon
diff --git a/.github/workflows/dotnet-ec2-nuget-test.yml b/.github/workflows/dotnet-ec2-nuget-test.yml
index 32f8c5d0e..de475ed46 100644
--- a/.github/workflows/dotnet-ec2-nuget-test.yml
+++ b/.github/workflows/dotnet-ec2-nuget-test.yml
@@ -163,9 +163,11 @@ jobs:
 
       - name: Get the sample app endpoint
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
         working-directory: terraform/dotnet/ec2/nuget
 
       - name: Initiate Gradlew Daemon
diff --git a/.github/workflows/dotnet-ec2-windows-test.yml b/.github/workflows/dotnet-ec2-windows-test.yml
index a4c3c904e..8ffd46dd6 100644
--- a/.github/workflows/dotnet-ec2-windows-test.yml
+++ b/.github/workflows/dotnet-ec2-windows-test.yml
@@ -180,10 +180,12 @@ jobs:
       - name: Get the sample app endpoint
         working-directory: terraform/dotnet/ec2/windows
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_INSTANCE_ID=$(terraform output remote_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+            echo "REMOTE_SERVICE_INSTANCE_ID=$(terraform output remote_service_instance_id)"
+          } >> $GITHUB_ENV
 
 # A standard Windows Deployment Script are Expect to run ~5min, plus waiting for SSM to be setup in EC2 instance ~2min
 # 15 Min loose upper timeout bound is designed to allow for a rate situation: in a very small chance,
diff --git a/.github/workflows/java-ec2-adaptive-sampling-test.yml b/.github/workflows/java-ec2-adaptive-sampling-test.yml
index eea759343..a0f9d62e7 100644
--- a/.github/workflows/java-ec2-adaptive-sampling-test.yml
+++ b/.github/workflows/java-ec2-adaptive-sampling-test.yml
@@ -133,10 +133,12 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/java/ec2/adaptive-sampling
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/java-ec2-adot-sigv4-test.yml b/.github/workflows/java-ec2-adot-sigv4-test.yml
index 4fbd10ac7..85d3a2ea8 100644
--- a/.github/workflows/java-ec2-adot-sigv4-test.yml
+++ b/.github/workflows/java-ec2-adot-sigv4-test.yml
@@ -164,9 +164,11 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/java/ec2/adot-sigv4
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/java-ec2-asg-test.yml b/.github/workflows/java-ec2-asg-test.yml
index f346c3e73..28039ad73 100644
--- a/.github/workflows/java-ec2-asg-test.yml
+++ b/.github/workflows/java-ec2-asg-test.yml
@@ -212,10 +212,12 @@ jobs:
         working-directory: terraform/java/ec2/asg
         run: |
           main_service_private_dns_name=$(aws ec2 describe-instances --instance-ids ${{ env.MAIN_SERVICE_INSTANCE_ID }} --region ${{ env.E2E_TEST_AWS_REGION }} --query "Reservations[].Instances[].PrivateDnsName" --output text)
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "PRIVATE_DNS_NAME=$main_service_private_dns_name" >> $GITHUB_ENV
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "PRIVATE_DNS_NAME=$main_service_private_dns_name"
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/java-ec2-default-test.yml b/.github/workflows/java-ec2-default-test.yml
index f79687311..2ba14a7df 100644
--- a/.github/workflows/java-ec2-default-test.yml
+++ b/.github/workflows/java-ec2-default-test.yml
@@ -202,9 +202,11 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/java/ec2/default
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/java-ec2-ubuntu-test.yml b/.github/workflows/java-ec2-ubuntu-test.yml
index 699ae2201..0d00aadda 100644
--- a/.github/workflows/java-ec2-ubuntu-test.yml
+++ b/.github/workflows/java-ec2-ubuntu-test.yml
@@ -174,9 +174,11 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/java/ec2/ubuntu
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8080" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8080"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/node-ec2-adot-sigv4-test.yml b/.github/workflows/node-ec2-adot-sigv4-test.yml
index a6b3cd83c..e007a6c8b 100644
--- a/.github/workflows/node-ec2-adot-sigv4-test.yml
+++ b/.github/workflows/node-ec2-adot-sigv4-test.yml
@@ -157,9 +157,11 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/node/ec2/adot-sigv4
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8000" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8000"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/node-ec2-asg-test.yml b/.github/workflows/node-ec2-asg-test.yml
index ea6c3a6f4..87d041380 100644
--- a/.github/workflows/node-ec2-asg-test.yml
+++ b/.github/workflows/node-ec2-asg-test.yml
@@ -195,10 +195,12 @@ jobs:
         working-directory: terraform/node/ec2/asg
         run: |
           main_service_private_dns_name=$(aws ec2 describe-instances --instance-ids ${{ env.MAIN_SERVICE_INSTANCE_ID }} --region ${{ env.E2E_TEST_AWS_REGION }} --query "Reservations[].Instances[].PrivateDnsName" --output text)
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8000" >> $GITHUB_ENV
-          echo "PRIVATE_DNS_NAME=$main_service_private_dns_name" >> $GITHUB_ENV
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8000"
+            echo "PRIVATE_DNS_NAME=$main_service_private_dns_name"
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/node-ec2-default-test.yml b/.github/workflows/node-ec2-default-test.yml
index ec7fd048a..bd5fd51b7 100644
--- a/.github/workflows/node-ec2-default-test.yml
+++ b/.github/workflows/node-ec2-default-test.yml
@@ -195,9 +195,11 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/node/ec2/default
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8000" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8000"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 83e01e7b3..49df62074 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -72,7 +72,6 @@ jobs:
           # TODO: Remove these suppressions incrementally as issues are fixed
           # SC2086: Double quote to prevent globbing and word splitting (212 occurrences)
           # SC2004: $/${} is unnecessary on arithmetic variables (14 occurrences)
-          # SC2129: Consider using { cmd1; cmd2; } >> file instead of individual redirects (10 occurrences)
           # SC2016: Expressions don't expand in single quotes, use double quotes for that (8 occurrences)
           # SC2010: Don't use ls | grep. Use a glob or a for loop with a condition (5 occurrences)
           # SC2015: Note that A && B || C is not if-then-else. C may run when A is true (5 occurrences)
@@ -82,7 +81,6 @@ jobs:
           flags: |
             -ignore SC2086
             -ignore SC2004
-            -ignore SC2129
             -ignore SC2016
             -ignore SC2010
             -ignore SC2015
diff --git a/.github/workflows/python-ec2-adaptive-sampling-test.yml b/.github/workflows/python-ec2-adaptive-sampling-test.yml
index 915d2256e..82b77b8fd 100644
--- a/.github/workflows/python-ec2-adaptive-sampling-test.yml
+++ b/.github/workflows/python-ec2-adaptive-sampling-test.yml
@@ -140,10 +140,12 @@ jobs:
       - name: Get the sample app and EC2 instance information
         working-directory: terraform/python/ec2/adaptive-sampling
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8000" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8000"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/python-ec2-asg-test.yml b/.github/workflows/python-ec2-asg-test.yml
index 024fcef55..a14b5d785 100644
--- a/.github/workflows/python-ec2-asg-test.yml
+++ b/.github/workflows/python-ec2-asg-test.yml
@@ -215,10 +215,12 @@ jobs:
         working-directory: terraform/python/ec2/asg
         run: |
           main_service_private_dns_name=$(aws ec2 describe-instances --instance-ids ${{ env.MAIN_SERVICE_INSTANCE_ID }} --region ${{ env.E2E_TEST_AWS_REGION }} --query "Reservations[].Instances[].PrivateDnsName" --output text)
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8000" >> $GITHUB_ENV
-          echo "PRIVATE_DNS_NAME=$main_service_private_dns_name" >> $GITHUB_ENV
-          echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8000"
+            echo "PRIVATE_DNS_NAME=$main_service_private_dns_name"
+            echo "EC2_INSTANCE_AMI=$(terraform output ec2_instance_ami)"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+          } >> $GITHUB_ENV
 
       - name: Initiate Gradlew Daemon
         if: steps.initiate-gradlew.outcome == 'failure'
diff --git a/.github/workflows/python-ec2-default-test.yml b/.github/workflows/python-ec2-default-test.yml
index 8013a6170..f37821800 100644
--- a/.github/workflows/python-ec2-default-test.yml
+++ b/.github/workflows/python-ec2-default-test.yml
@@ -204,9 +204,11 @@ jobs:
 
       - name: Get the sample app endpoint
         run: |
-          echo "MAIN_SERVICE_ENDPOINT=localhost:8000" >> $GITHUB_ENV
-          echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)" >> $GITHUB_ENV
-          echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)" >> $GITHUB_ENV
+          {
+            echo "MAIN_SERVICE_ENDPOINT=localhost:8000"
+            echo "REMOTE_SERVICE_IP=$(terraform output sample_app_remote_service_private_ip)"
+            echo "MAIN_SERVICE_INSTANCE_ID=$(terraform output main_service_instance_id)"
+          } >> $GITHUB_ENV
         working-directory: terraform/python/ec2/default
 
       - name: Initiate Gradlew Daemon
diff --git a/.github/workflows/python-ec2-genesis-test.yml b/.github/workflows/python-ec2-genesis-test.yml
index 20744c6c4..604726779 100644
--- a/.github/workflows/python-ec2-genesis-test.yml
+++ b/.github/workflows/python-ec2-genesis-test.yml
@@ -75,9 +75,11 @@ jobs:
           XRAY_TRACE_ID="1-${ID_1}-${ID_2}"
           PARENT_ID="$(openssl rand -hex 8)"
           TRACE_ID_HEADER="Root=${XRAY_TRACE_ID};Parent=${PARENT_ID};Sampled=1"
-          echo "XRAY_TRACE_ID=${XRAY_TRACE_ID}" >> $GITHUB_ENV
-          echo "W3C_TRACE_ID=${W3C_TRACE_ID}" >> $GITHUB_ENV
-          echo "TRACE_ID_HEADER=${TRACE_ID_HEADER}" >> $GITHUB_ENV
+          {
+            echo "XRAY_TRACE_ID=${XRAY_TRACE_ID}"
+            echo "W3C_TRACE_ID=${W3C_TRACE_ID}"
+            echo "TRACE_ID_HEADER=${TRACE_ID_HEADER}"
+          } >> $GITHUB_ENV
           echo "Generated XRay Trace ID: ${XRAY_TRACE_ID}"
           echo "Generated W3C Trace ID: ${W3C_TRACE_ID}"
           echo "Generated Trace ID Header: ${TRACE_ID_HEADER}"