From 96ab8e15a22d57ba34a4b16848e5fcd95059f3f8 Mon Sep 17 00:00:00 2001 From: didericis Date: Sat, 25 Jul 2026 14:07:57 -0400 Subject: [PATCH] refactor(backend): rename teardown_consolidated -> deprovision_consolidated The backends' public teardown entry point now pairs with `launch_consolidated` under the provision/deprovision verb used everywhere else (`deprovision_bottle`, `deprovision_git_gate`). Renamed across all three backends' consolidated_launch + launch modules and the tests. Co-Authored-By: Claude Opus 4.8 --- bot_bottle/backend/docker/consolidated_launch.py | 4 ++-- bot_bottle/backend/docker/launch.py | 4 ++-- bot_bottle/backend/firecracker/consolidated_launch.py | 4 ++-- bot_bottle/backend/firecracker/launch.py | 4 ++-- bot_bottle/backend/macos_container/consolidated_launch.py | 4 ++-- bot_bottle/backend/macos_container/launch.py | 4 ++-- tests/unit/test_consolidated_launch.py | 4 ++-- tests/unit/test_docker_launch_committed_image.py | 2 +- tests/unit/test_docker_launch_teardown.py | 2 +- tests/unit/test_macos_consolidated_launch.py | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bot_bottle/backend/docker/consolidated_launch.py b/bot_bottle/backend/docker/consolidated_launch.py index 633da99f..1db46a5d 100644 --- a/bot_bottle/backend/docker/consolidated_launch.py +++ b/bot_bottle/backend/docker/consolidated_launch.py @@ -168,7 +168,7 @@ def launch_consolidated( ) -def teardown_consolidated( +def deprovision_consolidated( bottle_id: str, *, orchestrator_url: str, infra_name: str = INFRA_NAME, timeout: float | None = None, ) -> None: @@ -180,6 +180,6 @@ def teardown_consolidated( __all__ = [ "LaunchContext", "launch_consolidated", - "teardown_consolidated", + "deprovision_consolidated", "ConsolidatedLaunchError", ] diff --git a/bot_bottle/backend/docker/launch.py b/bot_bottle/backend/docker/launch.py index f4dfc835..3cec0b6a 100644 --- a/bot_bottle/backend/docker/launch.py +++ b/bot_bottle/backend/docker/launch.py @@ -62,7 +62,7 @@ from .compose import ( ) from .consolidated_compose import consolidated_agent_compose from ...orchestrator.store.config_store import resolve_teardown_timeout -from .consolidated_launch import launch_consolidated, teardown_consolidated +from .consolidated_launch import launch_consolidated, deprovision_consolidated from .infra import INFRA_NAME from .gateway import DockerGateway @@ -151,7 +151,7 @@ def launch( plan.egress_plan, git_gate_plan, image_ref=plan.image, tokens=token_values, ) stack.callback( - teardown_consolidated, ctx.bottle_id, + deprovision_consolidated, ctx.bottle_id, orchestrator_url=ctx.orchestrator_url, timeout=teardown_timeout, ) diff --git a/bot_bottle/backend/firecracker/consolidated_launch.py b/bot_bottle/backend/firecracker/consolidated_launch.py index ed7de77e..f27037f4 100644 --- a/bot_bottle/backend/firecracker/consolidated_launch.py +++ b/bot_bottle/backend/firecracker/consolidated_launch.py @@ -146,7 +146,7 @@ def launch_consolidated( ) -def teardown_consolidated( +def deprovision_consolidated( bottle_id: str, *, orchestrator_url: str, timeout: float | None = None, ) -> None: """Deregister the bottle and remove its git-gate state from the gateway @@ -160,7 +160,7 @@ def teardown_consolidated( __all__ = [ "LaunchContext", "launch_consolidated", - "teardown_consolidated", + "deprovision_consolidated", "ConsolidatedLaunchError", "OrchestratorStartError", ] diff --git a/bot_bottle/backend/firecracker/launch.py b/bot_bottle/backend/firecracker/launch.py index 5c22d896..866e1dac 100644 --- a/bot_bottle/backend/firecracker/launch.py +++ b/bot_bottle/backend/firecracker/launch.py @@ -54,7 +54,7 @@ from ...orchestrator.store.secret_store import ENV_VAR_SECRET_NAME from .consolidated_launch import ( launch_consolidated, persist_env_var_secret, - teardown_consolidated, + deprovision_consolidated, ) @@ -119,7 +119,7 @@ def launch( tokens=token_values, ) stack.callback( - teardown_consolidated, ctx.bottle_id, + deprovision_consolidated, ctx.bottle_id, orchestrator_url=ctx.orchestrator_url, timeout=teardown_timeout, ) diff --git a/bot_bottle/backend/macos_container/consolidated_launch.py b/bot_bottle/backend/macos_container/consolidated_launch.py index 5c2c8397..a18b08a2 100644 --- a/bot_bottle/backend/macos_container/consolidated_launch.py +++ b/bot_bottle/backend/macos_container/consolidated_launch.py @@ -184,7 +184,7 @@ def register_agent( ) -def teardown_consolidated( +def deprovision_consolidated( bottle_id: str, *, orchestrator_url: str, timeout: float | None = None, ) -> None: """Deregister the bottle and remove its git-gate state from the gateway. @@ -200,7 +200,7 @@ __all__ = [ "ensure_gateway", "live_source_ips", "register_agent", - "teardown_consolidated", + "deprovision_consolidated", "ConsolidatedLaunchError", "OrchestratorStartError", "GATEWAY_NETWORK", diff --git a/bot_bottle/backend/macos_container/launch.py b/bot_bottle/backend/macos_container/launch.py index ba34ff97..34793fba 100644 --- a/bot_bottle/backend/macos_container/launch.py +++ b/bot_bottle/backend/macos_container/launch.py @@ -68,7 +68,7 @@ from .consolidated_launch import ( GatewayEndpoint, ensure_gateway, register_agent, - teardown_consolidated, + deprovision_consolidated, ) _REPO_DIR = str(Path(__file__).resolve().parent.parent.parent.parent) @@ -202,7 +202,7 @@ def launch( env_var_secret=plan.env_var_secret, ) stack.callback( - teardown_consolidated, ctx.bottle_id, + deprovision_consolidated, ctx.bottle_id, orchestrator_url=ctx.orchestrator_url, timeout=teardown_timeout, ) diff --git a/tests/unit/test_consolidated_launch.py b/tests/unit/test_consolidated_launch.py index 68403bce..8177a34a 100644 --- a/tests/unit/test_consolidated_launch.py +++ b/tests/unit/test_consolidated_launch.py @@ -8,7 +8,7 @@ from unittest.mock import MagicMock, Mock, patch from bot_bottle.backend.docker.consolidated_launch import ( launch_consolidated, - teardown_consolidated, + deprovision_consolidated, ) from bot_bottle.egress import EgressPlan, EgressRoute from bot_bottle.git_gate import GitGatePlan @@ -91,7 +91,7 @@ class TestTeardownConsolidated(unittest.TestCase): client = Mock() with patch(f"{_UTIL}.OrchestratorClient", return_value=client), \ patch(f"{_UTIL}.deprovision_git_gate") as deprov: - teardown_consolidated("b1", orchestrator_url="http://orch:8080") + deprovision_consolidated("b1", orchestrator_url="http://orch:8080") client.teardown_bottle.assert_called_once_with("b1") deprov.assert_called_once() diff --git a/tests/unit/test_docker_launch_committed_image.py b/tests/unit/test_docker_launch_committed_image.py index dad97734..05180f6d 100644 --- a/tests/unit/test_docker_launch_committed_image.py +++ b/tests/unit/test_docker_launch_committed_image.py @@ -96,7 +96,7 @@ class TestLaunchCommittedImage(unittest.TestCase): mock.patch.object(launch_mod.docker_mod, "verify_agent_image"), \ mock.patch.object(launch_mod.docker_mod, "image_created_at"), \ mock.patch.object(launch_mod, "launch_consolidated", return_value=_CTX), \ - mock.patch.object(launch_mod, "teardown_consolidated"), \ + mock.patch.object(launch_mod, "deprovision_consolidated"), \ mock.patch.object(launch_mod, "DockerGateway", return_value=gw), \ mock.patch.object(launch_mod, "consolidated_agent_compose", side_effect=compose), \ mock.patch.object(launch_mod, "write_compose_file", return_value=Path("/tmp/c.yml")), \ diff --git a/tests/unit/test_docker_launch_teardown.py b/tests/unit/test_docker_launch_teardown.py index 38b8a6e2..d80b3c42 100644 --- a/tests/unit/test_docker_launch_teardown.py +++ b/tests/unit/test_docker_launch_teardown.py @@ -99,7 +99,7 @@ class TestTeardownWarning(unittest.TestCase): with mock.patch.object(launch_mod.docker_mod, "build_image"), \ mock.patch.object(launch_mod.docker_mod, "verify_agent_image"), \ mock.patch.object(launch_mod, "launch_consolidated", return_value=ctx), \ - mock.patch.object(launch_mod, "teardown_consolidated"), \ + mock.patch.object(launch_mod, "deprovision_consolidated"), \ mock.patch.object(launch_mod, "DockerGateway", return_value=gw), \ mock.patch.object( launch_mod, "consolidated_agent_compose", diff --git a/tests/unit/test_macos_consolidated_launch.py b/tests/unit/test_macos_consolidated_launch.py index 743d795f..503a937b 100644 --- a/tests/unit/test_macos_consolidated_launch.py +++ b/tests/unit/test_macos_consolidated_launch.py @@ -10,7 +10,7 @@ from bot_bottle.backend.macos_container.consolidated_launch import ( GatewayEndpoint, ensure_gateway, register_agent, - teardown_consolidated, + deprovision_consolidated, ) from bot_bottle.egress import EgressPlan, EgressRoute from bot_bottle.git_gate import GitGatePlan @@ -129,7 +129,7 @@ class TestTeardown(unittest.TestCase): deprovision = Mock() with patch(f"{_UTIL}.OrchestratorClient", return_value=client), \ patch(f"{_UTIL}.deprovision_git_gate", deprovision): - teardown_consolidated("b1", orchestrator_url="http://o:8099") + deprovision_consolidated("b1", orchestrator_url="http://o:8099") client.teardown_bottle.assert_called_once_with("b1") self.assertEqual("b1", deprovision.call_args.args[1])