port-ocean 0.18.4__tar.gz → 0.18.5__tar.gz

{port_ocean-0.18.4 → port_ocean-0.18.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.18.4
+Version: 0.18.5
 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.18.4 → port_ocean-0.18.5}/port_ocean/context/event.py

@@ -19,6 +19,7 @@ from pydispatch import dispatcher  # type: ignore
 from werkzeug.local import LocalStack, LocalProxy
 
 from port_ocean.context.resource import resource
+from port_ocean.exceptions.api import EmptyPortAppConfigError
 from port_ocean.exceptions.context import (
     EventContextNotFoundError,
     ResourceContextNotFoundError,
@@ -176,8 +177,14 @@ async def event_context(
         logger.info("Event started")
         try:
             yield event
-        except:
+        except EmptyPortAppConfigError as e:
+            logger.error(
+                f"Skipping resync due to empty mapping: {str(e)}", exc_info=True
+            )
+            raise
+        except Exception as e:
             success = False
+            logger.error(f"Event failed with error: {str(e)}", exc_info=True)
             raise
         else:
             success = True

{port_ocean-0.18.4 → port_ocean-0.18.5}/port_ocean/core/handlers/port_app_config/api.py

@@ -3,6 +3,7 @@ from typing import Any
 from loguru import logger
 
 from port_ocean.core.handlers.port_app_config.base import BasePortAppConfig
+from port_ocean.exceptions.api import EmptyPortAppConfigError
 
 
 class APIPortAppConfig(BasePortAppConfig):
@@ -20,7 +21,9 @@ class APIPortAppConfig(BasePortAppConfig):
         if not config:
             logger.error(
                 "The integration port app config is empty. "
+                f"Integration: {integration}, "
+                f"Config: {config}. "
                 "Please make sure to configure your port app config using Port's API."
             )
-
+            raise EmptyPortAppConfigError()
         return config

{port_ocean-0.18.4 → port_ocean-0.18.5}/port_ocean/exceptions/api.py

@@ -13,3 +13,10 @@ class BaseAPIException(BaseOceanException, abc.ABC):
 class InternalServerException(BaseAPIException):
     def response(self) -> Response:
         return PlainTextResponse(content="Internal server error", status_code=500)
+
+
+class EmptyPortAppConfigError(Exception):
+    """Exception raised when the Port app configuration is empty."""
+
+    def __init__(self, message: str = "Port app config is empty") -> None:
+        super().__init__(message)

port_ocean-0.18.5/port_ocean/tests/core/handlers/port_app_config/test_api.py

@@ -0,0 +1,67 @@
+import pytest
+from unittest.mock import AsyncMock
+
+from port_ocean.core.handlers.port_app_config.api import APIPortAppConfig
+from port_ocean.exceptions.api import EmptyPortAppConfigError
+
+
+@pytest.fixture
+def mock_context() -> AsyncMock:
+    context = AsyncMock()
+    context.port_client.get_current_integration = AsyncMock()
+    return context
+
+
+@pytest.fixture
+def api_config(mock_context: AsyncMock) -> APIPortAppConfig:
+    return APIPortAppConfig(mock_context)
+
+
+async def test_get_port_app_config_valid_config_returns_config(
+    api_config: APIPortAppConfig, mock_context: AsyncMock
+) -> None:
+    # Arrange
+    expected_config = {"key": "value"}
+    mock_context.port_client.get_current_integration.return_value = {
+        "config": expected_config
+    }
+
+    # Act
+    result = await api_config._get_port_app_config()
+
+    # Assert
+    assert result == expected_config
+    mock_context.port_client.get_current_integration.assert_called_once()
+
+
+async def test_get_port_app_config_empty_config_raises_value_error(
+    api_config: APIPortAppConfig, mock_context: AsyncMock
+) -> None:
+    # Arrange
+    mock_context.port_client.get_current_integration.return_value = {"config": {}}
+
+    # Act & Assert
+    with pytest.raises(EmptyPortAppConfigError, match="Port app config is empty"):
+        await api_config._get_port_app_config()
+
+
+async def test_get_port_app_config_missing_config_key_raises_key_error(
+    api_config: APIPortAppConfig, mock_context: AsyncMock
+) -> None:
+    # Arrange
+    mock_context.port_client.get_current_integration.return_value = {}
+
+    # Act & Assert
+    with pytest.raises(KeyError):
+        await api_config._get_port_app_config()
+
+
+async def test_get_port_app_config_empty_integration_raises_key_error(
+    api_config: APIPortAppConfig, mock_context: AsyncMock
+) -> None:
+    # Arrange
+    mock_context.port_client.get_current_integration.return_value = {}
+
+    # Act & Assert
+    with pytest.raises(KeyError):
+        await api_config._get_port_app_config()

port_ocean-0.18.5/port_ocean/tests/core/handlers/port_app_config/test_base.py

@@ -0,0 +1,197 @@
+import pytest
+from unittest.mock import MagicMock
+from pydantic import ValidationError
+from typing import Any, Dict
+
+from port_ocean.context.ocean import PortOceanContext
+from port_ocean.core.handlers.port_app_config.base import BasePortAppConfig
+from port_ocean.core.handlers.port_app_config.models import PortAppConfig
+from port_ocean.context.event import EventType, event_context
+from port_ocean.exceptions.api import EmptyPortAppConfigError
+
+
+class TestPortAppConfig(BasePortAppConfig):
+    mock_get_port_app_config: Any
+
+    async def _get_port_app_config(self) -> Dict[str, Any]:
+        return self.mock_get_port_app_config()
+
+
+@pytest.fixture
+def mock_context() -> PortOceanContext:
+    context = MagicMock(spec=PortOceanContext)
+    context.config.port.port_app_config_cache_ttl = 300  # 5 minutes
+    return context
+
+
+@pytest.fixture
+def port_app_config_handler(mock_context: PortOceanContext) -> TestPortAppConfig:
+    handler = TestPortAppConfig(mock_context)
+    handler.mock_get_port_app_config = MagicMock()
+    return handler
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_success(
+    port_app_config_handler: TestPortAppConfig,
+) -> None:
+    # Arrange
+    valid_config = {
+        "resources": [
+            {
+                "kind": "repository",
+                "selector": {"query": "true"},
+                "port": {
+                    "entity": {
+                        "mappings": {
+                            "identifier": ".name",
+                            "title": ".name",
+                            "blueprint": '"service"',
+                            "properties": {
+                                "description": ".description",
+                                "url": ".html_url",
+                                "defaultBranch": ".default_branch",
+                            },
+                        }
+                    }
+                },
+            }
+        ]
+    }
+    port_app_config_handler.mock_get_port_app_config.return_value = valid_config
+
+    # Act
+    async with event_context(EventType.RESYNC, trigger_type="machine"):
+        result = await port_app_config_handler.get_port_app_config()
+
+    # Assert
+    assert isinstance(result, PortAppConfig)
+    assert result.resources[0].port.entity.mappings.title == ".name"
+    assert result.resources[0].port.entity.mappings.identifier == ".name"
+    assert result.resources[0].port.entity.mappings.blueprint == '"service"'
+    assert (
+        result.resources[0].port.entity.mappings.properties["description"]
+        == ".description"
+    )
+    assert result.resources[0].port.entity.mappings.properties["url"] == ".html_url"
+    assert (
+        result.resources[0].port.entity.mappings.properties["defaultBranch"]
+        == ".default_branch"
+    )
+    port_app_config_handler.mock_get_port_app_config.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_uses_cache(
+    port_app_config_handler: TestPortAppConfig,
+) -> None:
+    # Arrange
+    valid_config = {
+        "resources": [
+            {
+                "kind": "repository",
+                "selector": {"query": "true"},
+                "port": {
+                    "entity": {
+                        "mappings": {
+                            "identifier": ".name",
+                            "title": ".name",
+                            "blueprint": '"service"',
+                            "properties": {
+                                "description": ".description",
+                                "url": ".html_url",
+                                "defaultBranch": ".default_branch",
+                            },
+                        }
+                    }
+                },
+            }
+        ]
+    }
+    port_app_config_handler.mock_get_port_app_config.return_value = valid_config
+
+    # Act
+    async with event_context(EventType.RESYNC, trigger_type="machine"):
+        result1 = await port_app_config_handler.get_port_app_config()
+        result2 = await port_app_config_handler.get_port_app_config()
+
+        # Assert
+        assert result1 == result2
+        port_app_config_handler.mock_get_port_app_config.assert_called_once()  # Called only once due to caching
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_bypass_cache(
+    port_app_config_handler: TestPortAppConfig,
+) -> None:
+    # Arrange
+    valid_config = {
+        "resources": [
+            {
+                "kind": "repository",
+                "selector": {"query": "true"},
+                "port": {
+                    "entity": {
+                        "mappings": {
+                            "identifier": ".name",
+                            "title": ".name",
+                            "blueprint": '"service"',
+                            "properties": {
+                                "description": ".description",
+                                "url": ".html_url",
+                                "defaultBranch": ".default_branch",
+                            },
+                        }
+                    }
+                },
+            }
+        ]
+    }
+    port_app_config_handler.mock_get_port_app_config.return_value = valid_config
+
+    # Act
+    async with event_context(EventType.RESYNC, trigger_type="machine"):
+        result1 = await port_app_config_handler.get_port_app_config()
+        result2 = await port_app_config_handler.get_port_app_config(use_cache=False)
+
+        # Assert
+        assert result1 == result2
+        assert (
+            port_app_config_handler.mock_get_port_app_config.call_count == 2
+        )  # Called twice due to cache bypass
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_validation_error(
+    port_app_config_handler: TestPortAppConfig, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    # Arrange
+    invalid_config = {"invalid_field": "invalid_value"}
+    port_app_config_handler.mock_get_port_app_config.return_value = invalid_config
+
+    def mock_parse_obj(*args: Any, **kwargs: Any) -> None:
+        raise ValidationError(errors=[], model=PortAppConfig)
+
+    monkeypatch.setattr(
+        port_app_config_handler.CONFIG_CLASS, "parse_obj", mock_parse_obj
+    )
+
+    # Act & Assert
+    with pytest.raises(ValidationError):
+        async with event_context(EventType.RESYNC, trigger_type="machine"):
+            await port_app_config_handler.get_port_app_config()
+
+
+@pytest.mark.asyncio
+async def test_get_port_app_config_fetch_error(
+    port_app_config_handler: TestPortAppConfig,
+) -> None:
+    # Arrange
+    port_app_config_handler.mock_get_port_app_config.side_effect = (
+        EmptyPortAppConfigError("Port app config is empty")
+    )
+
+    # Act & Assert
+    async with event_context(EventType.RESYNC, trigger_type="machine"):
+        with pytest.raises(EmptyPortAppConfigError, match="Port app config is empty"):
+            await port_app_config_handler.get_port_app_config()

{port_ocean-0.18.4 → port_ocean-0.18.5}/pyproject.toml

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