From 067d28739819f7a7e2ce564deee3af99610e4fa5 Mon Sep 17 00:00:00 2001 From: DavHau Date: Thu, 12 Sep 2024 17:24:22 +0200 Subject: [PATCH] vars/list: display '' also for secrets --- pkgs/clan-cli/clan_cli/vars/_types.py | 4 ++-- pkgs/clan-cli/tests/test_vars.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vars/_types.py b/pkgs/clan-cli/clan_cli/vars/_types.py index 0bed00b09..9ebe07f97 100644 --- a/pkgs/clan-cli/clan_cli/vars/_types.py +++ b/pkgs/clan-cli/clan_cli/vars/_types.py @@ -63,9 +63,9 @@ class Var: return self._store.exists(self.generator, self.name, self.shared) def __str__(self) -> str: - if self.secret: - return f"{self.id}: ********" if self._store.exists(self.generator, self.name, self.shared): + if self.secret: + return f"{self.id}: ********" return f"{self.id}: {self.printable_value}" return f"{self.id}: " diff --git a/pkgs/clan-cli/tests/test_vars.py b/pkgs/clan-cli/tests/test_vars.py index bad094731..fc9ea9115 100644 --- a/pkgs/clan-cli/tests/test_vars.py +++ b/pkgs/clan-cli/tests/test_vars.py @@ -94,6 +94,8 @@ def test_generate_public_var( monkeypatch.chdir(flake.path) machine = Machine(name="my_machine", flake=FlakeId(str(flake.path))) assert not check_vars(machine) + vars_text = stringify_all_vars(machine) + assert "my_generator/my_value: " in vars_text cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"]) assert check_vars(machine) store = in_repo.FactStore( @@ -133,8 +135,10 @@ def test_generate_secret_var_sops( sops_setup.init() machine = Machine(name="my_machine", flake=FlakeId(str(flake.path))) assert not check_vars(machine) + vars_text = stringify_all_vars(machine) cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"]) assert check_vars(machine) + assert "my_generator/my_secret: " in vars_text in_repo_store = in_repo.FactStore( Machine(name="my_machine", flake=FlakeId(str(flake.path))) )