Merge branch 'main' into debug/sonar

integrations/pagerduty/.port/resources/port-app-config.yaml

@@ -33,7 +33,7 @@ resources:
           blueprint: '"pagerdutyIncident"'
           properties:
             status: .status
-            url: .self
+            url: .html_url
             urgency: .urgency
             assignees: .assignments | map(.assignee.email)
             escalation_policy: .escalation_policy.summary

integrations/pagerduty/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.116 (2024-11-18)
+
+
+### Improvements
+
+- Updated the incident url mapping to use html_url instead of the api url. (0.1.116)
+
+
 ## 0.1.115 (2024-11-12)
 
 

integrations/pagerduty/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pagerduty"
-version = "0.1.115"
+version = "0.1.116"
 description = "Pagerduty Integration"
 authors = ["Port Team <[email protected]>"]
 

integrations/snyk/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+
+## 0.1.102 (2024-11-14)
+
+
+### Improvements
+
+- Added rate limiting handling to the integration to prevent reaching the Snyk API rate limit
+
+
 ## 0.1.101 (2024-11-12)
 
 

integrations/snyk/main.py

@@ -8,11 +8,13 @@
 from port_ocean.core.ocean_types import ASYNC_GENERATOR_RESYNC_TYPE
 from port_ocean.context.ocean import ocean
 from port_ocean.context.event import event
-
+from aiolimiter import AsyncLimiter
 from snyk.client import SnykClient
 from snyk.overrides import ProjectResourceConfig
 
 CONCURRENT_REQUESTS = 20
+SNYK_LIMIT = 1320
+RATELIMITER = AsyncLimiter(SNYK_LIMIT)
 
 
 class ObjectKind(StrEnum):
@@ -46,6 +48,7 @@ def parse_list(value: str) -> Optional[list[str]]:
         parse_list(ocean.integration_config.get("organization_id", "")),
         parse_list(ocean.integration_config.get("groups", "")),
         ocean.integration_config.get("webhook_secret"),
+        RATELIMITER,
     )
 
 

integrations/snyk/pyproject.toml

@@ -1,11 +1,12 @@
 [tool.poetry]
 name = "snyk"
