port-ocean 0.27.2__tar.gz → 0.27.5__tar.gz

{port_ocean-0.27.2 → port_ocean-0.27.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.27.2
+Version: 0.27.5
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port
@@ -26,7 +26,7 @@ Requires-Dist: aiostream (>=0.5.2,<0.7.0)
 Requires-Dist: click (>=8.1.3,<9.0.0) ; extra == "cli"
 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: fastapi (>=0.116.0,<0.117.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"

{port_ocean-0.27.2 → port_ocean-0.27.5}/port_ocean/core/event_listener/kafka.py

@@ -16,6 +16,7 @@ from port_ocean.core.event_listener.base import (
     EventListenerEvents,
     EventListenerSettings,
 )
+from pydantic import validator
 
 
 class KafkaEventListenerSettings(EventListenerSettings):
@@ -46,6 +47,19 @@ class KafkaEventListenerSettings(EventListenerSettings):
     kafka_security_enabled: bool = True
     consumer_poll_timeout: int = 1
 
+    @validator("brokers")
+    @classmethod
+    def parse_brokers(cls, v: str) -> str:
+        # If it's a JSON array string, parse and join
+        if v.strip().startswith("[") and v.strip().endswith("]"):
+            try:
+                parsed = json.loads(v)
+                if isinstance(parsed, list):
+                    return ",".join(parsed)
+            except json.JSONDecodeError:
+                pass
+        return v
+
     def get_changelog_destination_details(self) -> dict[str, Any]:
         """
         Returns the changelog destination configuration for the Kafka event listener.

{port_ocean-0.27.2 → port_ocean-0.27.5}/port_ocean/core/handlers/entity_processor/jq_entity_processor.py

@@ -242,6 +242,7 @@ class JQEntityProcessor(BaseEntityProcessor):
         data: dict[str, Any],
         raw_entity_mappings: dict[str, Any],
         items_to_parse: str | None,
+        items_to_parse_name: str,
         selector_query: str,
         parse_all: bool = False,
     ) -> tuple[list[MappedEntity], list[Exception]]:
@@ -255,7 +256,7 @@ class JQEntityProcessor(BaseEntityProcessor):
                         f" Skipping..."
                     )
                     return [], []
-                raw_data = [{"item": item, **data} for item in items]
+                raw_data = [{items_to_parse_name: item, **data} for item in items]
 
         entities, errors = await gather_and_split_errors_from_results(
             [
@@ -304,6 +305,7 @@ class JQEntityProcessor(BaseEntityProcessor):
                 self._calculate_entity,
                 raw_entity_mappings,
                 mapping.port.items_to_parse,
+                mapping.port.items_to_parse_name,
                 mapping.selector.query,
                 parse_all,
             )

{port_ocean-0.27.2 → port_ocean-0.27.5}/port_ocean/core/handlers/port_app_config/models.py

@@ -39,6 +39,7 @@ class MappingsConfig(BaseModel):
 class PortResourceConfig(BaseModel):
     entity: MappingsConfig
     items_to_parse: str | None = Field(alias="itemsToParse")
+    items_to_parse_name: str | None = Field(alias="itemsToParseName", default="item")
 
 
 class Selector(BaseModel):

port_ocean-0.27.5/port_ocean/tests/core/event_listener/test_kafka.py

@@ -0,0 +1,70 @@
+from port_ocean.core.event_listener.kafka import KafkaEventListenerSettings
+import pytest
+from pydantic import ValidationError
+
+
+def test_default_kafka_settings() -> None:
+    """Test default values are properly set"""
+    config = KafkaEventListenerSettings(type="KAFKA")
+    assert config.type == "KAFKA"
+    assert config.security_protocol == "SASL_SSL"
+    assert config.authentication_mechanism == "SCRAM-SHA-512"
+    assert config.kafka_security_enabled is True
+    assert config.consumer_poll_timeout == 1
+    assert "b-1-public.publicclusterprod" in config.brokers
+
+
+def test_brokers_json_array_parsing() -> None:
+    """Test that JSON array strings get converted to comma-separated"""
+    json_brokers = '["broker1:9092", "broker2:9092", "broker3:9092"]'
+    config = KafkaEventListenerSettings(type="KAFKA", brokers=json_brokers)
+    assert config.brokers == "broker1:9092,broker2:9092,broker3:9092"
+
+
+def test_brokers_regular_string_unchanged() -> None:
+    """Test that regular comma-separated strings pass through unchanged"""
+    regular_brokers = "broker1:9092,broker2:9092"
+    config = KafkaEventListenerSettings(type="KAFKA", brokers=regular_brokers)
+    assert config.brokers == regular_brokers
+
+
+def test_brokers_malformed_json_unchanged() -> None:
+    """Test that malformed JSON strings don't break validation"""
+    bad_json = "[broker1:9092, broker2:9092"
+    config = KafkaEventListenerSettings(type="KAFKA", brokers=bad_json)
+    assert config.brokers == bad_json
+
+
+def test_custom_values() -> None:
+    """Test overriding default values"""
+    config = KafkaEventListenerSettings(
+        type="KAFKA",
+        brokers="custom:9092",
+        security_protocol="PLAINTEXT",
+        authentication_mechanism="PLAIN",
+        kafka_security_enabled=False,
+        consumer_poll_timeout=5,
+    )
+    assert config.brokers == "custom:9092"
+    assert config.security_protocol == "PLAINTEXT"
+    assert config.authentication_mechanism == "PLAIN"
+    assert config.kafka_security_enabled is False
+    assert config.consumer_poll_timeout == 5
+
+
+def test_type_literal_validation() -> None:
+    """Test that type field only accepts KAFKA"""
+    with pytest.raises(ValidationError):
+        KafkaEventListenerSettings(type="RABBITMQ")  # type: ignore[arg-type]
+
+
+def test_empty_brokers_array() -> None:
+    """Test empty JSON array becomes empty string"""
+    config = KafkaEventListenerSettings(type="KAFKA", brokers="[]")
+    assert config.brokers == ""
+
+
+def test_single_broker_array() -> None:
+    """Test single broker in JSON array"""
+    config = KafkaEventListenerSettings(type="KAFKA", brokers='["single:9092"]')
+    assert config.brokers == "single:9092"

{port_ocean-0.27.2 → port_ocean-0.27.5}/port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py

@@ -60,7 +60,7 @@ class TestJQEntityProcessor:
         raw_entity_mappings = {"foo": ".foo"}
         selector_query = '.foo == "bar"'
         result, errors = await mocked_processor._calculate_entity(
-            data, raw_entity_mappings, None, selector_query
+            data, raw_entity_mappings, None, "item", selector_query
         )
         assert len(result) == 1
         assert result[0].entity == {"foo": "bar"}

{port_ocean-0.27.2 → port_ocean-0.27.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.27.2"
+version = "0.27.5"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
@@ -44,7 +44,7 @@ pydantic = { version = "^1.10.8", extras = ["dotenv"] }
 loguru = "^0.7.0"
 pyyaml = "^6.0"
 werkzeug = ">=2.3.4,<4.0.0"
-fastapi = "^0.115.3"
+fastapi = "^0.116.0"
 uvicorn = "^0.34.3"
 confluent-kafka = "^2.10.1"
 httpx = "^0.28.1"