Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/dotnet-ec2-adot-sigv4-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/dotnet-ec2-asg-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/dotnet-ec2-default-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/dotnet-ec2-nuget-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/dotnet-ec2-windows-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/java-ec2-adaptive-sampling-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/java-ec2-adot-sigv4-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/java-ec2-asg-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/java-ec2-default-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/java-ec2-ubuntu-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/node-ec2-adot-sigv4-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/node-ec2-asg-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/node-ec2-default-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,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)
Expand All @@ -83,7 +82,6 @@ jobs:
flags: |
-ignore SC2086
-ignore SC2004
-ignore SC2129
-ignore SC2016
-ignore SC2010
-ignore SC2015
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/python-ec2-adaptive-sampling-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/python-ec2-asg-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/python-ec2-default-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/python-ec2-genesis-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down