mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
kevinveenbirkenbachandClaude Opus 5
575a5a87ac
Every script a role ships now lives under `files/<language>/`, and the unit
suite is split the same way: `tests/unit/python/` beside new sibling trees for
the other languages. `tests/lint/filesystem/test_role_files_layout.py` keeps it
that way; directories whose shape is dictated from outside carry a `.nocheck`
naming the constraint (Docker build contexts, WordPress mu-plugins, the Joomla
extension, Odoo addons, Playwright suites, the `files/test/test.sh` harness
that `test-e2e-cli` resolves generically).
This cannot be applied in halves. Moving a file and repointing what names it
are the same change: 14 references resolve only at deploy time, so the tree is
green either before or after, never between.
Those 14 were found by static resolution over every reference class, not by the
test suite -- a full `make quality-high` was green while all of them were
broken:
* 7 `src:` values built from a role variable holding a bare filename
(svc-bkp-remote-2-local, decidim, espocrm, friendica, joomla, pixelfed x2).
The variable doubles as the destination name inside the container, so the
language segment belongs at the call site, not in the variable.
* `sys-service/tasks/04_base.yml` resolved every consumer's systemd script
through `first_found(..., errors='strict')` over `files/script.{sh,py}`.
18 roles ship exactly that and have no template fallback: the play would
have died on each.
* `sys-front-inj-javascript` fell back to `<role>/files/javascript.js`; the
interface now reads `files/javascript/javascript.js`.
* `sys-front-inj-logout/templates/head_sub.j2` built the cache-busting mtime
path through `path_absolute(... 'files', ...)`.
* 4 `ansible.builtin.script:` invocations naming a bare command
(pull.py, prune.sh, set_postgres_superuser_password.sh, ganesha-serve.sh).
* `dev-python/files/shell/install.sh` pointed at a sibling role's script.
Depth-dependent paths inside the moved trees were bumped accordingly: 59
`parents[N]` computations, 12 relative climbs, and the per-role recover CLI,
whose path `cli/administration/recover/recoverers.py` still assembled from the
pre-move location.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
72 lines
2.7 KiB
PHP
72 lines
2.7 KiB
PHP
<?php
|
|
// nocheck: mirrored-unit-test - reads $argv, requires Friendica's autoloader and
|
|
// queries the live hook table over PDO; a unit test would mock away the entire script
|
|
|
|
/*
|
|
* Verify a Friendica addon's _install() hooks are present in the
|
|
* `hook` DB table. `bin/console addon enable` only ever writes the
|
|
* `config[addons.<X>]` entry; the `_install()` function runs in the
|
|
* same PHP process but its Hook::register() calls have empirically
|
|
* been observed to leave the `hook` table empty on the first deploy
|
|
* of a fresh stack. A disable+enable cycle from a clean shell at any
|
|
* later point recovers it. Run this verifier after the addon-sync
|
|
* loop so the broken state fails the role instead of surfacing as a
|
|
* silent login regression at the Playwright stage.
|
|
*
|
|
* Run inside the friendica container, as the www-data user, with
|
|
* /var/www/html as the working directory:
|
|
* php verify_addon_hooks.php ADDON MIN_HOOKS
|
|
* ADDON addon name (e.g. ldapauth)
|
|
* MIN_HOOKS minimum number of rows expected in `hook` for this
|
|
* addon (e.g. 2 for ldapauth's load_config +
|
|
* authenticate)
|
|
*
|
|
* On mismatch, runs one `bin/console addon disable` + `enable` cycle
|
|
* and re-checks. Exits non-zero if hooks are still missing.
|
|
*/
|
|
|
|
if ($argc !== 3) {
|
|
fwrite(STDERR, "usage: php verify_addon_hooks.php ADDON MIN_HOOKS\n");
|
|
exit(2);
|
|
}
|
|
|
|
$addon = $argv[1];
|
|
$minHooks = (int) $argv[2];
|
|
|
|
require '/var/www/html/vendor/autoload.php';
|
|
$cfgFile = getenv('FRIENDICA_CONFIG_FILE');
|
|
if ($cfgFile === false) {
|
|
fwrite(STDERR, "FRIENDICA_CONFIG_FILE env missing\n");
|
|
exit(1);
|
|
}
|
|
$cfg = include $cfgFile;
|
|
$db = $cfg['database'];
|
|
$h = explode(':', $db['hostname']);
|
|
$dsn = 'mysql:host=' . $h[0] . ';port=' . ($h[1] ?? 3306) . ';dbname=' . $db['database'];
|
|
$pdo = new PDO($dsn, $db['username'], $db['password']);
|
|
|
|
function count_hooks(PDO $pdo, string $addon): int {
|
|
$s = $pdo->prepare('SELECT COUNT(*) FROM hook WHERE file LIKE :p');
|
|
$s->execute([':p' => '%addon/' . $addon . '/' . $addon . '.php']);
|
|
return (int) $s->fetchColumn();
|
|
}
|
|
|
|
$count = count_hooks($pdo, $addon);
|
|
if ($count >= $minHooks) {
|
|
echo "[verify_addon_hooks] $addon hooks=$count (>= $minHooks, OK)\n";
|
|
exit(0);
|
|
}
|
|
|
|
echo "[verify_addon_hooks] $addon hooks=$count (< $minHooks); re-cycling disable+enable\n";
|
|
passthru('/var/www/html/bin/console addon disable ' . escapeshellarg($addon));
|
|
passthru('/var/www/html/bin/console addon enable ' . escapeshellarg($addon));
|
|
|
|
$count = count_hooks($pdo, $addon);
|
|
if ($count >= $minHooks) {
|
|
echo "[verify_addon_hooks] $addon hooks=$count after re-cycle (>= $minHooks, OK)\n";
|
|
exit(0);
|
|
}
|
|
|
|
fwrite(STDERR, "[verify_addon_hooks] $addon hooks=$count after re-cycle (still < $minHooks)\n");
|
|
exit(1);
|