port-ocean 0.17.0__tar.gz → 0.17.4__tar.gz

{port_ocean-0.17.0 → port_ocean-0.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.17.0
+Version: 0.17.4
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port

{port_ocean-0.17.0 → port_ocean-0.17.4}/port_ocean/context/ocean.py

@@ -73,8 +73,10 @@ class PortOceanContext:
     def on_resync(
         self,
         kind: str | None = None,
-    ) -> Callable[[RESYNC_EVENT_LISTENER], RESYNC_EVENT_LISTENER | None]:
-        def wrapper(function: RESYNC_EVENT_LISTENER) -> RESYNC_EVENT_LISTENER | None:
+    ) -> Callable[[RESYNC_EVENT_LISTENER | None], RESYNC_EVENT_LISTENER | None]:
+        def wrapper(
+            function: RESYNC_EVENT_LISTENER | None,
+        ) -> RESYNC_EVENT_LISTENER | None:
             if not self.app.config.event_listener.should_resync:
                 logger.debug(
                     "Webhook only event listener is used, resync events are ignored"

{port_ocean-0.17.0 → port_ocean-0.17.4}/port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -3,7 +3,6 @@ from asyncio import Task
 from dataclasses import dataclass, field
 from functools import lru_cache
 from typing import Any, Optional
-
 import jq  # type: ignore
 from loguru import logger
 
@@ -66,6 +65,22 @@ class JQEntityProcessor(BaseEntityProcessor):
 
         return inner
 
+    @staticmethod
+    def _notify_mapping_issues(
+        entity_misconfigurations: dict[str, str],
+        missing_required_fields: bool,
+        entity_mapping_fault_counter: int,
+    ) -> None:
+
+        if len(entity_misconfigurations) > 0:
+            logger.info(
+                f"Unable to find valid data for: {entity_misconfigurations} (null, missing, or misconfigured)"
+            )
+        if missing_required_fields:
+            logger.info(
+                f"{entity_mapping_fault_counter} transformations of batch failed due to empty, null or missing values"
+            )
+
     async def _search(self, data: dict[str, Any], pattern: str) -> Any:
         try:
             loop = asyncio.get_event_loop()
@@ -252,9 +267,12 @@ class JQEntityProcessor(BaseEntityProcessor):
         examples_to_send: list[dict[str, Any]] = []
         entity_misconfigurations: dict[str, str] = {}
         missing_required_fields: bool = False
+        entity_mapping_fault_counter: int = 0
+
         for result in calculated_entities_results:
             if len(result.misconfigurations) > 0:
                 entity_misconfigurations |= result.misconfigurations
+
             if result.entity.get("identifier") and result.entity.get("blueprint"):
                 parsed_entity = Entity.parse_obj(result.entity)
                 if result.did_entity_pass_selector:
@@ -268,10 +286,14 @@ class JQEntityProcessor(BaseEntityProcessor):
                     failed_entities.append(parsed_entity)
             else:
                 missing_required_fields = True
-        if len(entity_misconfigurations) > 0:
-            logger.info(
-                f"The mapping resulted with invalid values for{" identifier, blueprint," if missing_required_fields else " "} properties. Mapping result: {entity_misconfigurations}"
-            )
+                entity_mapping_fault_counter += 1
+
+        self._notify_mapping_issues(
+            entity_misconfigurations,
+            missing_required_fields,
+            entity_mapping_fault_counter,
+        )
+
         if (
             not calculated_entities_results
             and raw_results

{port_ocean-0.17.0 → port_ocean-0.17.4}/port_ocean/core/integrations/mixins/events.py

@@ -46,7 +46,7 @@ class EventsMixin:
         return func
 
     def on_resync(
-        self, func: RESYNC_EVENT_LISTENER, kind: str | None = None
+        self, func: RESYNC_EVENT_LISTENER| None, kind: str | None = None
     ) -> RESYNC_EVENT_LISTENER:
         """Register a function as a listener for a "resync" event.
 
@@ -57,6 +57,8 @@ class EventsMixin:
         Returns:
             RESYNC_EVENT_LISTENER: The input function, unchanged.
         """
+        if func is None:
+            return None
         if kind is None:
             logger.debug(f"Registering resync event listener any kind")
         else:

{port_ocean-0.17.0 → port_ocean-0.17.4}/port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py

@@ -1,6 +1,8 @@
 from typing import Any
 from unittest.mock import AsyncMock, Mock
+from loguru import logger
 import pytest
+from io import StringIO
 
 from port_ocean.context.ocean import PortOceanContext
 from port_ocean.core.handlers.entity_processor.jq_entity_processor import (
@@ -303,3 +305,46 @@ class TestJQEntityProcessor:
             "url": ".foobar",
             "defaultBranch": ".bar.baz",
         }
+
+    async def test_parse_items_empty_required(
+        self, mocked_processor: JQEntityProcessor
+    ) -> None:
+        stream = StringIO()
+        sink_id = logger.add(stream, level="DEBUG")
+
+        mapping = Mock()
+        mapping.port.entity.mappings.dict.return_value = {
+            "identifier": ".foo",
+            "blueprint": ".bar",
+        }
+        mapping.port.items_to_parse = None
+        mapping.selector.query = "true"
+        raw_results: list[dict[Any, Any]] = [
+            {"foo": "", "bar": "bluePrintMapped"},
+            {"foo": "identifierMapped", "bar": ""},
+        ]
+        result = await mocked_processor._parse_items(mapping, raw_results)
+        assert "identifier" not in result.misonfigured_entity_keys
+        assert "blueprint" not in result.misonfigured_entity_keys
+
+        raw_results = [
+            {"foo": "identifierMapped", "bar": None},
+            {"foo": None, "bar": ""},
+        ]
+        result = await mocked_processor._parse_items(mapping, raw_results)
+        assert result.misonfigured_entity_keys == {
+            "identifier": ".foo",
+            "blueprint": ".bar",
+        }
+
+        logger.remove(sink_id)
+        logs_captured = stream.getvalue()
+
+        assert (
+            "2 transformations of batch failed due to empty, null or missing values"
+            in logs_captured
+        )
+        assert (
+            "{'blueprint': '.bar', 'identifier': '.foo'} (null, missing, or misconfigured)"
+            in logs_captured
+        )

{port_ocean-0.17.0 → port_ocean-0.17.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.17.0"
+version = "0.17.4"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"