From 03640d3cf04e9540b59cc1806e50b07095ea393f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 15 Oct 2025 12:26:14 +0200 Subject: [PATCH] services: cuirass: Validate specifications at build time. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures problems in the spec are caught before the system is instantiated. * gnu/services/cuirass.scm (cuirass-configuration->specification-file): New procedure. (cuirass-shepherd-service): Use it instead of ‘scheme-file’. Change-Id: I90187ed4ed1a51958159741a55b6dc635c97312a --- gnu/services/cuirass.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 27ff87ca56d..0cc504562a4 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -134,6 +134,28 @@ (web-extra-options cuirass-configuration-web-extra-options (default '()))) +(define (cuirass-configuration->specification-file config) + "Return a specification file built from CONFIG and validate it." + (define cuirass + (cuirass-configuration-cuirass config)) + + (define build + #~(begin + (use-modules (ice-9 pretty-print)) + + (call-with-output-file #$output + (lambda (port) + (pretty-print '#$(cuirass-configuration-specifications config) + port))) + + ;; Validate the spec file upfront. + (unless (zero? + (system* #$(file-append cuirass "/bin/cuirass") "register" + "--check" "-S" #$output)) + (exit 1)))) + + (computed-file "cuirass-specs.scm" build)) + (define (cuirass-shepherd-service config) "Return a for the Cuirass service with CONFIG." (define (endpoint name) @@ -162,9 +184,7 @@ (database (cuirass-configuration-database config)) (port (cuirass-configuration-port config)) (host (cuirass-configuration-host config)) - (config-file (scheme-file - "cuirass-specs.scm" - (cuirass-configuration-specifications config))) + (config-file (cuirass-configuration->specification-file config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) (extra-options (cuirass-configuration-extra-options config))