nix stdlib: add dns function

and use that in cicero's CI
input-output-hk · Jan 17, 2022 · 1a0cc55 · 1a0cc55
1 parent 4de4259
commit 1a0cc55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/actions/cicero/ci.nix b/actions/cicero/ci.nix
@@ -16,6 +16,8 @@ std.behavior.onInputChange "start" name args
     std.chain args [
       actionLib.jobDefaults
 
+      (std.dns [ "1.1.1.1" ])
+
       (std.escapeNames [ ] [ ])
 
       {
@@ -32,8 +34,6 @@ std.behavior.onInputChange "start" name args
 
               (std.wrapScript "bash" (next: ''
                 set -x
-                mkdir -p /etc
-                echo "nameserver 1.1.1.1" >> /etc/resolv.conf
                 ${lib.escapeShellArgs next}
               ''))
 
@@ -79,9 +79,6 @@ std.behavior.onInputChange "start" name args
 
               (std.script "bash" ''
                 set -ex
-                mkdir -p /etc
-                echo "nameserver 1.1.1.1" >> /etc/resolv.conf
-
                 exec cicero start
               '')
             ];
@@ -101,8 +98,6 @@ std.behavior.onInputChange "start" name args
 
               (std.wrapScript "bash" (next: ''
                 set -ex
-                mkdir -p /etc
-                echo "nameserver 1.1.1.1" >> /etc/resolv.conf
                 exec ${lib.escapeShellArgs next}
               ''))
 

diff --git a/pkgs/cicero/evaluators/nix/lib.nix b/pkgs/cicero/evaluators/nix/lib.nix
@@ -208,6 +208,14 @@ rec {
             template = data-merge.append outer.template;
           };
 
+      dns = nameservers:
+        wrapScript "bash" (next: ''
+          mkdir -p /etc
+          for nameserver in ${lib.escapeShellArg nameservers}; do
+            echo "nameserver $nameserver" >> /etc/resolv.conf
+          done
+        '');
+
       nix = {
         install = action: next:
           data-merge.merge
@@ -357,7 +365,7 @@ rec {
   };
 
   inherit (actions) behavior;
-  inherit (tasks) script;
+  inherit (tasks) script dns;
   inherit (chains) chain;
   inherit (chains.jobs) escapeNames singleTask;
   inherit (chains.tasks) wrapScript nix makes git github;