Skip to content

Commit 9de95e0

Browse files
committed
GHA: Remove dynamic secret access
1 parent bc2ede0 commit 9de95e0

File tree

2 files changed

+32
-42
lines changed

2 files changed

+32
-42
lines changed

.github/workflows/deploy-next.yml

+16-21
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55
branches:
66
- main
77

8-
env:
9-
DEPLOYMENT_NAME: "Next"
10-
SECRET_PREFIX: NEXT_
11-
SOURCE_DIR: .vitepress/dist
12-
138
# https://github.com/ouzi-dev/commit-status-updater/tree/v2/#workflow-permissions
149
permissions:
1510
contents: read
@@ -36,9 +31,9 @@ jobs:
3631
- name: Set deployment status
3732
uses: ouzi-dev/commit-status-updater@v2
3833
with:
39-
name: Deploy to ${{ env.DEPLOYMENT_NAME }}
34+
name: Deploy
4035
status: pending
41-
description: Preparing deploy to ${{ env.DEPLOYMENT_NAME }}
36+
description: Preparing deploy
4237

4338
- name: Install
4439
run: npm ci
@@ -54,34 +49,34 @@ jobs:
5449
with:
5550
args: --delete
5651
env:
57-
AWS_S3_BUCKET: ${{ vars[format('{0}BUCKET_NAME', env.SECRET_PREFIX)] }}
58-
AWS_ACCESS_KEY_ID: ${{ secrets[format('{0}KEY', env.SECRET_PREFIX)] }}
59-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('{0}SECRET', env.SECRET_PREFIX)] }}
60-
AWS_REGION: ${{ vars[format('{0}REGION', env.SECRET_PREFIX)] }}
61-
SOURCE_DIR: ${{ env.SOURCE_DIR }}
52+
AWS_S3_BUCKET: ${{ vars.NEXT_BUCKET_NAME }}
53+
AWS_ACCESS_KEY_ID: ${{ secrets.NEXT_KEY }}
54+
AWS_SECRET_ACCESS_KEY: ${{ secrets.NEXT_SECRET }}
55+
AWS_REGION: ${{ vars.NEXT_REGION }}
56+
SOURCE_DIR: .vitepress/dist
6257

6358
- name: Set success deployment status
6459
if: success()
6560
uses: ouzi-dev/commit-status-updater@v2
6661
with:
67-
name: Deploy to ${{ env.DEPLOYMENT_NAME }}
62+
name: Deploy
6863
status: success
69-
description: Deploy ready for ${{ env.DEPLOYMENT_NAME }}!
70-
url: ${{ vars[format('{0}URL', env.SECRET_PREFIX)] }}
64+
description: Deploy ready
65+
url: ${{ vars.NEXT_URL }}
7166

7267
- name: Set failed deployment status
7368
if: failure()
7469
uses: ouzi-dev/commit-status-updater@v2
7570
with:
76-
name: Deploy to ${{ env.DEPLOYMENT_NAME }}
71+
name: Deploy
7772
status: failure
78-
description: Failed to deploy to ${{ env.DEPLOYMENT_NAME }}
73+
description: Failed to deploy
7974

8075
- name: Invalidate CloudFront
8176
uses: chetan/invalidate-cloudfront-action@v2
8277
env:
83-
DISTRIBUTION: ${{ vars[format('{0}DISTRIBUTION', env.SECRET_PREFIX)] }}
78+
DISTRIBUTION: ${{ vars.NEXT_DISTRIBUTION }}
8479
PATHS: "/ /*"
85-
AWS_REGION: ${{ vars[format('{0}REGION', env.SECRET_PREFIX)] }}
86-
AWS_ACCESS_KEY_ID: ${{ secrets[format('{0}KEY', env.SECRET_PREFIX)] }}
87-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('{0}SECRET', env.SECRET_PREFIX)] }}
80+
AWS_REGION: ${{ vars.NEXT_REGION }}
81+
AWS_ACCESS_KEY_ID: ${{ secrets.NEXT_KEY }}
82+
AWS_SECRET_ACCESS_KEY: ${{ secrets.NEXT_SECRET }}

