ensure path availability in deployments (#511)

Reviewed-on: Fediversity/Fediversity#511

deployment/check/data-model-ssh/nixosTest.nix

@@ -39,10 +39,9 @@ in
   ];
 
   nodes.deployer =
-    { pkgs, ... }:
+    { ... }:
     {
-      environment.systemPackages = with pkgs; [
+      environment.systemPackages = [
-        jq
         deploy
       ];
 

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

@@ -31,11 +31,9 @@ in
   ];
 
   nodes.deployer =
-    { pkgs, ... }:
+    { ... }:
     {
-      environment.systemPackages = with pkgs; [
+      environment.systemPackages = [
-        (pkgs.callPackage ../../run/tf-single-host/tf.nix { })
-        jq
         deploy
       ];
 
@@ -50,10 +48,10 @@ in
     };
 
   extraTestScript = ''
-    with subtest("ssh: Check the status before deployment"):
+    with subtest("Check the status before deployment"):
       target.fail("hello 1>&2")
 
-    with subtest("ssh: Run the deployment"):
+    with subtest("Run the deployment"):
       deployer.succeed("""
         ${lib.getExe deploy}
       """)

deployment/data-model.nix

@@ -3,6 +3,7 @@
   config,
   inputs,
   pkgs,
+  sources ? import ../npins,
   ...
 }:
 let
@@ -146,11 +147,22 @@ let
                   deployment_type = "ssh-host";
                 };
               in
-              pkgs.writeShellScriptBin "deploy-ssh.sh" ''
+              pkgs.writers.writeBashBin "deploy-sh.sh"
-                env ${
+                {
-                  toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") environment)
+                  makeWrapperArgs = [
-                } bash ./deployment/run/ssh-single-host/run.sh
+                    "--prefix"
-              '';
+                    "PATH"
+                    ":"
+                    "${lib.makeBinPath [
+                      pkgs.jq
+                    ]}"
+                  ];
+                }
+                ''
+                  env ${
+                    toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") environment)
+                  } bash ./deployment/run/ssh-single-host/run.sh
+                '';
           };
         };
       });
@@ -221,10 +233,22 @@ let
                 };
                 tf-env = pkgs.callPackage ./run/tf-single-host/tf-env.nix { };
               in
-              pkgs.writeShellScriptBin "deploy-ssh.sh" ''
+              pkgs.writers.writeBashBin "deploy-tf.sh"
-                env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
+                {
-                tf_env=${tf-env} bash ./deployment/run/tf-single-host/run.sh
+                  makeWrapperArgs = [
-              '';
+                    "--prefix"
+                    "PATH"
+                    ":"
+                    "${lib.makeBinPath [
+                      pkgs.jq
+                      (pkgs.callPackage ./run/tf-single-host/tf.nix { inherit sources; })
+                    ]}"
+                  ];
+                }
+                ''
+                  env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
+                  tf_env=${tf-env} bash ./deployment/run/tf-single-host/run.sh
+                '';
           };
         };
       });