Skip to content

Commit b68c2ba

Browse files
aaronchung-bitquillaaronchung-bitquill
committed
test - try add role-session-name, output-credentials flag, and role-duration, and remove temp creds step
1 parent 39bdc23 commit b68c2ba

8 files changed

+51
-129
lines changed

‎.github/workflows/mysql_advanced_performance.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,22 @@ jobs:
2323
distribution: 'corretto'
2424
java-version: 8
2525
- name: 'Configure AWS credentials'
26+
id: creds
2627
uses: aws-actions/configure-aws-credentials@v4
2728
with:
2829
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
30+
role-session-name: run_adv_perf_test_mysql
2931
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
30-
- name: 'Set up temp AWS credentials'
31-
run: |
32-
creds=($(aws sts get-session-token \
33-
--duration-seconds 21600 \
34-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
35-
--output text \
36-
| xargs));
37-
echo "::add-mask::${creds[0]}"
38-
echo "::add-mask::${creds[1]}"
39-
echo "::add-mask::${creds[2]}"
40-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
41-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
42-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
32+
output-credentials: true
4333
- name: 'Run performance tests (OpenJDK)'
4434
run: |
4535
./gradlew --no-parallel --no-daemon test-aurora-mysql-advanced-performance
4636
env:
4737
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
4838
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
49-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
50-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
51-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
39+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
40+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
41+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5242
MYSQL_VERSION: "default"
5343
PG_VERSION: "default"
5444
- name: 'Archive Performance Results'

‎.github/workflows/mysql_performance.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,22 @@ jobs:
2323
distribution: 'corretto'
2424
java-version: 8
2525
- name: 'Configure AWS credentials'
26+
id: creds
2627
uses: aws-actions/configure-aws-credentials@v4
2728
with:
2829
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
30+
role-session-name: run_perf_test_mysql
2931
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
30-
- name: 'Set up temp AWS credentials'
31-
run: |
32-
creds=($(aws sts get-session-token \
33-
--duration-seconds 21600 \
34-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
35-
--output text \
36-
| xargs));
37-
echo "::add-mask::${creds[0]}"
38-
echo "::add-mask::${creds[1]}"
39-
echo "::add-mask::${creds[2]}"
40-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
41-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
42-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
32+
output-credentials: true
4333
- name: 'Run performance tests (OpenJDK)'
4434
run: |
4535
./gradlew --no-parallel --no-daemon test-aurora-mysql-performance
4636
env:
4737
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
4838
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
49-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
50-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
51-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
39+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
40+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
41+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5242
MYSQL_VERSION: "default"
5343
PG_VERSION: "default"
5444
- name: 'Archive Performance Results'

‎.github/workflows/pg_advanced_performance.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,22 @@ jobs:
2323
distribution: 'corretto'
2424
java-version: 8
2525
- name: 'Configure AWS credentials'
26+
id: creds
2627
uses: aws-actions/configure-aws-credentials@v4
2728
with:
2829
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
30+
role-session-name: run_adv_perf_test_pgsql
2931
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
30-
- name: 'Set up temp AWS credentials'
31-
run: |
32-
creds=($(aws sts get-session-token \
33-
--duration-seconds 21600 \
34-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
35-
--output text \
36-
| xargs));
37-
echo "::add-mask::${creds[0]}"
38-
echo "::add-mask::${creds[1]}"
39-
echo "::add-mask::${creds[2]}"
40-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
41-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
42-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
32+
output-credentials: true
4333
- name: 'Run performance tests (OpenJDK)'
4434
run: |
4535
./gradlew --no-parallel --no-daemon test-aurora-pg-advanced-performance
4636
env:
4737
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
4838
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
49-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
50-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
51-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
39+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
40+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
41+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5242
MYSQL_VERSION: "default"
5343
PG_VERSION: "default"
5444
- name: 'Archive Performance Results'

‎.github/workflows/pg_performance.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,22 @@ jobs:
2323
distribution: 'corretto'
2424
java-version: 8
2525
- name: 'Configure AWS credentials'
26+
id: creds
2627
uses: aws-actions/configure-aws-credentials@v4
2728
with:
2829
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
30+
role-session-name: run_perf_test_pgsql
2931
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
30-
- name: 'Set up temp AWS credentials'
31-
run: |
32-
creds=($(aws sts get-session-token \
33-
--duration-seconds 21600 \
34-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
35-
--output text \
36-
| xargs));
37-
echo "::add-mask::${creds[0]}"
38-
echo "::add-mask::${creds[1]}"
39-
echo "::add-mask::${creds[2]}"
40-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
41-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
42-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
32+
output-credentials: true
4333
- name: 'Run performance tests (OpenJDK)'
4434
run: |
4535
./gradlew --no-parallel --no-daemon test-aurora-pg-performance
4636
env:
4737
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
4838
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
49-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
50-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
51-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
39+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
40+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
41+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5242
MYSQL_VERSION: "default"
5343
PG_VERSION: "default"
5444
- name: 'Archive Performance Results'

‎.github/workflows/run-autoscaling-tests.yml

