Skip to content

Commit 8b1e7cc

Browse files
RainbowDashyRainbowDashy
authored
chore: use environment variable for service account and password (#45)
1 parent 7ed9cd5 commit 8b1e7cc

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

‎.github/workflows/chatops-migrate.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66

77
env:
88
BYTEBASE_URL: https://demo.bytebase.com
9-
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com
10-
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }}
9+
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com # set service account via environment variable
10+
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }} # set service account secret via environment variable
1111
BYTEBASE_PROJECT: "projects/hr"
1212
FILE_PATTERN: "migrations-semver/*.sql"
1313

@@ -135,8 +135,6 @@ jobs:
135135
136136
bytebase-action rollout \
137137
--url=${{ env.BYTEBASE_URL }} \
138-
--service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} \
139-
--service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} \
140138
--project=${{ env.BYTEBASE_PROJECT }} \
141139
--file-pattern=${{ env.FILE_PATTERN }} \
142140
--targets=${{ env.BYTEBASE_TARGETS }} \
@@ -195,8 +193,6 @@ jobs:
195193
196194
bytebase-action rollout \
197195
--url=${{ env.BYTEBASE_URL }} \
198-
--service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} \
199-
--service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} \
200196
--project=${{ env.BYTEBASE_PROJECT }} \
201197
--target-stage=${{ env.BYTEBASE_TARGET_STAGE }} \
202198
--plan=${{ steps.create-rollout.outputs.plan }}

‎.github/workflows/declarative-release-action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ concurrency:
1515

1616
env:
1717
BYTEBASE_URL: https://demo.bytebase.com
18-
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com
19-
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }}
18+
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com # set service account via environment variable
19+
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }} # set service account secret via environment variable
2020
BYTEBASE_PROJECT: "projects/hr"
2121

2222
jobs:
@@ -47,7 +47,7 @@ jobs:
4747
FILE_PATTERN: "schema/*.sql"
4848
BYTEBASE_OUTPUT: ${{ runner.temp }}/bytebase-metadata.json
4949
run: |
50-
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --file-pattern=${{ env.FILE_PATTERN }} --targets=${{ env.BYTEBASE_TARGETS }} --declarative --output=${{ env.BYTEBASE_OUTPUT }}
50+
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --file-pattern=${{ env.FILE_PATTERN }} --targets=${{ env.BYTEBASE_TARGETS }} --declarative --output=${{ env.BYTEBASE_OUTPUT }}
5151
- name: Set output
5252
id: set-output
5353
run: |
@@ -66,7 +66,7 @@ jobs:
6666
env:
6767
BYTEBASE_TARGET_STAGE: environments/test
6868
run: |
69-
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
69+
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
7070
- name: Deploy app
7171
run: |
7272
echo "Deploying app to test environment..."
@@ -86,7 +86,7 @@ jobs:
8686
env:
8787
BYTEBASE_TARGET_STAGE: environments/prod
8888
run: |
89-
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
89+
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
9090
- name: Deploy app
9191
run: |
9292
echo "Deploying app to prod environment..."

‎.github/workflows/release-action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99

1010
env:
1111
BYTEBASE_URL: https://demo.bytebase.com
12-
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com
13-
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }}
12+
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com # set service account via environment variable
13+
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }} # set service account secret via environment variable
1414
BYTEBASE_PROJECT: "projects/hr"
1515

1616
jobs:
@@ -41,7 +41,7 @@ jobs:
4141
FILE_PATTERN: "migrations-semver/*.sql"
4242
BYTEBASE_OUTPUT: ${{ runner.temp }}/bytebase-metadata.json
4343
run: |
44-
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --file-pattern=${{ env.FILE_PATTERN }} --targets=${{ env.BYTEBASE_TARGETS }} --output=${{ env.BYTEBASE_OUTPUT }}
44+
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --file-pattern=${{ env.FILE_PATTERN }} --targets=${{ env.BYTEBASE_TARGETS }} --output=${{ env.BYTEBASE_OUTPUT }}
4545
- name: Set output
4646
id: set-output
4747
run: |
@@ -60,7 +60,7 @@ jobs:
6060
env:
6161
BYTEBASE_TARGET_STAGE: environments/test
6262
run: |
63-
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
63+
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
6464
- name: Deploy app
6565
run: |
6666
echo "Deploying app to test environment..."
@@ -80,7 +80,7 @@ jobs:
8080
env:
8181
BYTEBASE_TARGET_STAGE: environments/prod
8282
run: |
83-
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
83+
bytebase-action rollout --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --target-stage=${{ env.BYTEBASE_TARGET_STAGE }} --plan=${{ needs.create-rollout.outputs.bytebase-plan }}
8484
- name: Deploy app
8585
run: |
8686
echo "Deploying app to prod environment..."

‎.github/workflows/sql-review-action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # set GITHUB_TOKEN because the 'Check release' step needs it to comment the pull request with check results.
2323
BYTEBASE_URL: https://demo.bytebase.com
24-
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com
25-
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }}
24+
BYTEBASE_SERVICE_ACCOUNT: api@service.bytebase.com # set service account via environment variable
25+
BYTEBASE_SERVICE_ACCOUNT_SECRET: ${{ secrets.BYTEBASE_SERVICE_ACCOUNT_SECRET }} # set service account secret via environment variable
2626
BYTEBASE_PROJECT: "projects/hr"
2727
BYTEBASE_TARGETS: "instances/prod-sample-instance/databases/hr_prod"
2828
FILE_PATTERN: "migrations-semver/*.sql"
2929
run: |
30-
bytebase-action check --url=${{ env.BYTEBASE_URL }} --service-account=${{ env.BYTEBASE_SERVICE_ACCOUNT }} --service-account-secret=${{ env.BYTEBASE_SERVICE_ACCOUNT_SECRET }} --project=${{ env.BYTEBASE_PROJECT }} --targets=${{ env.BYTEBASE_TARGETS }} --file-pattern=${{ env.FILE_PATTERN }}
30+
bytebase-action check --url=${{ env.BYTEBASE_URL }} --project=${{ env.BYTEBASE_PROJECT }} --targets=${{ env.BYTEBASE_TARGETS }} --file-pattern=${{ env.FILE_PATTERN }}

0 commit comments

Comments
 (0)