Skip to content
Open
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
2 changes: 1 addition & 1 deletion services/serviceaccount/oas_commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb550f3c2129447568c2855337b1874968e033bb
0e64886dd0847341800d7191ed193b75413be998

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,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 @@ -63,8 +65,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 @@ -267,7 +271,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 @@ -284,7 +288,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 @@ -296,6 +300,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 @@ -311,12 +316,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 @@ -326,7 +335,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__
Expand Down Expand Up @@ -354,7 +363,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 @@ -400,12 +409,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 @@ -553,12 +564,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
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
Do not edit the class manually.
""" # noqa: E501


# import models into model package
from stackit.serviceaccount.models.access_token import AccessToken
from stackit.serviceaccount.models.access_token_metadata import AccessTokenMetadata
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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,7 +38,7 @@ class AccessToken(BaseModel):

active: StrictBool = Field(description="Newly created access tokens are valid, and can be revoked if needed.")
created_at: datetime = Field(description="Creation time of the access token.", alias="createdAt")
id: StrictStr = Field(description="Unique ID of the access token. Also used as JTI field.")
id: UUID = Field(description="Unique ID of the access token. Also used as JTI field.")
token: StrictStr = Field(
description="The access token in JWT format. Use this with `Bearer` prefix for API calls. Store it, as it is not recoverable later."
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@
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,
StrictBool,
StrictStr,
field_validator,
)
from pydantic import BaseModel, ConfigDict, Field, StrictBool, field_validator
from typing_extensions import Self


Expand All @@ -39,7 +33,7 @@ class AccessTokenMetadata(BaseModel):
description="If true, access token can be used for authorized API calls, if false, the token is not usable anymore."
)
created_at: datetime = Field(description="Creation time of the access token.", alias="createdAt")
id: StrictStr = Field(description="Unique ID of the access token. Also used as JTI field.")
id: UUID = Field(description="Unique ID of the access token. Also used as JTI field.")
valid_until: datetime = Field(
description="Approximate expiration time of the access token. Check the JWT for actual validity date.",
alias="validUntil",
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 assertions (list)
_items = []
if self.assertions:
for _item in self.assertions:
if _item:
_items.append(_item.to_dict())
for _item_assertions in self.assertions:
if _item_assertions:
_items.append(_item_assertions.to_dict())
_dict["assertions"] = _items
return _dict

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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 @@ -42,7 +43,7 @@ class CreateServiceAccountKeyResponse(BaseModel):
active: StrictBool
created_at: datetime = Field(description="Creation time of the key", alias="createdAt")
credentials: CreateServiceAccountKeyResponseCredentials
id: StrictStr = Field(description="Unique ID of the key.")
id: UUID = Field(description="Unique ID of the key.")
key_algorithm: StrictStr = Field(alias="keyAlgorithm")
key_origin: StrictStr = Field(alias="keyOrigin")
key_type: StrictStr = Field(alias="keyType")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,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 @@ -34,7 +35,7 @@ class CreateServiceAccountKeyResponseCredentials(BaseModel):
description="Private key. Only present, if the service account API was generating the key. Not recoverable later.",
alias="privateKey",
)
sub: StrictStr = Field(description="Service account id")
sub: UUID = Field(description="Service account id")
__properties: ClassVar[List[str]] = ["aud", "iss", "kid", "privateKey", "sub"]

model_config = ConfigDict(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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 @@ -36,7 +37,7 @@ class FederatedIdentityProvider(BaseModel):
description="list of assertions of the federated identity provider"
)
created_at: datetime = Field(description="Creation time of the federated identity provider.", alias="createdAt")
id: Optional[StrictStr] = Field(default=None, description="Unique ID of the federated identity provider.")
id: Optional[UUID] = Field(default=None, description="Unique ID of the federated identity provider.")
issuer: StrictStr = Field(description="Issuer of the federated identity provider.")
name: StrictStr = Field(description="Unique name of the federated identity provider.")
updated_at: datetime = Field(description="Last update time of the federated identity provider.", alias="updatedAt")
Expand Down Expand Up @@ -108,9 +109,9 @@ def to_dict(self) -> Dict[str, Any]:
# override the default output from pydantic by calling `to_dict()` of each item in assertions (list)
_items = []
if self.assertions:
for _item in self.assertions:
if _item:
_items.append(_item.to_dict())
for _item_assertions in self.assertions:
if _item_assertions:
_items.append(_item_assertions.to_dict())
_dict["assertions"] = _items
return _dict

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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 @@ -42,7 +43,7 @@ class GetServiceAccountKeyResponse(BaseModel):
active: StrictBool
created_at: datetime = Field(description="Creation time of the key", alias="createdAt")
credentials: GetServiceAccountKeyResponseCredentials
id: StrictStr = Field(description="Unique ID of the key.")
id: UUID = Field(description="Unique ID of the key.")
key_algorithm: StrictStr = Field(alias="keyAlgorithm")
key_origin: StrictStr = Field(alias="keyOrigin")
key_type: StrictStr = Field(alias="keyType")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,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,7 +30,7 @@ class GetServiceAccountKeyResponseCredentials(BaseModel):
aud: StrictStr = Field(description="Audience - service account API URL")
iss: StrictStr = Field(description="Service account email")
kid: StrictStr = Field(description="Key id to use")
sub: StrictStr = Field(description="Service account id")
sub: UUID = Field(description="Service account id")
__properties: ClassVar[List[str]] = ["aud", "iss", "kid", "sub"]

model_config = ConfigDict(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ def to_dict(self) -> Dict[str, Any]:
# override the default output from pydantic by calling `to_dict()` of each item in keys (list)
_items = []
if self.keys:
for _item in self.keys:
if _item:
_items.append(_item.to_dict())
for _item_keys in self.keys:
if _item_keys:
_items.append(_item_keys.to_dict())
_dict["keys"] = _items
return _dict

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,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

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 assertions (list)
_items = []
if self.assertions:
for _item in self.assertions:
if _item:
_items.append(_item.to_dict())
for _item_assertions in self.assertions:
if _item_assertions:
_items.append(_item_assertions.to_dict())
_dict["assertions"] = _items
return _dict

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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,7 +38,7 @@ class PartialUpdateServiceAccountKeyResponse(BaseModel):

active: StrictBool
created_at: datetime = Field(description="Creation time of the key", alias="createdAt")
id: StrictStr = Field(description="Unique ID of the key.")
id: UUID = Field(description="Unique ID of the key.")
key_algorithm: StrictStr = Field(alias="keyAlgorithm")
key_origin: StrictStr = Field(alias="keyOrigin")
key_type: StrictStr = Field(alias="keyType")
Expand Down
Loading
Loading