Skip to content

Commit 58af1b5

Browse files
committed
ci: Use organisation-level AWS secrets
This commit updates the CI workflows to use the `zephyrproject-rtos` organisation-level AWS secrets instead of the repository-level secrets. Using organisation-level secrets allows more centralised management of the access keys used throughout the GitHub Actions CI infrastructure. Note that the `AWS_*_ACCESS_KEY_ID` is now stored in plaintext as a variable instead of a secret because it is equivalent to username and needs to be identifiable for management and audit purposes. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent 70f2a49 commit 58af1b5

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

.github/workflows/clang.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-clang-${{ matrix.platform }}-ccache
7979
path: /github/home/.ccache
8080
aws-s3-bucket: ccache.zephyrproject.org
81-
aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
82-
aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
81+
aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
82+
aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
8383
aws-region: us-east-2
8484

8585
- name: ccache stats initial

.github/workflows/codecov.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
key: ${{ steps.ccache_cache_prop.outputs.repo }}-${{github.event_name}}-${{matrix.platform}}-codecov-ccache
6666
path: /github/home/.ccache
6767
aws-s3-bucket: ccache.zephyrproject.org
68-
aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
69-
aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
68+
aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
69+
aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
7070
aws-region: us-east-2
7171

7272
- name: ccache stats initial

.github/workflows/daily_test_version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Configure AWS Credentials
2020
uses: aws-actions/configure-aws-credentials@v1
2121
with:
22-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_TESTING }}
23-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTING }}
22+
aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
23+
aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
2424
aws-region: us-east-1
2525

2626
- name: install-pip

.github/workflows/doc-publish-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Configure AWS Credentials
5151
uses: aws-actions/configure-aws-credentials@v1
5252
with:
53-
aws-access-key-id: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
53+
aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
5454
aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_SECRET_ACCESS_KEY }}
5555
aws-region: us-east-1
5656

.github/workflows/doc-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
- name: Configure AWS Credentials
3333
uses: aws-actions/configure-aws-credentials@v1
3434
with:
35-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
36-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
35+
aws-access-key-id: ${{ vars.AWS_DOCS_ACCESS_KEY_ID }}
36+
aws-secret-access-key: ${{ secrets.AWS_DOCS_SECRET_ACCESS_KEY }}
3737
aws-region: us-east-1
3838

3939
- name: Upload to AWS S3

.github/workflows/footprint-tracking.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
- name: Configure AWS Credentials
5454
uses: aws-actions/configure-aws-credentials@v1
5555
with:
56-
aws-access-key-id: ${{ secrets.FOOTPRINT_AWS_KEY_ID }}
57-
aws-secret-access-key: ${{ secrets.FOOTPRINT_AWS_ACCESS_KEY }}
56+
aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
57+
aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
5858
aws-region: us-east-1
5959

6060
- name: Record Footprint

.github/workflows/issue_count.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
- name: Configure AWS Credentials
4444
uses: aws-actions/configure-aws-credentials@v1
4545
with:
46-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_TESTING }}
47-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_TESTING }}
46+
aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
47+
aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
4848
aws-region: us-east-1
4949

5050
- name: Post Results

.github/workflows/twister.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ jobs:
183183
key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-${{github.event_name}}-${{ matrix.subset }}-ccache
184184
path: /github/home/.ccache
185185
aws-s3-bucket: ccache.zephyrproject.org
186-
aws-access-key-id: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
187-
aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
186+
aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
187+
aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
188188
aws-region: us-east-2
189189

190190
- name: ccache stats initial

0 commit comments

Comments
 (0)