fix change to bytes

Author: Laure-di

scaleway-core/scaleway_core/api.py

@@ -124,8 +124,10 @@ def _request(
 
             if body is None:
                 body = {}
-
-        raw_body = json.dumps(body) if body is not None else None
+        if isinstance(body, bytes):
+            raw_body = body
+        else:
+            raw_body = json.dumps(body) if body is not None else None
 
         request_params: List[Tuple[str, Any]] = []
         for k, v in params.items():
@@ -155,9 +157,8 @@ def _request(
             url=url,
             params=request_params,
             headers=headers,
-            body=raw_body,
+            body=raw_body.decode("utf-8", errors="replace") if isinstance(raw_body, bytes) else raw_body,
         )
-
         response = requests.request(
             method=method,
             url=url,

scaleway/scaleway/instance/v1/custom_api.py

@@ -2,9 +2,8 @@
 from scaleway_core.bridge import Zone
 from scaleway_core.utils import validate_path_param
 from .api import InstanceV1API
-from .custom_marshalling import marshal_GetServerUserDataRequest, unmarshal_GetServerUserDataResponse, \
-    marshal_SetServerUserDataRequest
-from .custom_types import GetServerUserDataRequest, SetServerUserDataRequest
+from .custom_marshalling import marshal_GetServerUserDataRequest
+from .custom_types import GetServerUserDataRequest
 
 
 class InstanceUtilsV1API(InstanceV1API):
@@ -45,7 +44,7 @@ def get_server_user_data(self, server_id: str, key: str, zone: Optional[Zone] =
             ),
         )
         self._throw_on_error(res)
-        return unmarshal_GetServerUserDataResponse(res.json())
+        return res
 
     def set_server_user_data(self, server_id: str, key: str, content: bytes, zone: Optional[Zone] = None):
         """
@@ -64,12 +63,7 @@ def set_server_user_data(self, server_id: str, key: str, content: bytes, zone: O
         res = self._request(
             "PATCH",
             f"/instance/v1/zones/{param_zone}/servers/{param_server_id}/user_data/{key}",
-            body=marshal_SetServerUserDataRequest(SetServerUserDataRequest(
-                zone=zone,
-                server_id=server_id,
-                content=content,
-                key=key,
-            ), self.client),
+            body=content,
             headers=headers,
         )
 

scaleway/scaleway/instance/v1/custom_marshalling.py

@@ -1,7 +1,6 @@
 from typing import Dict, Any
 
-from scaleway.instance.v1.custom_types import GetServerUserDataRequest, GetServerUserDataResponse, \
-    SetServerUserDataRequest
+from scaleway.instance.v1.custom_types import GetServerUserDataRequest, GetServerUserDataResponse
 from scaleway_core.profile import ProfileDefaults
 
 
@@ -16,40 +15,3 @@ def marshal_GetServerUserDataRequest(request: GetServerUserDataRequest, defaults
         output["zone"] = request.zone
 
     return output
-
-
-def unmarshal_GetServerUserDataResponse(data: Any) -> GetServerUserDataResponse:
-    if not isinstance(data, dict):
-        raise TypeError(
-            "Unmarshalling the type 'GetServerUserDataResponse' failed as data isn't a dictionary."
-        )
-    args: Dict[str, Any] = {}
-
-    field = data.get("server_id", None)
-    if field is not None:
-        args["server_id"] = field
-
-    field = data.get("key", None)
-    if field is not None:
-        args["key"] = field
-
-    field = data.get("content", None)
-    if field is not None:
-        args["content"] = field
-
-    return GetServerUserDataResponse(**args)
-
-
-def marshal_SetServerUserDataRequest(request: SetServerUserDataRequest, defaults: ProfileDefaults) -> Dict[str, Any]:
-    output: Dict[str, Any] = {}
-
-    if request.server_id is not None:
-        output["server_id"] = request.server_id
-    if request.key is not None:
-        output["key"] = request.key
-    if request.zone is not None:
-        output["zone"] = request.zone
-    if request.content is not None:
-        output["content"] = request.content.decode("utf-8")
-
-    return output

scaleway/scaleway/instance/v1/custom_types.py

@@ -29,23 +29,3 @@ class GetServerUserDataResponse:
     """
 
     content: str
-
-
-@dataclass
-class SetServerUserDataRequest:
-    zone: Optional[Zone]
-    """
-    Zone of the user data to set
-    """
-
-    server_id: str
-
-    key: str
-    """
-    Key defines the user data key to set
-    """
-
-    content: bytes
-    """
-    Content defines the data to set as bytes
-    """