yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vars/list: display '<not set>' also for secrets

Browse Source
This commit is contained in:
DavHau
2024-09-12 17:24:22 +02:00
parent 90a70d536d
commit 067d287398
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/vars/_types.py
View File

@@ -63,9 +63,9 @@ class Var:
return self._store.exists(self.generator, self.name, self.shared) return self._store.exists(self.generator, self.name, self.shared)
def __str__(self) -> str: def __str__(self) -> str:
if self._store.exists(self.generator, self.name, self.shared):
if self.secret: if self.secret:
return f"{self.id}: ********" return f"{self.id}: ********"
if self._store.exists(self.generator, self.name, self.shared):
return f"{self.id}: {self.printable_value}" return f"{self.id}: {self.printable_value}"
return f"{self.id}: <not set>" return f"{self.id}: <not set>"

4
pkgs/clan-cli/tests/test_vars.py
View File

@@ -94,6 +94,8 @@ def test_generate_public_var(
monkeypatch.chdir(flake.path) monkeypatch.chdir(flake.path)
machine = Machine(name="my_machine", flake=FlakeId(str(flake.path))) machine = Machine(name="my_machine", flake=FlakeId(str(flake.path)))
assert not check_vars(machine) assert not check_vars(machine)
vars_text = stringify_all_vars(machine)
assert "my_generator/my_value: <not set>" in vars_text
cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"]) cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"])
assert check_vars(machine) assert check_vars(machine)
store = in_repo.FactStore( store = in_repo.FactStore(
@@ -133,8 +135,10 @@ def test_generate_secret_var_sops(
sops_setup.init() sops_setup.init()
machine = Machine(name="my_machine", flake=FlakeId(str(flake.path))) machine = Machine(name="my_machine", flake=FlakeId(str(flake.path)))
assert not check_vars(machine) assert not check_vars(machine)
vars_text = stringify_all_vars(machine)
cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"]) cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"])
assert check_vars(machine) assert check_vars(machine)
assert "my_generator/my_secret: <not set>" in vars_text
in_repo_store = in_repo.FactStore( in_repo_store = in_repo.FactStore(
Machine(name="my_machine", flake=FlakeId(str(flake.path))) Machine(name="my_machine", flake=FlakeId(str(flake.path)))
) )