Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions services/scf/oas_commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0e64886dd0847341800d7191ed193b75413be998
589 changes: 295 additions & 294 deletions services/scf/src/stackit/scf/api/default_api.py

Large diffs are not rendered by default.

31 changes: 22 additions & 9 deletions services/scf/src/stackit/scf/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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,
)

Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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__
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion services/scf/src/stackit/scf/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion services/scf/src/stackit/scf/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
Do not edit the class manually.
""" # noqa: E501


# import models into model package
from stackit.scf.models.apply_organization_quota_payload import (
ApplyOrganizationQuotaPayload,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -27,7 +28,7 @@ class ApplyOrganizationQuotaPayload(BaseModel):
ApplyOrganizationQuotaPayload
""" # noqa: E501

quota_id: StrictStr = Field(alias="quotaId")
quota_id: UUID = Field(alias="quotaId")
__properties: ClassVar[List[str]] = ["quotaId"]

model_config = ConfigDict(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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 typing_extensions import Self
Expand All @@ -30,7 +31,7 @@ class CreateOrgRolePayload(BaseModel):
""" # noqa: E501

type: OrgRoleType
user_guid: Optional[StrictStr] = Field(default=None, alias="userGuid")
user_guid: Optional[UUID] = Field(default=None, alias="userGuid")
user_name: Optional[StrictStr] = Field(default=None, alias="userName")
__properties: ClassVar[List[str]] = ["type", "userGuid", "userName"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Annotated, Self


Expand All @@ -28,7 +29,7 @@ class CreateOrganizationPayload(BaseModel):
""" # noqa: E501

name: Annotated[str, Field(min_length=1, strict=True, max_length=255)]
platform_id: Optional[StrictStr] = Field(default=None, alias="platformId")
platform_id: Optional[UUID] = Field(default=None, alias="platformId")
__properties: ClassVar[List[str]] = ["name", "platformId"]

model_config = ConfigDict(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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 typing_extensions import Self
Expand All @@ -30,7 +31,7 @@ class CreateSpaceRolePayload(BaseModel):
""" # noqa: E501

type: SpaceRoleType
user_guid: Optional[StrictStr] = Field(default=None, alias="userGuid")
user_guid: Optional[UUID] = Field(default=None, alias="userGuid")
user_name: Optional[StrictStr] = Field(default=None, alias="userName")
__properties: ClassVar[List[str]] = ["type", "userGuid", "userName"]

Expand Down
9 changes: 5 additions & 4 deletions services/scf/src/stackit/scf/models/isolation_segment.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import re # noqa: F401
from datetime import datetime
from typing import Any, ClassVar, Dict, List, Optional, Set
from uuid import UUID

from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
from typing_extensions import Self
Expand All @@ -30,11 +31,11 @@ class IsolationSegment(BaseModel):
""" # noqa: E501

created_at: datetime = Field(alias="createdAt")
guid: StrictStr
guid: UUID
name: StrictStr
org_id: StrictStr = Field(alias="orgId")
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
org_id: UUID = Field(alias="orgId")
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
region: StrictStr
updated_at: datetime = Field(alias="updatedAt")
__properties: ClassVar[List[str]] = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ def to_dict(self) -> Dict[str, Any]:
# override the default output from pydantic by calling `to_dict()` of each item in resources (list)
_items = []
if self.resources:
for _item in self.resources:
if _item:
_items.append(_item.to_dict())
for _item_resources in self.resources:
if _item_resources:
_items.append(_item_resources.to_dict())
_dict["resources"] = _items
return _dict

Expand Down
9 changes: 5 additions & 4 deletions services/scf/src/stackit/scf/models/org_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import re # noqa: F401
from datetime import datetime
from typing import Any, ClassVar, Dict, List, Optional, Set
from uuid import UUID

from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
from typing_extensions import Self
Expand All @@ -30,10 +31,10 @@ class OrgManager(BaseModel):
""" # noqa: E501

created_at: datetime = Field(alias="createdAt")
guid: StrictStr
org_id: StrictStr = Field(alias="orgId")
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
guid: UUID
org_id: UUID = Field(alias="orgId")
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
region: StrictStr
updated_at: datetime = Field(alias="updatedAt")
username: StrictStr
Expand Down
9 changes: 5 additions & 4 deletions services/scf/src/stackit/scf/models/org_manager_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import re # noqa: F401
from datetime import datetime
from typing import Any, ClassVar, Dict, List, Optional, Set
from uuid import UUID

from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
from typing_extensions import Self
Expand All @@ -30,11 +31,11 @@ class OrgManagerResponse(BaseModel):
""" # noqa: E501

created_at: datetime = Field(alias="createdAt")
guid: StrictStr
org_id: StrictStr = Field(alias="orgId")
guid: UUID
org_id: UUID = Field(alias="orgId")
password: StrictStr
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
region: StrictStr
updated_at: datetime = Field(alias="updatedAt")
username: StrictStr
Expand Down
9 changes: 5 additions & 4 deletions services/scf/src/stackit/scf/models/org_role_response.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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 typing_extensions import Self
Expand All @@ -29,10 +30,10 @@ class OrgRoleResponse(BaseModel):
OrgRoleResponse
""" # noqa: E501

guid: StrictStr
org_id: StrictStr = Field(alias="orgId")
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
guid: UUID
org_id: UUID = Field(alias="orgId")
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
region: StrictStr
type: OrgRoleType
__properties: ClassVar[List[str]] = ["guid", "orgId", "platformId", "projectId", "region", "type"]
Expand Down
9 changes: 5 additions & 4 deletions services/scf/src/stackit/scf/models/organization.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import re # noqa: F401
from datetime import datetime
from typing import Any, ClassVar, Dict, List, Optional, Set
from uuid import UUID

from pydantic import (
BaseModel,
Expand All @@ -37,11 +38,11 @@ class Organization(BaseModel):
""" # noqa: E501

created_at: datetime = Field(alias="createdAt")
guid: StrictStr
guid: UUID
name: StrictStr
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
quota_id: StrictStr = Field(alias="quotaId")
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
quota_id: UUID = Field(alias="quotaId")
region: StrictStr
status: StrictStr = Field(
description="The organization's status. The status value starts with `deleting` when a deleting request is in progress. The status value starts with `delete_failed` when the deletion failed. The status value can be different from `deleting` and `delete_failed`. Additional details can be provided in the future. "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ def to_dict(self) -> Dict[str, Any]:
# override the default output from pydantic by calling `to_dict()` of each value in roles (dict)
_field_dict = {}
if self.roles:
for _key in self.roles:
if self.roles[_key]:
_field_dict[_key] = self.roles[_key].to_dict()
for _key_roles in self.roles:
if self.roles[_key_roles]:
_field_dict[_key_roles] = self.roles[_key_roles].to_dict()
_dict["roles"] = _field_dict
return _dict

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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 typing_extensions import Self
Expand All @@ -27,9 +28,9 @@ class OrganizationCreateResponse(BaseModel):
OrganizationCreateResponse
""" # noqa: E501

guid: StrictStr
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
guid: UUID
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
region: StrictStr
__properties: ClassVar[List[str]] = ["guid", "platformId", "projectId", "region"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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 typing_extensions import Self
Expand All @@ -27,9 +28,9 @@ class OrganizationDeleteResponse(BaseModel):
OrganizationDeleteResponse
""" # noqa: E501

guid: StrictStr
platform_id: StrictStr = Field(alias="platformId")
project_id: StrictStr = Field(alias="projectId")
guid: UUID
platform_id: UUID = Field(alias="platformId")
project_id: UUID = Field(alias="projectId")
region: StrictStr
__properties: ClassVar[List[str]] = ["guid", "platformId", "projectId", "region"]

Expand Down
Loading
Loading