talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixosTests: fixup tests/common/resolver to work with a local resolver

Browse Source 
When 757a455ddeea43e24bbf3a8258fe5994b4fde10b refactored the zones to go
from a list to a map, this broke the tests/common/resolver helper.

reproduction:
```
let
  pkgs = import <nixpkgs> {};

  testConfig = {
    name = "resolver-repro";
    nodes = {
      acme = { nodes, ... }: {
        imports = [ (pkgs.path + /nixos/tests/common/acme/server) ];
      };
    };

    testScript = ''
    '';
  };
in pkgs.nixosTest testConfig
```
This commit is contained in:
Arthur Gautier 2024-10-06 03:45:27 +00:00
parent 1c2278eed8
commit a32dbada18
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/tests/common/resolver.nix
View File

@ -31,10 +31,11 @@
services.bind.forwarders = lib.mkForce []; services.bind.forwarders = lib.mkForce [];
services.bind.zones = lib.singleton { services.bind.zones = lib.singleton {
name = "."; name = ".";
master = true;
file = let file = let
addDot = zone: zone + lib.optionalString (!lib.hasSuffix "." zone) "."; addDot = zone: zone + lib.optionalString (!lib.hasSuffix "." zone) ".";
mkNsdZoneNames = zones: map addDot (lib.attrNames zones); mkNsdZoneNames = zones: map addDot (lib.attrNames zones);
mkBindZoneNames = zones: map (zone: addDot zone.name) zones; mkBindZoneNames = zones: map addDot (lib.attrNames zones);
getZones = cfg: mkNsdZoneNames cfg.services.nsd.zones getZones = cfg: mkNsdZoneNames cfg.services.nsd.zones
++ mkBindZoneNames cfg.services.bind.zones; ++ mkBindZoneNames cfg.services.bind.zones;