Skip to content

chore(ci): Replace GH_CQ_BOT PAT with GitHub App tokens #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 5 commits into from
Mar 27, 2026
+39 −6
Merged

chore(ci): Replace GH_CQ_BOT PAT with GitHub App tokens #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cc018a
chore(ci): Replace GH_CQ_BOT PAT with GitHub App tokens
erezrokah Mar 26, 2026
07c721f
fix(ci): Add cross-repo permissions for GitHub App tokens
erezrokah Mar 27, 2026
a942815
fix(ci): Use multiline format for repositories input
erezrokah Mar 27, 2026
73f8481
fix(ci): Split gen-client.yml into two tokens for least privilege
erezrokah Mar 27, 2026
eb52aaf
fix(ci): Split release-pr.yml into two tokens for least privilege
erezrokah Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions .github/workflows/gen-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,31 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3
with:
app-id: ${{ secrets.CQ_APP_ID }}
private-key: ${{ secrets.CQ_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
- name: Generate GitHub App token for cloud repo
id: app-token-cloud
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3
with:
app-id: ${{ secrets.CQ_APP_ID }}
private-key: ${{ secrets.CQ_APP_PRIVATE_KEY }}
repositories: |
cloud
permission-contents: read
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
with:
token: ${{ secrets.GH_CQ_BOT }}
token: ${{ steps.app-token.outputs.token }}

- name: Get Specs File
run: |
curl -H "Authorization: token ${{ secrets.GH_CQ_BOT }}" https://raw.githubusercontent.com/cloudquery/cloud/main/cloud/internal/servergen/spec.json -o spec.json
curl -H "Authorization: token ${{ steps.app-token-cloud.outputs.token }}" https://raw.githubusercontent.com/cloudquery/cloud/main/cloud/internal/servergen/spec.json -o spec.json

- name: Format Specs File
run: |
Expand All @@ -38,11 +55,10 @@ jobs:
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8
with:
# required so the PR triggers workflow runs
token: ${{ secrets.GH_CQ_BOT }}
token: ${{ steps.app-token.outputs.token }}
branch: fix/gen-cloudquery-api
base: main
title: 'fix: Generate CloudQuery Go API Client from `spec.json`'
commit-message: 'fix: Generate CloudQuery Go API Client from `spec.json`'
body: This PR was created by a scheduled workflow to generate the CloudQuery Go API Client from `spec.json`
author: cq-bot <cq-bot@users.noreply.github.com>
labels: automerge
21 changes: 19 additions & 2 deletions .github/workflows/release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,27 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3
with:
app-id: ${{ secrets.CQ_APP_ID }}
private-key: ${{ secrets.CQ_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
- name: Generate GitHub App token for .github repo
id: app-token-github
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3
with:
app-id: ${{ secrets.CQ_APP_ID }}
private-key: ${{ secrets.CQ_APP_PRIVATE_KEY }}
repositories: |
.github
permission-actions: write
- uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4
id: release
with:
token: ${{ secrets.GH_CQ_BOT }}
token: ${{ steps.app-token.outputs.token }}
- name: Parse semver string
if: steps.release.outputs.release_created
id: semver_parser
Expand All @@ -34,7 +51,7 @@ jobs:
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
if: steps.release.outputs.release_created && steps.semver_parser.outputs.prerelease == ''
with:
github-token: ${{ secrets.GH_CQ_BOT }}
github-token: ${{ steps.app-token-github.outputs.token }}
script: |
github.rest.actions.createWorkflowDispatch({
owner: 'cloudquery',
Expand Down
Loading