port-ocean 0.10.10__py3-none-any.whl → 0.10.12__py3-none-any.whl

port_ocean/core/integrations/mixins/sync_raw.py

@@ -456,7 +456,8 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
 
                         creation_results.append(await task)
             except asyncio.CancelledError as e:
-                logger.warning("Resync aborted successfully")
+                logger.warning("Resync aborted successfully, skipping delete phase. This leads to an incomplete state")
+                raise
             else:
                 if not did_fetched_current_state:
                     logger.warning(
@@ -489,3 +490,4 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                         {"before": entities_at_port, "after": flat_created_entities},
                         user_agent_type,
                     )
+                    logger.info("Resync finished successfully")

port_ocean/ocean.py

@@ -82,6 +82,10 @@ class Ocean:
             try:
                 await self.integration.sync_raw_all()
                 await self.resync_state_updater.update_after_resync()
+            except asyncio.CancelledError:
+                logger.warning(
+                    "resync was cancelled by the scheduled resync, skipping state update"
+                )
             except Exception as e:
                 await self.resync_state_updater.update_after_resync(
                     IntegrationStateStatus.Failed

port_ocean/tests/conftest.py

@@ -0,0 +1,4 @@
+# ruff: noqa
+from port_ocean.tests.helpers.fixtures import (
+    port_client_for_fake_integration,
+)

port_ocean/tests/helpers/__init__.py

@@ -1,80 +0,0 @@
-import sys
-from inspect import getmembers
-from pathlib import Path
-from typing import Dict, List, Set, Tuple, Union
-
-from yaml import safe_load
-
-from port_ocean.bootstrap import create_default_app
-from port_ocean.core.handlers.port_app_config.models import ResourceConfig
-from port_ocean.core.ocean_types import RESYNC_RESULT
-from port_ocean.ocean import Ocean
-from port_ocean.utils.misc import get_spec_file, load_module
-
-
-def get_integration_ocean_app(integration_path: str) -> Ocean:
-    spec_file = get_spec_file(Path(integration_path))
-
-    config_factory = None if not spec_file else spec_file.get("configurations", [])
-
-    default_app = create_default_app(
-        integration_path,
-        config_factory,
-        {
-            "port": {
-                "client_id": "bla",
-                "client_secret": "bla",
-            },
-        },
-    )
-    main_path = f"{integration_path}/main.py"
-    sys.path.append(integration_path)
-    app_module = load_module(main_path)
-    app: Ocean = {name: item for name, item in getmembers(app_module)}.get(
-        "app", default_app
-    )
-
-    return app
-
-
-def get_integation_resource_configs(integration_path: str) -> List[ResourceConfig]:
-    with open(
-        f"{integration_path}/.port/resources/port-app-config.yml"
-    ) as port_app_config_file:
-        resource_configs = safe_load(port_app_config_file)
-
-    return [ResourceConfig(**item) for item in resource_configs["resources"]]
-
-
-def get_integation_resource_config_by_name(
-    integration_path: str, kind: str
-) -> Union[ResourceConfig, None]:
-    resource_configs = get_integation_resource_configs(integration_path)
-
-    relevant_configs = [x for x in resource_configs if x.kind == kind]
-
-    return relevant_configs[0] if len(relevant_configs) else None
-
-
-async def get_raw_result_on_integration_sync_kinds(
-    integration_path: str, override_kinds: Union[Set[str], None] = None
-) -> Dict[str, List[Tuple[RESYNC_RESULT, List[Exception]]]]:
-    app = get_integration_ocean_app(integration_path)
-
-    resource_configs = get_integation_resource_configs(integration_path)
-
-    if override_kinds:
-        resource_configs = [x for x in resource_configs if x.kind in override_kinds]
-
-    results: Dict[str, List[Tuple[RESYNC_RESULT, List[Exception]]]] = {}
-
-    for resource_config in resource_configs:
-        resource_result = await app.integration._get_resource_raw_results(
-            resource_config
-        )
-
-        results[resource_config.kind] = results.get(resource_config.kind, []) + [
-            resource_result
-        ]
-
-    return results

port_ocean/tests/helpers/fixtures.py

@@ -0,0 +1,110 @@
+from os import environ, path
+from typing import Any, AsyncGenerator, Callable, List, Tuple, Union
+
+import pytest_asyncio
+from pydantic import BaseModel
+
+from port_ocean.clients.port.client import PortClient
+from port_ocean.core.handlers.port_app_config.models import ResourceConfig
+from port_ocean.ocean import Ocean
+from port_ocean.tests.helpers.ocean_app import (
+    get_integation_resource_configs,
+    get_integration_ocean_app,
+)
+
+
+def get_port_client_for_integration(
+    client_id: str,
+    client_secret: str,
+    integration_identifier: str,
+    integration_type: str,
+    integration_version: str,
+    base_url: Union[str, None],
+) -> PortClient:
+    return PortClient(
+        base_url=base_url or "https://api.getport/io",
+        client_id=client_id,
+        client_secret=client_secret,
+        integration_identifier=integration_identifier,
+        integration_type=integration_type,
+        integration_version=integration_version,
+    )
+
+
+async def cleanup_integration(client: PortClient, blueprints: List[str]) -> None:
+    for blueprint in blueprints:
+        bp = await client.get_blueprint(blueprint)
+        if bp is not None:
+            migration_id = await client.delete_blueprint(
+                identifier=blueprint, delete_entities=True
+            )
+            if migration_id:
+                await client.wait_for_migration_to_complete(migration_id=migration_id)
+    headers = await client.auth.headers()
+    await client.client.delete(f"{client.auth.api_url}/integrations", headers=headers)
+
+
+class SmokeTestDetails(BaseModel):
+    integration_identifier: str
+    blueprint_department: str
+    blueprint_person: str
+
+
+@pytest_asyncio.fixture()
+async def port_client_for_fake_integration() -> (
+    AsyncGenerator[Tuple[SmokeTestDetails, PortClient], None]
+):
+    blueprint_department = "fake-department"
+    blueprint_person = "fake-person"
+    integration_identifier = "smoke-test-integration"
+    smoke_test_suffix = environ.get("SMOKE_TEST_SUFFIX")
+    client_id = environ.get("PORT_CLIENT_ID")
+    client_secret = environ.get("PORT_CLIENT_SECRET")
+
+    if not client_secret or not client_id:
+        assert False, "Missing port credentials"
+
+    base_url = environ.get("PORT_BASE_URL")
+    integration_version = "0.1.1-dev"
+    integration_type = "smoke-test"
+    if smoke_test_suffix is not None:
+        integration_identifier = f"{integration_identifier}-{smoke_test_suffix}"
+        blueprint_person = f"{blueprint_person}-{smoke_test_suffix}"
+        blueprint_department = f"{blueprint_department}-{smoke_test_suffix}"
+
+    client = get_port_client_for_integration(
+        client_id,
+        client_secret,
+        integration_identifier,
+        integration_type,
+        integration_version,
+        base_url,
+    )
+
+    smoke_test_details = SmokeTestDetails(
+        integration_identifier=integration_identifier,
+        blueprint_person=blueprint_person,
+        blueprint_department=blueprint_department,
+    )
+    yield smoke_test_details, client
+    await cleanup_integration(client, [blueprint_department, blueprint_person])
+
+
+@pytest_asyncio.fixture
+def get_mocked_ocean_app(request: Any) -> Callable[[], Ocean]:
+    test_dir = path.join(path.dirname(request.module.__file__), "..")
+
+    def get_ocean_app() -> Ocean:
+        return get_integration_ocean_app(test_dir)
+
+    return get_ocean_app
+
+
+@pytest_asyncio.fixture
+def get_mock_ocean_resource_configs(request: Any) -> Callable[[], List[ResourceConfig]]:
+    module_dir = path.join(path.dirname(request.module.__file__), "..")
+
+    def get_ocean_resource_configs() -> List[ResourceConfig]:
+        return get_integation_resource_configs(module_dir)
+
+    return get_ocean_resource_configs

port_ocean/tests/helpers/ocean_app.py

@@ -0,0 +1,54 @@
+import sys
+from inspect import getmembers
+from pathlib import Path
+from typing import List, Tuple
+
+from yaml import safe_load
+
+from port_ocean.bootstrap import create_default_app
+from port_ocean.core.handlers.port_app_config.models import ResourceConfig
+from port_ocean.core.ocean_types import RESYNC_RESULT
+from port_ocean.ocean import Ocean
+from port_ocean.utils.misc import get_spec_file, load_module
+
+
+def get_integration_ocean_app(integration_path: str) -> Ocean:
+    spec_file = get_spec_file(Path(integration_path))
+
+    config_factory = None if not spec_file else spec_file.get("configurations", [])
+
+    default_app = create_default_app(
+        integration_path,
+        config_factory,
+        {
+            "port": {
+                "client_id": "bla",
+                "client_secret": "bla",
+            },
+        },
+    )
+    main_path = f"{integration_path}/main.py"
+    sys.path.append(integration_path)
+    app_module = load_module(main_path)
+    app: Ocean = {name: item for name, item in getmembers(app_module)}.get(
+        "app", default_app
+    )
+
+    return app
+
+
+def get_integation_resource_configs(integration_path: str) -> List[ResourceConfig]:
+    with open(
+        f"{integration_path}/.port/resources/port-app-config.yml"
+    ) as port_app_config_file:
+        resource_configs = safe_load(port_app_config_file)
+
+    return [ResourceConfig(**item) for item in resource_configs["resources"]]
+
+
+async def get_raw_result_on_integration_sync_resource_config(
+    app: Ocean, resource_config: ResourceConfig
+) -> Tuple[RESYNC_RESULT, List[Exception]]:
+    resource_result = await app.integration._get_resource_raw_results(resource_config)
+
+    return resource_result

port_ocean/tests/test_smoke.py

@@ -0,0 +1,71 @@
+from os import environ
+from typing import Tuple
+import pytest
+
+from port_ocean.clients.port.client import PortClient
+from port_ocean.clients.port.types import UserAgentType
+from port_ocean.tests.helpers.fixtures import SmokeTestDetails
+
+
+@pytest.mark.skipif(
+    environ.get("SMOKE_TEST_SUFFIX", None) is None,
+    reason="You need to run the fake integration once",
+)
+async def test_valid_fake_integration(
+    port_client_for_fake_integration: Tuple[SmokeTestDetails, PortClient],
+) -> None:
+    _, port_client = port_client_for_fake_integration
+    current_integration = await port_client.get_current_integration()
+    assert current_integration is not None
+    assert current_integration.get("resyncState") is not None
+    assert current_integration.get("resyncState", {}).get("status") == "completed"
+
+
+@pytest.mark.skipif(
+    environ.get("SMOKE_TEST_SUFFIX", None) is None,
+    reason="You need to run the fake integration once",
+)
+async def test_valid_fake_departments(
+    port_client_for_fake_integration: Tuple[SmokeTestDetails, PortClient],
+) -> None:
+    details, port_client = port_client_for_fake_integration
+    entities = await port_client.search_entities(user_agent_type=UserAgentType.exporter)
+    assert len(entities)
+    departments = [
+        x for x in entities if f"{x.blueprint}" == details.blueprint_department
+    ]
+    assert len(departments) == 5
+
+
+@pytest.mark.skipif(
+    environ.get("SMOKE_TEST_SUFFIX", None) is None,
+    reason="You need to run the fake integration once",
+)
+async def test_valid_fake_persons(
+    port_client_for_fake_integration: Tuple[SmokeTestDetails, PortClient],
+) -> None:
+    details, port_client = port_client_for_fake_integration
+    headers = await port_client.auth.headers()
+    fake_person_entities_result = await port_client.client.get(
+        f"{port_client.auth.api_url}/blueprints/{details.blueprint_person}/entities",
+        headers=headers,
+    )
+
+    fake_person_entities = fake_person_entities_result.json()["entities"]
+    assert len(fake_person_entities)
+
+    fake_departments_result = await port_client.client.get(
+        f"{port_client.auth.api_url}/blueprints/{details.blueprint_department}/entities",
+        headers=headers,
+    )
+
+    departments = [x["identifier"] for x in fake_departments_result.json()["entities"]]
+
+    for department in departments:
+        assert len(
+            [
+                x
+                for x in fake_person_entities
+                if x["relations"]["department"] == department
+            ]
+        )

{port_ocean-0.10.10.dist-info → port_ocean-0.10.12.dist-info}/METADATA

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

@@ -94,7 +94,7 @@ port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4
 port_ocean/core/integrations/mixins/events.py,sha256=Ddfx2L4FpghV38waF8OfVeOV0bHBxNIgjU-q5ffillI,2341
 port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
 port_ocean/core/integrations/mixins/sync.py,sha256=B9fEs8faaYLLikH9GBjE_E61vo0bQDjIGQsQ1SRXOlA,3931
-port_ocean/core/integrations/mixins/sync_raw.py,sha256=nPYlUTQdh6HDIqBwh3jQ-hmraNx4CeSK9YQ98NTonbQ,18697
+port_ocean/core/integrations/mixins/sync_raw.py,sha256=BGS5EnZ2N3ifcAi94Wo-ZassSJ-_Se9eFJMpBDT7pNY,18841
 port_ocean/core/integrations/mixins/utils.py,sha256=7y1rGETZIjOQadyIjFJXIHKkQFKx_SwiP-TrAIsyyLY,2303
 port_ocean/core/models.py,sha256=dJ2_olTdbjUpObQJNmg7e7EENU_zZiX6XOaknNp54B0,1342
 port_ocean/core/ocean_types.py,sha256=3_d8-n626f1kWLQ_Jxw194LEyrOVupz05qs_Y1pvB-A,990
@@ -115,14 +115,18 @@ port_ocean/log/handlers.py,sha256=k9G_Mb4ga2-Jke9irpdlYqj6EYiwv0gEsh4TgyqqOmI,28
 port_ocean/log/logger_setup.py,sha256=BaXt-mh9CVXhneh37H46d04lqOdIBixG1pFyGfotuZs,2328
 port_ocean/log/sensetive.py,sha256=wkyvkKMbyLTjZDSbvvLHL9bv4RvD0DPAyL3uWSttUOA,2916
 port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
-port_ocean/ocean.py,sha256=0dtaiRxKgY3kYNm1ZI3uFCJRhnNoTMwVv-PkWlLJQrQ,4842
+port_ocean/ocean.py,sha256=fHF3nCIb2bfD3gMizXV9mwF11DR3fXoK6am172jrIt4,5025
 port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/run.py,sha256=rTxBlrQd4yyrtgErCFJCHCEHs7d1OXrRiJehUYmIbN0,2212
 port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
 port_ocean/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/clients/port/mixins/test_entities.py,sha256=A9myrnkLhKSQrnOLv1Zz2wiOVSxW65Q9RIUIRbn_V7w,1586
-port_ocean/tests/helpers/__init__.py,sha256=K-8wwjJz9N5F76P3NZZxe-g7nroMGjHl3semIjyuNog,2567
+port_ocean/tests/conftest.py,sha256=JXASSS0IY0nnR6bxBflhzxS25kf4iNaABmThyZ0mZt8,101
+port_ocean/tests/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+port_ocean/tests/helpers/fixtures.py,sha256=XGR8wjcAKBBYoIRKh_KzFg1PdqhlL9GqqR8z_q08nHA,3699
+port_ocean/tests/helpers/ocean_app.py,sha256=Dp1bwEDhWsx_G-KVxOfJX1eVIS4168ajLu39wAY275g,1693
 port_ocean/tests/test_sample.py,sha256=Ew5LA_G1k6DC5a2ygU2FoyjZQa0fRmPy73N0bio0d14,46
+port_ocean/tests/test_smoke.py,sha256=F-1MoEcdIT1smjWv3s1iaS7U5UxpKGf-AHc8mYHjOlw,2522
 port_ocean/utils/__init__.py,sha256=KMGnCPXZJbNwtgxtyMycapkDz8tpSyw23MSYT3iVeHs,91
 port_ocean/utils/async_http.py,sha256=arnH458TExn2Dju_Sy6pHas_vF5RMWnOp-jBz5WAAcE,1226
 port_ocean/utils/async_iterators.py,sha256=iw3cUHxfQm3zUSPdw2FmSXDU8E1Ppnys4TGhswNuQ8s,1569
@@ -133,8 +137,8 @@ port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,32
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.10.10.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.10.10.dist-info/METADATA,sha256=TYp3Vs2UhjxUckbdD-qPXrmJONsIn94f66BHbsSmtxI,6617
-port_ocean-0.10.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-port_ocean-0.10.10.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.10.10.dist-info/RECORD,,
+port_ocean-0.10.12.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.10.12.dist-info/METADATA,sha256=tttQQiBv4cQkkOpY3210bf0r_HlbdbshcCVt5JFfELs,6617
+port_ocean-0.10.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+port_ocean-0.10.12.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.10.12.dist-info/RECORD,,