diff --git a/services/mongodbflex/oas_commit b/services/mongodbflex/oas_commit new file mode 100644 index 000000000..e3713dde3 --- /dev/null +++ b/services/mongodbflex/oas_commit @@ -0,0 +1 @@ +0e64886dd0847341800d7191ed193b75413be998 diff --git a/services/mongodbflex/src/stackit/mongodbflex/api_client.py b/services/mongodbflex/src/stackit/mongodbflex/api_client.py index 46fb6b4fb..6e913bf39 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/api_client.py +++ b/services/mongodbflex/src/stackit/mongodbflex/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")): # noqa: B009 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/mongodbflex/src/stackit/mongodbflex/exceptions.py b/services/mongodbflex/src/stackit/mongodbflex/exceptions.py index 4c4dcdec8..12b2d7b01 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/exceptions.py +++ b/services/mongodbflex/src/stackit/mongodbflex/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/mongodbflex/src/stackit/mongodbflex/models/__init__.py b/services/mongodbflex/src/stackit/mongodbflex/models/__init__.py index cbf183261..bf5d7d940 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/__init__.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/__init__.py @@ -13,7 +13,6 @@ Do not edit the class manually. """ # noqa: E501 - # import models into model package from stackit.mongodbflex.models.acl import ACL from stackit.mongodbflex.models.backup import Backup diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_slow_queries_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_slow_queries_response.py index 4e7014b1c..bbde5dbd9 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_slow_queries_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_slow_queries_response.py @@ -76,9 +76,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in slow_queries (list) _items = [] if self.slow_queries: - for _item in self.slow_queries: - if _item: - _items.append(_item.to_dict()) + for _item_slow_queries in self.slow_queries: + if _item_slow_queries: + _items.append(_item_slow_queries.to_dict()) _dict["slowQueries"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_suggested_indexes_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_suggested_indexes_response.py index 27355987f..8614abb58 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_suggested_indexes_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/handlers_instances_suggested_indexes_response.py @@ -81,16 +81,16 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in shapes (list) _items = [] if self.shapes: - for _item in self.shapes: - if _item: - _items.append(_item.to_dict()) + for _item_shapes in self.shapes: + if _item_shapes: + _items.append(_item_shapes.to_dict()) _dict["shapes"] = _items # override the default output from pydantic by calling `to_dict()` of each item in suggested_indexes (list) _items = [] if self.suggested_indexes: - for _item in self.suggested_indexes: - if _item: - _items.append(_item.to_dict()) + for _item_suggested_indexes in self.suggested_indexes: + if _item_suggested_indexes: + _items.append(_item_suggested_indexes.to_dict()) _dict["suggestedIndexes"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/host.py b/services/mongodbflex/src/stackit/mongodbflex/models/host.py index aa76dbbf4..136f8ba2f 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/host.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/host.py @@ -73,9 +73,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in host_metrics (list) _items = [] if self.host_metrics: - for _item in self.host_metrics: - if _item: - _items.append(_item.to_dict()) + for _item_host_metrics in self.host_metrics: + if _item_host_metrics: + _items.append(_item_host_metrics.to_dict()) _dict["hostMetrics"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/host_metric.py b/services/mongodbflex/src/stackit/mongodbflex/models/host_metric.py index 7c923f072..62cf661e8 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/host_metric.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/host_metric.py @@ -74,9 +74,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in datapoints (list) _items = [] if self.datapoints: - for _item in self.datapoints: - if _item: - _items.append(_item.to_dict()) + for _item_datapoints in self.datapoints: + if _item_datapoints: + _items.append(_item_datapoints.to_dict()) _dict["datapoints"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/list_backups_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/list_backups_response.py index e81fdc6cb..563de3898 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/list_backups_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/list_backups_response.py @@ -73,9 +73,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/mongodbflex/src/stackit/mongodbflex/models/list_flavors_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/list_flavors_response.py index ffb42d64d..9822a8279 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/list_flavors_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/list_flavors_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 flavors (list) _items = [] if self.flavors: - for _item in self.flavors: - if _item: - _items.append(_item.to_dict()) + for _item_flavors in self.flavors: + if _item_flavors: + _items.append(_item_flavors.to_dict()) _dict["flavors"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/list_instances_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/list_instances_response.py index f43a4fc29..587878ad9 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/list_instances_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/list_instances_response.py @@ -73,9 +73,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/mongodbflex/src/stackit/mongodbflex/models/list_metrics_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/list_metrics_response.py index 222f54ba2..e7fbe0329 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/list_metrics_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/list_metrics_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 hosts (list) _items = [] if self.hosts: - for _item in self.hosts: - if _item: - _items.append(_item.to_dict()) + for _item_hosts in self.hosts: + if _item_hosts: + _items.append(_item_hosts.to_dict()) _dict["hosts"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/models/list_restore_jobs_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/list_restore_jobs_response.py index af32667df..38074eaaa 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/list_restore_jobs_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/list_restore_jobs_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/mongodbflex/src/stackit/mongodbflex/models/list_users_response.py b/services/mongodbflex/src/stackit/mongodbflex/models/list_users_response.py index d7723ce53..2e859039b 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/list_users_response.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/list_users_response.py @@ -73,9 +73,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/mongodbflex/src/stackit/mongodbflex/models/shape.py b/services/mongodbflex/src/stackit/mongodbflex/models/shape.py index c0c1f4df6..98fbda93a 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/models/shape.py +++ b/services/mongodbflex/src/stackit/mongodbflex/models/shape.py @@ -97,9 +97,9 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of each item in operations (list) _items = [] if self.operations: - for _item in self.operations: - if _item: - _items.append(_item.to_dict()) + for _item_operations in self.operations: + if _item_operations: + _items.append(_item_operations.to_dict()) _dict["operations"] = _items return _dict diff --git a/services/mongodbflex/src/stackit/mongodbflex/rest.py b/services/mongodbflex/src/stackit/mongodbflex/rest.py index a8bfd49af..80c346cc7 100644 --- a/services/mongodbflex/src/stackit/mongodbflex/rest.py +++ b/services/mongodbflex/src/stackit/mongodbflex/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)])