wip

Author: monyarm

modules/healthcheck/default.nix

@@ -8,53 +8,49 @@
       pkgs,
       ...
     }:
-
-    with lib;
-
     let
-
       mkProbeOptions = x: {
         options =
           {
-            enable = mkEnableOption "the ${x} probe";
+            enable = lib.mkEnableOption "the ${x} probe";
 
-            command = mkOption {
-              type = types.str;
+            command = lib.mkOption {
+              type = lib.types.str;
               description = "The command to execute for the ${x} check. Any necessary programs should be added to the healthcheck.runtimePackages option.";
             };
 
-            initialDelay = mkOption {
-              type = types.int;
+            initialDelay = lib.mkOption {
+              type = lib.types.int;
               default = 15;
               description = "Seconds to wait after the service is up before the first ${x} probe.";
             };
 
-            interval = mkOption {
-              type = types.int;
+            interval = lib.mkOption {
+              type = lib.types.int;
               default = if x == "liveness" then 30 else 2;
               description = "How often (in seconds) to perform the ${x} probe.";
             };
 
-            timeout = mkOption {
-              type = types.int;
+            timeout = lib.mkOption {
+              type = lib.types.int;
               default = 10;
               description = "Seconds after which the ${x} probe command times out.";
             };
-            retryCount = mkOption {
-              type = types.int;
+            retryCount = lib.mkOption {
+              type = lib.types.int;
               default = 10;
               description = "Number of times to retry the ${x} probe before considering it failed. (-1 means infinite retries)";
             };
           }
           // lib.optionalAttrs (x == "readiness") {
-            statusWaitingMessage = mkOption {
-              type = types.str;
+            statusWaitingMessage = lib.mkOption {
+              type = lib.types.str;
               default = "Service starting, waiting for ready signal...";
               description = "The status message to send to systemd while waiting.";
             };
 
-            statusReadyMessage = mkOption {
-              type = types.str;
+            statusReadyMessage = lib.mkOption {
+              type = lib.types.str;
               default = "Service is ready.";
               description = ''
                 The status message to send when the service is ready.
@@ -84,7 +80,7 @@
             let
               cfg = serviceConfig.healthcheck;
             in
-            mkIf (cfg != null && cfg.readiness-probe.enable) {
+            lib.mkIf (cfg != null && cfg.readiness-probe.enable) {
               assertion = cfg.exec != null;
               message = "When healthcheck.readiness-probe is enabled, you must define `healthcheck.exec` with the service command. (${serviceName})";
             }
@@ -97,7 +93,7 @@
               in
               {
                 name = "${mainServiceName}-liveness-check";
-                value = mkIf (cfg != null && cfg.liveness-probe.enable) {
+                value = lib.mkIf (cfg != null && cfg.liveness-probe.enable) {
                   description = "Timer for ${mainServiceName} liveness probe";
                   timerConfig = {
                     Unit = "${mainServiceName}-liveness-check.service";
@@ -114,7 +110,7 @@
                   let
                     cfg = serviceConfig.healthcheck;
                   in
-                  (mkIf (cfg.readiness-probe.enable) (
+                  (lib.mkIf (cfg.readiness-probe.enable) (
                     let
                       probeCfg = cfg.readiness-probe;
                     in
@@ -127,7 +123,7 @@
                       # We replace the ExecStart with a script that runs the readiness probe in the background, and the original service command in the foreground.
                       serviceConfig.ExecStart =
                         let
-                          scriptPath = makeBinPath (
+                          scriptPath = lib.makeBinPath (
                             [
                               pkgs.systemd
                               pkgs.curl
@@ -187,7 +183,7 @@
                   in
                   {
                     name = "${mainServiceName}-liveness-check";
-                    value = mkIf (cfg != null && cfg.liveness-probe.enable) (
+                    value = lib.mkIf (cfg != null && cfg.liveness-probe.enable) (
                       let
                         probeCfg = cfg.liveness-probe;
                         checkScript = pkgs.writeShellScript "liveness-check" ''
@@ -230,29 +226,29 @@
           };
         };
 
-      options.mcl.services = mkOption {
+      options.mcl.services = lib.mkOption {
         default = { };
-        type = types.attrsOf (
-          types.submodule (
+        type = lib.types.attrsOf (
+          lib.types.submodule (
             { ... }:
             {
               options = {
-                healthcheck = mkOption {
+                healthcheck = lib.mkOption {
                   default = null;
                   description = "Declarative health checks for this systemd service.";
-                  type = types.nullOr (
-                    types.submodule {
+                  type = lib.types.nullOr (
+                    lib.types.submodule {
                       options = {
                         # Programs to add to the PATH for the health check.
-                        runtimePackages = mkOption {
-                          type = types.listOf types.package;
+                        runtimePackages = lib.mkOption {
+                          type = lib.types.listOf lib.types.package;
                           default = [ ];
                           description = "Additional programs to add to the PATH for health checks.";
                         };
 
                         # The main command for the service, required when readiness-probe is on.
-                        exec = mkOption {
-                          type = types.str;
+                        exec = lib.mkOption {
+                          type = lib.types.str;
                           description = ''
                             The actual command to run for the service.
                             This MUST be used instead of `script` or `serviceConfig.ExecStart`
@@ -261,14 +257,14 @@
                         };
 
                         # The new readiness probe that uses the notify pattern.
-                        readiness-probe = mkOption {
-                          type = types.submodule readinessProbeOptions;
+                        readiness-probe = lib.mkOption {
+                          type = lib.types.submodule readinessProbeOptions;
                           default = { };
                         };
 
                         # The liveness probe (timer-based).
-                        liveness-probe = mkOption {
-                          type = types.submodule livenessProbeOptions;
+                        liveness-probe = lib.mkOption {
+                          type = lib.types.submodule livenessProbeOptions;
                           default = { };
                         };
                       };