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

vars: Improve logging for migration

Browse Source
This commit is contained in:
DavHau
2024-12-04 12:41:49 +07:00
parent 61a4915a9d
commit a11820b1d6
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,7 @@ class StoreBase(ABC):
generator: "Generator", generator: "Generator",
var: "Var", var: "Var",
value: bytes, value: bytes,
is_migration: bool = False,
) -> Path | None: ) -> Path | None:
if self.exists(generator, var.name): if self.exists(generator, var.name):
if self.is_secret_store: if self.is_secret_store:
@@ -92,15 +93,15 @@ class StoreBase(ABC):
old_val = None old_val = None
old_val_str = "<not set>" old_val_str = "<not set>"
new_file = self._set(generator, var, value) new_file = self._set(generator, var, value)
action_str = "Migrated" if is_migration else "Updated"
if self.is_secret_store: if self.is_secret_store:
print(f"Updated secret var {generator.name}/{var.name}\n") print(f"{action_str} secret var {generator.name}/{var.name}\n")
else: else:
if value != old_val: if value != old_val:
print( msg = f"{action_str} var {generator.name}/{var.name}"
f"Updated var {generator.name}/{var.name}\n" if not is_migration:
f" old: {old_val_str}\n" msg += f"\n old: {old_val_str}\n new: {string_repr(value)}"
f" new: {string_repr(value)}" print(msg)
)
else: else:
print( print(
f"Var {generator.name}/{var.name} remains unchanged: {old_val_str}" f"Var {generator.name}/{var.name} remains unchanged: {old_val_str}"

4
pkgs/clan-cli/clan_cli/vars/generate.py
View File

@@ -315,10 +315,10 @@ def _migrate_file(
if file.secret: if file.secret:
old_value = machine.secret_facts_store.get(service_name, fact_name) old_value = machine.secret_facts_store.get(service_name, fact_name)
machine.secret_vars_store.set(generator, file, old_value) machine.secret_vars_store.set(generator, file, old_value, is_migration=True)
else: else:
old_value = machine.public_facts_store.get(service_name, fact_name) old_value = machine.public_facts_store.get(service_name, fact_name)
machine.public_vars_store.set(generator, file, old_value) machine.public_vars_store.set(generator, file, old_value, is_migration=True)
def _migrate_files( def _migrate_files(

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

@@ -842,6 +842,7 @@ def test_migration(
monkeypatch: pytest.MonkeyPatch, monkeypatch: pytest.MonkeyPatch,
flake: ClanFlake, flake: ClanFlake,
sops_setup: SopsSetup, sops_setup: SopsSetup,
capture_output: CaptureOutput,
) -> None: ) -> None:
config = flake.machines["my_machine"] config = flake.machines["my_machine"]
config["nixpkgs"]["hostPlatform"] = "x86_64-linux" config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
@@ -860,7 +861,10 @@ def test_migration(
monkeypatch.chdir(flake.path) monkeypatch.chdir(flake.path)
sops_setup.init() sops_setup.init()
cli.run(["facts", "generate", "--flake", str(flake.path), "my_machine"]) cli.run(["facts", "generate", "--flake", str(flake.path), "my_machine"])
cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"]) with capture_output as output:
cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"])
assert "Migrated var my_generator/my_value" in output.out
assert "Migrated secret var my_generator/my_secret" in output.out
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)))
) )