Skip to content

Commit ba08d49

Browse files
authored
s/PLANETSCALE_SERVICE_TOKEN_NAME/PLANETSCALE_SERVICE_TOKEN_ID/
1 parent b1eac03 commit ba08d49

8 files changed

+14
-14
lines changed

.github/workflows/add-operation-column-and-index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Add operation - if asked, please click on displayed link to authenticate
2020
timeout-minutes: 3
2121
env:
22-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
22+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
2323
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
2424
ORG_NAME: ${{secrets.ORG_NAME}}
2525
DB_NAME: ${{secrets.DB_NAME}}

.github/workflows/create-database.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Create database - please click on displayed link to authenticate
2020
timeout-minutes: 3
2121
env:
22-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
22+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
2323
ORG_NAME: ${{secrets.ORG_NAME}}
2424
DB_NAME: ${{secrets.DB_NAME}}
2525
GITHUB_USER: ${{github.actor}}

.github/workflows/create-db-branch-and-pr-dr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
id: create-db-branch-and-dr
5858
timeout-minutes: 3
5959
env:
60-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
60+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
6161
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
6262
ORG_NAME: ${{secrets.ORG_NAME}}
6363
DB_NAME: ${{secrets.DB_NAME}}

.github/workflows/issue-ops-ps-commands.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
id: merge-dr
190190
timeout-minutes: 10
191191
env:
192-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
192+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
193193
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
194194
GITHUB_USER: ${{github.actor}}
195195
REF: ${{ needs.prechecks.outputs.ref }}
@@ -424,7 +424,7 @@ jobs:
424424
id: create-db-branch-and-dr
425425
timeout-minutes: 5
426426
env:
427-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
427+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
428428
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
429429
DB_NAME: ${{secrets.DB_NAME}}
430430
ORG_NAME: ${{secrets.ORG_NAME}}
@@ -649,7 +649,7 @@ jobs:
649649
id: update-db-branch
650650
timeout-minutes: 3
651651
env:
652-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
652+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
653653
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
654654
REF: ${{ needs.prechecks.outputs.ref }}
655655
GITHUB_USER: ${{github.actor}}
@@ -844,7 +844,7 @@ jobs:
844844
id: approve-deploy-request
845845
timeout-minutes: 3
846846
env:
847-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
847+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
848848
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
849849
REF: ${{ needs.prechecks.outputs.ref }}
850850
GITHUB_USER: ${{github.actor}}
@@ -1009,7 +1009,7 @@ jobs:
10091009
id: delete-db-branch
10101010
timeout-minutes: 3
10111011
env:
1012-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
1012+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
10131013
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
10141014
REF: ${{ needs.prechecks.outputs.ref }}
10151015
GITHUB_USER: ${{github.actor}}
@@ -1185,7 +1185,7 @@ jobs:
11851185
timeout-minutes: 3
11861186
env:
11871187
REF: ${{needs.prechecks.outputs.ref}}
1188-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
1188+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
11891189
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
11901190
DB_NAME: ${{steps.validate_params.outputs.DB_NAME}}
11911191
ORG_NAME: ${{steps.validate_params.outputs.ORG_NAME}}

.github/workflows/merge-latest-open-deploy-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Merge request - if asked, please click on displayed link to authenticate
2020
timeout-minutes: 10
2121
env:
22-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
22+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
2323
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
2424
ORG_NAME: ${{secrets.ORG_NAME}}
2525
DB_NAME: ${{secrets.DB_NAME}}

.github/workflows/remove-database.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Remove database - please click on displayed link to authenticate
2020
timeout-minutes: 3
2121
env:
22-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
22+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
2323
ORG_NAME: ${{secrets.ORG_NAME}}
2424
DB_NAME: ${{secrets.DB_NAME}}
2525
GITHUB_USER: ${{github.actor}}

.github/workflows/remove-operation-column-and-index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Remove operation - if asked, please click on displayed link to authenticate
2020
timeout-minutes: 3
2121
env:
22-
PLANETSCALE_SERVICE_TOKEN_NAME: ${{secrets.PLANETSCALE_SERVICE_TOKEN_NAME}}
22+
PLANETSCALE_SERVICE_TOKEN_ID: ${{secrets.PLANETSCALE_SERVICE_TOKEN_ID}}
2323
PLANETSCALE_SERVICE_TOKEN: ${{secrets.PLANETSCALE_SERVICE_TOKEN}}
2424
ORG_NAME: ${{secrets.ORG_NAME}}
2525
DB_NAME: ${{secrets.DB_NAME}}

.pscale/cli-helper-scripts/create-database.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ fi
3838
pscale branch promote "$DB_NAME" "$BRANCH_NAME" --org "$ORG_NAME"
3939

4040
# grant service token permission to use the database if service token is set
41-
if [ -n "$PLANETSCALE_SERVICE_TOKEN_NAME" ]; then
41+
if [ -n "$PLANETSCALE_SERVICE_TOKEN_ID" ]; then
4242
echo "Granting access to new database for service tokens ..."
43-
pscale service-token add-access "$PLANETSCALE_SERVICE_TOKEN_NAME" approve_deploy_request connect_branch create_branch create_comment create_deploy_request delete_branch read_branch read_deploy_request connect_production_branch --database "$DB_NAME" --org "$ORG_NAME"
43+
pscale service-token add-access "$PLANETSCALE_SERVICE_TOKEN_ID" approve_deploy_request connect_branch create_branch create_comment create_deploy_request delete_branch read_branch read_deploy_request connect_production_branch --database "$DB_NAME" --org "$ORG_NAME"
4444
fi
4545

4646
. create-branch-connection-string.sh

0 commit comments

Comments
 (0)