Merge pull request 'lib/test/sops: Fix secret deployment for test machines' (#4120) from kenji/ke-fix-sops-test-integration into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4120
This commit is contained in:
kenji
2025-06-27 10:45:41 +00:00

View File

@@ -6,15 +6,18 @@
system.activationScripts =
let
# https://github.com/Mic92/sops-nix/blob/61154300d945f0b147b30d24ddcafa159148026a/modules/sops/default.nix#L27
hasRegularSecrets = lib.filterAttrs (_: v: v.neededForUsers) config.sops.secrets != { };
hasRegularSecrets = lib.filterAttrs (_: v: !v.neededForUsers) config.sops.secrets != { };
hasUserSecrets = lib.filterAttrs (_: v: v.neededForUsers) config.sops.secrets != { };
in
{
age-key.text = ''
echo AGE-SECRET-KEY-1PL0M9CWRCG3PZ9DXRTTLMCVD57U6JDFE8K7DNVQ35F4JENZ6G3MQ0RQLRV > /run/age-key.txt
'';
}
// lib.optionalAttrs (hasRegularSecrets) {
// lib.optionalAttrs hasRegularSecrets {
setupSecrets.deps = [ "age-key" ];
}
// lib.optionalAttrs hasUserSecrets {
setupSecretsForUsers.deps = [ "age-key" ];
};
}