Archived
Fill ${setting:} in a service's unit name, and refuse a value that makes no unit name #171
Assignees
agent-ace
agent-g14
agent-novox
agent-shanks
jschoubben
mesh-tools
miel.truyen
nox-agent
Clear assignees
agent-ace
agent-g14
agent-novox
agent-shanks
jschoubben
mesh-tools
miel.truyen
nox-agent
No Assignees
No due date set.
Dependencies
No dependencies set.
Reference: novox/mesh-controller#171
Reference in New Issue
Block a user
Why. The second review of mesh-catalog #147 found that
${setting:}is substituted only into file content (setting_into.go). The zfs module declares the distribution's timer for the operator's pool aszfs-scrub-weekly@${setting:scrub-pool}.timer, so the home server would have been sent that literal unit name and the apply would have failed. The pool cannot be written into the definition (hq ADR 0112).What changes.
serviceresource'sunitnow takes${setting:}from the same layers a file does: the module's defaults, then the mesh's layer, then the node's.^[A-Za-z0-9:_.-]+$. The name ends up in systemctl arguments and unit paths, so a space, a slash, a newline, an@, a\escape,*,$(…)or an empty value must never reach them.JudgeSettingssees it.Tests, written first:
internal/catalogue/setting_in_unit_test.go. Against main, all three behaviour tests failed: the unit was composed aszfs-scrub-weekly@${setting:scrub-pool}.timer, and nothing was refused.scrub-pool=storageandscrub-cadence=monthly, throughCompose):zfs.distribution-weekly→zfs-scrub-weekly@storage.timerzfs.distribution-monthly→zfs-scrub-monthly@storage.timerpool=storage\ncadence=monthly\n"",stor age,a/b,storage\nExecStart=/bin/sh,a@b,$(x),*anda\\x2d, each named by its key, with the resource unchanged.go vetandgo test ./...pass locally. Needed by mesh-catalog #147 before the zfs module goes on the home server.A module that holds the distribution's scrub timer for the pool the operator names (zfs-scrub-weekly@<pool>.timer) cannot write the pool into its definition (hq ADR 0112). Settings were substituted only into file content, so the unit reached the machine as "zfs-scrub-weekly@${setting:scrub-pool}.timer", a unit no machine has, and the apply failed far from its cause (second review of mesh-catalog #147). A service's unit now takes ${setting:} from the same layers a file does, and is refused by key when nothing sets it. A value is also refused unless it is only letters, digits, ':', '_', '.' and '-': the name ends up in unit files and systemctl arguments, and a space, a slash or a newline must never reach them. A key a unit asks for is not called stray.Delivery
novox/mesh-controller@eb5f9d2f531b— delivered since 2026-10-09T00:48:21ZDelivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step
Machines
Transitions
The commit's note under
refs/notes/mesh-plankeeps every transition:git log --notes=mesh-plan.Merge check at
e4d28686mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step
Run by the build seat on ace as
build-1791502365709598177(builds --log build-1791502365709598177).Merge check at
eb5f9d2fmesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step
Run by the build seat on shanks as
build-1791503516706395670(builds --log build-1791503516706395670).Merge check at
eb5f9d2fmesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step
Run by the build seat on shanks as
build-1791505542851415146(builds --log build-1791505542851415146).