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

@ -43,7 +43,7 @@ in {
common = mkOption {
description = "List of common options to apply to tests";
type = types.listOf (types.submodule ({ ...}: {
type = types.listOf (types.submodule (_: {
options = {
features = mkOption {
description = "List of features that test has to have to apply options";
@ -70,7 +70,7 @@ in {
inherit module;
})
(types.submodule testModule));
apply = tests: filter isTestEnabled tests;
apply = filter isTestEnabled;
};
testsByName = mkOption {

View file

@ -6,7 +6,7 @@
}:
with lib;
with import ../../lib/docker {inherit lib pkgs;}; let
testing = config.testing;
inherit (config) testing;
allImages = unique (flatten (map (t: t.evaled.config.docker.export or []) testing.tests));
@ -33,7 +33,7 @@ in {
images = allImages;
copyScript = copyDockerImages {
images = cfg.images;
inherit (cfg) images;
dest = "docker://" + cfg.registryUrl;
};
};

View file

@ -5,7 +5,7 @@
...
}:
with lib; let
testing = config.testing;
inherit (config) testing;
cfg = testing.driver.kubetest;
kubetest = import ./kubetestdrv.nix {inherit pkgs;};

View file

@ -5,7 +5,7 @@
...
}:
with lib; let
testing = config.testing;
inherit (config) testing;
script = pkgs.writeScript "run-local-k8s-tests-${testing.name}.sh" ''
#!${pkgs.runtimeShell}

View file

@ -6,7 +6,7 @@
...
}:
with lib; let
testing = config.testing;
inherit (config) testing;
# kubeconfig = "/etc/${config.services.kubernetes.pki.etcClusterAdminKubeconfig}";
kubeconfig = "/etc/kubernetes/cluster-admin.kubeconfig";
kubecerts = "/var/lib/kubernetes/secrets";