diff --git a/default.nix b/default.nix index 1596a26..94703b2 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,8 @@ -{system ? builtins.currentSystem}: ( - (import ./compat.nix).flake-compat { - src = ./.; - inherit system; - } - ) - .defaultNix +{system ? builtins.currentSystem}: +( + (import ./compat.nix).flake-compat { + src = ./.; + inherit system; + } +) +.defaultNix diff --git a/examples/nginx-deployment/default.nix b/examples/nginx-deployment/default.nix index e8a015a..ebb197e 100644 --- a/examples/nginx-deployment/default.nix +++ b/examples/nginx-deployment/default.nix @@ -3,7 +3,8 @@ registry, }: let # evaluated configuration - inherit ((evalModules { + inherit + ((evalModules { module = {kubenix, ...}: { imports = [ kubenix.modules.testing @@ -29,7 +30,9 @@ ]; }; }; - })) config; + })) + config + ; in { inherit config; diff --git a/flake.nix b/flake.nix index bffb9cd..f0a1054 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ nixpkgs, ... } @ inputs: - (inputs.flake-utils.lib.eachSystem ["x86_64-linux"]( + (inputs.flake-utils.lib.eachSystem ["x86_64-linux"] ( #inputs.flake-utils.lib.eachDefaultSystem ( system: let pkgs = import inputs.nixpkgs { @@ -77,10 +77,10 @@ else pkgs.runCommandNoCC "testing-suite-config-assertions-for-${suite.name}-failed" {} "exit 1"; mkExamples = attrs: (import ./examples {inherit evalModules;}) - ({registry = "docker.io/gatehub";} // attrs); + ({registry = "docker.io/gatehub";} // attrs); mkK8STests = attrs: (import ./tests {inherit evalModules;}) - ({registry = "docker.io/gatehub";} // attrs); + ({registry = "docker.io/gatehub";} // attrs); in { # TODO: access "success" derivation with nice testing utils for nice output nginx-example = wasSuccess (mkExamples {}).nginx-deployment.config.testing; diff --git a/jobs/generators/k8s/default.nix b/jobs/generators/k8s/default.nix index d3e03e6..6b05ebd 100644 --- a/jobs/generators/k8s/default.nix +++ b/jobs/generators/k8s/default.nix @@ -305,7 +305,8 @@ with lib; let genResourceOptions = resource: with gen; let - submoduleForDefinition' = definition: submoduleForDefinition + submoduleForDefinition' = definition: + submoduleForDefinition definition.ref definition.name definition.kind diff --git a/modules/base.nix b/modules/base.nix index d55c69b..7ff854e 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -1,7 +1,4 @@ -{ - lib, - ... -}: +{lib, ...}: with lib; { options = { kubenix.project = mkOption { diff --git a/modules/k8s.nix b/modules/k8s.nix index 71f3ed0..3ed2182 100644 --- a/modules/k8s.nix +++ b/modules/k8s.nix @@ -415,7 +415,8 @@ in { features = ["k8s" "submodule"]; module = {config, ...}: { # set module defaults - kubernetes.api.defaults = (filter (default: default.propagate) cfg.api.defaults) + kubernetes.api.defaults = + (filter (default: default.propagate) cfg.api.defaults) ++ [ # set module name and version for all kuberentes resources { diff --git a/modules/submodules.nix b/modules/submodules.nix index 5ad92f9..e01ab79 100644 --- a/modules/submodules.nix +++ b/modules/submodules.nix @@ -236,11 +236,14 @@ in { }: let evaledSubmodule' = evalModules { inherit specialArgs; - modules = config.modules ++ [./base.nix] ++ [ - { - _module.args.check = false; - } - ]; + modules = + config.modules + ++ [./base.nix] + ++ [ + { + _module.args.check = false; + } + ]; }; evaledSubmodule = diff --git a/modules/testing/runtime/nixos-k8s.nix b/modules/testing/runtime/nixos-k8s.nix index ea55a1c..b31b96f 100644 --- a/modules/testing/runtime/nixos-k8s.nix +++ b/modules/testing/runtime/nixos-k8s.nix @@ -12,10 +12,7 @@ with lib; let kubecerts = "/var/lib/kubernetes/secrets"; # how we differ from the standard configuration of mkKubernetesBaseTest - extraConfiguration = { - config, - ... - }: { + extraConfiguration = {config, ...}: { virtualisation = { memorySize = 2048; }; diff --git a/shell.nix b/shell.nix index 6b2af31..ecf415d 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,8 @@ -{system ? builtins.currentSystem}: ( - (import ./compat.nix).flake-compat { - src = ./.; - inherit system; - } - ) - .shellNix +{system ? builtins.currentSystem}: +( + (import ./compat.nix).flake-compat { + src = ./.; + inherit system; + } +) +.shellNix diff --git a/tests/default.nix b/tests/default.nix index df57e09..d9fdf62 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -7,7 +7,8 @@ doThrowError ? true, # whether any testing error should throw an error enabledTests ? null, }: let - inherit ((evalModules { + inherit + ((evalModules { module = { kubenix, pkgs, @@ -48,6 +49,8 @@ ]; }; }; - })) config; + })) + config + ; in config.testing // {recurseForDerivations = true;} diff --git a/tests/helm/simple.nix b/tests/helm/simple.nix index bc08ae3..835453a 100644 --- a/tests/helm/simple.nix +++ b/tests/helm/simple.nix @@ -1,9 +1,14 @@ -{ config, lib, pkgs, kubenix, helm, ... }: - +{ + config, + lib, + pkgs, + kubenix, + helm, + ... +}: with lib; with kubenix.lib; -with pkgs.dockerTools; -let +with pkgs.dockerTools; let corev1 = config.kubernetes.api.resources.core.v1; appsv1 = config.kubernetes.api.resources.apps.v1; @@ -30,9 +35,8 @@ let finalImageName = "docker.io/bitnami/bitnami-shell"; finalImageTag = "10"; }; -in -{ - imports = [ kubenix.modules.test kubenix.modules.helm kubenix.modules.k8s kubenix.modules.docker ]; +in { + imports = [kubenix.modules.test kubenix.modules.helm kubenix.modules.k8s kubenix.modules.docker]; docker.images = { postgresql.image = postgresql; @@ -43,14 +47,16 @@ in test = { name = "helm-simple"; description = "Simple k8s testing wheter name, apiVersion and kind are preset"; - assertions = [{ - message = "should have generated resources"; - assertion = - appsv1.StatefulSet ? "app-psql-postgresql-primary" && - appsv1.StatefulSet ? "app-psql-postgresql-read" && - corev1.Secret ? "app-psql-postgresql" && - corev1.Service ? "app-psql-postgresql-headless"; - } + assertions = [ + { + message = "should have generated resources"; + assertion = + appsv1.StatefulSet + ? "app-psql-postgresql-primary" + && appsv1.StatefulSet ? "app-psql-postgresql-read" + && corev1.Secret ? "app-psql-postgresql" + && corev1.Service ? "app-psql-postgresql-headless"; + } { message = "should have values passed"; assertion = appsv1.StatefulSet.app-psql-postgresql-read.spec.replicas == 2; @@ -59,7 +65,8 @@ in message = "should have namespace defined"; assertion = appsv1.StatefulSet.app-psql-postgresql-primary.metadata.namespace == "test"; - }]; + } + ]; script = '' @pytest.mark.applymanifest('${config.kubernetes.resultYAML}') def test_helm_deployment(kube): diff --git a/tests/istio/bookinfo.nix b/tests/istio/bookinfo.nix index cfc574a..36b4b7f 100644 --- a/tests/istio/bookinfo.nix +++ b/tests/istio/bookinfo.nix @@ -1,7 +1,4 @@ -{ - kubenix, - ... -}: { +{kubenix, ...}: { imports = with kubenix.modules; [test k8s istio]; test = { diff --git a/tests/submodules/defaults.nix b/tests/submodules/defaults.nix index e9de06a..85dca3b 100644 --- a/tests/submodules/defaults.nix +++ b/tests/submodules/defaults.nix @@ -13,7 +13,7 @@ with lib; let inherit (config.submodules.instances) instance5; inherit (config.submodules.instances) versioned-submodule; - submodule = { ...}: { + submodule = {...}: { imports = [kubenix.modules.submodule]; options.submodule.args = {