didericis
fcbbc4484d
Replace bottle.tokens (with Kind enum and hardcoded per-kind
route/auth tables) with bottle.cred_proxy.routes — each route
declares its own path, upstream, auth_scheme, token_ref, and
optional role[]. The manifest is now the source of truth for the
proxy's runtime route table; adding an upstream is a manifest edit,
not a code change.
Agent-side rewrites move from per-kind dispatch to per-role tags
on routes:
anthropic-base-url -> set ANTHROPIC_BASE_URL=<proxy><path>
npm-registry -> write ~/.npmrc registry=
git-insteadof -> write ~/.gitconfig [url] insteadOf, keyed
off route.upstream (suppressed when
bottle.git brokers the same host)
tea-login -> add a ~/.config/tea/config.yml login
Roles are a list (string accepted as sugar). A gitea route
typically carries ["git-insteadof", "tea-login"]. Singleton roles
(anthropic-base-url, npm-registry) appear on at most one route.
token_env slots are assigned per distinct TokenRef in declaration
order — two routes sharing a token_ref (e.g. github API + git
endpoints) share a slot.
Drops: TOKEN_KINDS, _KIND_ROUTES, _KIND_AUTH_SCHEME, _TOKEN_DEFAULT_HOST,
cred_proxy_route_path_for_gitea, the kind field on CredProxyUpstream,
and the kind-based hardcoding in pipelock_token_hosts (now derives
from route.UpstreamHost).
Legacy bottle.tokens manifests now die with a hint pointing at
bottle.cred_proxy.routes + this PRD. Tests rewritten end-to-end.
Docs + example.json + the dev ~/claude-bottle.json updated to match.
106 lines
3.5 KiB
Python
106 lines
3.5 KiB
Python
"""Unit: DockerCredProxy helpers + early-exit guards (PRD 0010).
|
|
|
|
The full docker lifecycle is exercised by integration tests; here we
|
|
cover the pure helpers and the validation checks `.start` runs
|
|
before touching docker."""
|
|
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from claude_bottle.backend.docker.cred_proxy import (
|
|
CRED_PROXY_HOSTNAME,
|
|
CRED_PROXY_PORT,
|
|
DockerCredProxy,
|
|
cred_proxy_container_name,
|
|
cred_proxy_url,
|
|
)
|
|
from claude_bottle.cred_proxy import CredProxyPlan, CredProxyUpstream
|
|
from claude_bottle.log import Die
|
|
|
|
|
|
def _empty_plan(**overrides):
|
|
base = {
|
|
"slug": "demo",
|
|
"routes_path": Path("/nonexistent"),
|
|
"upstreams": (),
|
|
"token_env_map": {},
|
|
"internal_network": "",
|
|
"egress_network": "",
|
|
"pipelock_ca_host_path": Path(),
|
|
"pipelock_proxy_url": "",
|
|
}
|
|
base.update(overrides)
|
|
return CredProxyPlan(**base)
|
|
|
|
|
|
class TestNameAndUrl(unittest.TestCase):
|
|
def test_container_name_carries_slug(self):
|
|
self.assertEqual("claude-bottle-cred-proxy-demo",
|
|
cred_proxy_container_name("demo"))
|
|
|
|
def test_url_uses_alias_not_container_name(self):
|
|
# The URL agents dial is stable across bottles — the slug
|
|
# never appears in it. That's the whole point of attaching
|
|
# --network-alias cred-proxy on the internal network.
|
|
self.assertEqual(f"http://{CRED_PROXY_HOSTNAME}:{CRED_PROXY_PORT}",
|
|
cred_proxy_url())
|
|
|
|
|
|
class TestStartGuards(unittest.TestCase):
|
|
def setUp(self):
|
|
self.proxy = DockerCredProxy()
|
|
|
|
def test_empty_upstreams_dies(self):
|
|
with self.assertRaises(Die):
|
|
self.proxy.start(_empty_plan())
|
|
|
|
def test_missing_internal_network_dies(self):
|
|
upstream = CredProxyUpstream(
|
|
path="/anthropic/",
|
|
upstream="https://api.anthropic.com",
|
|
auth_scheme="Bearer", token_env="CRED_PROXY_TOKEN_0",
|
|
token_ref="T",
|
|
)
|
|
with self.assertRaises(Die):
|
|
self.proxy.start(_empty_plan(upstreams=(upstream,)))
|
|
|
|
def test_missing_routes_file_dies(self):
|
|
upstream = CredProxyUpstream(
|
|
path="/anthropic/",
|
|
upstream="https://api.anthropic.com",
|
|
auth_scheme="Bearer", token_env="CRED_PROXY_TOKEN_0",
|
|
token_ref="T",
|
|
)
|
|
with self.assertRaises(Die):
|
|
self.proxy.start(_empty_plan(
|
|
upstreams=(upstream,),
|
|
internal_network="net-x",
|
|
egress_network="egress-x",
|
|
routes_path=Path("/tmp/cred-proxy-test-does-not-exist.json"),
|
|
))
|
|
|
|
def test_pipelock_url_without_ca_dies(self):
|
|
# URL set + CA path empty/missing is a wiring bug: either both
|
|
# populated (production) or both empty (test escape hatch).
|
|
upstream = CredProxyUpstream(
|
|
path="/anthropic/",
|
|
upstream="https://api.anthropic.com",
|
|
auth_scheme="Bearer", token_env="CRED_PROXY_TOKEN_0",
|
|
token_ref="T",
|
|
)
|
|
with tempfile.NamedTemporaryFile() as routes:
|
|
with self.assertRaises(Die):
|
|
self.proxy.start(_empty_plan(
|
|
upstreams=(upstream,),
|
|
internal_network="net-x",
|
|
egress_network="egress-x",
|
|
routes_path=Path(routes.name),
|
|
pipelock_proxy_url="http://pipelock:8888",
|
|
pipelock_ca_host_path=Path("/tmp/cred-proxy-no-ca.pem"),
|
|
))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|