From f4153a048c79990487c6f6a122a56b3eb9792251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
<nicolas.jeannerod@moduscreate.com>
Date: Mon, 24 Feb 2025 19:06:54 +0100
Subject: [PATCH] Reintroduce test machines deployment
---
infra/flake-part.nix | 119 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 107 insertions(+), 12 deletions(-)
diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 9b33d1f8..4a4a0718 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -1,11 +1,17 @@
{
+ self,
inputs,
lib,
...
}:
let
- inherit (lib) mkOption evalModules;
+ inherit (lib)
+ attrNames
+ mkOption
+ evalModules
+ mapAttrs
+ ;
inherit (lib.attrsets) genAttrs;
## Given a machine's name, make a resource module, except for its missing
@@ -21,7 +27,7 @@ let
};
## Given a list of machine names, make a deployment with those machines'
- ## configurations as resources
+ ## configurations as resources.
makeDeployment =
vmNames:
{ providers, ... }:
@@ -37,6 +43,25 @@ let
};
makeDeployment' = vmName: makeDeployment [ vmName ];
+ ## Given an attrset of test configurations (key = test machine name, value =
+ ## NixOS configuration module), make a deployment with those machines'
+ ## configurations as resources.
+ makeTestDeployment =
+ vmConfigs:
+ { providers, ... }:
+ {
+ providers.local = inputs.nixops4.modules.nixops4Provider.local;
+ resources = mapAttrs (vmName: vmConfig: {
+ type = providers.local.exec;
+ imports = [
+ inputs.nixops4-nixos.modules.nixops4Resource.nixos
+ (makeResourceModule vmName)
+ { nixos.module = vmConfig; }
+ { nixos.module = self.nixosModules.fediversity; }
+ ];
+ }) vmConfigs;
+ };
+
nixops4ResourceNixosMockOptions = {
## NOTE: We allow the use of a few options from
## `inputs.nixops4-nixos.modules.nixops4Resource.nixos` such that we can
@@ -92,13 +117,81 @@ let
"fedi201"
];
- testMachines = [
- "test01"
- "test02"
- "test03"
- "test04"
- "test05"
- ];
+ testMachineConfigurations =
+ let
+ ## NOTE: All of these secrets are publicly available in this source file
+ ## and will end up in the Nix store. We don't care as they are only ever
+ ## used for testing anyway.
+ mastodonS3KeyConfig =
+ { pkgs, ... }:
+ {
+ s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK3515373e4c851ebaad366558";
+ s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34";
+ };
+ peertubeS3KeyConfig =
+ { pkgs, ... }:
+ {
+ s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK1f9feea9960f6f95ff404c9b";
+ s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7295c4201966a02c2c3d25b5cea4a5ff782966a2415e3a196f91924631191395";
+ };
+ pixelfedS3KeyConfig =
+ { pkgs, ... }:
+ {
+ s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GKb5615457d44214411e673b7b";
+ s3SecretKeyFile = pkgs.writeText "s3SecretKey" "5be6799a88ca9b9d813d1a806b64f15efa49482dbe15339ddfaf7f19cf434987";
+ };
+
+ in
+ {
+ test01 =
+ { pkgs, ... }:
+ {
+ fediversity = {
+ domain = "abundos.eu";
+ garage.enable = true;
+ pixelfed = pixelfedS3KeyConfig { inherit pkgs; };
+ mastodon = mastodonS3KeyConfig { inherit pkgs; };
+ peertube = peertubeS3KeyConfig { inherit pkgs; };
+ };
+ };
+
+ test02 =
+ { pkgs, ... }:
+ {
+ fediversity = {
+ domain = "abundos.eu";
+ mastodon = mastodonS3KeyConfig { inherit pkgs; } // {
+ enable = true;
+ };
+
+ temp.cores = 1; # FIXME: should come from NixOps4 eventually
+ };
+ };
+
+ test03 =
+ { pkgs, ... }:
+ {
+ fediversity = {
+ domain = "abundos.eu";
+ peertube = peertubeS3KeyConfig { inherit pkgs; } // {
+ enable = true;
+ ## NOTE: Only ever used for testing anyway.
+ secretsFile = pkgs.writeText "secret" "574e093907d1157ac0f8e760a6deb1035402003af5763135bae9cbd6abe32b24";
+ };
+ };
+ };
+
+ test04 =
+ { pkgs, ... }:
+ {
+ fediversity = {
+ domain = "abundos.eu";
+ pixelfed = pixelfedS3KeyConfig { inherit pkgs; } // {
+ enable = true;
+ };
+ };
+ };
+ };
in
{
@@ -111,8 +204,10 @@ in
## - We add a “test” deployment with all test machines.
nixops4Deployments = genAttrs machines makeDeployment' // {
default = makeDeployment machines;
- test = makeDeployment testMachines;
+ test = makeTestDeployment testMachineConfigurations;
};
- flake.nixosConfigurations = genAttrs (machines ++ testMachines) makeConfiguration;
- flake.vmOptions = genAttrs (machines ++ testMachines) makeVmOptions;
+ flake.nixosConfigurations = genAttrs (
+ machines ++ attrNames testMachineConfigurations
+ ) makeConfiguration;
+ flake.vmOptions = genAttrs (machines ++ attrNames testMachineConfigurations) makeVmOptions;
}