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

no longer write deprecated settings.json in tests

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-29 18:40:18 +02:00
parent 23c23390a8
commit 489977bf3b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,9 +55,8 @@ def set_machine_settings(
machine_name: str, machine_name: str,
machine_settings: dict, machine_settings: dict,
) -> None: ) -> None:
settings_path = flake / "machines" / machine_name / "settings.json" config_path = flake / "machines" / machine_name / "configuration.json"
settings_path.parent.mkdir(parents=True, exist_ok=True) config_path.write_text(json.dumps(machine_settings, indent=2))
settings_path.write_text(json.dumps(machine_settings, indent=2))
def generate_flake( def generate_flake(
@@ -121,7 +120,12 @@ def generate_flake(
# generate machines from machineConfigs # generate machines from machineConfigs
for machine_name, machine_config in machine_configs.items(): for machine_name, machine_config in machine_configs.items():
set_machine_settings(flake, machine_name, machine_config) configuration_nix = flake / "machines" / machine_name / "configuration.nix"
configuration_nix.parent.mkdir(parents=True, exist_ok=True)
configuration_nix.write_text("""
{ imports = [ (builtins.fromJSON (builtins.readFile ./configuration.json)) ]; }
""")
set_machine_config(flake, machine_name, machine_config)
if "/tmp" not in str(os.environ.get("HOME")): if "/tmp" not in str(os.environ.get("HOME")):
log.warning( log.warning(