feat: Remove useless VO parameter from /config

DIRACGrid · Jan 28, 2024 · 1b75d16 · 1b75d16
1 parent 7502815
commit 1b75d16
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 32 deletions.
diff --git a/diracx-cli/src/diracx/cli/config.py b/diracx-cli/src/diracx/cli/config.py
@@ -18,8 +18,7 @@
 @app.async_command()
 async def dump():
     async with DiracClient() as api:
-        user_info = await api.auth.userinfo()
-        config = await api.config.serve_config(user_info.vo)
+        config = await api.config.serve_config()
         display(config)
 
 

diff --git a/diracx-client/src/diracx/client/aio/operations/_operations.py b/diracx-client/src/diracx/client/aio/operations/_operations.py
@@ -788,24 +788,20 @@ def __init__(self, *args, **kwargs) -> None:
     @distributed_trace_async
     async def serve_config(
         self,
-        vo: str,
         *,
         if_none_match: Optional[str] = None,
         if_modified_since: Optional[str] = None,
         **kwargs: Any,
     ) -> Any:
         """Serve Config.
 
-        "
         Get the latest view of the config.
 
         If If-None-Match header is given and matches the latest ETag, return 304
 
         If If-Modified-Since is given and is newer than latest,
             return 304: this is to avoid flip/flopping.
 
-        :param vo: Required.
-        :type vo: str
         :keyword if_none_match: Default value is None.
         :paramtype if_none_match: str
         :keyword if_modified_since: Default value is None.
@@ -828,7 +824,6 @@ async def serve_config(
         cls: ClsType[Any] = kwargs.pop("cls", None)
 
         request = build_config_serve_config_request(
-            vo=vo,
             if_none_match=if_none_match,
             if_modified_since=if_modified_since,
             headers=_headers,

diff --git a/diracx-client/src/diracx/client/operations/_operations.py b/diracx-client/src/diracx/client/operations/_operations.py
@@ -264,7 +264,6 @@ def build_auth_userinfo_request(**kwargs: Any) -> HttpRequest:
 
 
 def build_config_serve_config_request(
-    vo: str,
     *,
     if_none_match: Optional[str] = None,
     if_modified_since: Optional[str] = None,
@@ -275,12 +274,7 @@ def build_config_serve_config_request(
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
-    _url = "/api/config/{vo}"
-    path_format_arguments = {
-        "vo": _SERIALIZER.url("vo", vo, "str"),
-    }
-
-    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
+    _url = "/api/config/"
 
     # Construct headers
     if if_none_match is not None:
@@ -1505,24 +1499,20 @@ def __init__(self, *args, **kwargs):
     @distributed_trace
     def serve_config(
         self,
-        vo: str,
         *,
         if_none_match: Optional[str] = None,
         if_modified_since: Optional[str] = None,
         **kwargs: Any,
     ) -> Any:
         """Serve Config.
 
-        "
         Get the latest view of the config.
 
         If If-None-Match header is given and matches the latest ETag, return 304
 
         If If-Modified-Since is given and is newer than latest,
             return 304: this is to avoid flip/flopping.
 
-        :param vo: Required.
-        :type vo: str
         :keyword if_none_match: Default value is None.
         :paramtype if_none_match: str
         :keyword if_modified_since: Default value is None.
@@ -1545,7 +1535,6 @@ def serve_config(
         cls: ClsType[Any] = kwargs.pop("cls", None)
 
         request = build_config_serve_config_request(
-            vo=vo,
             if_none_match=if_none_match,
             if_modified_since=if_modified_since,
             headers=_headers,

diff --git a/diracx-routers/src/diracx/routers/configuration.py b/diracx-routers/src/diracx/routers/configuration.py
@@ -18,15 +18,14 @@
 router = DiracxRouter()
 
 
-@router.get("/{vo}")
+@router.get("/")
 async def serve_config(
-    vo: str,
     config: Config,
     response: Response,
     if_none_match: Annotated[str | None, Header()] = None,
     if_modified_since: Annotated[str | None, Header()] = None,
 ):
-    """ "
+    """
     Get the latest view of the config.
 
 

diff --git a/diracx-routers/tests/test_config_manager.py b/diracx-routers/tests/test_config_manager.py
@@ -12,20 +12,20 @@ def normal_user_client(client_factory):
 
 def test_unauthenticated(client_factory):
     with client_factory.unauthenticated() as client:
-        response = client.get("/api/config/lhcb/")
+        response = client.get("/api/config/")
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
 
 def test_get_config(normal_user_client):
-    r = normal_user_client.get("/api/config/lhcb")
+    r = normal_user_client.get("/api/config/")
     assert r.status_code == status.HTTP_200_OK, r.json()
     assert r.json(), r.text
 
     last_modified = r.headers["Last-Modified"]
     etag = r.headers["ETag"]
 
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": etag,
             "If-Modified-Since": last_modified,
@@ -37,7 +37,7 @@ def test_get_config(normal_user_client):
 
     # If only an invalid ETAG is passed, we expect a response
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": "wrongEtag",
         },
@@ -47,7 +47,7 @@ def test_get_config(normal_user_client):
 
     # If an past ETAG and an past timestamp as give, we expect an response
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": "pastEtag",
             "If-Modified-Since": "Mon, 1 Apr 2000 00:42:42 GMT",
@@ -58,7 +58,7 @@ def test_get_config(normal_user_client):
 
     # If an future ETAG and an new timestamp as give, we expect 304
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": "futureEtag",
             "If-Modified-Since": "Mon, 1 Apr 9999 00:42:42 GMT",
@@ -69,7 +69,7 @@ def test_get_config(normal_user_client):
 
     # If an invalid ETAG and an invalid modified time, we expect a response
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": "futureEtag",
             "If-Modified-Since": "wrong format",
@@ -80,7 +80,7 @@ def test_get_config(normal_user_client):
 
     # If the correct ETAG and a past timestamp as give, we expect 304
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": etag,
             "If-Modified-Since": "Mon, 1 Apr 2000 00:42:42 GMT",
@@ -91,7 +91,7 @@ def test_get_config(normal_user_client):
 
     # If the correct ETAG and a new timestamp as give, we expect 304
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": etag,
             "If-Modified-Since": "Mon, 1 Apr 9999 00:42:42 GMT",
@@ -102,7 +102,7 @@ def test_get_config(normal_user_client):
 
     # If the correct ETAG and an invalid modified time, we expect 304
     r = normal_user_client.get(
-        "/api/config/lhcb",
+        "/api/config/",
         headers={
             "If-None-Match": etag,
             "If-Modified-Since": "wrong format",