fix(oci): services show their address instead of a web link, and applications are not asked for their own

AppImage/scripts/lxc_apps.py

@@ -5509,7 +5509,9 @@ def ensure_oci_registration(vmid) -> bool:
         # A database or a cache is reached by the application, not by the user.
         endpoints = []
     elif not endpoints:
-        port = meta.get("endpoint_port") or next(iter(meta.get("ports") or []), None)
+        # A recipe that names no web address has none: its ports are the
+        # service itself, a database or an SSH server, and not a page to open.
+        port = meta.get("endpoint_port")
         endpoints = [{"port": port, "scheme": meta.get("endpoint_scheme"), "path": meta.get("endpoint_path"),
                       "description": "", "logo_url": ""}] if isinstance(port, int) else []
     ports = []
@@ -5638,6 +5640,19 @@ def _oci_instance_meta(vmid) -> Optional[dict]:
             continue
         if 1 <= port <= 65535 and port not in ports:
             ports.append(port)
+    # With no web address, the application is a service reached on the ports
+    # of its container; they are shown as an address and never as a link. The
+    # database or the cache of a stack is reached by its application only.
+    service_ports = []
+    if not endpoint.get("port") and not _oci_secondary_member(record):
+        for entry in contract.get("ports") or []:
+            try:
+                port = int((entry or {}).get("container_port"))
+            except (TypeError, ValueError):
+                continue
+            if 1 <= port <= 65535:
+                service_ports.append({"port": port,
+                                      "protocol": "udp" if (entry or {}).get("protocol") == "udp" else "tcp"})
     template_id = str(template.get("id") or "").strip()
     # The application is reached on its first endpoint and carries its own
     # name and logo. Any other endpoint is a service of its own, such as
@@ -5708,6 +5723,7 @@ def _oci_instance_meta(vmid) -> Optional[dict]:
         "endpoint_path": str(endpoint.get("path") or "").strip() or None,
         "ports": ports,
         "endpoints": endpoints,
+        "service_ports": service_ports,
         # The exact image this container was created from. Its digest is what
         # an update is decided on; the version label is only for reading.
         "installed_digest": str(observed_image.get("manifest_digest") or "").strip() or None,
@@ -6244,7 +6260,9 @@ def get_suggestions(vmid, force: bool = False) -> dict:
             ports = [oci_meta["endpoint_port"]] + [p for p in (oci_meta["ports"] or ports)
                                                    if p != oci_meta["endpoint_port"]]
         elif oci_meta["ports"]:
-            default_ports = list(oci_meta["ports"])
+            # A service has no page to open: none of its ports is proposed
+            # as a web link.
+            default_ports = []
         web_hint = oci_meta["endpoint_path"] or web_hint
         if oci_meta["template_id"] == "image-adguard-home":
             # The first-run endpoint disappears once setup switches to :80.
@@ -6289,6 +6307,7 @@ def get_suggestions(vmid, force: bool = False) -> dict:
             "port": oci_meta["endpoint_port"],
             "path": oci_meta["endpoint_path"],
             "website": oci_meta["website"],
+            "service_ports": oci_meta["service_ports"],
         } if oci_meta else None,
         # Categoría preset for the primary detection — same lookup as
         # get_catalog_entry so the Register button pre-selects it.

AppImage/scripts/tests/test_oci_endpoints.py

@@ -105,6 +105,30 @@ class OciEndpointTests(CatalogFixture):
         self.assertNotIn('logo_url', ports[0])
         self.assertEqual(ports[1]['logo_url'], ICON)
 
+    def test_a_service_with_no_web_address_is_registered_without_a_link(self):
+        # A database or an SSH server: its port is not a page to open.
+        meta = self.install([])
+        self.assertEqual(meta['service_ports'], [{'port': 8971, 'protocol': 'tcp'}])
+        with patch.object(lxc_apps, '_read_sidecar', return_value=None), \
+             patch.object(lxc_apps, '_oci_dismissed', return_value={}), \
+             patch.object(lxc_apps, 'add_app', return_value=(True, {})) as add:
+            self.assertTrue(lxc_apps.ensure_oci_registration(190))
+        self.assertEqual(add.call_args.args[1]['ports'], [])
+
+    def test_a_service_is_shown_by_its_address_and_not_proposed_as_a_link(self):
+        self.install([])
+        with patch.object(lxc_apps, '_probe_listening_ports', return_value=[]), \
+             patch.object(lxc_apps, '_helper_slug_meta', return_value=None), \
+             patch.object(lxc_apps, '_fetch_tracking_hints', return_value={}), \
+             patch.object(lxc_apps, '_oci_image_versions', return_value={'error': 'offline'}), \
+             patch.object(lxc_apps, '_read_sidecar', return_value=None):
+            suggestion = lxc_apps.get_suggestions(190)
+        self.assertEqual(suggestion['default_ports'], [])
+        self.assertEqual(suggestion['oci_instance']['service_ports'], [{'port': 8971, 'protocol': 'tcp'}])
+
+    def test_an_application_with_a_web_address_has_no_service_ports(self):
+        self.assertEqual(self.install(ENDPOINTS)['service_ports'], [])
+
 
 class OciGuestVersionTests(CatalogFixture):
     def test_version_read_from_the_file_the_catalog_names(self):