feat: refactor file structure module interfaces and other

tests/default.nix

@@ -16,13 +16,9 @@ let
     version' = replaceStrings ["."] ["_"] version;
   in nameValuePair "v${version'}" (kubenix.evalModules {
     modules = [
-      kubenix.testing
+      kubenix.modules.testing
 
       {
-        imports = [kubenix.k8s kubenix.submodules];
-
-        kubernetes.version = version;
-
         testing.throwError = throwError;
         testing.e2e = e2e;
         testing.tests = [
@@ -40,7 +36,7 @@ let
           ./module.nix
         ];
         testing.defaults = ({kubenix, ...}: {
-          imports = [kubenix.k8s];
+          imports = [kubenix.modules.k8s];
           kubernetes.version = version;
           _module.args.images = images;
         });

tests/helm/simple.nix

@@ -1,4 +1,4 @@
-{ config, lib, test, pkgs, kubenix, helm, ... }:
+{ config, lib, pkgs, kubenix, helm, ... }:
 
 with lib;
 with kubenix.lib;
@@ -29,9 +29,7 @@ let
     finalImageTag = "latest";
   };
 in {
-  imports = [
-    kubenix.helm
-  ];
+  imports = [ kubenix.modules.test kubenix.modules.helm ];
 
   test = {
     name = "helm-simple";

tests/istio/bookinfo.nix

@@ -1,12 +1,7 @@
-{ config, test, kubenix, k8s, ... }:
-
-with k8s;
+{ config, kubenix, ... }:
 
 {
-  imports = [
-    kubenix.k8s
-    kubenix.istio
-  ];
+  imports = with kubenix.modules; [ test k8s istio ];
 
   test = {
     name = "istio-bookinfo";

tests/k8s/1.13/crd.nix

@@ -5,9 +5,7 @@ with lib;
 let
   cfg = config.kubernetes.api.customresourcedefinitions.crontabs;
 in {
-  imports = [
-    kubenix.k8s
-  ];
+  imports = with kubenix.modules; [ test k8s ];
 
   test = {
     name = "k8s-1.13-crd";

tests/k8s/crd.nix

@@ -5,9 +5,7 @@ with lib;
 let
   cfg = config.kubernetes.api.customresourcedefinitions.crontabs;
 in {
-  imports = [
-    kubenix.k8s
-  ];
+  imports = with kubenix.modules; [ test k8s ];
 
   test = {
     name = "k8s-crd";

tests/k8s/defaults.nix

@@ -1,15 +1,12 @@
-{ config, lib, test, kubenix, k8s, ... }:
+{ config, lib, kubenix, ... }:
 
 with lib;
-with k8s;
 
 let
   pod1 = config.kubernetes.api.pods.pod1;
   pod2 = config.kubernetes.api.pods.pod2;
 in {
-  imports = [
-    kubenix.k8s
-  ];
+  imports = with kubenix.modules; [ test k8s ];
 
   test = {
     name = "k8s-defaults";

tests/k8s/deployment.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, test, kubenix, images, ... }:
+{ config, lib, pkgs, kubenix, images, ... }:
 
 with lib;
 
@@ -6,9 +6,7 @@ let
   cfg = config.kubernetes.api.deployments.nginx;
   image = images.nginx;
 in {
-  imports = [
-    kubenix.k8s
-  ];
+  imports = [ kubenix.modules.test kubenix.modules.k8s ];
 
   test = {
     name = "k8s-deployment";

tests/k8s/order.nix

@@ -5,9 +5,7 @@ with lib;
 let
   cfg = config.kubernetes.api.customresourcedefinitions.crontabs;
 in {
-  imports = [
-    kubenix.k8s
-  ];
+  imports = with kubenix.modules; [ test k8s ];
 
   test = {
     name = "k8s-order";

tests/k8s/simple.nix

@@ -1,13 +1,9 @@
-{ config, test, kubenix, k8s, ... }:
-
-with k8s;
+{ config, kubenix, ... }:
 
 let
   cfg = config.kubernetes.api.pods.nginx;
 in {
-  imports = [
-    kubenix.k8s
-  ];
+  imports = [ kubenix.modules.test kubenix.modules.k8s ];
 
   test = {
     name = "k8s-simple";

tests/module.nix

@@ -6,9 +6,7 @@ let
   cfg = config.submodules.instances.test.config;
   deployment = cfg.kubernetes.api.deployments.nginx;
 in {
-  imports = [
-    kubenix.module
-  ];
+  imports = [ kubenix.modules.test kubenix.module ];
 
   test = {
     name = "module";

tests/submodules/defaults.nix

@@ -21,9 +21,7 @@ let
     };
   };
 in {
-  imports = [
-    kubenix.submodules
-  ];
+  imports = with kubenix.modules; [ test submodules ];
 
   test = {
     name = "submodules-defatuls";

tests/submodules/simple.nix

@@ -5,9 +5,7 @@ with lib;
 let
   cfg = config.submodules.instances.instance;
 in {
-  imports = [
-    kubenix.submodules
-  ];
+  imports = with kubenix.modules; [ test submodules ];
 
   test = {
     name = "submodules-simple";

tests/submodules/versioning.nix

@@ -16,9 +16,7 @@ let
     };
   };
 in {
-  imports = [
-    kubenix.submodules
-  ];
+  imports = with kubenix.modules; [ test submodules ];
 
   test = {
     name = "submodules-imports";