port-ocean 0.28.2__py3-none-any.whl → 0.29.0__py3-none-any.whl

port_ocean/tests/clients/port/mixins/test_entities.py

@@ -179,7 +179,7 @@ async def test_search_entities_uses_datasource_route_when_query_is_none(
 ) -> None:
     """Test that search_entities uses datasource route when query is None"""
     mock_response = MagicMock()
-    mock_response.json.return_value = {"entities": []}
+    mock_response.json.return_value = {"entities": [], "next": None}
     mock_response.is_error = False
     mock_response.status_code = 200
     mock_response.headers = {}
@@ -208,8 +208,74 @@ async def test_search_entities_uses_datasource_route_when_query_is_none(
         == "https://api.getport.io/v1/blueprints/entities/datasource-entities"
     )
 
-    expected_json = {
-        "datasource_prefix": "port-ocean/test-integration/",
-        "datasource_suffix": "/test-identifier/sync",
+    sent_json = call_args[1]["json"]
+    assert sent_json["datasource_prefix"] == "port-ocean/test-integration/"
+    assert sent_json["datasource_suffix"] == "/test-identifier/sync"
+
+
+async def test_search_entities_uses_datasource_route_when_query_is_none_two_pages(
+    entity_client: EntityClientMixin,
+) -> None:
+    """Test that search_entities uses datasource route when query is None"""
+    # First response with pagination token
+    mock_response_first = MagicMock()
+    mock_response_first.json.return_value = {
+        "entities": [
+            Entity(identifier="entity_1", blueprint="entity_1"),
+            Entity(identifier="entity_2", blueprint="entity_2"),
+        ],
+        "next": "next_page_token",
+    }
+    mock_response_first.is_error = False
+    mock_response_first.status_code = 200
+    mock_response_first.headers = {}
+
+    # Second response without pagination token (end of pagination)
+    mock_response_second = MagicMock()
+    mock_response_second.json.return_value = {
+        "entities": [Entity(identifier="entity_3", blueprint="entity_3")],
+        "next": None,
     }
-    assert call_args[1]["json"] == expected_json
+    mock_response_second.is_error = False
+    mock_response_second.status_code = 200
+    mock_response_second.headers = {}
+
+    # Mock the client to return different responses for each call
+    entity_client.client.post = AsyncMock(side_effect=[mock_response_first, mock_response_second])  # type: ignore
+    entity_client.auth.headers = AsyncMock(return_value={"Authorization": "Bearer test"})  # type: ignore
+
+    entity_client.auth.integration_type = "test-integration"
+    entity_client.auth.integration_identifier = "test-identifier"
+    entity_client.auth.api_url = "https://api.getport.io/v1"
+
+    mock_user_agent_type = MagicMock()
+    mock_user_agent_type.value = "sync"
+
+    entities = await entity_client.search_entities(
+        user_agent_type=mock_user_agent_type,
+        query=None,
+    )
+
+    # Should call the datasource-entities endpoint exactly twice for pagination
+    assert entity_client.client.post.await_count == 2
+    assert len(entities) == 3
+
+    # Check first call
+    first_call_args = entity_client.client.post.call_args_list[0]
+    assert (
+        first_call_args[0][0]
+        == "https://api.getport.io/v1/blueprints/entities/datasource-entities"
+    )
+    first_sent_json = first_call_args[1]["json"]
+    assert first_sent_json["datasource_prefix"] == "port-ocean/test-integration/"
+    assert first_sent_json["datasource_suffix"] == "/test-identifier/sync"
+
+    # Check second call
+    second_call_args = entity_client.client.post.call_args_list[1]
+    assert (
+        second_call_args[0][0]
+        == "https://api.getport.io/v1/blueprints/entities/datasource-entities"
+    )
+    second_sent_json = second_call_args[1]["json"]
+    assert second_sent_json["datasource_prefix"] == "port-ocean/test-integration/"
+    assert second_sent_json["datasource_suffix"] == "/test-identifier/sync"

port_ocean/tests/core/event_listener/test_kafka.py

@@ -1,11 +1,12 @@
 from port_ocean.core.event_listener.kafka import KafkaEventListenerSettings
+from port_ocean.core.models import EventListenerType
 import pytest
 from pydantic import ValidationError
 
 
 def test_default_kafka_settings() -> None:
     """Test default values are properly set"""
-    config = KafkaEventListenerSettings(type="KAFKA")
+    config = KafkaEventListenerSettings(type=EventListenerType.KAFKA)
     assert config.type == "KAFKA"
     assert config.security_protocol == "SASL_SSL"
     assert config.authentication_mechanism == "SCRAM-SHA-512"
@@ -17,28 +18,32 @@ def test_default_kafka_settings() -> None:
 def test_brokers_json_array_parsing() -> None:
     """Test that JSON array strings get converted to comma-separated"""
     json_brokers = '["broker1:9092", "broker2:9092", "broker3:9092"]'
-    config = KafkaEventListenerSettings(type="KAFKA", brokers=json_brokers)
+    config = KafkaEventListenerSettings(
+        type=EventListenerType.KAFKA, brokers=json_brokers
+    )
     assert config.brokers == "broker1:9092,broker2:9092,broker3:9092"
 
 
 def test_brokers_regular_string_unchanged() -> None:
     """Test that regular comma-separated strings pass through unchanged"""
     regular_brokers = "broker1:9092,broker2:9092"
-    config = KafkaEventListenerSettings(type="KAFKA", brokers=regular_brokers)
+    config = KafkaEventListenerSettings(
+        type=EventListenerType.KAFKA, brokers=regular_brokers
+    )
     assert config.brokers == regular_brokers
 
 
 def test_brokers_malformed_json_unchanged() -> None:
     """Test that malformed JSON strings don't break validation"""
     bad_json = "[broker1:9092, broker2:9092"
-    config = KafkaEventListenerSettings(type="KAFKA", brokers=bad_json)
+    config = KafkaEventListenerSettings(type=EventListenerType.KAFKA, brokers=bad_json)
     assert config.brokers == bad_json
 
 
 def test_custom_values() -> None:
     """Test overriding default values"""
     config = KafkaEventListenerSettings(
-        type="KAFKA",
+        type=EventListenerType.KAFKA,
         brokers="custom:9092",
         security_protocol="PLAINTEXT",
         authentication_mechanism="PLAIN",
@@ -60,11 +65,13 @@ def test_type_literal_validation() -> None:
 
 def test_empty_brokers_array() -> None:
     """Test empty JSON array becomes empty string"""
-    config = KafkaEventListenerSettings(type="KAFKA", brokers="[]")
+    config = KafkaEventListenerSettings(type=EventListenerType.KAFKA, brokers="[]")
     assert config.brokers == ""
 
 
 def test_single_broker_array() -> None:
     """Test single broker in JSON array"""
-    config = KafkaEventListenerSettings(type="KAFKA", brokers='["single:9092"]')
+    config = KafkaEventListenerSettings(
+        type=EventListenerType.KAFKA, brokers='["single:9092"]'
+    )
     assert config.brokers == "single:9092"