pocketbase-bot: accept the var_ names and two missing fields (#17305)

* pocketbase-bot: accept the var_ names and two missing fields

cpu, ram, hdd, os and version were already reachable, but only under
the PocketBase names. People type what the ct scripts call them, so
"/pocketbase <slug> var_ram=4096" was rejected as an unknown field
while "ram=4096" worked. The bot already carried the mapping as
RESOURCE_TO_CT_VAR, for display only.

Normalise the keys in parseKVPairs, so both the field=value path and
the method path accept them, along with disk and memory as the other
two names people reach for. Matching is case-insensitive.

pin_reason and last_update_commit exist on the record and are worth
editing, but were not in ALLOWED_FIELDS. slug, script_created and
script_updated stay out: the first is the key the command looks the
record up by, the other two belong to the timestamp workflow. notes and
install_methods keep their own subcommands.

* pocketbase-bot: write the sync PR against the PR template

The sync PR body had its own Summary and Source headings, so the
autolabeler found none of the template checkboxes it looks for and the
PR came out with nothing but "needs triage". It also never referenced
the issue the command came from.

Write the body the way the template expects, with the Website update
box ticked, which is what a PocketBase sync is. Tested thoroughly stays
unticked and Tested on says not tested, because nothing here was run;
close-invalid-pr-template skips bot authors, so that costs nothing.

Reference the triggering number as Fixes when the command came from an
issue and as a plain mention when it came from a PR comment, where
Fixes would point the PR at itself. issue_comment carries both under
github.event.issue, so the new IS_PR_COMMENT tells them apart.

* ci: stop the .app header PR being closed as a new script

allowedBots carried "community-scripts-pr-app" but not the
"[bot]"-suffixed name GitHub actually reports, and the check is an exact
match, so the exemption never applied to it. push-app-to-main is listed
both ways; this one was not. PR #17304 was closed as an untested new
script submission because of it.

generate-app-headers.sh empties ct/headers, tools/headers and
vm/headers and writes them again, so every run reports those files as
added. That is what the autolabeler's new-script rule looks for, and
the vm rule matched vm/headers too. Exclude the header directories from
both, and skip them in the close workflow's own added-file fallback, so
the label cannot come back by another route.

Checked against minimatch with the shipped config: header files get
neither label, ct/*.sh, install/*.sh and vm/*.sh still get theirs.

* pocketbase-bot: label the sync PR as a bugfix

The sync corrects CT defaults that no longer match the PocketBase
record, so bugfix describes it better than website update, which is
meant for metadata changes on the site itself.
This commit is contained in:
CanbiZ (MickLesk)
2026-09-16 13:27:27 +02:00
committed by GitHub
parent fe6efcb468
commit 556b9c4653
3 changed files with 49 additions and 10 deletions

14
.github/autolabeler-config.json generated vendored
View File

@@ -8,7 +8,12 @@
"turnkey/**", "turnkey/**",
"vm/**" "vm/**"
], ],
"excludeGlobs": [] "excludeGlobs": [
"**/headers/**",
"ct/headers/**",
"tools/headers/**",
"vm/headers/**"
]
} }
], ],
"update script": [ "update script": [
@@ -41,7 +46,12 @@
"includeGlobs": [ "includeGlobs": [
"vm/**" "vm/**"
], ],
"excludeGlobs": [] "excludeGlobs": [
"**/headers/**",
"ct/headers/**",
"tools/headers/**",
"vm/headers/**"
]
} }
], ],
"tools": [ "tools": [

View File

@@ -28,6 +28,7 @@ jobs:
const allowedBots = [ const allowedBots = [
"push-app-to-main[bot]", "push-app-to-main[bot]",
"push-app-to-main", "push-app-to-main",
"community-scripts-pr-app[bot]",
"community-scripts-pr-app" "community-scripts-pr-app"
]; ];
@@ -62,7 +63,9 @@ jobs:
per_page: 100, per_page: 100,
}); });
hasAddedScriptFile = files.some( hasAddedScriptFile = files.some(
f => f.status === "added" && scriptPrefixes.some(p => f.filename.startsWith(p)) f => f.status === "added" &&
!f.filename.includes("/headers/") &&
scriptPrefixes.some(p => f.filename.startsWith(p))
); );
} catch (error) { } catch (error) {
core.warning(`Could not list files for PR #${prNumber}: ${error.message}`); core.warning(`Could not list files for PR #${prNumber}: ${error.message}`);

40
.github/workflows/pocketbase-bot.yml generated vendored
View File

@@ -26,6 +26,7 @@ jobs:
COMMENT_BODY: ${{ github.event.comment.body }} COMMENT_BODY: ${{ github.event.comment.body }}
COMMENT_ID: ${{ github.event.comment.id }} COMMENT_ID: ${{ github.event.comment.id }}
ISSUE_NUMBER: ${{ github.event.issue.number }} ISSUE_NUMBER: ${{ github.event.issue.number }}
IS_PR_COMMENT: ${{ github.event.issue.pull_request && 'true' || 'false' }}
REPO_OWNER: ${{ github.repository_owner }} REPO_OWNER: ${{ github.repository_owner }}
REPO_NAME: ${{ github.event.repository.name }} REPO_NAME: ${{ github.event.repository.name }}
ACTOR: ${{ github.event.comment.user.login }} ACTOR: ${{ github.event.comment.user.login }}
@@ -84,6 +85,7 @@ jobs:
const owner = process.env.REPO_OWNER; const owner = process.env.REPO_OWNER;
const repo = process.env.REPO_NAME; const repo = process.env.REPO_NAME;
const issueNumber = parseInt(process.env.ISSUE_NUMBER, 10); const issueNumber = parseInt(process.env.ISSUE_NUMBER, 10);
const isPrComment = process.env.IS_PR_COMMENT === 'true';
const commentId = parseInt(process.env.COMMENT_ID, 10); const commentId = parseInt(process.env.COMMENT_ID, 10);
const actor = process.env.ACTOR; const actor = process.env.ACTOR;
@@ -216,11 +218,22 @@ jobs:
const prTitle = 'chore(ct): sync ' + slugValue + ' defaults with PocketBase'; const prTitle = 'chore(ct): sync ' + slugValue + ' defaults with PocketBase';
const prBody = const prBody =
'## Summary\n' + '## ✍️ Description\n\n' +
'- Sync default CT variables for `' + slugValue + '` after `/pocketbase` update.\n' + 'Sync of the default CT variables for `' + slugValue + '` after a `/pocketbase` update by @' + actor + '.\n\n' +
'- Updated vars: `' + updateResult.updatedVars.join('`, `') + '`.\n\n' + 'Updated: `' + updateResult.updatedVars.join('`, `') + '`\n\n' +
'## Source\n' + '## 🔗 Related Issue\n\n' +
'- Triggered by @' + actor + ' via PocketBase bot.\n'; (isPrComment ? 'Triggered from #' : 'Fixes #') + issueNumber + '\n\n' +
'## ✅ Prerequisites (**X** in brackets)\n\n' +
'- [x] **Self-review completed** Code follows project standards.\n' +
'- [ ] **Tested thoroughly** Changes work as expected.\n' +
'- [x] **No security risks** No hardcoded secrets, unnecessary privilege escalations, or permission issues.\n\n' +
'**Tested on:** not tested — generated from the PocketBase record, only `var_` defaults changed.\n\n' +
'---\n\n' +
'## 🤖 AI Assistance (**X** in brackets)\n\n' +
'- [x] **No AI used** Scripts were written without AI assistance.\n\n' +
'---\n\n' +
'## 🛠️ Type of Change (**X** in brackets)\n\n' +
'- [x] 🐞 **Bug fix** Resolves an issue without breaking functionality.\n';
const createPrRes = await ghRequest('/repos/' + owner + '/' + repo + '/pulls', 'POST', { const createPrRes = await ghRequest('/repos/' + owner + '/' + repo + '/pulls', 'POST', {
title: prTitle, title: prTitle,
body: prBody, body: prBody,
@@ -335,7 +348,10 @@ jobs:
'`architectures` (amd64,arm64) `platforms` (pve,incus) ' + '`architectures` (amd64,arm64) `platforms` (pve,incus) ' +
'`execute_in` (pve,lxc,pbs,vm,pmg,pdm) `categories` (names or ids) ' + '`execute_in` (pve,lxc,pbs,vm,pmg,pdm) `categories` (names or ids) ' +
'`type` (ct, vm, addon, …) ' + '`type` (ct, vm, addon, …) ' +
'`is_disabled` `disable_message` `is_deleted` `deleted_message`\n\n' + '`is_disabled` `disable_message` `is_deleted` `deleted_message` ' +
'`pin_reason` `last_update_commit`\n\n' +
'The `var_` names from the ct scripts work too: `var_cpu` `var_ram` `var_disk`\n' +
'`var_os` `var_version` `var_port` `var_tags` `var_unprivileged`\n\n' +
'**Screenshots:**\n' + '**Screenshots:**\n' +
'```\n' + '```\n' +
'/pocketbase <slug> screenshot https://example.com/one.png https://example.com/two.png\n' + '/pocketbase <slug> screenshot https://example.com/one.png https://example.com/two.png\n' +
@@ -399,6 +415,14 @@ jobs:
// ── Shared helpers ───────────────────────────────────────────────── // ── Shared helpers ─────────────────────────────────────────────────
// The ct scripts name these var_cpu/var_ram/var_disk, and that is what
// people type. Accept them for the PocketBase keys.
const KEY_ALIASES = {
var_cpu: 'cpu', var_ram: 'ram', var_disk: 'hdd', var_hdd: 'hdd',
var_os: 'os', var_version: 'version', var_unprivileged: 'unprivileged',
var_port: 'port', var_tags: 'tags', disk: 'hdd', memory: 'ram',
};
// Key=value parser: handles unquoted and "quoted" values // Key=value parser: handles unquoted and "quoted" values
function parseKVPairs(str) { function parseKVPairs(str) {
const fields = {}; const fields = {};
@@ -426,7 +450,7 @@ jobs:
while (pos < str.length && !/\s/.test(str[pos])) pos++; while (pos < str.length && !/\s/.test(str[pos])) pos++;
value = str.substring(valStart, pos); value = str.substring(valStart, pos);
} }
fields[key] = value; fields[KEY_ALIASES[key.toLowerCase()] || key] = value;
} }
return fields; return fields;
} }
@@ -982,6 +1006,8 @@ jobs:
disable_message: 'string', disable_message: 'string',
is_deleted: 'boolean', is_deleted: 'boolean',
deleted_message: 'string', deleted_message: 'string',
pin_reason: 'string',
last_update_commit: 'string',
}; };
const parsedFields = parseKVPairs(rest); const parsedFields = parseKVPairs(rest);