Revert "inline proxmox-template call (#588)" (#592)

Reverts commit 65a14f63ff, which seems to have caused a regression.

Reviewed-on: fediversity/fediversity#592

deployment/check/data-model-tf-proxmox/nixosTest.nix

@@ -7,61 +7,23 @@
 }:
 let
   inherit (pkgs) system;
-  inherit (pkgs.callPackage ../../utils.nix { }) evalModel;
-  inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
   backendPort = builtins.toString 8080;
   tfBackend = fragment: {
     address = "http://localhost:${backendPort}/state/${fragment}";
   };
   template-deployment =
-    (evalModel (
+    (import ./setups/template.nix {
-      { config, ... }:
+      inherit sources system modulesPath;
-      {
+      config = {
-        imports = [ ../common/model.nix ];
+        httpBackend = tfBackend "proxmox-test/upload";
-        config = {
+        nodeName = "pve";
-          environments.default = environment: {
+        targetSystem = system;
-            resources."operator-environment".login-shell = {
+        node-name = "pve";
-              wheel = true;
+        imageDatastoreId = "local";
-              username = "operator";
+      };
-            };
+    }).default.tf-proxmox-template;
-            implementation =
-              {
-                required-resources,
-                ...
-              }:
-              {
-                tf-proxmox-template = {
-                  nixos-configuration = {
-                    imports = [
-                      (mkNixosConfiguration environment required-resources)
-                      ./shared.nix
-                    ];
-                  };
-                  inherit system;
-                  ssh.host = "pve";
-                  httpBackend = tfBackend "proxmox-test/upload";
-                  node-name = "pve";
-                  imageDatastoreId = "local";
-                };
-              };
-          };
-        };
-        options.default =
-          let
-            env = config.environments.default;
-          in
-          lib.mkOption {
-            type = env.resource-mapping.output-type;
-            default = env.deployment {
-              deployment-name = "default";
-              # normally our template is distinct, but our test cannot download build deps due to sandboxing
-              configuration = config."example-configuration";
-            };
-          };
-      }
-    )).default.tf-proxmox-template;
   vm-deployment =
-    (import ./data-model.nix {
+    (import ./setups/vm.nix {
       inherit sources system modulesPath;
       config = {
         httpBackend = tfBackend "proxmox-test/nixos";

deployment/check/data-model-tf-proxmox/setups/shared.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  sources ? import ../../../npins,
+  sources ? import ../../../../npins,
   ...
 }:
 {
   imports = [
     "${sources.disko}/module.nix"
-    ../../../infra/common/proxmox-qemu-vm.nix
+    ../../../../infra/common/proxmox-qemu-vm.nix
   ];
   networking.useDHCP = false;
   services.qemuGuest.enable = true;

deployment/check/data-model-tf-proxmox/setups/template.nix

@@ -0,0 +1,70 @@
+{
+  config,
+  system,
+  modulesPath,
+  sources ? import ../../../../npins,
+  ...
+}:
+let
+  inherit (sources) nixpkgs;
+  pkgs = import nixpkgs { inherit system; };
+  inherit (pkgs) lib;
+  inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (config)
+    nodeName
+    targetSystem
+    httpBackend
+    node-name
+    imageDatastoreId
+    ;
+in
+(pkgs.callPackage ../../../utils.nix { }).evalModel (
+  { config, ... }:
+  {
+    imports = [ ../../common/model.nix ];
+    config = {
+      environments.default = environment: {
+        resources."operator-environment".login-shell = {
+          wheel = true;
+          username = "operator";
+        };
+        implementation =
+          {
+            required-resources,
+            ...
+          }:
+          {
+            tf-proxmox-template = {
+              nixos-configuration = {
+                imports = [
+                  (mkNixosConfiguration environment required-resources)
+                  ./shared.nix
+                ];
+              };
+              system = targetSystem;
+              ssh = {
+                host = nodeName;
+              };
+              inherit
+                node-name
+                httpBackend
+                imageDatastoreId
+                ;
+            };
+          };
+      };
+    };
+    options.default =
+      let
+        env = config.environments.default;
+      in
+      lib.mkOption {
+        type = env.resource-mapping.output-type;
+        default = env.deployment {
+          deployment-name = "default";
+          # normally our template is distinct, but our test cannot download build deps due to sandboxing
+          configuration = config."example-configuration";
+        };
+      };
+  }
+)

deployment/check/data-model-tf-proxmox/setups/vm.nix

@@ -2,14 +2,14 @@
   config,
   system,
   modulesPath,
-  sources ? import ../../../npins,
+  sources ? import ../../../../npins,
   ...
 }@args:
 let
   inherit (sources) nixpkgs;
   pkgs = import nixpkgs { inherit system; };
   inherit (pkgs) lib;
-  inherit (pkgs.callPackage ../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
+  inherit (pkgs.callPackage ../../common/utils.nix { inherit modulesPath; }) mkNixosConfiguration;
   inherit (config)
     nodeName
     pathToRoot
@@ -30,10 +30,10 @@ let
     ipv6Address
     ;
 in
-(pkgs.callPackage ../../utils.nix { }).evalModel (
+(pkgs.callPackage ../../../utils.nix { }).evalModel (
   { config, ... }:
   {
-    imports = [ ../common/model.nix ];
+    imports = [ ../../common/model.nix ];
     config = {
       environments.default = environment: {
         resources."operator-environment".login-shell = {