From 123ef6a9967d5ca8ed4052d84128ff0e98950532 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 18 Dec 2023 10:19:25 -0800
Subject: [PATCH] Fix warnings when running checks

`nix flake check` had these warnings:

    trace: warning: Module argument `nodes.client.config` is deprecated. Use `nodes.client` instead.
    trace: warning: Module argument `nodes.client.config` is deprecated. Use `nodes.client` instead.
    trace: warning: The option `services.openssh.permitRootLogin' defined in `/nix/store/3m3hfpmbjdf4w39qfjami7ljhvhczay1-source/tests/nixos/nix-copy.nix' has been renamed to `services.openssh.settings.PermitRootLogin'.
    trace: warning: Module argument `nodes.http_dns.config` is deprecated. Use `nodes.http_dns` instead.
    trace: warning: Module argument `nodes.github.config` is deprecated. Use `nodes.github` instead.
    trace: warning: Module argument `nodes.sourcehut.config` is deprecated. Use `nodes.sourcehut` instead.
---
 tests/nixos/github-flakes.nix        | 2 +-
 tests/nixos/nix-copy.nix             | 2 +-
 tests/nixos/nss-preload.nix          | 4 ++--
 tests/nixos/remote-builds-ssh-ng.nix | 2 +-
 tests/nixos/remote-builds.nix        | 8 ++++----
 tests/nixos/sourcehut-flakes.nix     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/nixos/github-flakes.nix b/tests/nixos/github-flakes.nix
index 62ae8871b..a51689445 100644
--- a/tests/nixos/github-flakes.nix
+++ b/tests/nixos/github-flakes.nix
@@ -144,7 +144,7 @@ in
           virtualisation.memorySize = 4096;
           nix.settings.substituters = lib.mkForce [ ];
           nix.extraOptions = "experimental-features = nix-command flakes";
-          networking.hosts.${(builtins.head nodes.github.config.networking.interfaces.eth1.ipv4.addresses).address} =
+          networking.hosts.${(builtins.head nodes.github.networking.interfaces.eth1.ipv4.addresses).address} =
             [ "channels.nixos.org" "api.github.com" "github.com" ];
           security.pki.certificateFiles = [ "${cert}/ca.crt" ];
         };
diff --git a/tests/nixos/nix-copy.nix b/tests/nixos/nix-copy.nix
index 2981cc2b8..7db5197aa 100644
--- a/tests/nixos/nix-copy.nix
+++ b/tests/nixos/nix-copy.nix
@@ -36,7 +36,7 @@ in {
       server =
         { config, pkgs, ... }:
         { services.openssh.enable = true;
-          services.openssh.permitRootLogin = "yes";
+          services.openssh.settings.PermitRootLogin = "yes";
 					users.users.root.password = "foobar";
           virtualisation.writableStore = true;
           virtualisation.additionalPaths = [ pkgB pkgC ];
diff --git a/tests/nixos/nss-preload.nix b/tests/nixos/nss-preload.nix
index cef62e95b..00505d114 100644
--- a/tests/nixos/nss-preload.nix
+++ b/tests/nixos/nss-preload.nix
@@ -84,8 +84,8 @@ in
     client = { lib, nodes, pkgs, ... }: {
       networking.useDHCP = false;
       networking.nameservers = [
-        (lib.head nodes.http_dns.config.networking.interfaces.eth1.ipv6.addresses).address
-        (lib.head nodes.http_dns.config.networking.interfaces.eth1.ipv4.addresses).address
+        (lib.head nodes.http_dns.networking.interfaces.eth1.ipv6.addresses).address
+        (lib.head nodes.http_dns.networking.interfaces.eth1.ipv4.addresses).address
       ];
       networking.interfaces.eth1.ipv6.addresses = [
         { address = "fd21::10"; prefixLength = 64; }
diff --git a/tests/nixos/remote-builds-ssh-ng.nix b/tests/nixos/remote-builds-ssh-ng.nix
index b59dde9bf..20a43803d 100644
--- a/tests/nixos/remote-builds-ssh-ng.nix
+++ b/tests/nixos/remote-builds-ssh-ng.nix
@@ -81,7 +81,7 @@ in
     client.succeed(f"ssh -o StrictHostKeyChecking=no {builder.name} 'echo hello world'")
 
     # Perform a build
-    out = client.succeed("nix-build ${expr nodes.client.config 1} 2> build-output")
+    out = client.succeed("nix-build ${expr nodes.client 1} 2> build-output")
 
     # Verify that the build was done on the builder
     builder.succeed(f"test -e {out.strip()}")
diff --git a/tests/nixos/remote-builds.nix b/tests/nixos/remote-builds.nix
index 1c96cc787..ad7f509db 100644
--- a/tests/nixos/remote-builds.nix
+++ b/tests/nixos/remote-builds.nix
@@ -90,22 +90,22 @@ in
 
     # Perform a build and check that it was performed on the builder.
     out = client.succeed(
-      "nix-build ${expr nodes.client.config 1} 2> build-output",
+      "nix-build ${expr nodes.client 1} 2> build-output",
       "grep -q Hello build-output"
     )
     builder1.succeed(f"test -e {out}")
 
     # And a parallel build.
-    paths = client.succeed(r'nix-store -r $(nix-instantiate ${expr nodes.client.config 2})\!out $(nix-instantiate ${expr nodes.client.config 3})\!out')
+    paths = client.succeed(r'nix-store -r $(nix-instantiate ${expr nodes.client 2})\!out $(nix-instantiate ${expr nodes.client 3})\!out')
     out1, out2 = paths.split()
     builder1.succeed(f"test -e {out1} -o -e {out2}")
     builder2.succeed(f"test -e {out1} -o -e {out2}")
 
     # And a failing build.
-    client.fail("nix-build ${expr nodes.client.config 5}")
+    client.fail("nix-build ${expr nodes.client 5}")
 
     # Test whether the build hook automatically skips unavailable builders.
     builder1.block()
-    client.succeed("nix-build ${expr nodes.client.config 4}")
+    client.succeed("nix-build ${expr nodes.client 4}")
   '';
 }
diff --git a/tests/nixos/sourcehut-flakes.nix b/tests/nixos/sourcehut-flakes.nix
index 6e8d884a0..04f3590e1 100644
--- a/tests/nixos/sourcehut-flakes.nix
+++ b/tests/nixos/sourcehut-flakes.nix
@@ -108,7 +108,7 @@ in
               flake-registry = https://git.sr.ht/~NixOS/flake-registry/blob/master/flake-registry.json
             '';
             environment.systemPackages = [ pkgs.jq ];
-            networking.hosts.${(builtins.head nodes.sourcehut.config.networking.interfaces.eth1.ipv4.addresses).address} =
+            networking.hosts.${(builtins.head nodes.sourcehut.networking.interfaces.eth1.ipv4.addresses).address} =
               [ "git.sr.ht" ];
             security.pki.certificateFiles = [ "${cert}/ca.crt" ];
           };