Rafactor extract params into a private method

Also adds unittests for it.

Author: mdellweg

pulp-glue/pulp_glue/common/openapi.py

@@ -310,7 +310,7 @@ def param_spec(
             param_spec = {k: v for k, v in param_spec.items() if v.get("required", False)}
         return param_spec
 
-    def extract_params(
+    def _extract_params(
         self,
         param_in: str,
         path_spec: t.Dict[str, t.Any],
@@ -603,15 +603,15 @@ def call(
         else:
             parameters = parameters.copy()
 
-        if any(self.extract_params("cookie", path_spec, method_spec, parameters)):
+        if any(self._extract_params("cookie", path_spec, method_spec, parameters)):
             raise NotImplementedError(_("Cookie parameters are not implemented."))
 
-        headers = self.extract_params("header", path_spec, method_spec, parameters)
+        headers = self._extract_params("header", path_spec, method_spec, parameters)
 
-        for name, value in self.extract_params("path", path_spec, method_spec, parameters).items():
+        for name, value in self._extract_params("path", path_spec, method_spec, parameters).items():
             path = path.replace("{" + name + "}", value)
 
-        query_params = self.extract_params("query", path_spec, method_spec, parameters)
+        query_params = self._extract_params("query", path_spec, method_spec, parameters)
 
         if any(parameters):
             raise OpenAPIError(

pulp-glue/tests/test_openapi.py

@@ -1,16 +1,27 @@
+import datetime
+import json
+
 import pytest
 
 from pulp_glue.common.openapi import OpenAPI, _Response
 
 pytestmark = pytest.mark.glue
 
-TEST_SCHEMA = b'{"openapi": "3.0.3", "paths": {}}'
+TEST_SCHEMA = json.dumps(
+    {
+        "openapi": "3.0.3",
+        "paths": {"test/": {"get": {"operationId": "test_id"}}},
+        "components": {"schemas": {}},
+    }
+).encode()
 
 
 @pytest.fixture
 def openapi(monkeypatch: pytest.MonkeyPatch) -> OpenAPI:
-    monkeypatch.setattr(OpenAPI, "_download_api", lambda x: TEST_SCHEMA)
-    return OpenAPI("base_url", "doc_path")
+    monkeypatch.setattr(OpenAPI, "load_api", lambda self, refresh_cache: TEST_SCHEMA)
+    openapi = OpenAPI("base_url", "doc_path")
+    openapi._parse_api(TEST_SCHEMA)
+    return openapi
 
 
 def test_parse_response_returns_dict_for_no_content(openapi: OpenAPI) -> None:
@@ -25,3 +36,46 @@ def test_parse_response_decodes_json(openapi: OpenAPI) -> None:
         {"responses": {"200": {"content": {"application/json": {}}}}}, response
     )
     assert result == {"a": 1, "b": "Hallo!"}
+
+
+def test_extract_params_with_no_match(openapi: OpenAPI) -> None:
+    parameters = {"a": 1, "b": "C"}
+    query_params = openapi._extract_params("query", {}, {}, parameters)
+    assert query_params == {}
+    assert parameters == {"a": 1, "b": "C"}
+
+
+def test_extract_params_raises_for_missing_required_parameter(openapi: OpenAPI) -> None:
+    parameters = {"a": 1, "b": "C"}
+    with pytest.raises(RuntimeError, match=r"Required parameters \[c\] missing"):
+        openapi._extract_params(
+            "query",
+            {"parameters": [{"name": "c", "in": "query", "required": True}]},
+            {},
+            parameters,
+        )
+    assert parameters == {"a": 1, "b": "C"}
+
+
+def test_extract_params_removes_matches(openapi: OpenAPI) -> None:
+    parameters = {"a": 1, "c": "C"}
+    query_params = openapi._extract_params(
+        "query", {"parameters": [{"name": "c", "in": "query", "required": True}]}, {}, parameters
+    )
+    assert query_params == {"c": "C"}
+    assert parameters == {"a": 1}
+
+
+def test_extract_params_encodes_date(openapi: OpenAPI) -> None:
+    parameters = {"a": datetime.date(2000, 1, 1)}
+    query_params = openapi._extract_params(
+        "query",
+        {
+            "parameters": [
+                {"name": "a", "in": "query", "schema": {"type": "string", "format": "date"}}
+            ]
+        },
+        {},
+        parameters,
+    )
+    assert query_params == {"a": "2000-01-01"}