port-ocean 0.25.4__tar.gz → 0.26.1__tar.gz

{port_ocean-0.25.4 → port_ocean-0.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.25.4
+Version: 0.26.1
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -28,6 +28,7 @@ Requires-Dist: confluent-kafka (>=2.10.1,<3.0.0)
 Requires-Dist: cookiecutter (>=2.1.1,<3.0.0) ; extra == "cli"
 Requires-Dist: fastapi (>=0.115.3,<0.116.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
+Requires-Dist: jinja2 (>=3.1.6)
 Requires-Dist: jinja2-time (>=0.2.0,<0.3.0) ; extra == "cli"
 Requires-Dist: jq (>=1.8.0,<2.0.0)
 Requires-Dist: loguru (>=0.7.0,<0.8.0)

{port_ocean-0.25.4 → port_ocean-0.26.1}/integrations/_infra/Dockerfile.Deb

@@ -40,6 +40,7 @@ RUN apt-get update \
         openssl \
         curl \
         acl \
+        sudo \
     && apt-get clean
 
 LABEL INTEGRATION_VERSION=${INTEGRATION_VERSION}
@@ -68,6 +69,11 @@ RUN chmod a+x /app/init.sh
 RUN ln -s /app/.venv/bin/ocean /usr/bin/ocean
 # Add ocean user to ssl certs group
 RUN setfacl -m u:ocean:rwX /etc/ssl/certs
+
+# Allow ocean user to run update-ca-certificates without password (secure, limited sudo)
+RUN echo "ocean ALL=(root) NOPASSWD: /usr/sbin/update-ca-certificates" >> /etc/sudoers.d/ocean-certs \
+    && chmod 440 /etc/sudoers.d/ocean-certs
+
 USER ocean
 # Run the application
 CMD ["bash", "/app/init.sh"]

{port_ocean-0.25.4 → port_ocean-0.26.1}/integrations/_infra/init.sh

@@ -1,5 +1,5 @@
 if test -e /usr/local/share/ca-certificates/cert.crt; then
-  update-ca-certificates
+  sudo update-ca-certificates
 fi
 
 ocean sail

{port_ocean-0.25.4 → port_ocean-0.26.1}/port_ocean/clients/port/mixins/entities.py

@@ -483,38 +483,56 @@ class EntityClientMixin:
         query: dict[Any, Any] | None = None,
         parameters_to_include: list[str] | None = None,
     ) -> list[Entity]:
-        default_query = {
-            "combinator": "and",
-            "rules": [
-                {
-                    "property": "$datasource",
-                    "operator": "contains",
-                    "value": f"port-ocean/{self.auth.integration_type}/",
+        if query is None:
+            datasource_prefix = f"port-ocean/{self.auth.integration_type}/"
+            datasource_suffix = (
+                f"/{self.auth.integration_identifier}/{user_agent_type.value}"
+            )
+            logger.info(
+                f"Searching entities with datasource prefix: {datasource_prefix} and suffix: {datasource_suffix}"
+            )
+
+            response = await self.client.post(
+                f"{self.auth.api_url}/blueprints/entities/datasource-entities",
+                json={
+                    "datasource_prefix": datasource_prefix,
+                    "datasource_suffix": datasource_suffix,
                 },
-                {
-                    "property": "$datasource",
-                    "operator": "contains",
-                    "value": f"/{self.auth.integration_identifier}/{user_agent_type.value}",
+                headers=await self.auth.headers(user_agent_type),
+                extensions={"retryable": True},
+            )
+        else:
+            default_query = {
+                "combinator": "and",
+                "rules": [
+                    {
+                        "property": "$datasource",
+                        "operator": "contains",
+                        "value": f"port-ocean/{self.auth.integration_type}/",
+                    },
+                    {
+                        "property": "$datasource",
+                        "operator": "contains",
+                        "value": f"/{self.auth.integration_identifier}/{user_agent_type.value}",
+                    },
+                ],
+            }
+
+            if query.get("rules"):
+                query["rules"].extend(default_query["rules"])
+
+            logger.info(f"Searching entities with custom query: {query}")
+            response = await self.client.post(
+                f"{self.auth.api_url}/entities/search",
+                json=query,
+                headers=await self.auth.headers(user_agent_type),
+                params={
+                    "exclude_calculated_properties": "true",
+                    "include": parameters_to_include or ["blueprint", "identifier"],
                 },
-            ],
-        }
+                extensions={"retryable": True},
+            )
 
-        if query is None:
-            query = default_query
-        elif query.get("rules"):
-            query["rules"].append(default_query)
-
-        logger.info(f"Searching entities with query {query}")
-        response = await self.client.post(
-            f"{self.auth.api_url}/entities/search",
-            json=query,
-            headers=await self.auth.headers(user_agent_type),
-            params={
-                "exclude_calculated_properties": "true",
-                "include": parameters_to_include or ["blueprint", "identifier"],
-            },
-            extensions={"retryable": True},
-        )
         handle_port_status_code(response)
         return [Entity.parse_obj(result) for result in response.json()["entities"]]
 

{port_ocean-0.25.4 → port_ocean-0.26.1}/port_ocean/tests/clients/port/mixins/test_entities.py

@@ -1,11 +1,11 @@
-from typing import Any, List, Generator
-from unittest.mock import MagicMock, patch, AsyncMock
+from typing import Any, Generator, List
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
+from httpx import ReadTimeout
 
 from port_ocean.clients.port.mixins.entities import EntityClientMixin
 from port_ocean.core.models import Entity
-from httpx import ReadTimeout
 
 # Mock the ocean context at module level
 pytestmark = pytest.mark.usefixtures("mock_ocean")
@@ -172,3 +172,44 @@ async def test_batch_upsert_entities_read_timeout_should_raise_true(
             await entity_client.upsert_entities_in_batches(
                 entities=all_entities, request_options=MagicMock(), should_raise=True
             )
+
+
+async def test_search_entities_uses_datasource_route_when_query_is_none(
+    entity_client: EntityClientMixin,
+) -> None:
+    """Test that search_entities uses datasource route when query is None"""
+    mock_response = MagicMock()
+    mock_response.json.return_value = {"entities": []}
+    mock_response.is_error = False
+    mock_response.status_code = 200
+    mock_response.headers = {}
+    entity_client.client.post = AsyncMock(return_value=mock_response)  # type: ignore
+    entity_client.auth.headers = AsyncMock(  # type: ignore
+        return_value={"Authorization": "Bearer test"}
+    )
+
+    entity_client.auth.integration_type = "test-integration"
+    entity_client.auth.integration_identifier = "test-identifier"
+    entity_client.auth.api_url = "https://api.getport.io/v1"
+
+    mock_user_agent_type = MagicMock()
+    mock_user_agent_type.value = "sync"
+
+    await entity_client.search_entities(
+        user_agent_type=mock_user_agent_type,
+        query=None,
+    )
+
+    entity_client.client.post.assert_called_once()
+    call_args = entity_client.client.post.call_args
+
+    assert (
+        call_args[0][0]
+        == "https://api.getport.io/v1/blueprints/entities/datasource-entities"
+    )
+
+    expected_json = {
+        "datasource_prefix": "port-ocean/test-integration/",
+        "datasource_suffix": "/test-identifier/sync",
+    }
+    assert call_args[1]["json"] == expected_json

{port_ocean-0.25.4 → port_ocean-0.26.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.25.4"
+version = "0.26.1"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -56,6 +56,7 @@ pydispatcher = "^2.0.7"
 tomli = "^2.0.1"
 aiostream = ">=0.5.2,<0.7.0"
 python-dateutil = "^2.9.0.post0"
+jinja2 = ">=3.1.6"
 
 # CLI
 click = { version = "^8.1.3", optional = true }