port-ocean 0.29.2__tar.gz → 0.29.4__tar.gz

{port_ocean-0.29.2 → port_ocean-0.29.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.29.2
+Version: 0.29.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.29.2 → port_ocean-0.29.4}/integrations/_infra/init.sh

@@ -2,4 +2,4 @@ if test -e /usr/local/share/ca-certificates/cert.crt; then
   sudo update-ca-certificates
 fi
 
-ocean sail
+exec ocean sail

{port_ocean-0.29.2 → port_ocean-0.29.4}/port_ocean/core/handlers/resync_state_updater/updater.py

@@ -102,4 +102,3 @@ class ResyncStateUpdater:
         await ocean.metrics.report_sync_metrics(
             kinds=[ocean.metrics.current_resource_kind()]
         )
-        ocean.metrics.event_id = f"{ocean.metrics.event_id}-done"

{port_ocean-0.29.2 → port_ocean-0.29.4}/port_ocean/core/integrations/mixins/sync_raw.py

@@ -735,10 +735,15 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 self._register_in_batches(resource, user_agent_type)
             )
             event.on_abort(lambda: task.cancel())
-            kind_results: tuple[list[Entity], list[Exception]] = await task
 
-            if ocean.metrics.sync_state != SyncState.FAILED:
-                ocean.metrics.sync_state = SyncState.COMPLETED
+            try:
+                kind_results: tuple[list[Entity], list[Exception]] = await task
+                if ocean.metrics.sync_state != SyncState.FAILED:
+                    ocean.metrics.sync_state = SyncState.COMPLETED
+            except asyncio.CancelledError:
+                logger.warning(f"Resource {resource.kind} processing was aborted")
+                ocean.metrics.sync_state = SyncState.ABORTED
+                raise
 
             await ocean.metrics.send_metrics_to_webhook(kind=resource_kind_id)
             await ocean.metrics.report_kind_sync_metrics(
@@ -1022,7 +1027,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
                 )
 
                 async with metric_resource_context(MetricResourceKind.RUNTIME):
-                    ocean.metrics.sync_state = SyncState.FAILED
+                    ocean.metrics.sync_state = SyncState.ABORTED
                     await ocean.metrics.send_metrics_to_webhook(kind=MetricResourceKind.RUNTIME)
                     await ocean.metrics.report_sync_metrics(kinds=[MetricResourceKind.RUNTIME])
                 raise

{port_ocean-0.29.2 → port_ocean-0.29.4}/port_ocean/helpers/metric/metric.py

@@ -57,6 +57,7 @@ class SyncState:
     COMPLETED = "completed"
     PENDING = "pending"
     FAILED = "failed"
+    ABORTED = "aborted"
 
 
 class MetricResourceKind:

{port_ocean-0.29.2 → port_ocean-0.29.4}/port_ocean/ocean.py

@@ -108,7 +108,7 @@ class Ocean:
         )
         self.app_initialized = False
 
-        signal_handler.register(self._report_resync_aborted)
+        signal_handler.register(self._report_resync_aborted, priority=100)
 
     async def _report_resync_aborted(self) -> None:
         """
@@ -116,13 +116,26 @@ class Ocean:
         This ensures Port is notified that the integration was interrupted.
         """
         try:
-            if self.metrics.event_id.find("-done") == -1:
-                await self.resync_state_updater.update_after_resync(
-                    IntegrationStateStatus.Aborted
+            if self.resync_state_updater:
+                current_integration = await self.port_client.get_current_integration()
+                current_status = (
+                    current_integration.get("resyncState", {}).get("status")
+                    if current_integration
+                    else None
                 )
-                logger.info("Resync status reported as aborted due to app shutdown")
+                if current_status == IntegrationStateStatus.Running.value:
+                    await self.resync_state_updater.update_after_resync(
+                        status=IntegrationStateStatus.Aborted
+                    )
+                    logger.info(
+                        "Graceful shutdown completed - sync state set to aborted"
+                    )
+                else:
+                    logger.info(
+                        "Graceful shutdown completed - sync was already completed, status unchanged"
+                    )
         except Exception as e:
-            logger.warning(f"Failed to report resync status on shutdown: {e}")
+            logger.warning(f"Error during graceful shutdown: {e}")
 
     def _get_process_execution_mode(self) -> ProcessExecutionMode:
         if self.config.process_execution_mode:
@@ -160,7 +173,10 @@ class Ocean:
                 )
             except asyncio.CancelledError:
                 logger.warning(
-                    "resync was cancelled by the scheduled resync, skipping state update"
+                    "resync was cancelled by the scheduled resync, updating state to aborted"
+                )
+                await self.resync_state_updater.update_after_resync(
+                    IntegrationStateStatus.Aborted
                 )
             except Exception as e:
                 await self.resync_state_updater.update_after_resync(

{port_ocean-0.29.2 → port_ocean-0.29.4}/pyproject.toml

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