clan/clan-core
12
4
Fork 18
Code Issues 99 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'fix secrets script not beeing fetched' (#369) from Mic92-main into main
All checks were successful
assets1 / test (push) Successful in 6s
Details
checks-impure / test (push) Successful in 8s
Details
checks / test (push) Successful in 22s
Details

Browse Source
This commit is contained in:
clan-bot 2023-09-28 13:53:35 +00:00
commit 6963e22dfc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/machines/update.py
View File

@ -40,11 +40,8 @@ def deploy_nixos(hosts: HostGroup, clan_dir: Path) -> None:
flake_attr = h.meta.get("flake_attr", "")
if generate_secrets_script := h.meta.get("generate_secrets"):
run_generate_secrets(generate_secrets_script, clan_dir)
if upload_secrets_script := h.meta.get("upload_secrets"):
run_upload_secrets(upload_secrets_script, clan_dir)
run_generate_secrets(h.meta["generateSecrets"], clan_dir)
run_upload_secrets(h.meta["uploadSecrets"], clan_dir)
target_host = h.meta.get("target_host")
if target_host:
@ -116,7 +113,9 @@ def get_selected_machines(machine_names: list[str], clan_dir: Path) -> HostGroup
machines = build_json(what)
hosts = []
for i, machine in enumerate(machines):
host = parse_deployment_address(machine_names[i], machine["deploymentAddress"])
host = parse_deployment_address(
machine_names[i], machine["deploymentAddress"], machine
)
hosts.append(host)
return HostGroup(hosts)