diff --git a/services/serverbackup/oas_commit b/services/serverbackup/oas_commit index 867163a2a..e3713dde3 100644 --- a/services/serverbackup/oas_commit +++ b/services/serverbackup/oas_commit @@ -1 +1 @@ -63c68f45675657d8e16a43ac9fbc216ac3a899ee +0e64886dd0847341800d7191ed193b75413be998 diff --git a/services/serverbackup/src/stackit/serverbackup/api_client.py b/services/serverbackup/src/stackit/serverbackup/api_client.py index eee0dc0f6..2cab4cfbe 100644 --- a/services/serverbackup/src/stackit/serverbackup/api_client.py +++ b/services/serverbackup/src/stackit/serverbackup/api_client.py @@ -13,11 +13,13 @@ """ # noqa: E501 import datetime +import decimal import json import mimetypes import os import re import tempfile +import uuid from enum import Enum from typing import Dict, List, Optional, Tuple, Union from urllib.parse import quote @@ -64,8 +66,10 @@ class ApiClient: "bool": bool, "date": datetime.date, "datetime": datetime.datetime, + "decimal": decimal.Decimal, "object": object, } + _pool = None def __init__(self, configuration, header_name=None, header_value=None, cookie=None) -> None: self.config: Configuration = configuration @@ -268,7 +272,7 @@ def response_deserialize( return_data = self.__deserialize_file(response_data) elif response_type is not None: match = None - content_type = response_data.getheader("content-type") + content_type = response_data.headers.get("content-type") if content_type is not None: match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type) encoding = match.group(1) if match else "utf-8" @@ -285,7 +289,7 @@ def response_deserialize( return ApiResponse( status_code=response_data.status, data=return_data, - headers=response_data.getheaders(), + headers=response_data.headers, raw_data=response_data.data, ) @@ -297,6 +301,7 @@ def sanitize_for_serialization(self, obj): If obj is str, int, long, float, bool, return directly. If obj is datetime.datetime, datetime.date convert to string in iso8601 format. + If obj is decimal.Decimal return string representation. If obj is list, sanitize each element in the list. If obj is dict, return the dict. If obj is OpenAPI model, return the properties dict. @@ -312,12 +317,16 @@ def sanitize_for_serialization(self, obj): return obj.get_secret_value() elif isinstance(obj, self.PRIMITIVE_TYPES): return obj + elif isinstance(obj, uuid.UUID): + return str(obj) elif isinstance(obj, list): return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj] elif isinstance(obj, tuple): return tuple(self.sanitize_for_serialization(sub_obj) for sub_obj in obj) elif isinstance(obj, (datetime.datetime, datetime.date)): return obj.isoformat() + elif isinstance(obj, decimal.Decimal): + return str(obj) elif isinstance(obj, dict): obj_dict = obj @@ -327,7 +336,7 @@ def sanitize_for_serialization(self, obj): # and attributes which value is not None. # Convert attribute name to json key in # model definition for request. - if hasattr(obj, "to_dict") and callable(obj.to_dict): + if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")): obj_dict = obj.to_dict() else: obj_dict = obj.__dict__ @@ -355,7 +364,7 @@ def deserialize(self, response_text: str, response_type: str, content_type: Opti data = json.loads(response_text) except ValueError: data = response_text - elif re.match(r"^application/(json|[\w!#$&.+-^_]+\+json)\s*(;|$)", content_type, re.IGNORECASE): + elif re.match(r"^application/(json|[\w!#$&.+\-^_]+\+json)\s*(;|$)", content_type, re.IGNORECASE): if response_text == "": data = "" else: @@ -401,12 +410,14 @@ def __deserialize(self, data, klass): if klass in self.PRIMITIVE_TYPES: return self.__deserialize_primitive(data, klass) - elif klass == object: + elif klass is object: return self.__deserialize_object(data) - elif klass == datetime.date: + elif klass is datetime.date: return self.__deserialize_date(data) - elif klass == datetime.datetime: + elif klass is datetime.datetime: return self.__deserialize_datetime(data) + elif klass is decimal.Decimal: + return decimal.Decimal(data) elif issubclass(klass, Enum): return self.__deserialize_enum(data, klass) else: @@ -554,12 +565,14 @@ def __deserialize_file(self, response): os.close(fd) os.remove(path) - content_disposition = response.getheader("Content-Disposition") + content_disposition = response.headers.get("Content-Disposition") if content_disposition: m = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?', content_disposition) if m is None: raise ValueError("Unexpected 'content-disposition' header value") - filename = m.group(1) + filename = os.path.basename(m.group(1)) # Strip any directory traversal + if filename in ("", ".", ".."): # fall back to tmp filename + filename = os.path.basename(path) path = os.path.join(os.path.dirname(path), filename) with open(path, "wb") as f: diff --git a/services/serverbackup/src/stackit/serverbackup/exceptions.py b/services/serverbackup/src/stackit/serverbackup/exceptions.py index cab7ce2c7..2d829a0c2 100644 --- a/services/serverbackup/src/stackit/serverbackup/exceptions.py +++ b/services/serverbackup/src/stackit/serverbackup/exceptions.py @@ -130,7 +130,7 @@ def __init__( self.body = http_resp.data.decode("utf-8") except Exception: # noqa: S110 pass - self.headers = http_resp.getheaders() + self.headers = http_resp.headers @classmethod def from_response( diff --git a/services/serverbackup/src/stackit/serverbackup/models/__init__.py b/services/serverbackup/src/stackit/serverbackup/models/__init__.py index 312a47fd1..561d7d8eb 100644 --- a/services/serverbackup/src/stackit/serverbackup/models/__init__.py +++ b/services/serverbackup/src/stackit/serverbackup/models/__init__.py @@ -13,7 +13,6 @@ Do not edit the class manually. """ # noqa: E501 - # import models into model package from stackit.serverbackup.models.backup import Backup from stackit.serverbackup.models.backup_job import BackupJob diff --git a/services/serverbackup/src/stackit/serverbackup/models/backup.py b/services/serverbackup/src/stackit/serverbackup/models/backup.py index aa948df43..199c86e2d 100644 --- a/services/serverbackup/src/stackit/serverbackup/models/backup.py +++ b/services/serverbackup/src/stackit/serverbackup/models/backup.py @@ -110,9 +110,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in volume_backups (list) _items = [] if self.volume_backups: - for _item in self.volume_backups: - if _item: - _items.append(_item.to_dict()) + for _item_volume_backups in self.volume_backups: + if _item_volume_backups: + _items.append(_item_volume_backups.to_dict()) _dict["volumeBackups"] = _items return _dict diff --git a/services/serverbackup/src/stackit/serverbackup/models/enable_service_resource_payload.py b/services/serverbackup/src/stackit/serverbackup/models/enable_service_resource_payload.py index 6e89b7a06..2a6cef81a 100644 --- a/services/serverbackup/src/stackit/serverbackup/models/enable_service_resource_payload.py +++ b/services/serverbackup/src/stackit/serverbackup/models/enable_service_resource_payload.py @@ -17,8 +17,9 @@ import json import pprint from typing import Any, ClassVar, Dict, List, Optional, Set +from uuid import UUID -from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic import BaseModel, ConfigDict, Field from typing_extensions import Self @@ -27,7 +28,7 @@ class EnableServiceResourcePayload(BaseModel): EnableServiceResourcePayload """ # noqa: E501 - backup_policy_id: Optional[StrictStr] = Field(default=None, alias="backupPolicyId") + backup_policy_id: Optional[UUID] = Field(default=None, alias="backupPolicyId") __properties: ClassVar[List[str]] = ["backupPolicyId"] model_config = ConfigDict( diff --git a/services/serverbackup/src/stackit/serverbackup/models/get_backup_policies_response.py b/services/serverbackup/src/stackit/serverbackup/models/get_backup_policies_response.py index 76460f0fe..257b003cc 100644 --- a/services/serverbackup/src/stackit/serverbackup/models/get_backup_policies_response.py +++ b/services/serverbackup/src/stackit/serverbackup/models/get_backup_policies_response.py @@ -72,9 +72,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in items (list) _items = [] if self.items: - for _item in self.items: - if _item: - _items.append(_item.to_dict()) + for _item_items in self.items: + if _item_items: + _items.append(_item_items.to_dict()) _dict["items"] = _items return _dict diff --git a/services/serverbackup/src/stackit/serverbackup/models/get_backup_schedules_response.py b/services/serverbackup/src/stackit/serverbackup/models/get_backup_schedules_response.py index fab992128..d29eed1e1 100644 --- a/services/serverbackup/src/stackit/serverbackup/models/get_backup_schedules_response.py +++ b/services/serverbackup/src/stackit/serverbackup/models/get_backup_schedules_response.py @@ -72,9 +72,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in items (list) _items = [] if self.items: - for _item in self.items: - if _item: - _items.append(_item.to_dict()) + for _item_items in self.items: + if _item_items: + _items.append(_item_items.to_dict()) _dict["items"] = _items return _dict diff --git a/services/serverbackup/src/stackit/serverbackup/models/get_backups_list_response.py b/services/serverbackup/src/stackit/serverbackup/models/get_backups_list_response.py index 421e4ccf0..1c389101c 100644 --- a/services/serverbackup/src/stackit/serverbackup/models/get_backups_list_response.py +++ b/services/serverbackup/src/stackit/serverbackup/models/get_backups_list_response.py @@ -72,9 +72,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in items (list) _items = [] if self.items: - for _item in self.items: - if _item: - _items.append(_item.to_dict()) + for _item_items in self.items: + if _item_items: + _items.append(_item_items.to_dict()) _dict["items"] = _items return _dict diff --git a/services/serverbackup/src/stackit/serverbackup/rest.py b/services/serverbackup/src/stackit/serverbackup/rest.py index 63a54b1e0..ad616b964 100644 --- a/services/serverbackup/src/stackit/serverbackup/rest.py +++ b/services/serverbackup/src/stackit/serverbackup/rest.py @@ -39,12 +39,17 @@ def read(self): self.data = self.response.content return self.data + @property + def headers(self): + """Returns a dictionary of response headers.""" + return self.response.headers + def getheaders(self): - """Returns a dictionary of the response headers.""" + """Returns a dictionary of the response headers; use ``headers`` instead.""" return self.response.headers def getheader(self, name, default=None): - """Returns a given response header.""" + """Returns a given response header; use ``headers.get()`` instead.""" return self.response.headers.get(name, default) @@ -94,6 +99,7 @@ def request(self, method, url, headers=None, body=None, post_params=None, _reque url, data=request_body, headers=headers, + timeout=_request_timeout, ) elif content_type == "application/x-www-form-urlencoded": r = self.session.request( @@ -101,6 +107,7 @@ def request(self, method, url, headers=None, body=None, post_params=None, _reque url, params=post_params, headers=headers, + timeout=_request_timeout, ) elif content_type == "multipart/form-data": # must del headers['Content-Type'], or the correct @@ -114,6 +121,7 @@ def request(self, method, url, headers=None, body=None, post_params=None, _reque url, files=post_params, headers=headers, + timeout=_request_timeout, ) # Pass a `string` parameter directly in the body to support # other content types than JSON when `body` argument is @@ -124,10 +132,17 @@ def request(self, method, url, headers=None, body=None, post_params=None, _reque url, data=body, headers=headers, + timeout=_request_timeout, ) elif headers["Content-Type"].startswith("text/") and isinstance(body, bool): request_body = "true" if body else "false" - r = self.session.request(method, url, data=request_body, headers=headers) + r = self.session.request( + method, + url, + data=request_body, + headers=headers, + timeout=_request_timeout, + ) else: # Cannot generate the request from given parameters msg = """Cannot prepare a request message for provided @@ -141,6 +156,7 @@ def request(self, method, url, headers=None, body=None, post_params=None, _reque url, params={}, headers=headers, + timeout=_request_timeout, ) except requests.exceptions.SSLError as e: msg = "\n".join([type(e).__name__, str(e)])