.github/workflows/deploy-production.yml

+16-21
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55
branches:
66
- production
77

8-
env:
9-
DEPLOYMENT_NAME: "Production"
10-
SECRET_PREFIX: PRODUCTION_
11-
SOURCE_DIR: .vitepress/dist
12-
138
# https://github.com/ouzi-dev/commit-status-updater/tree/v2/#workflow-permissions
149
permissions:
1510
contents: read
@@ -36,9 +31,9 @@ jobs:
3631
- name: Set deployment status
3732
uses: ouzi-dev/commit-status-updater@v2
3833
with:
39-
name: Deploy to ${{ env.DEPLOYMENT_NAME }}
34+
name: Deploy
4035
status: pending
41-
description: Preparing deploy to ${{ env.DEPLOYMENT_NAME }}
36+
description: Preparing deploy
4237

4338
- name: Install
4439
run: npm ci
@@ -54,34 +49,34 @@ jobs:
5449
with:
5550
args: --delete
5651
env:
57-
AWS_S3_BUCKET: ${{ vars[format('{0}BUCKET_NAME', env.SECRET_PREFIX)] }}
58-
AWS_ACCESS_KEY_ID: ${{ secrets[format('{0}KEY', env.SECRET_PREFIX)] }}
59-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('{0}SECRET', env.SECRET_PREFIX)] }}
60-
AWS_REGION: ${{ vars[format('{0}REGION', env.SECRET_PREFIX)] }}
61-
SOURCE_DIR: ${{ env.SOURCE_DIR }}
52+
AWS_S3_BUCKET: ${{ vars.PRODUCTION_BUCKET_NAME }}
53+
AWS_ACCESS_KEY_ID: ${{ secrets.PRODUCTION_KEY }}
54+
AWS_SECRET_ACCESS_KEY: ${{ secrets.PRODUCTION_SECRET }}
55+
AWS_REGION: ${{ vars.PRODUCTION_REGION }}
56+
SOURCE_DIR: .vitepress/dist
6257

6358
- name: Set success deployment status
6459
if: success()
6560
uses: ouzi-dev/commit-status-updater@v2
6661
with:
67-
name: Deploy to ${{ env.DEPLOYMENT_NAME }}
62+
name: Deploy
6863
status: success
69-
description: Deploy ready for ${{ env.DEPLOYMENT_NAME }}!
70-
url: ${{ vars[format('{0}URL', env.SECRET_PREFIX)] }}
64+
description: Deploy ready
65+
url: ${{ vars.PRODUCTION_URL }}
7166

7267
- name: Set failed deployment status
7368
if: failure()
7469
uses: ouzi-dev/commit-status-updater@v2
7570
with:
76-
name: Deploy to ${{ env.DEPLOYMENT_NAME }}
71+
name: Deploy
7772
status: failure
78-
description: Failed to deploy to ${{ env.DEPLOYMENT_NAME }}
73+
description: Failed to deploy
7974

8075
- name: Invalidate CloudFront
8176
uses: chetan/invalidate-cloudfront-action@v2
8277
env:
83-
DISTRIBUTION: ${{ vars[format('{0}DISTRIBUTION', env.SECRET_PREFIX)] }}
78+
DISTRIBUTION: ${{ vars.PRODUCTION_DISTRIBUTION }}
8479
PATHS: "/ /*"
85-
AWS_REGION: ${{ vars[format('{0}REGION', env.SECRET_PREFIX)] }}
86-
AWS_ACCESS_KEY_ID: ${{ secrets[format('{0}KEY', env.SECRET_PREFIX)] }}
87-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('{0}SECRET', env.SECRET_PREFIX)] }}
80+
AWS_REGION: ${{ vars.PRODUCTION_REGION }}
81+
AWS_ACCESS_KEY_ID: ${{ secrets.PRODUCTION_KEY }}
82+
AWS_SECRET_ACCESS_KEY: ${{ secrets.PRODUCTION_SECRET }}

0 commit comments

Comments
 (0)