Skip to content

Commit 1d6165e

Browse files
committed
simplify workflow: use OIDC credentials directly
1 parent 87cec15 commit 1d6165e

1 file changed

Lines changed: 2 additions & 51 deletions

File tree

.github/workflows/test-sync-fix.yml

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ env:
1616
SAM_CLI_CONTAINER_CONNECTION_TIMEOUT: 60
1717
BY_CANARY: true
1818
NOSE_PARAMETERIZED_NO_WARN: 1
19-
UV_PYTHON: python3.11
20-
CREDENTIAL_DISTRIBUTION_LAMBDA_ARN: ${{ secrets.CREDENTIAL_DISTRIBUTION_LAMBDA_ARN }}
21-
ACCOUNT_RESET_LAMBDA_ARN: ${{ secrets.ACCOUNT_RESET_LAMBDA_ARN }}
2219

2320
jobs:
2421
sync-integ-tests:
@@ -51,8 +48,8 @@ jobs:
5148
- name: Install Maven
5249
run: |
5350
sudo apt-get remove -y maven || true
54-
wget https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip -P /tmp
55-
sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip
51+
wget -q https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip -P /tmp
52+
sudo unzip -q -d /opt/mvn /tmp/apache-maven-*.zip
5653
sudo ln -sf /opt/mvn/apache-maven-3.9.12/bin/mvn /usr/local/bin/mvn
5754
echo "/opt/mvn/apache-maven-3.9.12/bin" >> $GITHUB_PATH
5855
echo "MAVEN_HOME=/opt/mvn/apache-maven-3.9.12" >> $GITHUB_ENV
@@ -67,38 +64,6 @@ jobs:
6764
- name: Initialize project
6865
run: make init
6966

70-
- name: Get testing resources and credentials
71-
run: |
72-
test_env_var=$(python3.11 tests/get_testing_resources.py skip_role_deletion)
73-
if [ $? -ne 0 ]; then
74-
test_env_var=$(python3.11 tests/get_testing_resources.py)
75-
fi
76-
77-
echo "::add-mask::$AWS_ACCESS_KEY_ID"
78-
echo "::add-mask::$AWS_SECRET_ACCESS_KEY"
79-
echo "::add-mask::$AWS_SESSION_TOKEN"
80-
echo "CI_ACCESS_ROLE_AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
81-
echo "CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
82-
echo "CI_ACCESS_ROLE_AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN" >> $GITHUB_ENV
83-
84-
TEST_ACCESS_KEY_ID=$(echo "$test_env_var" | jq -j ".accessKeyID")
85-
TEST_SECRET_ACCESS_KEY=$(echo "$test_env_var" | jq -j ".secretAccessKey")
86-
TEST_SESSION_TOKEN=$(echo "$test_env_var" | jq -j ".sessionToken")
87-
TEST_TASK_TOKEN=$(echo "$test_env_var" | jq -j ".taskToken")
88-
89-
echo "::add-mask::$TEST_ACCESS_KEY_ID"
90-
echo "::add-mask::$TEST_SECRET_ACCESS_KEY"
91-
echo "::add-mask::$TEST_SESSION_TOKEN"
92-
echo "::add-mask::$TEST_TASK_TOKEN"
93-
94-
echo "AWS_ACCESS_KEY_ID=$TEST_ACCESS_KEY_ID" >> $GITHUB_ENV
95-
echo "AWS_SECRET_ACCESS_KEY=$TEST_SECRET_ACCESS_KEY" >> $GITHUB_ENV
96-
echo "AWS_SESSION_TOKEN=$TEST_SESSION_TOKEN" >> $GITHUB_ENV
97-
echo "TASK_TOKEN=$TEST_TASK_TOKEN" >> $GITHUB_ENV
98-
echo "AWS_S3_TESTING=$(echo "$test_env_var" | jq -j ".TestBucketName")" >> $GITHUB_ENV
99-
echo "AWS_ECR_TESTING=$(echo "$test_env_var" | jq -j ".TestECRURI")" >> $GITHUB_ENV
100-
echo "AWS_KMS_KEY=$(echo "$test_env_var" | jq -j ".TestKMSKeyArn")" >> $GITHUB_ENV
101-
10267
- name: Login to Public ECR
10368
run: |
10469
aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
@@ -117,17 +82,3 @@ jobs:
11782
with:
11883
name: sync-test-report
11984
path: test-report.json
120-
121-
- name: Reset test account
122-
if: always()
123-
run: |
124-
export AWS_ACCESS_KEY_ID=$CI_ACCESS_ROLE_AWS_ACCESS_KEY_ID
125-
export AWS_SECRET_ACCESS_KEY=$CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY
126-
export AWS_SESSION_TOKEN=$CI_ACCESS_ROLE_AWS_SESSION_TOKEN
127-
aws lambda invoke \
128-
--function-name "$ACCOUNT_RESET_LAMBDA_ARN" \
129-
--payload "{\"taskToken\": \"$TASK_TOKEN\", \"output\": \"{}\"}" \
130-
./lambda-output.txt \
131-
--region us-west-2 \
132-
--cli-binary-format raw-in-base64-out
133-
cat ./lambda-output.txt

0 commit comments

Comments
 (0)