From cf1a4f805c9dba2594d17c57059931743ee9e3e0 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Tue, 4 Feb 2025 15:37:52 +0700 Subject: [PATCH] pkgs/cli: Rename `create_file` -> `persist` --- pkgs/clan-cli/clan_cli/vars/list.py | 2 +- pkgs/clan-cli/clan_cli/vars/prompt.py | 4 ++-- pkgs/clan-cli/tests/test_vars.py | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vars/list.py b/pkgs/clan-cli/clan_cli/vars/list.py index c82a6a032..6db537afe 100644 --- a/pkgs/clan-cli/clan_cli/vars/list.py +++ b/pkgs/clan-cli/clan_cli/vars/list.py @@ -47,7 +47,7 @@ def _get_previous_value( generator: Generator, prompt: Prompt, ) -> str | None: - if not prompt.create_file: + if not prompt.persist: return None pub_store = public_store(machine) diff --git a/pkgs/clan-cli/clan_cli/vars/prompt.py b/pkgs/clan-cli/clan_cli/vars/prompt.py index 6f6c5e726..ca77059ba 100644 --- a/pkgs/clan-cli/clan_cli/vars/prompt.py +++ b/pkgs/clan-cli/clan_cli/vars/prompt.py @@ -23,7 +23,7 @@ class Prompt: description: str prompt_type: PromptType - create_file: bool = False + persist: bool = False previous_value: str | None = None @classmethod @@ -32,7 +32,7 @@ class Prompt: name=data["name"], description=data["description"], prompt_type=PromptType(data["type"]), - create_file=data.get("persist", data["persist"]), + persist=data.get("persist", data["persist"]), previous_value=data.get("previousValue"), ) diff --git a/pkgs/clan-cli/tests/test_vars.py b/pkgs/clan-cli/tests/test_vars.py index eb3bc8f50..9598fd68c 100644 --- a/pkgs/clan-cli/tests/test_vars.py +++ b/pkgs/clan-cli/tests/test_vars.py @@ -484,7 +484,7 @@ def test_prompt( my_generator["prompts"]["prompt2"]["persist"] = False my_generator["prompts"]["prompt2"]["type"] = "line" - my_generator["prompts"]["prompt_create_file"]["persist"] = True + my_generator["prompts"]["prompt_persist"]["persist"] = True my_generator["script"] = ( "cat $prompts/prompt1 > $out/line_value; cat $prompts/prompt2 > $out/multiline_value" @@ -494,7 +494,7 @@ def test_prompt( sops_setup.init() monkeypatch.setattr( "clan_cli.vars.prompt.MOCK_PROMPT_RESPONSE", - iter(["line input", "my\nmultiline\ninput\n", "prompt_create_file"]), + iter(["line input", "my\nmultiline\ninput\n", "prompt_persist"]), ) cli.run(["vars", "generate", "--flake", str(flake.path), "my_machine"]) in_repo_store = in_repo.FactStore( @@ -515,11 +515,11 @@ def test_prompt( Machine(name="my_machine", flake=FlakeId(str(flake.path))) ) assert sops_store.exists( - Generator(name="my_generator", share=False, files=[]), "prompt_create_file" + Generator(name="my_generator", share=False, files=[]), "prompt_persist" ) assert ( - sops_store.get(Generator(name="my_generator"), "prompt_create_file").decode() - == "prompt_create_file" + sops_store.get(Generator(name="my_generator"), "prompt_persist").decode() + == "prompt_persist" )