test(ffe): cover customer CDN endpoint source mode

Author: leoromanovsky

tests/parametric/test_ffe/test_source_modes.py

@@ -13,7 +13,7 @@
 from utils import features, scenarios
 from utils.dd_constants import RemoteConfigApplyState
 from utils.docker_fixtures import TestAgentAPI
-from utils.docker_fixtures._mock_cdn import MockCDNServer
+from utils.docker_fixtures._mock_cdn import MockCDNServer, MockCDNStatus
 
 parametrize = pytest.mark.parametrize
 pytest_plugins = ["utils.docker_fixtures._mock_cdn"]
@@ -87,16 +87,17 @@ def library_env(request: pytest.FixtureRequest, mock_cdn: MockCDNServer) -> dict
 
 
 def _wait_for_status(
-    mock_cdn: MockCDNServer, predicate: Callable[[dict[str, Any]], bool], description: str
-) -> dict[str, Any]:
-    last_status: dict[str, Any] = {}
+    mock_cdn: MockCDNServer, predicate: Callable[[MockCDNStatus], bool], description: str
+) -> MockCDNStatus:
+    last_status: MockCDNStatus | None = None
     for _ in range(MOCK_STATUS_ATTEMPTS):
         last_status = mock_cdn.status()
         if predicate(last_status):
             return last_status
         time.sleep(MOCK_STATUS_INTERVAL_SECONDS)
 
     pytest.fail(f"mock CDN status did not reach expected state: {description}; status={last_status}", pytrace=False)
+    raise AssertionError("unreachable")
 
 
 def _evaluate(test_library: APMLibrary) -> dict[str, Any]:
@@ -183,6 +184,26 @@ def test_default_cdn_positive(self, test_library: APMLibrary, mock_cdn: MockCDNS
         assert status["fixture"] == "valid_control"
         assert status["last_source_mode"] == "cdn"
 
+    @parametrize(
+        "library_env",
+        [{"source_mode": None, "fixture": "valid_control", "base_url_form": "endpoint"}],
+        indirect=True,
+    )
+    def test_customer_http_endpoint_default_cdn_positive(
+        self, test_library: APMLibrary, mock_cdn: MockCDNServer
+    ) -> None:
+        assert test_library.ffe_start(), "failed to start FFE provider with customer HTTP endpoint override"
+        _assert_expected_value(_evaluate(test_library))
+
+        status = _wait_for_status(
+            mock_cdn,
+            lambda current: current["requests_total"] > 0 and current["last_status_code"] == 200,
+            "customer HTTP endpoint request",
+        )
+        assert status["fixture"] == "valid_control"
+        assert status["last_path"] == "/mock/ufc/config"
+        assert status["last_source_mode"] == "cdn"
+
     @parametrize(
         "library_env",
         [{"source_mode": "cdn", "fixture": "missing_auth_cold", "api_key": None}],
@@ -367,6 +388,8 @@ def test_mock_cdn_status_is_metadata_only(self, mock_cdn: MockCDNServer) -> None
             "requests_total",
             "in_flight",
             "max_in_flight",
+            "last_path",
+            "last_query",
             "last_if_none_match",
             "last_auth_present",
             "last_source_mode",

utils/docker_fixtures/_mock_cdn.py

@@ -56,6 +56,8 @@ class MockCDNStatus(TypedDict):
     requests_total: int
     in_flight: int
     max_in_flight: int
+    last_path: str | None
+    last_query: str | None
     last_if_none_match: str | None
     last_auth_present: bool
     last_source_mode: str | None
@@ -70,6 +72,8 @@ def __init__(self) -> None:
         self.requests_total = 0
         self.in_flight = 0
         self.max_in_flight = 0
+        self.last_path: str | None = None
+        self.last_query: str | None = None
         self.last_if_none_match: str | None = None
         self.last_auth_present = False
         self.last_source_mode: str | None = None
@@ -83,6 +87,8 @@ def reset(self) -> None:
             self.requests_total = 0
             self.in_flight = 0
             self.max_in_flight = 0
+            self.last_path = None
+            self.last_query = None
             self.last_if_none_match = None
             self.last_auth_present = False
             self.last_source_mode = None
@@ -112,6 +118,8 @@ def record_request(self, headers: Mapping[str, str], path: str) -> tuple[str, in
             self.requests_total += 1
             self.in_flight += 1
             self.max_in_flight = max(self.max_in_flight, self.in_flight)
+            self.last_path = parsed.path
+            self.last_query = parsed.query or None
             self.last_if_none_match = headers.get("If-None-Match")
             self.last_auth_present = _has_auth(headers)
             self.last_source_mode = source_mode
@@ -135,6 +143,8 @@ def status(self) -> MockCDNStatus:
                 "requests_total": self.requests_total,
                 "in_flight": self.in_flight,
                 "max_in_flight": self.max_in_flight,
+                "last_path": self.last_path,
+                "last_query": self.last_query,
                 "last_if_none_match": self.last_if_none_match,
                 "last_auth_present": self.last_auth_present,
                 "last_source_mode": self.last_source_mode,
@@ -184,14 +194,15 @@ def log_message(self, _format: str, *_args: object) -> None:
         return
 
     def _handle_config(self) -> None:
-        fixture, sequence_index = self.server.state.record_request(dict(self.headers), self.path)
+        request_headers = dict(self.headers)
+        fixture, sequence_index = self.server.state.record_request(request_headers, self.path)
         try:
             if fixture == "delayed_no_overlap":
                 time.sleep(DELAYED_RESPONSE_SECONDS)
 
             status_code, body, headers = _response_for_fixture(
                 fixture=fixture,
-                has_auth=_has_auth(self.headers),
+                has_auth=_has_auth(request_headers),
                 if_none_match=self.headers.get("If-None-Match"),
                 sequence_index=sequence_index,
             )