+6-16
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,22 @@ jobs:
2626
distribution: 'corretto'
2727
java-version: 8
2828
- name: 'Configure AWS credentials'
29+
id: creds
2930
uses: aws-actions/configure-aws-credentials@v4
3031
with:
3132
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
33+
role-session-name: run_autoscale_test
3234
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
33-
- name: 'Set up temp AWS credentials'
34-
run: |
35-
creds=($(aws sts get-session-token \
36-
--duration-seconds 21600 \
37-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
38-
--output text \
39-
| xargs));
40-
echo "::add-mask::${creds[0]}"
41-
echo "::add-mask::${creds[1]}"
42-
echo "::add-mask::${creds[2]}"
43-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
44-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
45-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
35+
output-credentials: true
4636
- name: Run integration tests
4737
run: |
4838
./gradlew --no-parallel --no-daemon test-autoscaling-only
4939
env:
5040
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
5141
AURORA_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
52-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
53-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
54-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
42+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
43+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
44+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5545
MYSQL_VERSION: "default"
5646
PG_VERSION: "default"
5747
- name: Mask data

‎.github/workflows/run-integration-tests-codebuild.yml

+7-17
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
engine_version: ["latest"]
1919
environment: ["mysql", "pg"]
2020
runs-on: codebuild-jdbcWrapper-${{ github.run_id }}-${{ github.run_attempt }}
21-
environment: ${{ matrix.environment }}_integ
2221
steps:
2322
- name: 'Clone repository'
2423
uses: actions/checkout@v4
@@ -30,32 +29,23 @@ jobs:
3029
distribution: 'corretto'
3130
java-version: 8
3231
- name: 'Configure AWS credentials'
32+
id: creds
3333
uses: aws-actions/configure-aws-credentials@v4
3434
with:
3535
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
36+
role-session-name: run_integration_test_codebuild
37+
role-duration-seconds: 28800
3638
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
37-
- name: 'Set up temp AWS credentials'
38-
run: |
39-
creds=($(aws sts get-session-token \
40-
--duration-seconds 21600 \
41-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
42-
--output text \
43-
| xargs));
44-
echo "::add-mask::${creds[0]}"
45-
echo "::add-mask::${creds[1]}"
46-
echo "::add-mask::${creds[2]}"
47-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
48-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
49-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
39+
output-credentials: true
5040
- name: Run integration tests
5141
run: |
5242
./gradlew --no-parallel --no-daemon test-all-${{ matrix.environment }}-aurora
5343
env:
5444
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
5545
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
56-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
57-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
58-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
46+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
47+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
48+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5949
RDS_ENDPOINT: ${{ secrets.RDS_ENDPOINT }}
6050
MYSQL_VERSION: "latest"
6151
PG_VERSION: "latest"

‎.github/workflows/run-integration-tests-default.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,23 @@ jobs:
2929
distribution: 'corretto'
3030
java-version: 8
3131
- name: 'Configure AWS credentials'
32+
id: creds
3233
uses: aws-actions/configure-aws-credentials@v4
3334
with:
3435
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
36+
role-session-name: run_integration_test_default
37+
role-duration-seconds: 28800
3538
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
36-
- name: 'Set up temp AWS credentials'
37-
run: |
38-
creds=($(aws sts get-session-token \
39-
--duration-seconds 21600 \
40-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
41-
--output text \
42-
| xargs));
43-
echo "::add-mask::${creds[0]}"
44-
echo "::add-mask::${creds[1]}"
45-
echo "::add-mask::${creds[2]}"
46-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
47-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
48-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
39+
output-credentials: true
4940
- name: Run integration tests
5041
run: |
5142
./gradlew --no-parallel --no-daemon test-all-${{ matrix.dbEngine }}
5243
env:
5344
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
5445
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
55-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
56-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
57-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
46+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
47+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
48+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5849
MYSQL_VERSION: "default"
5950
PG_VERSION: "default"
6051
- name: Mask data

‎.github/workflows/run-integration-tests-latest.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,22 @@ jobs:
3030
java-version: 8
3131
- name: 'Configure AWS credentials'
3232
uses: aws-actions/configure-aws-credentials@v4
33+
id: creds
3334
with:
3435
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_DEPLOY_ROLE }}
36+
role-session-name: run_integration_test_latest
37+
role-duration-seconds: 28800
3538
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
36-
- name: 'Set up temp AWS credentials'
37-
run: |
38-
creds=($(aws sts get-session-token \
39-
--duration-seconds 21600 \
40-
--query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
41-
--output text \
42-
| xargs));
43-
echo "::add-mask::${creds[0]}"
44-
echo "::add-mask::${creds[1]}"
45-
echo "::add-mask::${creds[2]}"
46-
echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
47-
echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
48-
echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
39+
output-credentials: true
4940
- name: Run integration tests
5041
run: |
5142
./gradlew --no-parallel --no-daemon test-all-${{ matrix.dbEngine }}
5243
env:
5344
AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
5445
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
55-
AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
56-
AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
57-
AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
46+
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
47+
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
48+
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
5849
MYSQL_VERSION: "latest"
5950
PG_VERSION: "latest"
6051
- name: Mask data

0 commit comments

Comments
 (0)