From 2650972ff9dfcb56643df8b143ae63cfc2c6183a Mon Sep 17 00:00:00 2001
From: Sebastien Quioc <sebastien.quioc@sekoia.fr>
Date: Wed, 2 Oct 2024 11:45:53 +0200
Subject: [PATCH 1/3] refactor(AsyncConnector): outsource the computation of
 the batchapi url and add tests on it

---
 sekoia_automation/aio/connector.py | 13 ++++++++-----
 tests/aio/test_connector.py        | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/sekoia_automation/aio/connector.py b/sekoia_automation/aio/connector.py
index 2129dd8..ca9220e 100644
--- a/sekoia_automation/aio/connector.py
+++ b/sekoia_automation/aio/connector.py
@@ -129,6 +129,13 @@ async def _async_send_chunk(
 
         return events_ids
 
+    @property
+    def _batchapi_url(self):
+        if intake_server := self.configuration.intake_server:
+            return urljoin(intake_server, "batch")
+        else:
+            return urljoin(self.intake_url, "batch")
+
     async def push_data_to_intakes(
         self, events: list[str]
     ) -> list[str]:  # pragma: no cover
@@ -142,10 +149,6 @@ async def push_data_to_intakes(
             list[str]:
         """
         self._last_events_time = datetime.utcnow()
-        if intake_server := self.configuration.intake_server:
-            batch_api = urljoin(intake_server, "batch")
-        else:
-            batch_api = urljoin(self.intake_url, "batch")
 
         result_ids = []
 
@@ -153,7 +156,7 @@ async def push_data_to_intakes(
 
         async with self.session() as session:
             forwarders = [
-                self._async_send_chunk(session, batch_api, chunk_index, chunk)
+                self._async_send_chunk(session, self._batchapi_url, chunk_index, chunk)
                 for chunk_index, chunk in enumerate(chunks)
             ]
             async for ids in limit_concurrency(forwarders, self.max_concurrency_tasks):
diff --git a/tests/aio/test_connector.py b/tests/aio/test_connector.py
index dcbe67e..6b409b9 100644
--- a/tests/aio/test_connector.py
+++ b/tests/aio/test_connector.py
@@ -215,3 +215,23 @@ async def test_async_connector_raise_error(
         except Exception as e:
             assert isinstance(e, RuntimeError)
             assert str(e) == expected_error
+
+
+@pytest.mark.parametrize(
+    'base_url,expected_batchapi_url',
+    [
+        ('http://intake.fake.url/', 'http://intake.fake.url/batch'),
+        ('http://fake.url/intake/', 'http://fake.url/intake/batch'),
+    ]
+)
+def test_async_connector_batchapi_url(storage, mocked_trigger_logs, base_url: str, expected_batchapi_url: str):
+    with patch("sentry_sdk.set_tag"):
+        async_connector = DummyAsyncConnector(data_path=storage)
+
+        async_connector.trigger_activation = "2022-03-14T11:16:14.236930Z"
+        async_connector.configuration = {
+            "intake_key": "",
+            "intake_server": base_url,
+        }
+
+        assert async_connector._batchapi_url == expected_batchapi_url

From 291a55ee54bd7621f3426fa6356b1300b099a097 Mon Sep 17 00:00:00 2001
From: Sebastien Quioc <sebastien.quioc@sekoia.fr>
Date: Wed, 2 Oct 2024 11:47:56 +0200
Subject: [PATCH 2/3] fix(AsyncConnector): replace urllib.parse.urljoin by
 posixpath.join

---
 sekoia_automation/aio/connector.py | 2 +-
 tests/aio/test_connector.py        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sekoia_automation/aio/connector.py b/sekoia_automation/aio/connector.py
index ca9220e..19d9091 100644
--- a/sekoia_automation/aio/connector.py
+++ b/sekoia_automation/aio/connector.py
@@ -6,7 +6,7 @@
 from contextlib import asynccontextmanager
 from datetime import datetime
 from pathlib import Path
-from urllib.parse import urljoin
+from posixpath import join as urljoin
 
 from aiohttp import ClientSession
 from aiolimiter import AsyncLimiter
diff --git a/tests/aio/test_connector.py b/tests/aio/test_connector.py
index 6b409b9..28fc70b 100644
--- a/tests/aio/test_connector.py
+++ b/tests/aio/test_connector.py
@@ -1,7 +1,7 @@
 """Test async connector."""
 
 from unittest.mock import Mock, patch
-from urllib.parse import urljoin
+from posixpath import join as urljoin
 
 import pytest
 from aiolimiter import AsyncLimiter
@@ -222,6 +222,7 @@ async def test_async_connector_raise_error(
     [
         ('http://intake.fake.url/', 'http://intake.fake.url/batch'),
         ('http://fake.url/intake/', 'http://fake.url/intake/batch'),
+        ('http://fake.url/intake', 'http://fake.url/intake/batch'),
     ]
 )
 def test_async_connector_batchapi_url(storage, mocked_trigger_logs, base_url: str, expected_batchapi_url: str):

From 2d8dc1bc2e93049c11320fadf35f60b796dbe0f1 Mon Sep 17 00:00:00 2001
From: Sebastien Quioc <sebastien.quioc@sekoia.fr>
Date: Wed, 2 Oct 2024 11:49:14 +0200
Subject: [PATCH 3/3] chore(SDK): add entry in the changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b09733b..b18bd50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Replace ulrllib.parse.urljoin by posixpath.join in AsyncConnector
 - Fix tests for async version of connector.
 
 ## 1.16.0 - 2024-10-16