From 3b719cea5345d46c06dd8a1ac72c6f0b4a41d320 Mon Sep 17 00:00:00 2001
From: Valentin Gagarin <valentin.gagarin@tweag.io>
Date: Mon, 14 Jul 2025 08:20:38 +0200
Subject: [PATCH] WIP: expose service tests in flake

---
 flake.nix                          |  2 ++
 services/default.nix               | 13 -------------
 services/fediversity/default.nix   |  2 +-
 services/tests/flake-part.nix      | 14 ++++++++++++++
 services/tests/mastodon.nix        |  4 ++--
 services/tests/pixelfed-garage.nix |  4 ++--
 6 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 services/default.nix
 create mode 100644 services/tests/flake-part.nix

diff --git a/flake.nix b/flake.nix
index 9eca940e..891ae8e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,8 @@
           ./infra/flake-part.nix
           ./keys/flake-part.nix
           ./secrets/flake-part.nix
+          ./secrets/flake-part.nix
+          ./services/tests/flake-part.nix
         ];
 
         perSystem =
diff --git a/services/default.nix b/services/default.nix
deleted file mode 100644
index 3117b861..00000000
--- a/services/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  system ? builtins.currentSystem,
-  sources ? import ../npins,
-  pkgs ? import sources.nixpkgs { inherit system; },
-  ...
-}:
-{
-  tests = {
-    mastodon = pkgs.nixosTest ./tests/mastodon.nix;
-    pixelfed-garage = pkgs.nixosTest ./tests/pixelfed-garage.nix;
-    peertube = pkgs.nixosTest ./tests/peertube.nix;
-  };
-}
diff --git a/services/fediversity/default.nix b/services/fediversity/default.nix
index ca7b1f38..184f7dba 100644
--- a/services/fediversity/default.nix
+++ b/services/fediversity/default.nix
@@ -49,7 +49,7 @@ in
               displayName = mkOption {
                 type = types.str;
                 description = "Name of the initial user, for humans";
-                default = config.fediversity.temp.initialUser.name;
+                default = config.fediversity.temp.initialUser.username;
               };
               email = mkOption {
                 type = types.str;
diff --git a/services/tests/flake-part.nix b/services/tests/flake-part.nix
new file mode 100644
index 00000000..3def25b9
--- /dev/null
+++ b/services/tests/flake-part.nix
@@ -0,0 +1,14 @@
+{ ... }:
+{
+  _class = "flake";
+
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = {
+        test-mastodon-service = pkgs.testers.runNixOSTest ./mastodon.nix;
+        test-pixelfed-garage-service = pkgs.testers.runNixOSTest ./pixelfed-garage.nix;
+        test-peertube-service = pkgs.testers.runNixOSTest ./peertube.nix;
+      };
+    };
+}
diff --git a/services/tests/mastodon.nix b/services/tests/mastodon.nix
index f5497520..c9ec3876 100644
--- a/services/tests/mastodon.nix
+++ b/services/tests/mastodon.nix
@@ -69,8 +69,8 @@ in
           expect
         ];
         environment.variables = {
-          AWS_ACCESS_KEY_ID = config.fediversity.garage.ensureKeys.mastodon.id;
-          AWS_SECRET_ACCESS_KEY = config.fediversity.garage.ensureKeys.mastodon.secret;
+          AWS_ACCESS_KEY_ID = "$(cat ${config.fediversity.mastodon.s3AccessKeyFile})";
+          AWS_SECRET_ACCESS_KEY = "$(cat ${config.fediversity.mastodon.s3SecretKeyFile})";
         };
       };
   };
diff --git a/services/tests/pixelfed-garage.nix b/services/tests/pixelfed-garage.nix
index 66116774..4939fdba 100644
--- a/services/tests/pixelfed-garage.nix
+++ b/services/tests/pixelfed-garage.nix
@@ -161,8 +161,8 @@ in
         ];
         environment.variables = {
           POST_MEDIA = ./fediversity.png;
-          AWS_ACCESS_KEY_ID = config.fediversity.garage.ensureKeys.pixelfed.id;
-          AWS_SECRET_ACCESS_KEY = config.fediversity.garage.ensureKeys.pixelfed.secret;
+          AWS_ACCESS_KEY_ID = "$(cat ${config.fediversity.pixelfed.s3AccessKeyFile})";
+          AWS_SECRET_ACCESS_KEY = "$(cat ${config.fediversity.pixelfed.s3SecretKeyFile})";
           ## without this we get frivolous errors in the logs
           MC_REGION = "garage";
         };