mirror of
https://github.com/TECHNOFAB11/kubenix.git
synced 2025-12-12 08:00:06 +01:00
testing: rename defaults to common options
They are technically no defaults and competing declarations cause a module error
This commit is contained in:
parent
557cc48a0a
commit
b29d3a11b2
5 changed files with 18 additions and 18 deletions
|
|
@ -39,21 +39,21 @@ in
|
|||
default = true;
|
||||
};
|
||||
|
||||
defaults = mkOption {
|
||||
description = "List of defaults to apply to tests";
|
||||
common = mkOption {
|
||||
description = "List of common options to apply to tests";
|
||||
type = types.listOf (types.submodule ({ config, ... }: {
|
||||
options = {
|
||||
features = mkOption {
|
||||
description = "List of features that test has to have to apply defaults";
|
||||
description = "List of features that test has to have to apply options";
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
default = mkOption {
|
||||
description = "Default to apply to test";
|
||||
options = mkOption {
|
||||
description = "Options to apply to test";
|
||||
type = types.unspecified;
|
||||
default = { };
|
||||
apply = default: { _file = "testing.defaults"; } // default;
|
||||
apply = default: { _file = "testing.common"; } // default;
|
||||
};
|
||||
};
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
config.testing.defaults = [{
|
||||
config.testing.common = [{
|
||||
features = [ "docker" ];
|
||||
default = {
|
||||
options = {
|
||||
_file = "testing.docker.registryUrl";
|
||||
docker.registry.url = cfg.registryUrl;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,23 +33,23 @@ let
|
|||
# test features
|
||||
testFeatures = evaled'.config._m.features;
|
||||
|
||||
# defaults that can be applied on tests
|
||||
defaults =
|
||||
# common options that can be applied on this test
|
||||
commonOpts =
|
||||
filter
|
||||
(d:
|
||||
(intersectLists d.features testFeatures) == d.features ||
|
||||
(length d.features) == 0
|
||||
)
|
||||
testing.defaults;
|
||||
testing.common;
|
||||
|
||||
# add default modules to all modules
|
||||
modulesWithDefaults = modules ++ (map (d: d.default) defaults);
|
||||
# add common options modules to all modules
|
||||
modulesWithCommonOptions = modules ++ (map (d: d.options) commonOpts);
|
||||
|
||||
# evaled test
|
||||
evaled =
|
||||
let
|
||||
evaled' = kubenix.evalModules {
|
||||
modules = modulesWithDefaults;
|
||||
modules = modulesWithCommonOptions;
|
||||
};
|
||||
in
|
||||
if testing.throwError then evaled'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue