clan/clan-core
11
2
Fork 13
Code Issues 90 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

outputs: pass secretsData directly

Browse Source
This commit is contained in:
lassulus 2024-03-02 10:24:49 +01:00
parent b1a4b4de96
commit 4cfd580447
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixosModules/clanCore/outputs.nix
View File

@ -62,19 +62,7 @@
description = ''
secret data as json for the generator
'';
default = pkgs.writers.writeJSON "secrets.json" (lib.mapAttrs
(_name: secret: {
secrets = lib.mapAttrsToList
(name: secret: {
inherit name;
} // lib.optionalAttrs (secret ? groups) {
inherit (secret) groups;
})
secret.secrets;
facts = lib.mapAttrs (_: secret: secret.path) secret.facts;
generator = secret.generator.finalScript;
})
config.clanCore.secrets);
default = pkgs.writers.writeJSON "secrets.json" config.clanCore.secrets;
};
vm.create = lib.mkOption {
type = lib.types.path;

2
pkgs/clan-cli/clan_cli/secrets/generate.py
View File

@ -58,7 +58,7 @@ def generate_service_secrets(
"--unshare-user",
"--uid", "1000",
"--",
"bash", "-c", machine.secrets_data[service]["generator"]
"bash", "-c", machine.secrets_data[service]["generator"]["finalScript"]
],
)
# fmt: on