refactor(dotfiles): separate registry validation

This commit is contained in:
2026-10-04 21:26:20 -04:00
parent 3e9295134e
commit 9d818712fe
2 changed files with 19 additions and 19 deletions

View File

@@ -19,14 +19,12 @@ let
]; ];
}).config; }).config;
data = validate (
lib.mapAttrs (
registryName: _registry:
lib.mapAttrs (hostName: host: host.config.registry.${registryName}.${hostName} or { }) hosts
) definitions
);
validate = import ./registry/validation.nix { inherit definitions lib; }; validate = import ./registry/validation.nix { inherit definitions lib; };
data = lib.mapAttrs (
registryName: _registry:
lib.mapAttrs (hostName: host: host.config.registry.${registryName}.${hostName} or { }) hosts
) definitions;
in in
{ {
types = lib.mapAttrs (_name: definition: definition.type) definitions; types = lib.mapAttrs (_name: definition: definition.type) definitions;
@@ -45,13 +43,16 @@ in
) definitions; ) definitions;
}; };
collected = data // { collected =
join = assert validate data;
host: entry: data
lib.filterAttrs (_name: value: value != null) ( // {
lib.mapAttrs ( join =
registryName: _registry: (data.${registryName}.${host} or { }).${entry} or null host: entry:
) definitions lib.filterAttrs (_name: value: value != null) (
); lib.mapAttrs (
}; registryName: _registry: (data.${registryName}.${host} or { }).${entry} or null
) definitions
);
};
} }

View File

@@ -35,7 +35,6 @@ let
assertions = validationAssertions data; assertions = validationAssertions data;
failures = lib.filter (assertion: !assertion.assertion) assertions; failures = lib.filter (assertion: !assertion.assertion) assertions;
in in
assert lib.assertMsg (lib.all (assertion: assertion.assertion) assertions) ( lib.assertMsg (lib.all (assertion: assertion.assertion) assertions) (
lib.concatMapStringsSep "\n" (assertion: assertion.message) failures lib.concatMapStringsSep "\n" (assertion: assertion.message) failures
); )
data