fix(core): total_count legacy (#595)

Co-authored-by: Rémy Léone <[email protected]>

Author: Laure-di

scaleway-core/scaleway_core/api.py

@@ -118,7 +118,6 @@ def _request(
         body: Optional[Body] = None,
     ) -> requests.Response:
         additional_headers: Dict[str, str] = {}
-
         method = method.upper()
         if method == "POST" or method == "PUT" or method == "PATCH":
             additional_headers["Content-Type"] = "application/json; charset=utf-8"
@@ -141,12 +140,12 @@ def _request(
 
         headers = {
             "accept": "application/json",
-            "x-auth-token": self.client.secret_key or "",
             "user-agent": self.client.user_agent,
             **additional_headers,
             **headers,
         }
-
+        if self.client.secret_key is not None:
+            headers["x-auth-token"] = self.client.secret_key
         url = f"{self.client.api_url}{path}"
 
         logger = APILogger(self._log, self.client._increment_request_count())
@@ -168,6 +167,12 @@ def _request(
             verify=not self.client.api_allow_insecure,
         )
 
+        if response.headers.get("x-total-count"):
+            b = response.json()
+            b["total_count"] = response.headers.get("x-total-count")
+            b = json.dumps(b)
+            response._content = bytes(b, "utf-8")
+
         logger.log_response(
             response=response,
         )

scaleway/tests/test_total_count_legacy.py

@@ -0,0 +1,23 @@
+import logging
+import sys
+import unittest
+from scaleway_core.client import Client
+from scaleway.instance.v1 import InstanceV1API
+
+logger = logging.getLogger()
+logger.level = logging.DEBUG
+stream_handler = logging.StreamHandler(sys.stdout)
+logger.addHandler(stream_handler)
+
+
+class TestTotalCountLegacy(unittest.TestCase):
+
+    def setUp(self) -> None:
+        self.client = Client()
+        self.instance_api = InstanceV1API(self.client, bypass_validation=True)
+
+    def test_list_servers_type(self):
+        list_server_type = self.instance_api.list_servers_types(zone="fr-par-1")
+        self.assertIsNotNone(list_server_type.total_count)
+
+