statix fix

This commit is contained in:
GTrunSec 2022-04-02 13:43:57 -07:00
parent 890b84be5e
commit 6a720a257e
No known key found for this signature in database
GPG key ID: 2368FAFA4ABDD2A0
27 changed files with 86 additions and 99 deletions

View file

@ -7,8 +7,7 @@
doThrowError ? true, # whether any testing error should throw an error
enabledTests ? null,
}: let
config =
(evalModules {
inherit ((evalModules {
module = {
kubenix,
pkgs,
@ -49,7 +48,6 @@
];
};
};
})
.config;
})) config;
in
config.testing // {recurseForDerivations = true;}

View file

@ -5,8 +5,8 @@
...
}:
with lib; let
pod1 = config.kubernetes.api.resources.pods.pod1;
pod2 = config.kubernetes.api.resources.pods.pod2;
inherit (config.kubernetes.api.resources.pods) pod1;
inherit (config.kubernetes.api.resources.pods) pod2;
in {
imports = with kubenix.modules; [test k8s];

View file

@ -14,7 +14,7 @@ with lib; let
apiVersion = "v1";
kind = "Pod";
metadata = {
namespace = config.kubernetes.namespace;
inherit (config.kubernetes) namespace;
name = "curl";
};
spec.containers = [

View file

@ -6,12 +6,12 @@
...
}:
with lib; let
instance1 = config.submodules.instances.instance1;
instance2 = config.submodules.instances.instance2;
instance3 = config.submodules.instances.instance3;
instance4 = config.submodules.instances.instance4;
instance5 = config.submodules.instances.instance5;
versioned-submodule = config.submodules.instances.versioned-submodule;
inherit (config.submodules.instances) instance1;
inherit (config.submodules.instances) instance2;
inherit (config.submodules.instances) instance3;
inherit (config.submodules.instances) instance4;
inherit (config.submodules.instances) instance5;
inherit (config.submodules.instances) versioned-submodule;
submodule = { ...}: {
imports = [kubenix.modules.submodule];

View file

@ -7,7 +7,7 @@
}:
with lib; let
cfg = config.submodules.instances.instance;
args = cfg.config.submodule.args;
inherit (cfg.config.submodule) args;
in {
imports = with kubenix.modules; [test submodules];
@ -37,7 +37,7 @@ in {
}
{
message = "should have tag set";
assertion = elem "tag" (cfg.config.submodule.tags);
assertion = elem "tag" cfg.config.submodule.tags;
}
];
};