yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Inventory: set {name,meta.name} automatically

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-09-15 15:09:54 +02:00
parent 27f3935abc
commit 8d5463587e
2 changed files with 74 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/inventory/build-inventory/default.nix
View File

@@ -160,10 +160,10 @@ let
{ {
config.clan.${serviceName} = lib.mkMerge ( config.clan.${serviceName} = lib.mkMerge (
[ [
(globalConfig) globalConfig
(lib.traceValSeq machineServiceConfig) machineServiceConfig
] ]
++ (roleServiceConfigs) ++ roleServiceConfigs
); );
} }
) )

121
lib/inventory/build-inventory/interface.nix
View File

@@ -13,6 +13,20 @@ let
type = types.nullOr types.str; type = types.nullOr types.str;
}; };
}; };
metaOptionsWith = name: {
name = lib.mkOption {
type = types.str;
default = name;
};
description = lib.mkOption {
default = null;
type = types.nullOr types.str;
};
icon = lib.mkOption {
default = null;
type = types.nullOr types.str;
};
};
moduleConfig = lib.mkOption { moduleConfig = lib.mkOption {
default = { }; default = { };
@@ -64,26 +78,30 @@ in
machines = lib.mkOption { machines = lib.mkOption {
default = { }; default = { };
type = types.attrsOf ( type = types.attrsOf (
types.submodule { types.submodule (
options = { { name, ... }:
inherit (metaOptions) name description icon; {
tags = lib.mkOption { options = {
inherit (metaOptionsWith name) name description icon;
default = [ ]; tags = lib.mkOption {
apply = lib.unique;
type = types.listOf types.str; default = [ ];
apply = lib.unique;
type = types.listOf types.str;
};
system = lib.mkOption {
default = null;
type = types.nullOr types.str;
};
deploy.targetHost = lib.mkOption {
description = "Configuration for the deployment of the machine";
default = null;
type = types.nullOr types.str;
};
}; };
system = lib.mkOption { }
default = null; )
type = types.nullOr types.str;
};
deploy.targetHost = lib.mkOption {
description = "Configuration for the deployment of the machine";
default = null;
type = types.nullOr types.str;
};
};
}
); );
}; };
@@ -91,38 +109,41 @@ in
default = { }; default = { };
type = types.attrsOf ( type = types.attrsOf (
types.attrsOf ( types.attrsOf (
types.submodule { types.submodule (
options.meta = metaOptions; { name, ... }:
options.imports = importsOption; {
options.config = moduleConfig; options.meta = metaOptionsWith name;
options.machines = lib.mkOption { options.imports = importsOption;
default = { }; options.config = moduleConfig;
type = types.attrsOf ( options.machines = lib.mkOption {
types.submodule { default = { };
options.imports = importsOption; type = types.attrsOf (
options.config = moduleConfig; types.submodule {
} options.imports = importsOption;
); options.config = moduleConfig;
}; }
options.roles = lib.mkOption { );
default = { }; };
type = types.attrsOf ( options.roles = lib.mkOption {
types.submodule { default = { };
options.machines = lib.mkOption { type = types.attrsOf (
default = [ ]; types.submodule {
type = types.listOf types.str; options.machines = lib.mkOption {
}; default = [ ];
options.tags = lib.mkOption { type = types.listOf types.str;
default = [ ]; };
apply = lib.unique; options.tags = lib.mkOption {
type = types.listOf types.str; default = [ ];
}; apply = lib.unique;
options.config = moduleConfig; type = types.listOf types.str;
options.imports = importsOption; };
} options.config = moduleConfig;
); options.imports = importsOption;
}; }
} );
};
}
)
) )
); );
}; };