port-ocean 0.21.0__tar.gz → 0.21.2__tar.gz

{port_ocean-0.21.0 → port_ocean-0.21.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.21.0
+Version: 0.21.2
 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.21.0 → port_ocean-0.21.2}/port_ocean/config/settings.py

@@ -83,6 +83,8 @@ class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
     )
     runtime: Runtime = Runtime.OnPrem
     resources_path: str = Field(default=".port/resources")
+    max_event_processing_seconds: float = 90.0
+    max_wait_seconds_before_shutdown: float = 5.0
 
     @root_validator()
     def validate_integration_config(cls, values: dict[str, Any]) -> dict[str, Any]:

{port_ocean-0.21.0 → port_ocean-0.21.2}/port_ocean/core/defaults/initialize.py

@@ -208,9 +208,6 @@ async def _create_resources(
 async def _initialize_defaults(
     config_class: Type[PortAppConfig], integration_config: IntegrationConfiguration
 ) -> None:
-    if not integration_config.initialize_port_resources:
-        return
-
     port_client = ocean.port_client
     defaults = get_port_integration_defaults(
         config_class, integration_config.resources_path
@@ -274,9 +271,10 @@ async def _initialize_defaults(
     if (
         integration_config.create_port_resources_origin
         == CreatePortResourcesOrigin.Port
+        or not integration_config.initialize_port_resources
     ):
         logger.info(
-            "Skipping creating defaults resources due to `create_port_resources_origin` being `Port`"
+            "Skipping creating defaults resources due to `create_port_resources_origin` being `Port` or `initialize_port_resources` being `false`"
         )
         return
     try:

{port_ocean-0.21.0 → port_ocean-0.21.2}/port_ocean/core/handlers/webhook/processor_manager.py

@@ -24,8 +24,8 @@ class LiveEventsProcessorManager(LiveEventsMixin, EventsMixin):
         self,
         router: APIRouter,
         signal_handler: SignalHandler,
-        max_event_processing_seconds: float = 90.0,
-        max_wait_seconds_before_shutdown: float = 5.0,
+        max_event_processing_seconds: float,
+        max_wait_seconds_before_shutdown: float,
     ) -> None:
         self._router = router
         self._processors_classes: Dict[str, list[Type[AbstractWebhookProcessor]]] = {}

{port_ocean-0.21.0 → port_ocean-0.21.2}/port_ocean/ocean.py

@@ -57,7 +57,10 @@ class Ocean:
         self.integration_router = integration_router or APIRouter()
 
         self.webhook_manager = LiveEventsProcessorManager(
-            self.integration_router, signal_handler
+            self.integration_router,
+            signal_handler,
+            max_event_processing_seconds=self.config.max_event_processing_seconds,
+            max_wait_seconds_before_shutdown=self.config.max_wait_seconds_before_shutdown,
         )
 
         self.port_client = PortClient(

{port_ocean-0.21.0 → port_ocean-0.21.2}/port_ocean/tests/core/handlers/webhook/test_processor_manager.py

@@ -175,7 +175,10 @@ def processor_manager() -> LiveEventsProcessorManager:
     router = APIRouter()
     signal_handler = SignalHandler()
     return LiveEventsProcessorManager(
-        router, signal_handler, max_event_processing_seconds=3
+        router,
+        signal_handler,
+        max_event_processing_seconds=3,
+        max_wait_seconds_before_shutdown=3,
     )
 
 
@@ -195,7 +198,7 @@ def webhook_event_for_process_webhook_request() -> WebhookEvent:
 
 @pytest.fixture
 def processor_manager_for_process_webhook_request() -> LiveEventsProcessorManager:
-    return LiveEventsProcessorManager(APIRouter(), SignalHandler())
+    return LiveEventsProcessorManager(APIRouter(), SignalHandler(), 3, 3)
 
 
 @pytest.fixture
@@ -571,7 +574,10 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessed_en
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler()
+        mock_context.app.integration_router,
+        SignalHandler(),
+        max_event_processing_seconds=3,
+        max_wait_seconds_before_shutdown=3,
     )
 
     mock_context.app.webhook_manager.register_processor(test_path, TestProcessor)
@@ -682,7 +688,10 @@ async def test_integrationTest_postRequestSent_reachedTimeout_entityNotUpserted(
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler(), 2
+        mock_context.app.integration_router,
+        SignalHandler(),
+        2,
+        2,
     )
 
     mock_context.app.webhook_manager.register_processor(test_path, TestProcessor)
@@ -796,7 +805,10 @@ async def test_integrationTest_postRequestSent_noMatchingHandlers_entityNotUpser
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler()
+        mock_context.app.integration_router,
+        SignalHandler(),
+        3,
+        3,
     )
 
     mock_context.app.webhook_manager.register_processor(test_path, TestProcessor)
@@ -973,7 +985,10 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedFor
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler()
+        mock_context.app.integration_router,
+        SignalHandler(),
+        3,
+        3,
     )
 
     mock_context.app.webhook_manager.register_processor(test_path, TestProcessorA)
@@ -1100,7 +1115,10 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedwit
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler()
+        mock_context.app.integration_router,
+        SignalHandler(),
+        3,
+        3,
     )
 
     mock_context.app.webhook_manager.register_processor(test_path, TestProcessor)
@@ -1227,7 +1245,10 @@ async def test_integrationTest_postRequestSent_webhookEventRawResultProcessedwit
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler()
+        mock_context.app.integration_router,
+        SignalHandler(),
+        90.0,
+        5.0,
     )
 
     mock_context.app.webhook_manager.register_processor(test_path, TestProcessor)
@@ -1363,7 +1384,10 @@ async def test_integrationTest_postRequestSent_oneProcessorThrowsException_onlyS
     test_path = "/webhook-test"
     mock_context.app.integration = BaseIntegration(ocean)
     mock_context.app.webhook_manager = LiveEventsProcessorManager(
-        mock_context.app.integration_router, SignalHandler()
+        mock_context.app.integration_router,
+        SignalHandler(),
+        3,
+        3,
     )
 
     # Register both processors

{port_ocean-0.21.0 → port_ocean-0.21.2}/pyproject.toml

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