From 557cc48a0a66ed637dd0e1e52c423f3268059d89 Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Mon, 31 May 2021 22:35:41 -0500
Subject: [PATCH] style: simplify example & tests top level invokation

---
 examples/nginx-deployment/default.nix | 36 ++++++++++++++++++---------
 tests/default.nix                     | 15 ++++++-----
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/examples/nginx-deployment/default.nix b/examples/nginx-deployment/default.nix
index 42f1d96..4f37c6a 100644
--- a/examples/nginx-deployment/default.nix
+++ b/examples/nginx-deployment/default.nix
@@ -3,20 +3,32 @@
 let
   # evaluated configuration
   config = (evalModules {
-    modules = [
+    module =
+      { kubenix, ... }: {
+        imports = [
+          kubenix.modules.testing
+          ./module.nix
+        ];
 
-      ({ kubenix, ... }: { imports = [ kubenix.modules.testing ]; })
+        # commonalities
+        kubenix.project = "nginx-deployment-example";
+        docker.registry.url = registry;
+        kubernetes.version = "1.21";
 
-      ./module.nix
-
-      { docker.registry.url = registry; }
-
-      {
-        testing.tests = [ ./test.nix ];
-        testing.docker.registryUrl = "";
-      }
-
-    ];
+        testing = {
+          tests = [ ./test.nix ];
+          docker.registryUrl = "";
+          # testing commonalities for tests that exhibit the respective feature
+          defaults = [
+            {
+              features = [ "k8s" ];
+              default = {
+                kubernetes.version = "1.20";
+              };
+            }
+          ];
+        };
+      };
   }).config;
 
 in
diff --git a/tests/default.nix b/tests/default.nix
index 0e596cb..f8a4f35 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -11,11 +11,11 @@
 let
   config = (evalModules {
 
-    modules = [
+    module =
+      { kubenix, pkgs, ... }: {
 
-      ({ kubenix, ... }: { imports = [ kubenix.modules.testing ]; })
+        imports = [ kubenix.modules.testing ];
 
-      ({ pkgs, ... }: {
         testing = {
           name = "kubenix-${k8sVersion}";
           throwError = throwError;
@@ -36,10 +36,10 @@ let
             ./submodules/exports.nix
             ./submodules/passthru.nix
           ];
-          args = {
-            images = pkgs.callPackage ./images.nix { };
-          };
+
+          args = { images = pkgs.callPackage ./images.nix { }; };
           docker.registryUrl = registry;
+
           defaults = [
             {
               features = [ "k8s" ];
@@ -49,9 +49,8 @@ let
             }
           ];
         };
-      })
 
-    ];
+      };
 
   }).config;
 in