From 7da954157c717ac9825bca5775307baca1a04731 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@gatehub.net>
Date: Mon, 11 Mar 2019 20:49:33 +0100
Subject: [PATCH] fix(testing): passing of extraConfiguration

---
 modules/test.nix    | 2 +-
 modules/testing.nix | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/test.nix b/modules/test.nix
index 07fd1a1..91bdacd 100644
--- a/modules/test.nix
+++ b/modules/test.nix
@@ -57,7 +57,7 @@ in {
       default = null;
     };
 
-    extraConfig = mkOption {
+    extraConfiguration = mkOption {
       description = "Extra configuration for running test";
       type = types.unspecified;
       default = {};
diff --git a/modules/testing.nix b/modules/testing.nix
index 9b69091..60afb4b 100644
--- a/modules/testing.nix
+++ b/modules/testing.nix
@@ -72,7 +72,7 @@ let
       inherit name;
 
       nodes.kube = { config, pkgs, nodes, ... }: {
-        imports = [ kubernetesBaseConfig ];
+        imports = [ kubernetesBaseConfig extraConfiguration ];
         services.kubernetes = {
           roles = ["master" "node"];
           flannel.enable = false;
@@ -186,15 +186,16 @@ let
     };
 
     config = mkMerge [{
+      inherit evaled;
       inherit (test) name description enable;
-    } (mkIf config.evaled {
+    } (mkIf (config.evaled != null) {
       inherit (evaled.config.test) assertions;
       success = all (el: el.assertion) config.assertions;
       test =
         if cfg.e2e && evaled.config.test.testScript != null
         then mkKubernetesSingleNodeTest {
-          inherit (evaled.config.test) testScript;
           name = config.name;
+          inherit (evaled.config.test) testScript extraConfiguration;
         } else null;
       generated = mkIf (hasAttr "kubernetes" evaled.config)
         (pkgs.writeText "${config.name}-gen.json" (builtins.toJSON evaled.config.kubernetes.generated));