diff --git a/koyeb/api/docs/SandboxMetadata.md b/koyeb/api/docs/SandboxMetadata.md index 2f084ffb..43fff91a 100644 --- a/koyeb/api/docs/SandboxMetadata.md +++ b/koyeb/api/docs/SandboxMetadata.md @@ -7,7 +7,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **public_url** | **str** | | [optional] **routing_key** | **str** | | [optional] -**internal_url** | **str** | In-cluster url of the sandbox gateway, for clients running in the same k8s cluster | [optional] ## Example diff --git a/koyeb/api/models/sandbox_metadata.py b/koyeb/api/models/sandbox_metadata.py index 0c09cc55..3868167c 100644 --- a/koyeb/api/models/sandbox_metadata.py +++ b/koyeb/api/models/sandbox_metadata.py @@ -31,8 +31,7 @@ class SandboxMetadata(BaseModel): public_url: Optional[StrictStr] = None routing_key: Optional[StrictStr] = None - internal_url: Optional[StrictStr] = None - __properties: ClassVar[List[str]] = ["public_url", "routing_key", "internal_url"] + __properties: ClassVar[List[str]] = ["public_url", "routing_key"] model_config = ConfigDict( validate_by_name=True, @@ -83,10 +82,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate( - { - "public_url": obj.get("public_url"), - "routing_key": obj.get("routing_key"), - "internal_url": obj.get("internal_url"), - } + {"public_url": obj.get("public_url"), "routing_key": obj.get("routing_key")} ) return _obj diff --git a/koyeb/api_async/docs/SandboxMetadata.md b/koyeb/api_async/docs/SandboxMetadata.md index 22536c32..f199bf1a 100644 --- a/koyeb/api_async/docs/SandboxMetadata.md +++ b/koyeb/api_async/docs/SandboxMetadata.md @@ -7,7 +7,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **public_url** | **str** | | [optional] **routing_key** | **str** | | [optional] -**internal_url** | **str** | In-cluster url of the sandbox gateway, for clients running in the same k8s cluster | [optional] ## Example diff --git a/koyeb/api_async/models/sandbox_metadata.py b/koyeb/api_async/models/sandbox_metadata.py index 0c09cc55..3868167c 100644 --- a/koyeb/api_async/models/sandbox_metadata.py +++ b/koyeb/api_async/models/sandbox_metadata.py @@ -31,8 +31,7 @@ class SandboxMetadata(BaseModel): public_url: Optional[StrictStr] = None routing_key: Optional[StrictStr] = None - internal_url: Optional[StrictStr] = None - __properties: ClassVar[List[str]] = ["public_url", "routing_key", "internal_url"] + __properties: ClassVar[List[str]] = ["public_url", "routing_key"] model_config = ConfigDict( validate_by_name=True, @@ -83,10 +82,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate( - { - "public_url": obj.get("public_url"), - "routing_key": obj.get("routing_key"), - "internal_url": obj.get("internal_url"), - } + {"public_url": obj.get("public_url"), "routing_key": obj.get("routing_key")} ) return _obj diff --git a/koyeb/sandbox/control_plane.py b/koyeb/sandbox/control_plane.py index 55e8e08a..12d71834 100644 --- a/koyeb/sandbox/control_plane.py +++ b/koyeb/sandbox/control_plane.py @@ -14,12 +14,8 @@ from __future__ import annotations -import functools -import os -import socket from dataclasses import dataclass from typing import Any, Dict, List, Optional, Tuple -from urllib.parse import urlparse from koyeb.api.exceptions import ApiException, NotFoundException from koyeb.api.models.create_app import CreateApp @@ -74,40 +70,6 @@ class DeploymentInfo: proxy_ports: List[Dict[str, Any]] -SANDBOX_URL_ENV = "KOYEB_SANDBOX_URL" - - -@functools.lru_cache(maxsize=None) -def _resolves(host: str) -> bool: - try: - socket.getaddrinfo(host, None) - return True - except (socket.gaierror, UnicodeError): - return False - - -def select_sandbox_url(sandbox_metadata: Any) -> Optional[str]: - """Pick which sandbox gateway URL to call. - - The API returns a public URL and, on self-hosted clusters, an in-cluster - one. The in-cluster URL is used when its host resolves (we run inside the - cluster); KOYEB_SANDBOX_URL=internal|public forces the choice. - """ - public_url = getattr(sandbox_metadata, "public_url", None) - internal_url = getattr(sandbox_metadata, "internal_url", None) - if not internal_url: - return public_url - mode = os.getenv(SANDBOX_URL_ENV, "").strip().lower() - if mode == "public": - return public_url - if mode == "internal" or not public_url: - return internal_url - host = urlparse(internal_url).hostname - if host and _resolves(host): - return internal_url - return public_url - - def _deployment_info(deployment: Any) -> DeploymentInfo: """Model-flavor-agnostic conversion shared by both adapters.""" definition = deployment.definition @@ -121,7 +83,7 @@ def _deployment_info(deployment: Any) -> DeploymentInfo: metadata = getattr(deployment, "metadata", None) if metadata is not None: if metadata.sandbox is not None: - sandbox_url = select_sandbox_url(metadata.sandbox) + sandbox_url = metadata.sandbox.public_url routing_key = metadata.sandbox.routing_key for port in metadata.proxy_ports or []: proxy_ports.append( diff --git a/koyeb/sandbox/sandbox.py b/koyeb/sandbox/sandbox.py index 299c0f68..513b0011 100644 --- a/koyeb/sandbox/sandbox.py +++ b/koyeb/sandbox/sandbox.py @@ -27,7 +27,6 @@ DeploymentInfo, ServiceInfo, SyncControlPlane, - select_sandbox_url, ) from .spec import SandboxSpec from .clients import ( @@ -979,14 +978,9 @@ def delete(self) -> None: # Caller-provided app: deleting it would destroy unrelated services. cp.delete_service(self.service_id) - def _get_url_and_header_from_metadata( - self, prefer_internal: bool = True - ) -> Optional[Tuple[str, str]]: + def _get_url_and_header_from_metadata(self) -> Optional[Tuple[str, str]]: """ - Get the url of the sandbox and the routing key to use to reach it. - - With prefer_internal=False, always returns the public URL: for URLs - handed to users, which must work from outside the cluster. + Get the public url of the sandbox and the routing key to use to reach it. """ try: from koyeb.api.exceptions import ApiException @@ -1001,12 +995,7 @@ def _get_url_and_header_from_metadata( deployment = clients.deployments.get_deployment(deployment_id) metadata = deployment.deployment.metadata if metadata and metadata.sandbox: - url = ( - select_sandbox_url(metadata.sandbox) - if prefer_internal - else metadata.sandbox.public_url - ) - return url, metadata.sandbox.routing_key + return metadata.sandbox.public_url, metadata.sandbox.routing_key return None except (NotFoundException, ApiException, Exception): @@ -1050,7 +1039,7 @@ def _get_url(self) -> Optional[str]: Optional[str]: The full URL or None if unavailable """ if self._url is None: - url_data = self._get_url_and_header_from_metadata(prefer_internal=False) + url_data = self._get_url_and_header_from_metadata() if url_data: self._url = f"{url_data[0]}/r/{url_data[1]}/" return self._url diff --git a/koyeb/sandbox/test_control_plane.py b/koyeb/sandbox/test_control_plane.py index cffe0d52..0ade33d0 100644 --- a/koyeb/sandbox/test_control_plane.py +++ b/koyeb/sandbox/test_control_plane.py @@ -2,9 +2,7 @@ error mapping exactly where the orchestration contract demands it.""" import asyncio -import os import unittest -from unittest import mock from types import SimpleNamespace from koyeb.api.exceptions import ApiException, NotFoundException @@ -17,8 +15,6 @@ DeploymentInfo, ServiceInfo, SyncControlPlane, - _deployment_info, - select_sandbox_url, ) from koyeb.sandbox.errors import SandboxError @@ -294,49 +290,5 @@ async def update_service(id, service): self.assertIsNotNone(sent[0].definition) -class TestSelectSandboxUrl(unittest.TestCase): - PUBLIC = "https://sandboxes.example.com" - INTERNAL = "http://sandbox-gateway.koyeb.svc.cluster.local" - - def _meta(self, internal=INTERNAL): - return SimpleNamespace(public_url=self.PUBLIC, internal_url=internal) - - def _select(self, meta, resolves, extra_env=None): - env = {k: v for k, v in os.environ.items() if k != "KOYEB_SANDBOX_URL"} - env.update(extra_env or {}) - with mock.patch.dict(os.environ, env, clear=True), mock.patch( - "koyeb.sandbox.control_plane._resolves", return_value=resolves - ): - return select_sandbox_url(meta) - - def test_no_internal_url_uses_public(self): - self.assertEqual(self._select(self._meta(internal=None), True), self.PUBLIC) - - def test_old_model_without_field_uses_public(self): - meta = SimpleNamespace(public_url=self.PUBLIC) - self.assertEqual(self._select(meta, True), self.PUBLIC) - - def test_in_cluster_uses_internal(self): - self.assertEqual(self._select(self._meta(), True), self.INTERNAL) - - def test_outside_cluster_uses_public(self): - self.assertEqual(self._select(self._meta(), False), self.PUBLIC) - - def test_env_forces_public(self): - env = {"KOYEB_SANDBOX_URL": "public"} - self.assertEqual(self._select(self._meta(), True, env), self.PUBLIC) - - def test_env_forces_internal(self): - env = {"KOYEB_SANDBOX_URL": "internal"} - self.assertEqual(self._select(self._meta(), False, env), self.INTERNAL) - - def test_deployment_info_uses_selected_url(self): - deployment = _fake_deployment() - deployment.metadata.sandbox.internal_url = self.INTERNAL - with mock.patch("koyeb.sandbox.control_plane._resolves", return_value=True): - info = _deployment_info(deployment) - self.assertEqual(info.sandbox_url, self.INTERNAL) - - if __name__ == "__main__": unittest.main() diff --git a/koyeb/sandbox/test_sandbox_url_choice.py b/koyeb/sandbox/test_sandbox_url_choice.py deleted file mode 100644 index 524ccc99..00000000 --- a/koyeb/sandbox/test_sandbox_url_choice.py +++ /dev/null @@ -1,54 +0,0 @@ -"""exec/files use the in-cluster URL when reachable; URLs handed to users -(get_domain) always stay public.""" - -import unittest -from types import SimpleNamespace -from unittest import mock - -from koyeb.sandbox.sandbox import Sandbox - -PUBLIC = "https://sandboxes.example.com" -INTERNAL = "http://sandbox-gateway.koyeb.svc.cluster.local" - - -def _clients(): - deployment = SimpleNamespace( - metadata=SimpleNamespace( - sandbox=SimpleNamespace( - public_url=PUBLIC, internal_url=INTERNAL, routing_key="rk" - ) - ) - ) - return SimpleNamespace( - deployments=SimpleNamespace( - get_deployment=lambda id: SimpleNamespace(deployment=deployment) - ) - ) - - -class TestSandboxUrlChoice(unittest.TestCase): - def setUp(self): - self.sandbox = Sandbox(sandbox_id="svc-1", app_id="app-1", service_id="svc-1") - self.sandbox._deployment_id = "depl-1" - patches = [ - mock.patch( - "koyeb.sandbox.clients.get_api_clients", return_value=_clients() - ), - mock.patch("koyeb.sandbox.control_plane._resolves", return_value=True), - mock.patch.dict("os.environ", {"KOYEB_SANDBOX_URL": ""}), - ] - for p in patches: - p.start() - self.addCleanup(p.stop) - - def test_exec_uses_internal_url_in_cluster(self): - self.assertEqual( - self.sandbox._get_sandbox_url(), (f"{INTERNAL}/koyeb-sandbox", "rk") - ) - - def test_get_domain_stays_public_in_cluster(self): - self.assertEqual(self.sandbox.get_domain(), "sandboxes.example.com/r/rk/") - - -if __name__ == "__main__": - unittest.main() diff --git a/spec/openapi.json b/spec/openapi.json index 90dbd35a..d817b21d 100644 --- a/spec/openapi.json +++ b/spec/openapi.json @@ -19836,10 +19836,6 @@ }, "routing_key": { "type": "string" - }, - "internal_url": { - "type": "string", - "title": "In-cluster url of the sandbox gateway, for clients running in the same k8s cluster" } } },