nixosTests.postgresql: run nixfmt

Because with as many changes as in here anybody working on those test
files will have merge conflicts anyway.
This commit is contained in:
Wolfgang Walther
2024-11-02 23:04:45 +01:00
parent 128244b598
commit 45cef36e39
10 changed files with 416 additions and 343 deletions

View File

@@ -1,16 +1,20 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
makeTest {
name = "postgresql_anonymizer-${package.name}";
meta.maintainers = lib.teams.flyingcircus.members;
nodes.machine = { pkgs, ... }: {
nodes.machine =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.pg-dump-anon ];
services.postgresql = {
inherit package;
@@ -103,7 +107,9 @@ let
};
in
lib.recurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (_: p: !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (_: p: !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}

View File

@@ -1,27 +1,38 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
makeTest {
name = "pgjwt-${package.name}";
meta = with lib.maintainers; {
maintainers = [ spinus willibutz ];
maintainers = [
spinus
willibutz
];
};
nodes.master = { ... }:
nodes.master =
{ ... }:
{
services.postgresql = {
inherit package;
enable = true;
extraPlugins = ps: with ps; [ pgjwt pgtap ];
extraPlugins =
ps: with ps; [
pgjwt
pgtap
];
};
};
testScript = { nodes, ... }:
testScript =
{ nodes, ... }:
let
sqlSU = "${nodes.master.services.postgresql.superUser}";
pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
@@ -37,7 +48,9 @@ let
};
in
lib.recurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (_: p: !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (_: p: !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}

View File

@@ -1,5 +1,6 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
@@ -22,26 +23,30 @@ let
('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]');
'';
makeTestFor = postgresqlPackage:
makeTestFor =
postgresqlPackage:
makeTest {
name = "pgvecto-rs-${postgresqlPackage.name}";
meta = with lib.maintainers; {
maintainers = [ diogotcorreia ];
};
nodes.machine = { ... }:
nodes.machine =
{ ... }:
{
services.postgresql = {
enable = true;
package = postgresqlPackage;
extraPlugins = ps: with ps; [
extraPlugins =
ps: with ps; [
pgvecto-rs
];
settings.shared_preload_libraries = "vectors";
};
};
testScript = { nodes, ... }:
testScript =
{ nodes, ... }:
let
inherit (nodes.machine.services.postgresql.package.pkgs) pgvecto-rs;
in
@@ -67,7 +72,9 @@ let
};
in
lib.recurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (_: p: !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (_: p: !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}

View File

@@ -1,16 +1,20 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
makeTest {
name = "postgresql-jit-${package.name}";
meta.maintainers = with lib.maintainers; [ ma27 ];
nodes.machine = { pkgs, ... }: {
nodes.machine =
{ pkgs, ... }:
{
services.postgresql = {
inherit package;
enable = true;
@@ -45,7 +49,9 @@ let
};
in
lib.recurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}

View File

@@ -1,46 +1,44 @@
{ 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"
''
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";
serverKey = runWithOpenSSL "server.key" "openssl ecparam -name prime256v1 -genkey -noout -out $out";
serverKeyPath = "/var/lib/postgresql";
serverCert =
runWithOpenSSL "server.crt" ''
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" ''
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 = { ... }: {
nodes.server =
{ ... }:
{
system.activationScripts = {
keyPlacement.text = ''
mkdir -p '${serverKeyPath}'
@@ -73,14 +71,19 @@ let
networking = {
interfaces.eth1 = {
ipv6.addresses = [
{ address = "fc00::1"; prefixLength = 120; }
{
address = "fc00::1";
prefixLength = 120;
}
];
};
firewall.allowedTCPPorts = [ 5432 ];
};
};
nodes.client = { ... }: {
nodes.client =
{ ... }:
{
system.activationScripts = {
keyPlacement.text = ''
mkdir -p '${clientKeyPath}'
@@ -105,10 +108,15 @@ let
networking = {
interfaces.eth1 = {
ipv6.addresses = [
{ address = "fc00::2"; prefixLength = 120; }
{
address = "fc00::2";
prefixLength = 120;
}
];
};
hosts = { "fc00::1" = [ "db.test.example" ]; };
hosts = {
"fc00::1" = [ "db.test.example" ];
};
};
};

View File

@@ -1,11 +1,13 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
let
postgresqlDataDir = "/var/lib/postgresql/${package.psqlSchema}";
replicationUser = "wal_receiver_user";
@@ -19,7 +21,9 @@ let
name = "postgresql-wal-receiver-${package.name}";
meta.maintainers = with lib.maintainers; [ pacien ];
nodes.machine = { ... }: {
nodes.machine =
{ ... }:
{
systemd.tmpfiles.rules = [
"d /var/cache/wals 0750 postgres postgres - -"
];

View File

@@ -1,11 +1,13 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
lib.recurseIntoAttrs {
postgresql = makeTestForWithBackupAll package false;
postgresql-backup-all = makeTestForWithBackupAll package true;
@@ -26,17 +28,19 @@ let
INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled
'';
makeTestForWithBackupAll = package: backupAll:
makeTestForWithBackupAll =
package: backupAll:
makeTest {
name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}";
meta = with lib.maintainers; {
maintainers = [ zagy ];
};
nodes.machine = {...}:
nodes.machine =
{ ... }:
{
services.postgresql = {
inherit (package);
inherit (package) ;
enable = true;
};
@@ -46,11 +50,13 @@ let
};
};
testScript = let
testScript =
let
backupName = if backupAll then "all" else "postgres";
backupService = if backupAll then "postgresqlBackup" else "postgresqlBackup-postgres";
backupFileBase = "/var/backup/postgresql/${backupName}";
in ''
in
''
def check_count(statement, lines):
return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
statement, lines
@@ -138,14 +144,16 @@ let
'';
};
makeEnsureTestFor = package:
makeEnsureTestFor =
package:
makeTest {
name = "postgresql-clauses-${package.name}";
meta = with lib.maintainers; {
maintainers = [ zagy ];
};
nodes.machine = {...}:
nodes.machine =
{ ... }:
{
services.postgresql = {
inherit package;
@@ -170,9 +178,11 @@ let
};
};
testScript = let
getClausesQuery = user: lib.concatStringsSep " "
[
testScript =
let
getClausesQuery =
user:
lib.concatStringsSep " " [
"SELECT row_to_json(row)"
"FROM ("
"SELECT"
@@ -187,7 +197,8 @@ let
"WHERE rolname = '${user}'"
") row;"
];
in ''
in
''
import json
machine.start()
machine.wait_for_unit("postgresql")

View File

@@ -1,5 +1,6 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
@@ -38,23 +39,28 @@ let
SELECT * FROM sth;
'';
makeTestFor = package:
makeTestFor =
package:
makeTest {
name = "timescaledb-${package.name}";
meta = with lib.maintainers; {
maintainers = [ typetetris ];
};
nodes.machine = { ... }:
nodes.machine =
{ ... }:
{
services.postgresql = {
inherit package;
enable = true;
extraPlugins = ps: with ps; [
extraPlugins =
ps: with ps; [
timescaledb
timescaledb_toolkit
];
settings = { shared_preload_libraries = "timescaledb, timescaledb_toolkit"; };
settings = {
shared_preload_libraries = "timescaledb, timescaledb_toolkit";
};
};
};
@@ -85,7 +91,9 @@ in
# To run these tests:
# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb
lib.dontRecurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (_: p: !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (_: p: !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}

View File

@@ -1,23 +1,27 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
makeTest {
name = "tsja-${package.name}";
meta = {
maintainers = with lib.maintainers; [ chayleaf ];
};
nodes.master = { ... }:
nodes.master =
{ ... }:
{
services.postgresql = {
inherit package;
enable = true;
extraPlugins = ps: with ps; [
extraPlugins =
ps: with ps; [
tsja
];
};
@@ -37,7 +41,9 @@ let
};
in
lib.recurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (_: p: !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (_: p: !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}

View File

@@ -1,11 +1,13 @@
{ pkgs
, makeTest
{
pkgs,
makeTest,
}:
let
inherit (pkgs) lib;
makeTestFor = package:
makeTestFor =
package:
makeTest {
name = "wal2json-${package.name}";
meta.maintainers = with pkgs.lib.maintainers; [ euank ];
@@ -41,7 +43,9 @@ let
};
in
lib.recurseIntoAttrs (
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (lib.filterAttrs (_: p: !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions)
lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) (
lib.filterAttrs (_: p: !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions
)
// {
passthru.override = p: makeTestFor p;
}