-version = "0.1.101"
+version = "0.1.102"
 description = "Snyk integration powered by Ocean"
 authors = ["Isaac Coffie <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.12"
+aiolimiter = "^1.1.0"
 port_ocean = {version = "^0.14.0", extras = ["cli"]}
 
 [tool.poetry.group.dev.dependencies]

integrations/snyk/snyk/client.py

@@ -5,9 +5,9 @@
 import httpx
 from httpx import Timeout
 from loguru import logger
-
 from port_ocean.context.event import event
 from port_ocean.utils import http_async_client
+from aiolimiter import AsyncLimiter
 
 
 class CacheKeys(StrEnum):
@@ -31,6 +31,7 @@ def __init__(
         organization_ids: list[str] | None,
         group_ids: list[str] | None,
         webhook_secret: str | None,
+        rate_limiter: AsyncLimiter,
     ):
         self.token = token
         self.api_url = f"{api_url}/v1"
@@ -43,6 +44,7 @@ def __init__(
         self.http_client.headers.update(self.api_auth_header)
         self.http_client.timeout = Timeout(30)
         self.snyk_api_version = "2024-06-21"
+        self.rate_limiter = rate_limiter
 
     @property
     def api_auth_header(self) -> dict[str, Any]:
@@ -60,20 +62,21 @@ async def _send_api_request(
             **(query_params or {}),
             **({"version": version} if version is not None else {}),
         }
-        try:
-            response = await self.http_client.request(
-                method=method, url=url, params=query_params, json=json_data
-            )
-            response.raise_for_status()
-            return response.json()
+        async with self.rate_limiter:
+            try:
+                response = await self.http_client.request(
+                    method=method, url=url, params=query_params, json=json_data
+                )
+                response.raise_for_status()
+                return response.json()
 
-        except httpx.HTTPStatusError as e:
-            logger.error(
-                f"Encountered an error while sending a request to {method} {url} with query_params: {query_params}, "
-                f"version: {version}, json: {json_data}. "
-                f"Got HTTP error with status code: {e.response.status_code} and response: {e.response.text}"
-            )
-            raise
+            except httpx.HTTPStatusError as e:
+                logger.error(
+                    f"Encountered an error while sending a request to {method} {url} with query_params: {query_params}, "
+                    f"version: {version}, json: {json_data}. "
+                    f"Got HTTP error with status code: {e.response.status_code} and response: {e.response.text}"
+                )
+                raise
 
     async def _get_paginated_resources(
         self,

integrations/snyk/tests/conftest.py

@@ -0,0 +1,5 @@
+# ruff: noqa
+from port_ocean.tests.helpers.fixtures import (
+    get_mocked_ocean_app,
+    get_mock_ocean_resource_configs,
+)

integrations/snyk/tests/snyk/test_client.py

@@ -0,0 +1,114 @@
+import pytest
+from unittest.mock import patch, AsyncMock, MagicMock
+from typing import Any, Dict, List, Generator
+from snyk.client import SnykClient
+from port_ocean.exceptions.context import PortOceanContextAlreadyInitializedError
+from port_ocean.context.ocean import initialize_port_ocean_context
+from port_ocean.context.event import EventContext
+from aiolimiter import AsyncLimiter
+import time
+import asyncio
+
+MOCK_API_URL = "https://api.snyk.io/v1"
+MOCK_TOKEN = "dummy_token"
+MOCK_PROJECT_ID = "12345"
+MOCK_ISSUES = [{"id": "issue1"}, {"id": "issue2"}]
+MOCK_ORG_URL = "https://your_organization_url.com"
+MOCK_PERSONAL_ACCESS_TOKEN = "personal_access_token"
+
+
+# Port Ocean Mocks
+@pytest.fixture(autouse=True)
+def mock_ocean_context() -> None:
+    """Fixture to mock the Ocean context initialization."""
+    try:
+        mock_ocean_app = MagicMock()
+        mock_ocean_app.config.integration.config = {
+            "organization_url": MOCK_ORG_URL,
+            "personal_access_token": MOCK_PERSONAL_ACCESS_TOKEN,
+        }
+        mock_ocean_app.integration_router = MagicMock()
+        mock_ocean_app.port_client = MagicMock()
+        initialize_port_ocean_context(mock_ocean_app)
+    except PortOceanContextAlreadyInitializedError:
+        pass
+
+
+@pytest.fixture
+def mock_event_context() -> Generator[MagicMock, None, None]:
+    """Fixture to mock the event context."""
+    mock_event = MagicMock(spec=EventContext)
+    mock_event.event_type = "test_event"
+    mock_event.trigger_type = "manual"
+    mock_event.attributes = {}
+    mock_event._deadline = 999999999.0
+    mock_event._aborted = False
+
+    with patch("port_ocean.context.event.event", mock_event):
+        yield mock_event
+
+
+@pytest.fixture
+def snyk_client() -> SnykClient:
+    """Fixture to create a SnykClient instance for testing."""
+    return SnykClient(
+        token=MOCK_TOKEN,
+        api_url=MOCK_API_URL,
+        app_host=None,
+        organization_ids=None,
+        group_ids=None,
+        webhook_secret=None,
+        rate_limiter=AsyncLimiter(5, 1),
+    )
+
+
+@pytest.mark.asyncio
+async def test_send_api_request_rate_limit(snyk_client: SnykClient) -> None:
+    """Test rate limit enforcement on API request."""
+    with patch.object(
+        snyk_client.http_client, "request", new_callable=AsyncMock
+    ) as mock_request:
+        mock_request.return_value.json = AsyncMock(return_value={})
+        mock_request.return_value.raise_for_status = AsyncMock()
+
+        async def make_request() -> None:
+            await snyk_client._send_api_request(url=f"{MOCK_API_URL}/test")
+            await mock_request.return_value.raise_for_status()
+
+        start_time = time.monotonic()
+
+        await asyncio.gather(*[make_request() for _ in range(15)])
+
+        elapsed_time = time.monotonic() - start_time
+
+        assert (
+            elapsed_time >= 1.0
+        ), "Rate limiter did not properly enforce the rate limit."
+
+
+@pytest.mark.asyncio
+async def test_get_paginated_resources(
+    snyk_client: SnykClient, mock_event_context: MagicMock
+) -> None:
+    """Test getting paginated resources with mocked response."""
+
+    async def mock_send_api_request(*args: Any, **kwargs: Any) -> Dict[str, Any]:
+        url = kwargs.get("url")
+        if url and url.endswith("/page1"):
+            return {"data": [{"id": "item1"}], "links": {"next": "/rest/page2"}}
+        elif url and url.endswith("/page2"):
+            return {"data": [{"id": "item2"}], "links": {"next": ""}}
+        return {}
+
+    with patch.object(
+        snyk_client, "_send_api_request", side_effect=mock_send_api_request
+    ):
+        url_path = "/page1"
+
+        resources: List[Dict[str, Any]] = []
+        async for resource_batch in snyk_client._get_paginated_resources(
+            url_path=url_path
+        ):
+            resources.extend(resource_batch)
+
+        assert resources == [{"id": "item1"}, {"id": "item2"}]