Use referenceid not uuid to refer to services

Author: waTeim

appstore/core/tests.py

@@ -71,6 +71,20 @@ def test_private_route_redirects_guid_to_controller_uuid(self, mock_get_helxinst
             "/private/pgadmin/wateim/3ccf4b07-ea15-488e-9208-48b0e3ffbb53/",
         )
 
+    @patch("core.views._get_helxinst_manager")
+    def test_private_route_keeps_reference_id_path(self, mock_get_helxinst_manager):
+        sid = "4ec0678656034b7198ae30fa598196af"
+        mock_mgr = Mock()
+        mock_mgr.get.return_value = {
+            "spec": {"referenceID": sid},
+            "status": {"uuid": "3ccf4b07-ea15-488e-9208-48b0e3ffbb53"},
+        }
+        mock_get_helxinst_manager.return_value = mock_mgr
+
+        response = self.client.get(f"/private/pgadmin/wateim/{sid}/")
+
+        self.assertEqual(response.status_code, 404)
+
     @patch("core.views._get_helxinst_manager")
     def test_private_route_returns_404_when_no_matching_helxinst(self, mock_get_helxinst_manager):
         mock_mgr = Mock()

appstore/core/views.py

@@ -132,6 +132,11 @@ def _resolve_private_redirect_path(path):
     if helxinst is None:
         return None
 
+    spec = helxinst.get("spec", {}) or {}
+    reference_id = spec.get("referenceID")
+    if reference_id and reference_id == sid:
+        return None
+
     controller_uuid = (helxinst.get("status") or {}).get("uuid")
     if not controller_uuid or controller_uuid == sid:
         return None

appstore/registry/spec_builder.py

@@ -17,21 +17,11 @@
 )
 from registry.models import ResolvedApp
 
-# Standard ambassador prefix — routes /private/<app>/<user>/<uuid>/ to this
-# service. Uses Go template expressions resolved by the controller at
+# Standard ambassador prefix — routes /private/<app>/<user>/<referenceID>/ to
+# the service. Uses Go template expressions resolved by the controller at
 # deployment time.
 _AMBASSADOR_PREFIX = (
-    "/private/{{ .system.AppClassName }}/{{ .system.UserName }}/{{ .system.UUID }}/"
-)
-
-# AppStore still launches applications with a stable reference ID in NB_PREFIX.
-# The helxapp-controller labels Services with its own UUID. Match on the
-# controller UUID externally, then rewrite the upstream path back to the
-# AppStore reference ID so path-aware apps (pgAdmin, filebrowser, notebooks)
-# see the prefix they were configured with at launch time.
-_AMBASSADOR_REFERENCE_REWRITE = (
-    '/private/{{ .system.AppClassName }}/{{ .system.UserName }}/'
-    '{{ .system.ReferenceID }}/'
+    "/private/{{ .system.AppClassName }}/{{ .system.UserName }}/{{ .system.ReferenceID }}/"
 )
 
 
@@ -85,7 +75,7 @@ def build_helxapp_spec(app: ResolvedApp, compose_spec: dict) -> HelxAppSpec:
         if has_service_port and not ambassador_assigned:
             proxy_rewrite = None
             if app.proxy_rewrite_enabled:
-                proxy_rewrite = app.proxy_rewrite_target or _AMBASSADOR_REFERENCE_REWRITE
+                proxy_rewrite = app.proxy_rewrite_target or _AMBASSADOR_PREFIX
             ambassador = AmbassadorSpec(
                 prefix=_AMBASSADOR_PREFIX,
                 ambassador_id=ambassador_id,

appstore/registry/tests/test_spec_builder.py

@@ -131,7 +131,7 @@ def test_ambassador_added_for_service_with_port(self):
         assert svc.ambassador is not None
         assert "{{ .system.AppClassName }}" in svc.ambassador.prefix
         assert "{{ .system.UserName }}" in svc.ambassador.prefix
-        assert "{{ .system.UUID }}" in svc.ambassador.prefix
+        assert "{{ .system.ReferenceID }}" in svc.ambassador.prefix
 
     def test_ambassador_in_to_dict(self):
         spec = build_helxapp_spec(_app(), _compose())
@@ -146,10 +146,7 @@ def test_ambassador_rewrite_defaults_to_prefix_when_enabled(self):
         )
         ambassador = spec.services[0].ambassador
         assert ambassador is not None
-        assert ambassador.proxy_rewrite != ambassador.prefix
-        assert "{{ .system.AppClassName }}" in ambassador.proxy_rewrite
-        assert "{{ .system.UserName }}" in ambassador.proxy_rewrite
-        assert "{{ .system.ReferenceID }}" in ambassador.proxy_rewrite
+        assert ambassador.proxy_rewrite == ambassador.prefix
 
     def test_ambassador_rewrite_uses_explicit_target(self):
         spec = build_helxapp_spec(