dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos-rebuild-ng: parse NIX_SSHOPTS instead of SSH_OPTS env var

Browse Source
This commit is contained in:
Thiago Kenji Okada 2024-11-20 18:30:49 +00:00
parent a6b9aaba1b
commit 3d7fbe88ab
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py
View File

@ -122,9 +122,16 @@ class SSH:
tty: bool
@classmethod
def from_arg(cls, host: str | None, tty: bool | None) -> Self | None:
def from_arg(cls, host: str | None, tty: bool | None, tmp_dir: Path) -> Self | None:
if host:
opts = os.getenv("SSH_OPTS", "").split()
opts = os.getenv("NIX_SSHOPTS", "").split() + [
"-o",
"ControlMaster=auto",
"-o",
f"ControlPath={tmp_dir / "ssh-%n"}",
"-o",
"ControlPersist=60",
]
return cls(host, opts, bool(tty))
else:
return None

34
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py
View File

@ -100,12 +100,34 @@ def test_profile_from_name(mock_mkdir: Any) -> None:
mock_mkdir.assert_called_once()
def test_ssh_from_name(monkeypatch: Any) -> None:
assert m.SSH.from_arg("user@localhost", None) == m.SSH("user@localhost", [], False)
monkeypatch.setenv("SSH_OPTS", "-f foo -b bar")
assert m.SSH.from_arg("user@localhost", True) == m.SSH(
def test_ssh_from_name(monkeypatch: Any, tmpdir: Path) -> None:
assert m.SSH.from_arg("user@localhost", None, tmpdir) == m.SSH(
"user@localhost",
["-f", "foo", "-b", "bar"],
[
"-o",
"ControlMaster=auto",
"-o",
f"ControlPath={tmpdir / "ssh-%n"}",
"-o",
"ControlPersist=60",
],
False,
)
monkeypatch.setenv("NIX_SSHOPTS", "-f foo -b bar", tmpdir)
assert m.SSH.from_arg("user@localhost", True, tmpdir) == m.SSH(
"user@localhost",
[
"-f",
"foo",
"-b",
"bar",
"-o",
"ControlMaster=auto",
"-o",
f"ControlPath={tmpdir / "ssh-%n"}",
"-o",
"ControlPersist=60",
],
True,
)