port-ocean 0.4.15__tar.gz → 0.4.17__tar.gz

{port_ocean-0.4.15 → port_ocean-0.4.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.4.15
+Version: 0.4.17
 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.4.15 → port_ocean-0.4.17}/port_ocean/cli/commands/new.py

@@ -10,13 +10,13 @@ from port_ocean.cli.utils import cli_root_path
 @cli_start.command()
 @click.argument("path", default=".", type=click.Path(exists=True))
 @click.option(
-    "--remove-docker-files",
-    "remove_docker_files",
+    "--private/--public",
+    "is_private_integration",
     is_flag=True,
-    default=False,
-    help="Remove Docker files from the generated project. (Used for contributing to Ocean)",
+    default=True,
+    help="Handle private integrations scaffolding. (Used for contributing to Ocean when set to public)",
 )
-def new(path: str, remove_docker_files: bool) -> None:
+def new(path: str, is_private_integration: bool) -> None:
     """
     Scaffold a new integration in the given PATH.
 
@@ -32,7 +32,7 @@ def new(path: str, remove_docker_files: bool) -> None:
         f"{cli_root_path}/cookiecutter",
         output_dir=path,
         extra_context={
-            "remove_docker_files": remove_docker_files,
+            "is_private_integration": is_private_integration,
         },
     )
     name = result.split("/")[-1]

{port_ocean-0.4.15 → port_ocean-0.4.17}/port_ocean/cli/cookiecutter/cookiecutter.json

@@ -5,7 +5,7 @@
     "full_name": "Your name",
     "email": "Your address email <you@example.com>",
     "release_date": "{% now 'local' %}",
-    "remove_docker_files": false,
+    "is_private_integration": true,
     "_extensions": [
         "jinja2_time.TimeExtension",
         "extensions.VersionExtension"

port_ocean-0.4.17/port_ocean/cli/cookiecutter/hooks/post_gen_project.py

@@ -0,0 +1,13 @@
+import os
+
+
+def handle_private_integration_flags():
+    if "{{ cookiecutter.is_private_integration }}" == "True":
+        os.remove("Dockerfile")
+        os.remove(".dockerignore")
+    if "{{ cookiecutter.is_private_integration }}" == "False":
+        os.remove("sonar-project.properties")
+
+
+if __name__ == "__main__":
+    handle_private_integration_flags()

port_ocean-0.4.17/port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/sonar-project.properties

@@ -0,0 +1,2 @@
+sonar.projectKey=port-labs_ocean_{{ cookiecutter.integration_name.lower().replace(' ', '-') }}
+sonar.organization=port-labs

{port_ocean-0.4.15 → port_ocean-0.4.17}/port_ocean/config/settings.py

@@ -41,6 +41,7 @@ class IntegrationSettings(BaseModel, extra=Extra.allow):
 class IntegrationConfiguration(BaseOceanSettings, extra=Extra.allow):
     initialize_port_resources: bool = True
     scheduled_resync_interval: int | None = None
+    client_timeout: int = 30
     port: PortSettings
     event_listener: EventListenerSettingsType
     integration: IntegrationSettings

port_ocean-0.4.17/port_ocean/sonar-project.properties

@@ -0,0 +1,3 @@
+sonar.projectKey=port-labs_ocean_framework
+sonar.organization=port-labs
+

{port_ocean-0.4.15 → port_ocean-0.4.17}/port_ocean/utils.py

@@ -18,6 +18,7 @@ from starlette.concurrency import run_in_threadpool
 from werkzeug.local import LocalStack, LocalProxy
 
 from port_ocean.helpers.async_client import OceanAsyncClient
+from port_ocean.context.ocean import ocean
 from port_ocean.helpers.retry import RetryTransport
 
 _http_client: LocalStack[httpx.AsyncClient] = LocalStack()
@@ -26,7 +27,7 @@ _http_client: LocalStack[httpx.AsyncClient] = LocalStack()
 def _get_http_client_context() -> httpx.AsyncClient:
     client = _http_client.top
     if client is None:
-        client = OceanAsyncClient(RetryTransport)
+        client = OceanAsyncClient(RetryTransport, timeout=ocean.config.client_timeout)
         _http_client.push(client)
 
     return client

{port_ocean-0.4.15 → port_ocean-0.4.17}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.4.15"
+version = "0.4.17"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"
 repository = "https://github.com/port-labs/Port-Ocean"
 
-authors = ["Daniel Sinai <daniel@getport.io>", "Yair Siman-Tov <yair@getport.io>"]
+authors = ["Daniel Sinai <daniel@getport.io>", "Yair Siman-Tov <yair@getport.io>", "Tom Tankilevitch <tom@getport.io>"]
 packages = [
     { include = "port_ocean", from = "." }
 ]

port_ocean-0.4.15/port_ocean/cli/cookiecutter/hooks/post_gen_project.py

@@ -1,11 +0,0 @@
-import os
-
-
-def delete_docker_files():
-    if "{{ cookiecutter.remove_docker_files }}" == "True":
-        os.remove("Dockerfile")
-        os.remove(".dockerignore")
-
-
-if __name__ == "__main__":
-    delete_docker_files()