port-ocean 0.20.0__tar.gz → 0.20.2__tar.gz

{port_ocean-0.20.0 → port_ocean-0.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.20.0
+Version: 0.20.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.20.0 → port_ocean-0.20.2}/port_ocean/clients/port/mixins/integrations.py

@@ -13,6 +13,7 @@ if TYPE_CHECKING:
     from port_ocean.core.handlers.port_app_config.models import PortAppConfig
 
 
+ORG_USE_PROVISIONED_DEFAULTS_FEATURE_FLAG = "USE_PROVISIONED_DEFAULTS"
 INTEGRATION_POLLING_INTERVAL_INITIAL_SECONDS = 3
 INTEGRATION_POLLING_INTERVAL_BACKOFF_FACTOR = 1.55
 INTEGRATION_POLLING_RETRY_LIMIT = 30
@@ -68,21 +69,26 @@ class IntegrationClientMixin:
         return response
 
     async def get_current_integration(
-        self, should_raise: bool = True, should_log: bool = True
+        self,
+        should_raise: bool = True,
+        should_log: bool = True,
+        has_provision_feature_flag: bool = False,
     ) -> dict[str, Any]:
         response = await self._get_current_integration()
         handle_status_code(response, should_raise, should_log)
         integration = response.json().get("integration", {})
         if integration.get("config", None) or not integration:
             return integration
-        is_provision_enabled_for_integration = integration.get(
-            "installationAppType", None
-        ) and (
-            await self.is_integration_provision_enabled(
-                integration.get("installationAppType", ""),
-                should_raise,
-                should_log,
+        is_provision_enabled_for_integration = (
+            integration.get("installationAppType", None)
+            and (
+                await self.is_integration_provision_enabled(
+                    integration.get("installationAppType", ""),
+                    should_raise,
+                    should_log,
+                )
             )
+            and has_provision_feature_flag
         )
 
         if is_provision_enabled_for_integration:

{port_ocean-0.20.0 → port_ocean-0.20.2}/port_ocean/core/defaults/initialize.py

@@ -58,11 +58,14 @@ async def _initialize_required_integration_settings(
     port_client: PortClient,
     integration_config: IntegrationConfiguration,
     default_mapping: PortAppConfig | None = None,
+    has_provision_feature_flag: bool = False,
 ) -> None:
     try:
         logger.info("Initializing integration at port")
         integration = await port_client.get_current_integration(
-            should_log=False, should_raise=False
+            should_log=False,
+            should_raise=False,
+            has_provision_feature_flag=has_provision_feature_flag,
         )
         if not integration:
             logger.info(
@@ -219,6 +222,10 @@ async def _initialize_defaults(
         )
     )
 
+    has_provision_feature_flag = ORG_USE_PROVISIONED_DEFAULTS_FEATURE_FLAG in (
+        await port_client.get_organization_feature_flags()
+    )
+
     if (
         not integration_config.create_port_resources_origin
         and is_integration_provision_enabled
@@ -236,11 +243,7 @@ async def _initialize_defaults(
         logger.info(
             "Resources origin is set to be Port, verifying integration is supported"
         )
-        org_feature_flags = await port_client.get_organization_feature_flags()
-        if (
-            not is_integration_provision_enabled
-            or ORG_USE_PROVISIONED_DEFAULTS_FEATURE_FLAG not in org_feature_flags
-        ):
+        if not is_integration_provision_enabled or not has_provision_feature_flag:
             logger.info(
                 "Port origin for Integration is not supported, changing resources origin to use Ocean"
             )
@@ -265,6 +268,7 @@ async def _initialize_defaults(
             port_client,
             integration_config,
             defaults.port_app_config if defaults else None,
+            has_provision_feature_flag=has_provision_feature_flag,
         )
 
     if (

{port_ocean-0.20.0 → port_ocean-0.20.2}/pyproject.toml

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