port-ocean 0.24.20__py3-none-any.whl → 0.24.22__py3-none-any.whl

port_ocean/clients/port/mixins/integrations.py

@@ -228,9 +228,11 @@ class IntegrationClientMixin:
     async def put_integration_sync_metrics(self, kind_metrics: dict[str, Any]) -> None:
         logger.debug("starting PUT metrics request", kind_metrics=kind_metrics)
         metrics_attributes = await self.get_metrics_attributes()
+        event_id = quote_plus(kind_metrics["eventId"])
+        kind_identifier = quote_plus(kind_metrics["kindIdentifier"])
         url = (
             metrics_attributes["ingestUrl"]
-            + f"/syncMetrics/resync/{kind_metrics['eventId']}/kind/{kind_metrics['kindIdentifier']}"
+            + f"/syncMetrics/resync/{event_id}/kind/{kind_identifier}"
         )
         headers = await self.auth.headers()
         response = await self.client.put(

port_ocean/config/dynamic.py

@@ -2,12 +2,37 @@ import json
 from typing import Type, Any, Optional
 
 from humps import decamelize
-from pydantic import BaseModel, AnyUrl, create_model, Extra, parse_obj_as, validator
+from pydantic import (
+    BaseConfig,
+    BaseModel,
+    AnyUrl,
+    create_model,
+    Extra,
+    parse_obj_as,
+    validator,
+)
 from pydantic.fields import ModelField, Field
 
 from port_ocean.config.base import BaseOceanModel
 
 
+class NoTrailingSlashUrl(AnyUrl):
+    @classmethod
+    def validate(cls, value: Any, field: ModelField, config: BaseConfig) -> "AnyUrl":
+        if value is not None:
+            if isinstance(value, (bytes, bytearray)):
+                try:
+                    value = value.decode()
+                except UnicodeDecodeError as exc:
+                    raise ValueError("URL bytes must be valid UTF-8") from exc
+            else:
+                value = str(value)
+
+            if value != "/":
+                value = value.rstrip("/")
+        return super().validate(value, field, config)
+
+
 class Configuration(BaseModel, extra=Extra.allow):
     name: str
     type: str
@@ -39,7 +64,7 @@ def default_config_factory(configurations: Any) -> Type[BaseModel]:
             case "object":
                 field_type = dict
             case "url":
-                field_type = AnyUrl
+                field_type = NoTrailingSlashUrl
             case "string":
                 field_type = str
             case "integer":

port_ocean/tests/clients/port/mixins/test_integrations.py

@@ -0,0 +1,205 @@
+from typing import Any
+from unittest.mock import MagicMock, patch, AsyncMock
+
+import pytest
+import httpx
+
+from port_ocean.clients.port.mixins.integrations import IntegrationClientMixin
+
+
+TEST_INTEGRATION_IDENTIFIER = "test-integration"
+TEST_INTEGRATION_VERSION = "1.0.0"
+TEST_INGEST_URL = "https://api.example.com"
+
+BASIC_KIND_METRICS = {
+    "eventId": "event-123",
+    "kindIdentifier": "service",
+    "metrics": {"count": 5},
+}
+
+KIND_METRICS_WITH_SLASH = {
+    "eventId": "event-456",
+    "kindIdentifier": "kind/kind1",
+    "metrics": {"count": 10},
+}
+
+EVENT_METRICS_WITH_SLASH = {
+    "eventId": "event/123",
+    "kindIdentifier": "service",
+    "metrics": {"count": 15},
+}
+
+BOTH_METRICS_WITH_SLASH = {
+    "eventId": "namespace/event/123",
+    "kindIdentifier": "app/service/v1",
+    "metrics": {"count": 20},
+}
+
+COMPLEX_KIND_METRICS = {
+    "eventId": "complete/test/123",
+    "kindIdentifier": "complex/kind/identifier",
+    "syncStart": "2024-01-01T00:00:00Z",
+    "syncEnd": "2024-01-01T01:00:00Z",
+    "metrics": {"totalEntities": 100, "successfulEntities": 95, "failedEntities": 5},
+}
+
+
+@pytest.fixture
+def integration_client(monkeypatch: Any) -> IntegrationClientMixin:
+    """Create an IntegrationClientMixin instance with mocked dependencies."""
+    auth = MagicMock()
+    auth.headers = AsyncMock()
+    auth.headers.return_value = {"Authorization": "Bearer test-token"}
+
+    client = MagicMock()
+    client.put = AsyncMock()
+    client.put.return_value = MagicMock()
+    client.put.return_value.status_code = 200
+    client.put.return_value.is_error = False
+
+    integration_client = IntegrationClientMixin(
+        integration_identifier=TEST_INTEGRATION_IDENTIFIER,
+        integration_version=TEST_INTEGRATION_VERSION,
+        auth=auth,
+        client=client,
+    )
+
+    mock_get_metrics_attributes = AsyncMock()
+    mock_get_metrics_attributes.return_value = {"ingestUrl": TEST_INGEST_URL}
+    monkeypatch.setattr(
+        integration_client, "get_metrics_attributes", mock_get_metrics_attributes
+    )
+
+    return integration_client
+
+
+async def test_put_integration_sync_metrics_basic(
+    integration_client: IntegrationClientMixin,
+) -> None:
+    """Test basic functionality of put_integration_sync_metrics."""
+    with patch(
+        "port_ocean.clients.port.mixins.integrations.handle_port_status_code"
+    ) as mock_handle:
+        await integration_client.put_integration_sync_metrics(BASIC_KIND_METRICS)
+
+        integration_client.get_metrics_attributes.assert_called_once()
+
+        integration_client.auth.headers.assert_called_once()
+
+        integration_client.client.put.assert_called_once()
+        call_args = integration_client.client.put.call_args
+
+        expected_url = f"{TEST_INGEST_URL}/syncMetrics/resync/event-123/kind/service"
+        assert call_args[0][0] == expected_url
+
+        expected_headers = {"Authorization": "Bearer test-token"}
+        assert call_args[1]["headers"] == expected_headers
+
+        expected_json = {"syncKindMetrics": BASIC_KIND_METRICS}
+        assert call_args[1]["json"] == expected_json
+
+        mock_handle.assert_called_once_with(
+            integration_client.client.put.return_value, should_log=False
+        )
+
+
+async def test_put_integration_sync_metrics_with_slash_in_kind_identifier(
+    integration_client: IntegrationClientMixin,
+) -> None:
+    """Test put_integration_sync_metrics with forward slash in kindIdentifier."""
+    with patch("port_ocean.clients.port.mixins.integrations.handle_port_status_code"):
+        await integration_client.put_integration_sync_metrics(KIND_METRICS_WITH_SLASH)
+
+        integration_client.client.put.assert_called_once()
+        call_args = integration_client.client.put.call_args
+
+        expected_url = (
+            f"{TEST_INGEST_URL}/syncMetrics/resync/event-456/kind/kind%2Fkind1"
+        )
+        assert call_args[0][0] == expected_url
+
+        expected_json = {"syncKindMetrics": KIND_METRICS_WITH_SLASH}
+        assert call_args[1]["json"] == expected_json
+
+
+async def test_put_integration_sync_metrics_with_slash_in_event_id(
+    integration_client: IntegrationClientMixin,
+) -> None:
+    """Test put_integration_sync_metrics with forward slash in eventId."""
+    with patch("port_ocean.clients.port.mixins.integrations.handle_port_status_code"):
+        await integration_client.put_integration_sync_metrics(EVENT_METRICS_WITH_SLASH)
+
+        integration_client.client.put.assert_called_once()
+        call_args = integration_client.client.put.call_args
+
+        expected_url = f"{TEST_INGEST_URL}/syncMetrics/resync/event%2F123/kind/service"
+        assert call_args[0][0] == expected_url
+
+
+async def test_put_integration_sync_metrics_with_slashes_in_both_fields(
+    integration_client: IntegrationClientMixin,
+) -> None:
+    """Test put_integration_sync_metrics with forward slashes in both eventId and kindIdentifier."""
+    with patch("port_ocean.clients.port.mixins.integrations.handle_port_status_code"):
+        await integration_client.put_integration_sync_metrics(BOTH_METRICS_WITH_SLASH)
+
+        integration_client.client.put.assert_called_once()
+        call_args = integration_client.client.put.call_args
+
+        expected_url = f"{TEST_INGEST_URL}/syncMetrics/resync/namespace%2Fevent%2F123/kind/app%2Fservice%2Fv1"
+        assert call_args[0][0] == expected_url
+
+
+async def test_put_integration_sync_metrics_with_special_characters(
+    integration_client: IntegrationClientMixin,
+) -> None:
+    """Test put_integration_sync_metrics with various special characters that need URL encoding."""
+    special_metrics = {
+        "eventId": "event@123#test",
+        "kindIdentifier": "kind with spaces+symbols",
+        "metrics": {"count": 25},
+    }
+
+    with patch("port_ocean.clients.port.mixins.integrations.handle_port_status_code"):
+        await integration_client.put_integration_sync_metrics(special_metrics)
+
+        integration_client.client.put.assert_called_once()
+        call_args = integration_client.client.put.call_args
+
+        expected_url = f"{TEST_INGEST_URL}/syncMetrics/resync/event%40123%23test/kind/kind+with+spaces%2Bsymbols"
+        assert call_args[0][0] == expected_url
+
+
+async def test_put_integration_sync_metrics_complete_flow(
+    integration_client: IntegrationClientMixin,
+) -> None:
+    """Test the complete flow of put_integration_sync_metrics method."""
+    with patch("port_ocean.clients.port.mixins.integrations.handle_port_status_code"):
+        await integration_client.put_integration_sync_metrics(COMPLEX_KIND_METRICS)
+
+        integration_client.get_metrics_attributes.assert_called_once()
+        integration_client.auth.headers.assert_called_once()
+        integration_client.client.put.assert_called_once()
+
+        call_args = integration_client.client.put.call_args
+        assert "complete%2Ftest%2F123" in call_args[0][0]
+        assert "complex%2Fkind%2Fidentifier" in call_args[0][0]
+
+        assert call_args[1]["json"]["syncKindMetrics"] == COMPLEX_KIND_METRICS
+
+
+async def test_put_integration_sync_metrics_error_handling(
+    integration_client: IntegrationClientMixin,
+    monkeypatch: Any,
+) -> None:
+    """Test that put_integration_sync_metrics properly handles errors."""
+    mock_get_metrics_attributes = AsyncMock()
+    mock_get_metrics_attributes.side_effect = httpx.HTTPStatusError(
+        message="Test error", request=MagicMock(), response=MagicMock()
+    )
+    monkeypatch.setattr(
+        integration_client, "get_metrics_attributes", mock_get_metrics_attributes
+    )
+
+    with pytest.raises(httpx.HTTPStatusError):
+        await integration_client.put_integration_sync_metrics(BASIC_KIND_METRICS)

port_ocean/tests/config/test_config.py

@@ -0,0 +1,38 @@
+import pytest
+from pydantic import BaseModel
+from port_ocean.config.dynamic import NoTrailingSlashUrl
+from typing import cast
+
+
+class TestClass(BaseModel):
+    url: NoTrailingSlashUrl | None
+
+
+def as_no_trailing_slash_url(value: str | None) -> NoTrailingSlashUrl:
+    # mypy casting
+    return cast(NoTrailingSlashUrl, value)
+
+
+def test_trailing_slash_valid() -> None:
+    cls = TestClass(url=as_no_trailing_slash_url("http://example"))
+    assert cls.url == "http://example"
+
+
+def test_trailing_slash_valid_remove_slash() -> None:
+    cls = TestClass(url=as_no_trailing_slash_url("http://example/"))
+    assert cls.url == "http://example"
+
+
+def test_trailing_slash_not_valid() -> None:
+    with pytest.raises(ValueError):
+        TestClass(url=as_no_trailing_slash_url("/"))
+
+
+def test_trailing_slash_not_valid_no_domain() -> None:
+    with pytest.raises(ValueError):
+        TestClass(url=as_no_trailing_slash_url("http:///"))
+
+
+def test_trailing_empty() -> None:
+    cls = TestClass(url=None)
+    assert cls.url is None

{port_ocean-0.24.20.dist-info → port_ocean-0.24.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.24.20
+Version: 0.24.22
 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.24.20.dist-info → port_ocean-0.24.22.dist-info}/RECORD

@@ -60,7 +60,7 @@ port_ocean/clients/port/client.py,sha256=dv0mxIOde6J-wFi1FXXZkoNPVHrZzY7RSMhNkDD
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=aMCG4zePsMSMjMLiGrU37h5z5_ElfMzTcTvqvOI5wXY,4683
 port_ocean/clients/port/mixins/entities.py,sha256=_FKoSEUxc_fGcdoWm4ZAeUKUnnzkGPMDQEsxmpbj8Vo,23352
-port_ocean/clients/port/mixins/integrations.py,sha256=s6paomK9bYWW-Tu3y2OIaEGSxsXCHyhapVi4JIhhO64,11162
+port_ocean/clients/port/mixins/integrations.py,sha256=DdMLxSHL2zmlLecnkJk1lWJ2fxkY89pSSL-m7H0zBuI,11256
 port_ocean/clients/port/mixins/migrations.py,sha256=vdL_A_NNUogvzujyaRLIoZEu5vmKDY2BxTjoGP94YzI,1467
 port_ocean/clients/port/mixins/organization.py,sha256=A2cP5V49KnjoAXxjmnm_XGth4ftPSU0qURNfnyUyS_Y,1041
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
@@ -68,7 +68,7 @@ port_ocean/clients/port/types.py,sha256=nvlgiAq4WH5_F7wQbz_GAWl-faob84LVgIjZ2Ww5
 port_ocean/clients/port/utils.py,sha256=osFyAjw7Y5Qf2uVSqC7_RTCQfijiL1zS74JJM0goxh0,2762
 port_ocean/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/config/base.py,sha256=x1gFbzujrxn7EJudRT81C6eN9WsYAb3vOHwcpcpX8Tc,6370
-port_ocean/config/dynamic.py,sha256=T0AWE41tjp9fL1sgrTRwNAGlPw6xiakFp-KXWvHtu_4,2035
+port_ocean/config/dynamic.py,sha256=Lrk4JRGtR-0YKQ9DDGexX5NGFE7EJ6VoHya19YYhssM,2687
 port_ocean/config/settings.py,sha256=R4Ju15XKbwQEg2W7uUCxoj4_9gUS9uYUFQnX-FUNRDI,7156
 port_ocean/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/consumers/kafka_consumer.py,sha256=N8KocjBi9aR0BOPG8hgKovg-ns_ggpEjrSxqSqF_BSo,4710
@@ -159,7 +159,9 @@ port_ocean/tests/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 port_ocean/tests/clients/oauth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/clients/oauth/test_oauth_client.py,sha256=2XVMQUalDpiD539Z7_dk5BK_ngXQzsTmb2lNBsfEm9c,3266
 port_ocean/tests/clients/port/mixins/test_entities.py,sha256=DeWbAQcaxT3LQQf_j9HA5nG7YgsQDvXmgK2aghlG9ug,6619
+port_ocean/tests/clients/port/mixins/test_integrations.py,sha256=vRt_EMsLozQC1LJNXxlvnHj3-FlOBGgAYxg5T0IAqtA,7621
 port_ocean/tests/clients/port/mixins/test_organization_mixin.py,sha256=zzKYz3h8dl4Z5A2QG_924m0y9U6XTth1XYOfwNrd_24,914
+port_ocean/tests/config/test_config.py,sha256=Rk4N-ldVSOfn1p23NzdVdfqUpPrqG2cMut4Sv-sAOrw,1023
 port_ocean/tests/conftest.py,sha256=JXASSS0IY0nnR6bxBflhzxS25kf4iNaABmThyZ0mZt8,101
 port_ocean/tests/core/conftest.py,sha256=7K_M1--wQ08VmiQRB0vo1nst2X00cwsuBS5UfERsnG8,7589
 port_ocean/tests/core/defaults/test_common.py,sha256=sR7RqB3ZYV6Xn6NIg-c8k5K6JcGsYZ2SCe_PYX5vLYM,5560
@@ -200,8 +202,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 port_ocean/utils/signal.py,sha256=mMVq-1Ab5YpNiqN4PkiyTGlV_G0wkUDMMjTZp5z3pb0,1514
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.24.20.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.24.20.dist-info/METADATA,sha256=fPKhhQUTw4aSDDmonmitNlAly2DARNFFdr6voWyS3kE,6856
-port_ocean-0.24.20.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.24.20.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.24.20.dist-info/RECORD,,
+port_ocean-0.24.22.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.24.22.dist-info/METADATA,sha256=50N8hfofvUl4hhRM850KH2qlF6RRBvw-EK_CCOrhFbA,6856
+port_ocean-0.24.22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.24.22.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.24.22.dist-info/RECORD,,