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

vars: refactor: use Machine objects instead of base_dir strings

Browse Source 
Replace base_dir string parameters with Machine objects throughout the vars
module for better type safety and consistency.
This commit is contained in:
DavHau
2025-08-19 18:30:53 +07:00
parent bdab3e23af
commit 7b61a668e9
6 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/clan-cli/clan_lib/network/network.py
View File

@@ -32,11 +32,11 @@ class Peer:
_var: dict[str, str] = self._host["var"]
machine_name = _var["machine"]
generator = _var["generator"]
from clan_lib.machines.machines import Machine
machine = Machine(name=machine_name, flake=self.flake)
var = get_machine_var(
str(
self.flake
), # TODO we should really pass the flake instance here instead of a str representation
machine_name,
machine,
f"{generator}/{_var['file']}",
)
if not var.exists:

7
pkgs/clan-cli/clan_lib/network/network_test.py
View File

@@ -2,6 +2,7 @@ from typing import Any
from unittest.mock import MagicMock, patch
from clan_lib.flake import Flake
from clan_lib.machines.machines import Machine
from clan_lib.network.network import Network, Peer, networks_from_flake
@@ -11,12 +12,12 @@ def test_networks_from_flake(mock_get_machine_var: MagicMock) -> None:
flake = MagicMock(spec=Flake)
# Mock the var decryption
def mock_var_side_effect(flake_path: str, machine: str, var_path: str) -> Any:
if machine == "machine1" and var_path == "wireguard/address":
def mock_var_side_effect(machine: Machine, var_path: str) -> Any:
if machine.name == "machine1" and var_path == "wireguard/address":
mock_var = MagicMock()
mock_var.value.decode.return_value = "192.168.1.10"
return mock_var
if machine == "machine2" and var_path == "wireguard/address":
if machine.name == "machine2" and var_path == "wireguard/address":
mock_var = MagicMock()
mock_var.value.decode.return_value = "192.168.1.11"
return mock_var