chore: update more deprecated api calls (#267)

Author: chesterwringe

qnexus/client/quotas.py

@@ -3,6 +3,7 @@
 from typing import Literal
 
 from qnexus.client import get_nexus_client
+from qnexus.client.users import get_self
 from qnexus.exceptions import ResourceFetchFailed
 from qnexus.models import Quota
 from qnexus.models.references import DataframableList
@@ -21,8 +22,15 @@
 
 def get_all() -> DataframableList[Quota]:
     """Get all quotas, including usage."""
+    user = get_self()
+
     res = get_nexus_client().get(
-        "/api/quotas/v1beta", params={"entity_type": "user", "include_usage": True}
+        "/api/quotas/v1beta",
+        params={
+            "entity_type": "user",
+            "entity_id": str(user.id),
+            "include_usage": True,
+        },
     )
 
     if res.status_code != 200:
@@ -50,9 +58,16 @@ def get_all() -> DataframableList[Quota]:
 
 def get(name: QuotaName) -> Quota:
     """Get specific quota details by name."""
+    user = get_self()
+
     res = get_nexus_client().get(
-        "/api/quotas/v1beta",
-        params={"entity_type": "user", "name": name, "include_usage": True},
+        "/api/quotas/v1beta3",
+        params={
+            "entity_type": "user",
+            "entity_id": str(user.id),
+            "name": name,
+            "include_usage": True,
+        },  # needs user id
     )
 
     if res.status_code != 200:
@@ -73,7 +88,10 @@ def get(name: QuotaName) -> Quota:
 
 def check_quota(name: QuotaName) -> bool:
     """Check that the current user has available quota."""
-    res = get_nexus_client().get("/api/quotas/v1beta/guard", params={"name": name})
+    user = get_self()
+    res = get_nexus_client().get(
+        "/api/quotas/v1beta3/guard", params={"name": name, "user_id": str(user.id)}
+    )
 
     if res.status_code != 200:
         return False

qnexus/client/roles.py

@@ -52,7 +52,7 @@ def assignments(resource_ref: BaseRef) -> DataframableList[RoleInfo]:
     """Check the assignments on a particular resource."""
 
     res = get_nexus_client().get(
-        f"/api/resources/v1beta/{resource_ref.id}/assignments",
+        f"/api/resources/v1beta2/{resource_ref.id}/assignments",
     )
 
     if res.status_code != 200:

qnexus/client/teams.py

@@ -8,7 +8,7 @@
 def get_all() -> DataframableList[TeamRef]:
     """No fuzzy name matching."""
     res = get_nexus_client().get(
-        "/api/v5/user/teams",
+        "/api/teams/v1beta2",
     )
 
     if res.status_code != 200:
@@ -18,10 +18,10 @@ def get_all() -> DataframableList[TeamRef]:
         [
             TeamRef(
                 id=team["id"],
-                name=team["team_name"],
-                description=team["description"],
+                name=team["attributes"]["name"],
+                description=team["attributes"]["description"],
             )
-            for team in res.json()
+            for team in res.json()["data"]
         ]
     )
 
@@ -31,9 +31,11 @@ def get(name: str) -> TeamRef:
     Get a single team using filters. Throws an exception if the filters do not
     match exactly one object.
     """
-    res = get_nexus_client().get("/api/v5/user/teams", params={"name": name})
+    res = get_nexus_client().get(
+        "/api/teams/v1beta2", params={"filter[team][name]": name}
+    )
 
-    if res.status_code == 404 or res.json() == []:
+    if res.status_code == 404 or res.json()["data"] == []:
         raise qnx_exc.ZeroMatches
 
     if res.status_code != 200:
@@ -42,13 +44,14 @@ def get(name: str) -> TeamRef:
     teams_list = [
         TeamRef(
             id=team["id"],
-            name=team["team_name"],
-            description=team["description"],
+            name=team["attributes"]["name"],
+            description=team["attributes"]["description"],
         )
-        for team in res.json()
+        for team in res.json()["data"]
     ]
 
     if len(teams_list) > 1:
+        print(teams_list)
         raise qnx_exc.NoUniqueMatch
 
     return teams_list[0]
@@ -58,31 +61,38 @@ def _fetch_by_id(team_id: str) -> TeamRef:
     """
     Get a single team by id.
     """
-    res = get_nexus_client().get(f"/api/v5/user/teams/{team_id}")
+    res = get_nexus_client().get(f"/api/teams/v1beta2/{team_id}")
 
     if res.status_code == 404:
         raise qnx_exc.ZeroMatches
 
     if res.status_code != 200:
         raise qnx_exc.ResourceFetchFailed(message=res.text, status_code=res.status_code)
 
-    team_dict = res.json()
+    team_dict = res.json()["data"]
 
     return TeamRef(
         id=team_dict["id"],
-        name=team_dict["team_name"],
-        description=team_dict["description"],
+        name=team_dict["attributes"]["name"],
+        description=team_dict["attributes"]["description"],
     )
 
 
 def create(name: str, description: str | None = None) -> TeamRef:
     """Create a team in Nexus."""
 
     resp = get_nexus_client().post(
-        "api/v5/user/teams/new",
+        "/api/teams/v1beta2",
         json={
-            "team_name": name,
-            "description": description,
+            "data": {
+                "attributes": {
+                    "name": name,
+                    "description": description,
+                    "display_name": name,
+                },
+                "relationships": {},
+                "type": "team",
+            },
         },
     )
 
@@ -91,9 +101,9 @@ def create(name: str, description: str | None = None) -> TeamRef:
             message=resp.text, status_code=resp.status_code
         )
 
-    team_dict = resp.json()
+    team_dict = resp.json()["data"]
     return TeamRef(
         id=team_dict["id"],
-        name=team_dict["team_name"],
-        description=team_dict["description"],
+        name=team_dict["attributes"]["name"],
+        description=team_dict["attributes"]["description"],
     )