refactor(spec-05-auth-fallback-chain): senior (eng_flash_high) review refinements
This commit is contained in:
1 parent
1b50c7d3e7
commit
b3925fee07
4 files changed
+267
-6
No files matched your search
@@ -473,13 +473,22 @@ class NodeStub:
|
|||||||
@handle_errors
|
@handle_errors
|
||||||
def list_nodes(self, filter_str=None, format_str=None):
|
def list_nodes(self, filter_str=None, format_str=None):
|
||||||
req = connpy_pb2.FilterRequest(filter_str=filter_str or "", format_str=format_str or "")
|
req = connpy_pb2.FilterRequest(filter_str=filter_str or "", format_str=format_str or "")
|
||||||
return from_value(self.stub.list_nodes(req).data) or []
|
nodes = from_value(self.stub.list_nodes(req).data) or []
|
||||||
|
if not format_str:
|
||||||
|
ctx_svc = self._get_context_service()
|
||||||
|
if ctx_svc is not None and not ctx_svc.is_default_all_context():
|
||||||
|
nodes = ctx_svc.filter_node_list(result=nodes)
|
||||||
|
return nodes
|
||||||
|
|
||||||
@MethodHook
|
@MethodHook
|
||||||
@handle_errors
|
@handle_errors
|
||||||
def list_folders(self, filter_str=None):
|
def list_folders(self, filter_str=None):
|
||||||
req = connpy_pb2.FilterRequest(filter_str=filter_str or "")
|
req = connpy_pb2.FilterRequest(filter_str=filter_str or "")
|
||||||
return from_value(self.stub.list_folders(req).data) or []
|
folders = from_value(self.stub.list_folders(req).data) or []
|
||||||
|
ctx_svc = self._get_context_service()
|
||||||
|
if ctx_svc is not None and not ctx_svc.is_default_all_context():
|
||||||
|
folders = ctx_svc.filter_node_list(result=folders)
|
||||||
|
return folders
|
||||||
|
|
||||||
@handle_errors
|
@handle_errors
|
||||||
def get_node_details(self, unique_id):
|
def get_node_details(self, unique_id):
|
||||||
@@ -512,7 +521,7 @@ class NodeStub:
|
|||||||
# node cache is what matters for fzf. We'll fetch profiles if we can.
|
# node cache is what matters for fzf. We'll fetch profiles if we can.
|
||||||
# For now, let's sync what we have.
|
# For now, let's sync what we have.
|
||||||
|
|
||||||
if nodes is not None or folders is not None or profiles is not None:
|
if self.config is not None and (nodes is not None or folders is not None or profiles is not None):
|
||||||
self.config._generate_nodes_cache(nodes=nodes, folders=folders, profiles=profiles)
|
self.config._generate_nodes_cache(nodes=nodes, folders=folders, profiles=profiles)
|
||||||
|
|
||||||
def _trigger_local_cache_sync(self):
|
def _trigger_local_cache_sync(self):
|
||||||
|
|||||||
@@ -92,9 +92,25 @@ class ContextService(BaseService):
|
|||||||
def set_active_context(self, name: str):
|
def set_active_context(self, name: str):
|
||||||
if name not in self.contexts:
|
if name not in self.contexts:
|
||||||
raise ValueError(f"Context '{name}' does not exist")
|
raise ValueError(f"Context '{name}' does not exist")
|
||||||
|
|
||||||
|
prev_context = self.current_context
|
||||||
self.config.config["current_context"] = name
|
self.config.config["current_context"] = name
|
||||||
self.config._saveconfig(self.config.file)
|
self.config._saveconfig(self.config.file)
|
||||||
|
can_refresh = (
|
||||||
|
self.config._is_context_filtering_enabled_unlocked()
|
||||||
|
if (
|
||||||
|
not hasattr(self.config, "assert_called")
|
||||||
|
and callable(getattr(self.config, "_is_context_filtering_enabled_unlocked", None))
|
||||||
|
)
|
||||||
|
else getattr(self.config, "_enforce_context", True)
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
name == "all"
|
||||||
|
and prev_context != "all"
|
||||||
|
and can_refresh
|
||||||
|
and hasattr(self.config, "_generate_nodes_cache")
|
||||||
|
):
|
||||||
|
self.config._generate_nodes_cache()
|
||||||
|
|
||||||
def get_active_regexes(self) -> list[re.Pattern]:
|
def get_active_regexes(self) -> list[re.Pattern]:
|
||||||
return compile_active_context_patterns(getattr(self.config, "config", None))
|
return compile_active_context_patterns(getattr(self.config, "config", None))
|
||||||
|
|||||||
@@ -187,8 +187,8 @@ class ExecutionService(BaseService):
|
|||||||
)
|
)
|
||||||
|
|
||||||
if self._is_remote_backend():
|
if self._is_remote_backend():
|
||||||
stub = self._get_remote_stub()
|
|
||||||
batches = self._build_remote_filter_batches(nodes_filter)
|
batches = self._build_remote_filter_batches(nodes_filter)
|
||||||
|
stub = self._get_remote_stub()
|
||||||
batch_results = [
|
batch_results = [
|
||||||
stub.run_commands(
|
stub.run_commands(
|
||||||
nodes_filter=batch,
|
nodes_filter=batch,
|
||||||
@@ -283,8 +283,8 @@ class ExecutionService(BaseService):
|
|||||||
)
|
)
|
||||||
|
|
||||||
if self._is_remote_backend():
|
if self._is_remote_backend():
|
||||||
stub = self._get_remote_stub()
|
|
||||||
batches = self._build_remote_filter_batches(nodes_filter)
|
batches = self._build_remote_filter_batches(nodes_filter)
|
||||||
|
stub = self._get_remote_stub()
|
||||||
batch_results = [
|
batch_results = [
|
||||||
stub.test_commands(
|
stub.test_commands(
|
||||||
nodes_filter=batch,
|
nodes_filter=batch,
|
||||||
|
|||||||
@@ -2949,3 +2949,239 @@ def test_context_regex_parity_case_cache_and_dirty_recovery(tmp_path: Path) -> N
|
|||||||
cfg._cache_dirty = False
|
cfg._cache_dirty = False
|
||||||
cfg._generate_nodes_cache()
|
cfg._generate_nodes_cache()
|
||||||
assert cfg._cache_dirty is True
|
assert cfg._cache_dirty is True
|
||||||
|
|
||||||
|
|
||||||
|
def test_context_stubs_remote_cli_caches_and_all_servicers(
|
||||||
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
||||||
|
) -> None:
|
||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
|
from connpy.cli.node_handler import NodeHandler
|
||||||
|
from connpy.grpc_layer.server import (
|
||||||
|
AIServicer,
|
||||||
|
ConfigServicer,
|
||||||
|
ExecutionServicer,
|
||||||
|
ImportExportServicer,
|
||||||
|
PluginServicer,
|
||||||
|
ProfileServicer,
|
||||||
|
SystemServicer,
|
||||||
|
)
|
||||||
|
from connpy.grpc_layer.stubs import ExecutionStub, NodeStub
|
||||||
|
from connpy.grpc_layer.utils import to_struct
|
||||||
|
from connpy.services.context_service import ContextService
|
||||||
|
from connpy.services.exceptions import ConnpyError, NodeNotFoundError
|
||||||
|
|
||||||
|
monkeypatch.setattr(sys, "argv", ["connpy", "nodes"])
|
||||||
|
cfg = _make_config(
|
||||||
|
tmp_path,
|
||||||
|
{
|
||||||
|
"config": {
|
||||||
|
"case": False,
|
||||||
|
"current_context": "prod",
|
||||||
|
"contexts": {
|
||||||
|
"all": [".*"],
|
||||||
|
"prod": ["^prod-.*", "^@ProdFolder"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"connections": {
|
||||||
|
"prod-1": {
|
||||||
|
"type": "connection",
|
||||||
|
"host": "10.0.0.1",
|
||||||
|
"protocol": "ssh",
|
||||||
|
"port": "",
|
||||||
|
"user": "u1",
|
||||||
|
"password": "",
|
||||||
|
"options": "",
|
||||||
|
"logs": "",
|
||||||
|
"tags": "",
|
||||||
|
"jumphost": "",
|
||||||
|
},
|
||||||
|
"dev-1": {
|
||||||
|
"type": "connection",
|
||||||
|
"host": "10.0.0.2",
|
||||||
|
"protocol": "ssh",
|
||||||
|
"port": "",
|
||||||
|
"user": "u2",
|
||||||
|
"password": "",
|
||||||
|
"options": "",
|
||||||
|
"logs": "",
|
||||||
|
"tags": "",
|
||||||
|
"jumphost": "",
|
||||||
|
},
|
||||||
|
"ProdFolder": {"type": "folder"},
|
||||||
|
"OtherFolder": {"type": "folder"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
cfg.fzf_cachefile = str(tmp_path / ".fzf_nodes_cache.txt")
|
||||||
|
cfg.folders_cachefile = str(tmp_path / ".folders_cache.txt")
|
||||||
|
|
||||||
|
# 1. ContextService.set_active_context refreshes FZF & folders caches both ways
|
||||||
|
cfg._generate_nodes_cache()
|
||||||
|
assert Path(cfg.fzf_cachefile).read_text(encoding="utf-8").splitlines() == ["prod-1"]
|
||||||
|
assert Path(cfg.folders_cachefile).read_text(encoding="utf-8").splitlines() == ["@ProdFolder"]
|
||||||
|
|
||||||
|
ctx_svc = ContextService(cfg)
|
||||||
|
ctx_svc.set_active_context("all")
|
||||||
|
assert sorted(Path(cfg.fzf_cachefile).read_text(encoding="utf-8").splitlines()) == [
|
||||||
|
"dev-1",
|
||||||
|
"prod-1",
|
||||||
|
]
|
||||||
|
assert sorted(Path(cfg.folders_cachefile).read_text(encoding="utf-8").splitlines()) == [
|
||||||
|
"@OtherFolder",
|
||||||
|
"@ProdFolder",
|
||||||
|
]
|
||||||
|
ctx_svc.set_active_context("prod")
|
||||||
|
assert Path(cfg.fzf_cachefile).read_text(encoding="utf-8").splitlines() == ["prod-1"]
|
||||||
|
assert Path(cfg.folders_cachefile).read_text(encoding="utf-8").splitlines() == ["@ProdFolder"]
|
||||||
|
|
||||||
|
# 2. NodeHandler.add(is_folder=True) enforces validate_parent_folder(..., is_folder=True)
|
||||||
|
node_svc = NodeService(cfg)
|
||||||
|
fake_app = SimpleNamespace(
|
||||||
|
case=False,
|
||||||
|
_type_node=lambda v: v,
|
||||||
|
nodes_list=node_svc.list_nodes(),
|
||||||
|
services=ServiceProvider(cfg, mode="local"),
|
||||||
|
)
|
||||||
|
handler = NodeHandler(fake_app)
|
||||||
|
with pytest.raises(SystemExit):
|
||||||
|
handler.add(SimpleNamespace(data="@OtherFolderSub"))
|
||||||
|
assert "OtherFolderSub" not in cfg.connections
|
||||||
|
handler.add(SimpleNamespace(data="@ProdFolderSub"))
|
||||||
|
assert "@ProdFolderSub" in node_svc.list_folders()
|
||||||
|
|
||||||
|
# 3. NodeStub config=None guard, list filtering vs _get_raw_*, and mutation guards
|
||||||
|
n_stub_no_cfg = NodeStub(MagicMock(), "localhost:50051")
|
||||||
|
n_stub_no_cfg.stub = MagicMock()
|
||||||
|
n_stub_no_cfg.stub.list_nodes.return_value = MagicMock(data=None)
|
||||||
|
n_stub_no_cfg.stub.list_folders.return_value = MagicMock(data=None)
|
||||||
|
with patch("connpy.grpc_layer.stubs.from_value", return_value=["prod-1"]):
|
||||||
|
n_stub_no_cfg.generate_cache()
|
||||||
|
|
||||||
|
n_stub = NodeStub(MagicMock(), "localhost:50051", config=cfg)
|
||||||
|
n_stub.stub = MagicMock()
|
||||||
|
n_stub.stub.list_nodes.return_value = MagicMock(data=None)
|
||||||
|
n_stub.stub.list_folders.return_value = MagicMock(data=None)
|
||||||
|
with patch("connpy.grpc_layer.stubs.from_value", return_value=["prod-1", "dev-1"]):
|
||||||
|
assert n_stub.list_nodes() == ["prod-1"]
|
||||||
|
assert n_stub._get_raw_nodes() == ["prod-1", "dev-1"]
|
||||||
|
with pytest.raises(InvalidConfigurationError):
|
||||||
|
n_stub.validate_parent_folder("dev-1", is_folder=False)
|
||||||
|
with pytest.raises(InvalidConfigurationError):
|
||||||
|
n_stub.validate_parent_folder("@Other", is_folder=True)
|
||||||
|
assert n_stub.stub.validate_parent_folder.call_count == 0
|
||||||
|
|
||||||
|
with pytest.raises(NodeNotFoundError):
|
||||||
|
n_stub.delete_node("dev-1")
|
||||||
|
assert n_stub.stub.delete_node.call_count == 0
|
||||||
|
|
||||||
|
with pytest.raises(NodeNotFoundError):
|
||||||
|
n_stub.connect_node("dev-1")
|
||||||
|
|
||||||
|
with pytest.raises(NodeNotFoundError):
|
||||||
|
n_stub.move_node("dev-1", "prod-2")
|
||||||
|
with pytest.raises(InvalidConfigurationError):
|
||||||
|
n_stub.move_node("prod-1", "dev-2")
|
||||||
|
assert n_stub.stub.move_node.call_count == 0
|
||||||
|
|
||||||
|
with pytest.raises(InvalidConfigurationError):
|
||||||
|
n_stub.bulk_add(["prod-2", "dev-2"], ["1.1.1.1", "1.1.1.2"], {})
|
||||||
|
assert n_stub.stub.bulk_add.call_count == 0
|
||||||
|
|
||||||
|
with patch("connpy.grpc_layer.stubs.from_value", return_value=["@ProdFolder", "@OtherFolder"]):
|
||||||
|
assert n_stub.list_folders() == ["@ProdFolder"]
|
||||||
|
assert n_stub._get_raw_folders() == ["@ProdFolder", "@OtherFolder"]
|
||||||
|
|
||||||
|
# 4. ExecutionStub.test_commands and ExecutionStub.run_cli_script context guards
|
||||||
|
n_stub.list_nodes = MagicMock(return_value=["prod-1", "dev-1"])
|
||||||
|
e_stub = ExecutionStub(MagicMock(), "localhost:50051", config=cfg, node_stub=n_stub)
|
||||||
|
e_stub.stub = MagicMock()
|
||||||
|
e_stub.stub.test_commands.return_value = [
|
||||||
|
connpy_pb2.NodeRunResult(
|
||||||
|
unique_id="prod-1",
|
||||||
|
output="ok",
|
||||||
|
status=0,
|
||||||
|
test_result=to_struct({"passed": True}),
|
||||||
|
)
|
||||||
|
]
|
||||||
|
t_res = e_stub.test_commands(["prod-1", "dev-1"], ["show ver"], ["1.0"])
|
||||||
|
assert t_res == {"prod-1": {"passed": True}}
|
||||||
|
assert list(e_stub.stub.test_commands.call_args[0][0].nodes) == ["^prod\\-1$"]
|
||||||
|
|
||||||
|
e_stub.stub.run_cli_script.return_value = MagicMock(data=to_struct({"prod-1": "done"}))
|
||||||
|
s_res = e_stub.run_cli_script(".*", "/tmp/s.txt")
|
||||||
|
assert s_res == {"prod-1": "done"}
|
||||||
|
assert e_stub.stub.run_cli_script.call_args[0][0].param1 == "^prod\\-1$"
|
||||||
|
with pytest.raises(ConnpyError):
|
||||||
|
e_stub.run_cli_script("dev-.*", "/tmp/s.txt")
|
||||||
|
|
||||||
|
# 5. ExecutionService remote _get_remote_stub() path + >500 chunking on test_commands
|
||||||
|
remote_dir = tmp_path / "remote_no_stub"
|
||||||
|
remote_dir.mkdir()
|
||||||
|
remote_cfg = configfile(conf=str(remote_dir / "config.yaml"), key=cfg.key)
|
||||||
|
remote_cfg.transactional_update(
|
||||||
|
lambda c: c.config.update(
|
||||||
|
{
|
||||||
|
"service_mode": "remote",
|
||||||
|
"remote_host": "localhost:50051",
|
||||||
|
"current_context": "prod",
|
||||||
|
"contexts": {"all": [".*"], "prod": ["^prod-.*"]},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
all_remote_nodes = [f"prod-{i}" for i in range(505)] + ["dev-1"]
|
||||||
|
seen_test_batches: list[list[str]] = []
|
||||||
|
|
||||||
|
class _FakeLazyNodeStub:
|
||||||
|
def __init__(self, _ch, remote_host=None, config=None):
|
||||||
|
self.remote_host = remote_host
|
||||||
|
self.config = config
|
||||||
|
|
||||||
|
def list_nodes(self, filter_str=None):
|
||||||
|
return list(all_remote_nodes)
|
||||||
|
|
||||||
|
class _FakeLazyExecutionStub:
|
||||||
|
def __init__(self, _ch, remote_host=None):
|
||||||
|
self.remote_host = remote_host
|
||||||
|
|
||||||
|
def test_commands(self, nodes_filter, **_kw):
|
||||||
|
seen_test_batches.append(list(nodes_filter))
|
||||||
|
return {
|
||||||
|
pat.strip("^$").replace("\\", ""): {"passed": True} for pat in nodes_filter
|
||||||
|
}
|
||||||
|
|
||||||
|
remote_svc = ExecutionService(remote_cfg)
|
||||||
|
with (
|
||||||
|
patch.object(remote_svc, "_get_remote_channel", return_value=(MagicMock(), "localhost:50051")),
|
||||||
|
patch("connpy.grpc_layer.stubs.NodeStub", _FakeLazyNodeStub),
|
||||||
|
patch("connpy.grpc_layer.stubs.ExecutionStub", _FakeLazyExecutionStub),
|
||||||
|
):
|
||||||
|
remote_test_res = remote_svc.test_commands(".*", ["show ver"], ["ok"])
|
||||||
|
|
||||||
|
assert len(seen_test_batches) == 2
|
||||||
|
assert len(seen_test_batches[0]) == 500
|
||||||
|
assert len(seen_test_batches[1]) == 5
|
||||||
|
assert len(remote_test_res) == 505
|
||||||
|
assert "dev-1" not in remote_test_res
|
||||||
|
assert ExecutionService._aggregate_remote_results([["prod-1"], ["prod-2"]]) == [
|
||||||
|
"prod-1",
|
||||||
|
"prod-2",
|
||||||
|
]
|
||||||
|
|
||||||
|
# 6. All 8 gRPC servicers force enforce_context=False on provider
|
||||||
|
for servicer_cls in (
|
||||||
|
NodeServicer,
|
||||||
|
ProfileServicer,
|
||||||
|
ConfigServicer,
|
||||||
|
PluginServicer,
|
||||||
|
ExecutionServicer,
|
||||||
|
ImportExportServicer,
|
||||||
|
AIServicer,
|
||||||
|
SystemServicer,
|
||||||
|
):
|
||||||
|
cfg._enforce_context = True
|
||||||
|
prov = ServiceProvider(cfg, mode="local", enforce_context=True)
|
||||||
|
servicer = servicer_cls(prov)
|
||||||
|
assert prov.enforce_context is False
|
||||||
|
assert prov.config._enforce_context is False
|
||||||
|
assert servicer._get_provider().enforce_context is False
|
||||||
Reference in new issue
Block a user