fix tests in lib

ibizaman · Oct 24, 2024 · 45352eb · 45352eb
1 parent 39c1627
commit 45352eb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -31,14 +31,15 @@ rec {
     resultPath = newPath;
   };
 
-  replaceSecretsScript = { file, resultPath, replacements, user ? null, permissions ? "u=r,g=r,o=" }:
+  genReplacement = secret:
     let
-      templatePath = resultPath + ".template";
-
       t = { transform ? null, ... }: if isNull transform then x: x else transform;
+    in
+      lib.attrsets.nameValuePair (secretName secret.name) ((t secret) "$(cat ${toString secret.source})");
 
-      genReplacement = secret:
-        lib.attrsets.nameValuePair (secretName secret.name) ((t secret) "$(cat ${toString secret.source})");
+  replaceSecretsScript = { file, resultPath, replacements, user ? null, permissions ? "u=r,g=r,o=" }:
+    let
+      templatePath = resultPath + ".template";
 
       # We check that the files containing the secrets have the
       # correct permissions for us to read them in this separate

diff --git a/test/modules/lib.nix b/test/modules/lib.nix
@@ -1,6 +1,8 @@
 { pkgs, lib, ... }:
 let
   shblib = pkgs.callPackage ../../lib {};
+
+  inherit (lib) nameValuePair;
 in
 {
   # Tests that withReplacements can:
@@ -79,15 +81,15 @@ in
   testLibGetReplacements = {
     expected =
       let
-        secrets = root: {
-          "%SECRET_${root}B%" = "$(cat /path/B)";
-          "%SECRET_${root}C%" = "prefix-$(cat /path/C)-suffix";
-        };
+        secrets = root: [
+          (nameValuePair "%SECRET_${root}B%" "$(cat /path/B)")
+          (nameValuePair "%SECRET_${root}C%" "prefix-$(cat /path/C)-suffix")
+        ];
       in
-        (secrets "") //
-        (secrets "NESTEDATTR_") //
-        (secrets "NESTEDLIST_0_") //
-        (secrets "DOUBLENESTEDLIST_0_N_");
+        (secrets "") ++
+        (secrets "DOUBLENESTEDLIST_0_N_") ++
+        (secrets "NESTEDATTR_") ++
+        (secrets "NESTEDLIST_0_");
     expr =
       let
         item = {
@@ -99,13 +101,13 @@ in
           c.other = "other";
         };
       in
-        shblib.getReplacements (
+        map shblib.genReplacement (shblib.getReplacements (
           item // {
             nestedAttr = item;
             nestedList = [ item ];
             doubleNestedList = [ { n = item; } ];
           }
-        );
+        ));
   };
 
   testParseXML = {