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

fix missing hostPlatform in test_vars

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-29 18:14:51 +02:00
parent 098a43eff9
commit cfb8df33a1
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,7 @@ def test_generate_public_var(
temporary_home: Path, temporary_home: Path,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"] my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
my_generator["files"]["my_value"]["secret"] = False my_generator["files"]["my_value"]["secret"] = False
my_generator["script"] = "echo hello > $out/my_value" my_generator["script"] = "echo hello > $out/my_value"
@@ -122,6 +123,7 @@ def test_generate_secret_var_sops(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"] my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
my_generator["files"]["my_secret"]["secret"] = True my_generator["files"]["my_secret"]["secret"] = True
my_generator["script"] = "echo hello > $out/my_secret" my_generator["script"] = "echo hello > $out/my_secret"
@@ -162,6 +164,7 @@ def test_generate_secret_var_sops_with_default_group(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
config["clan"]["core"]["sops"]["defaultGroups"] = ["my_group"] config["clan"]["core"]["sops"]["defaultGroups"] = ["my_group"]
my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"] my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
my_generator["files"]["my_secret"]["secret"] = True my_generator["files"]["my_secret"]["secret"] = True
@@ -193,6 +196,7 @@ def test_generated_shared_secret_sops(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
m1_config = nested_dict() m1_config = nested_dict()
m1_config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
shared_generator = m1_config["clan"]["core"]["vars"]["generators"][ shared_generator = m1_config["clan"]["core"]["vars"]["generators"][
"my_shared_generator" "my_shared_generator"
] ]
@@ -200,6 +204,7 @@ def test_generated_shared_secret_sops(
shared_generator["files"]["my_shared_secret"]["secret"] = True shared_generator["files"]["my_shared_secret"]["secret"] = True
shared_generator["script"] = "echo hello > $out/my_shared_secret" shared_generator["script"] = "echo hello > $out/my_shared_secret"
m2_config = nested_dict() m2_config = nested_dict()
m2_config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
m2_config["clan"]["core"]["vars"]["generators"]["my_shared_generator"] = ( m2_config["clan"]["core"]["vars"]["generators"]["my_shared_generator"] = (
shared_generator.copy() shared_generator.copy()
) )
@@ -235,6 +240,7 @@ def test_generate_secret_var_password_store(
temporary_home: Path, temporary_home: Path,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
config["clan"]["core"]["vars"]["settings"]["secretStore"] = "password-store" config["clan"]["core"]["vars"]["settings"]["secretStore"] = "password-store"
my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"] my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
my_generator["files"]["my_secret"]["secret"] = True my_generator["files"]["my_secret"]["secret"] = True
@@ -421,6 +427,7 @@ def test_share_flag(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
shared_generator = config["clan"]["core"]["vars"]["generators"]["shared_generator"] shared_generator = config["clan"]["core"]["vars"]["generators"]["shared_generator"]
shared_generator["share"] = True shared_generator["share"] = True
shared_generator["files"]["my_secret"]["secret"] = True shared_generator["files"]["my_secret"]["secret"] = True
@@ -641,6 +648,7 @@ def test_default_value(
temporary_home: Path, temporary_home: Path,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"] my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
my_generator["files"]["my_value"]["secret"] = False my_generator["files"]["my_value"]["secret"] = False
my_generator["files"]["my_value"]["value"]["_type"] = "override" my_generator["files"]["my_value"]["value"]["_type"] = "override"
@@ -683,6 +691,7 @@ def test_stdout_of_generate(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"] my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
my_generator["files"]["my_value"]["secret"] = False my_generator["files"]["my_value"]["secret"] = False
my_generator["script"] = "echo -n hello > $out/my_value" my_generator["script"] = "echo -n hello > $out/my_value"
@@ -761,6 +770,7 @@ def test_migration_skip(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_service = config["clan"]["core"]["facts"]["services"]["my_service"] my_service = config["clan"]["core"]["facts"]["services"]["my_service"]
my_service["secret"]["my_value"] = {} my_service["secret"]["my_value"] = {}
my_service["generator"]["script"] = "echo -n hello > $secrets/my_value" my_service["generator"]["script"] = "echo -n hello > $secrets/my_value"
@@ -792,6 +802,7 @@ def test_migration(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_service = config["clan"]["core"]["facts"]["services"]["my_service"] my_service = config["clan"]["core"]["facts"]["services"]["my_service"]
my_service["public"]["my_value"] = {} my_service["public"]["my_value"] = {}
my_service["generator"]["script"] = "echo -n hello > $facts/my_value" my_service["generator"]["script"] = "echo -n hello > $facts/my_value"
@@ -822,6 +833,7 @@ def test_fails_when_files_are_left_from_other_backend(
sops_setup: SopsSetup, sops_setup: SopsSetup,
) -> None: ) -> None:
config = nested_dict() config = nested_dict()
config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
my_secret_generator = config["clan"]["core"]["vars"]["generators"][ my_secret_generator = config["clan"]["core"]["vars"]["generators"][
"my_secret_generator" "my_secret_generator"
] ]

1
pkgs/clan-cli/tests/test_vars_deployment.py
View File

@@ -23,6 +23,7 @@ def test_vm_deployment(
) -> None: ) -> None:
# machine 1 # machine 1
machine1_config = nested_dict() machine1_config = nested_dict()
machine1_config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
machine1_config["clan"]["virtualisation"]["graphics"] = False machine1_config["clan"]["virtualisation"]["graphics"] = False
machine1_config["services"]["getty"]["autologinUser"] = "root" machine1_config["services"]["getty"]["autologinUser"] = "root"
machine1_config["services"]["openssh"]["enable"] = True machine1_config["services"]["openssh"]["enable"] = True