nixosTests.postgresql: run nixfmt

Because with as many changes as in here anybody working on those test files will have merge conflicts anyway.
2025-06-15 05:59:17 +03:00 · 2024-11-02 23:04:45 +01:00 · 2024-11-02 23:04:45 +01:00 · 45cef36e39
commit 45cef36e39
parent 128244b598
10 changed files with 416 additions and 343 deletions
--- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix
+++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix
@ -1,116 +1,124 @@
-{ pkgs
-, makeTest
+{
+  pkgs,
+  makeTest,
 }:

 let
  inherit (pkgs) lib;

-  runWithOpenSSL = file: cmd: pkgs.runCommand file
-    {
+  runWithOpenSSL =
+    file: cmd:
+    pkgs.runCommand file {
      buildInputs = [ pkgs.openssl ];
-    }
-    cmd;
+    } cmd;
  caKey = runWithOpenSSL "ca.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
-  caCert = runWithOpenSSL
-    "ca.crt"
-    ''
-      openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500
-    '';
-  serverKey =
-    runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
+  caCert = runWithOpenSSL "ca.crt" ''
+    openssl req -new -x509 -sha256 -key ${caKey} -out $out -subj "/CN=test.example" -days 36500
+  '';
+  serverKey = runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
  serverKeyPath = "/var/lib/postgresql";
-  serverCert =
-    runWithOpenSSL "server.crt" ''
-      openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example"
-      openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \
-        -CAcreateserial -out $out -days 36500 -sha256
-    '';
-  clientKey =
-    runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
-  clientCert =
-    runWithOpenSSL "client.crt" ''
-      openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test"
-      openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \
-        -CAcreateserial -out $out -days 36500 -sha256
-    '';
+  serverCert = runWithOpenSSL "server.crt" ''
+    openssl req -new -sha256 -key ${serverKey} -out server.csr -subj "/CN=db.test.example"
+    openssl x509 -req -in server.csr -CA ${caCert} -CAkey ${caKey} \
+      -CAcreateserial -out $out -days 36500 -sha256
+  '';
+  clientKey = runWithOpenSSL "client.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
+  clientCert = runWithOpenSSL "client.crt" ''
+    openssl req -new -sha256 -key ${clientKey} -out client.csr -subj "/CN=test"
+    openssl x509 -req -in client.csr -CA ${caCert} -CAkey ${caKey} \
+      -CAcreateserial -out $out -days 36500 -sha256
+  '';
  clientKeyPath = "/root";

-  makeTestFor = package:
+  makeTestFor =
+    package:
    makeTest {
      name = "postgresql-tls-client-cert-${package.name}";
      meta.maintainers = with lib.maintainers; [ erictapen ];

-      nodes.server = { ... }: {
-        system.activationScripts = {
-          keyPlacement.text = ''
-            mkdir -p '${serverKeyPath}'
-            cp '${serverKey}' '${serverKeyPath}/server.key'
-            chown postgres:postgres '${serverKeyPath}/server.key'
-            chmod 600 '${serverKeyPath}/server.key'
-          '';
-        };
-        services.postgresql = {
-          inherit package;
-          enable = true;
-          enableTCPIP = true;
-          ensureUsers = [
-            {
-              name = "test";
-              ensureDBOwnership = true;
-            }
-          ];
-          ensureDatabases = [ "test" ];
-          settings = {
-            ssl = "on";
-            ssl_ca_file = toString caCert;
-            ssl_cert_file = toString serverCert;
-            ssl_key_file = "${serverKeyPath}/server.key";
+      nodes.server =
+        { ... }:
+        {
+          system.activationScripts = {
+            keyPlacement.text = ''
+              mkdir -p '${serverKeyPath}'
+              cp '${serverKey}' '${serverKeyPath}/server.key'
+              chown postgres:postgres '${serverKeyPath}/server.key'
+              chmod 600 '${serverKeyPath}/server.key'
+            '';
          };
-          authentication = ''
-            hostssl test test ::/0 cert clientcert=verify-full
-          '';
-        };
-        networking = {
-          interfaces.eth1 = {
-            ipv6.addresses = [
-              { address = "fc00::1"; prefixLength = 120; }
+          services.postgresql = {
+            inherit package;
+            enable = true;
+            enableTCPIP = true;
+            ensureUsers = [
+              {
+                name = "test";
+                ensureDBOwnership = true;
+              }
            ];
+            ensureDatabases = [ "test" ];
+            settings = {
+              ssl = "on";
+              ssl_ca_file = toString caCert;
+              ssl_cert_file = toString serverCert;
+              ssl_key_file = "${serverKeyPath}/server.key";
+            };
+            authentication = ''
+              hostssl test test ::/0 cert clientcert=verify-full
+            '';
+          };
+          networking = {
+            interfaces.eth1 = {
+              ipv6.addresses = [
+                {
+                  address = "fc00::1";
+                  prefixLength = 120;
+                }
+              ];
+            };
+            firewall.allowedTCPPorts = [ 5432 ];
          };
-          firewall.allowedTCPPorts = [ 5432 ];
        };
-      };

-      nodes.client = { ... }: {
-        system.activationScripts = {
-          keyPlacement.text = ''
-            mkdir -p '${clientKeyPath}'
-            cp '${clientKey}' '${clientKeyPath}/client.key'
-            chown root:root '${clientKeyPath}/client.key'
-            chmod 600 '${clientKeyPath}/client.key'
-          '';
-        };
-        environment = {
-          variables = {
-            PGHOST = "db.test.example";
-            PGPORT = "5432";
-            PGDATABASE = "test";
-            PGUSER = "test";
-            PGSSLMODE = "verify-full";
-            PGSSLCERT = clientCert;
-            PGSSLKEY = "${clientKeyPath}/client.key";
-            PGSSLROOTCERT = caCert;
+      nodes.client =
+        { ... }:
+        {
+          system.activationScripts = {
+            keyPlacement.text = ''
+              mkdir -p '${clientKeyPath}'
+              cp '${clientKey}' '${clientKeyPath}/client.key'
+              chown root:root '${clientKeyPath}/client.key'
+              chmod 600 '${clientKeyPath}/client.key'
+            '';
          };
-          systemPackages = [ package ];
-        };
-        networking = {
-          interfaces.eth1 = {
-            ipv6.addresses = [
-              { address = "fc00::2"; prefixLength = 120; }
-            ];
+          environment = {
+            variables = {
+              PGHOST = "db.test.example";
+              PGPORT = "5432";
+              PGDATABASE = "test";
+              PGUSER = "test";
+              PGSSLMODE = "verify-full";
+              PGSSLCERT = clientCert;
+              PGSSLKEY = "${clientKeyPath}/client.key";
+              PGSSLROOTCERT = caCert;
+            };
+            systemPackages = [ package ];
+          };
+          networking = {
+            interfaces.eth1 = {
+              ipv6.addresses = [
+                {
+                  address = "fc00::2";
+                  prefixLength = 120;
+                }
+              ];
+            };
+            hosts = {
+              "fc00::1" = [ "db.test.example" ];
+            };
          };
-          hosts = { "fc00::1" = [ "db.test.example" ]; };
        };
-      };

      testScript = ''
        server.wait_for_unit("multi-user.target")