Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from .types import ResourceType
from .types import AccountOrganizationInfo
from .types import AccountUserInfo
from .types import InstanceServerInfo
from .types import KeyManagerKeyInfo
from .types import KubernetesACLInfo
from .types import KubernetesClusterInfo
Expand All @@ -27,6 +28,7 @@
"ResourceType",
"AccountOrganizationInfo",
"AccountUserInfo",
"InstanceServerInfo",
"KeyManagerKeyInfo",
"KubernetesACLInfo",
"KubernetesClusterInfo",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from .types import (
AccountOrganizationInfo,
AccountUserInfo,
InstanceServerInfo,
KeyManagerKeyInfo,
KubernetesACLInfo,
KubernetesClusterInfo,
Expand Down Expand Up @@ -56,6 +57,21 @@ def unmarshal_AccountUserInfo(data: Any) -> AccountUserInfo:
return AccountUserInfo(**args)


def unmarshal_InstanceServerInfo(data: Any) -> InstanceServerInfo:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'InstanceServerInfo' failed as data isn't a dictionary."
)

args: Dict[str, Any] = {}

field = data.get("name", None)
if field is not None:
args["name"] = field

return InstanceServerInfo(**args)


def unmarshal_KeyManagerKeyInfo(data: Any) -> KeyManagerKeyInfo:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -296,6 +312,12 @@ def unmarshal_Resource(data: Any) -> Resource:
else:
args["account_organization_info"] = None

field = data.get("instance_server_info", None)
if field is not None:
args["instance_server_info"] = unmarshal_InstanceServerInfo(field)
else:
args["instance_server_info"] = None

return Resource(**args)


Expand Down
8 changes: 8 additions & 0 deletions scaleway-async/scaleway_async/audit_trail/v1alpha1/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
KEY_MANAGER_KEY = "key_manager_key"
ACCOUNT_USER = "account_user"
ACCOUNT_ORGANIZATION = "account_organization"
INSTANCE_SERVER = "instance_server"

def __str__(self) -> str:
return str(self.value)
Expand All @@ -61,6 +62,11 @@ class AccountUserInfo:
phone_number: Optional[str]


@dataclass
class InstanceServerInfo:
name: str


@dataclass
class KeyManagerKeyInfo:
pass
Expand Down Expand Up @@ -145,6 +151,8 @@ class Resource:

account_organization_info: Optional[AccountOrganizationInfo]

instance_server_info: Optional[InstanceServerInfo]


@dataclass
class ProductService:
Expand Down
2 changes: 2 additions & 0 deletions scaleway/scaleway/audit_trail/v1alpha1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from .types import ResourceType
from .types import AccountOrganizationInfo
from .types import AccountUserInfo
from .types import InstanceServerInfo
from .types import KeyManagerKeyInfo
from .types import KubernetesACLInfo
from .types import KubernetesClusterInfo
Expand All @@ -27,6 +28,7 @@
"ResourceType",
"AccountOrganizationInfo",
"AccountUserInfo",
"InstanceServerInfo",
"KeyManagerKeyInfo",
"KubernetesACLInfo",
"KubernetesClusterInfo",
Expand Down
22 changes: 22 additions & 0 deletions scaleway/scaleway/audit_trail/v1alpha1/marshalling.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from .types import (
AccountOrganizationInfo,
AccountUserInfo,
InstanceServerInfo,
KeyManagerKeyInfo,
KubernetesACLInfo,
KubernetesClusterInfo,
Expand Down Expand Up @@ -56,6 +57,21 @@ def unmarshal_AccountUserInfo(data: Any) -> AccountUserInfo:
return AccountUserInfo(**args)


def unmarshal_InstanceServerInfo(data: Any) -> InstanceServerInfo:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'InstanceServerInfo' failed as data isn't a dictionary."
)

args: Dict[str, Any] = {}

field = data.get("name", None)
if field is not None:
args["name"] = field

return InstanceServerInfo(**args)


def unmarshal_KeyManagerKeyInfo(data: Any) -> KeyManagerKeyInfo:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -296,6 +312,12 @@ def unmarshal_Resource(data: Any) -> Resource:
else:
args["account_organization_info"] = None

field = data.get("instance_server_info", None)
if field is not None:
args["instance_server_info"] = unmarshal_InstanceServerInfo(field)
else:
args["instance_server_info"] = None

return Resource(**args)


Expand Down
8 changes: 8 additions & 0 deletions scaleway/scaleway/audit_trail/v1alpha1/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
KEY_MANAGER_KEY = "key_manager_key"
ACCOUNT_USER = "account_user"
ACCOUNT_ORGANIZATION = "account_organization"
INSTANCE_SERVER = "instance_server"

def __str__(self) -> str:
return str(self.value)
Expand All @@ -61,6 +62,11 @@ class AccountUserInfo:
phone_number: Optional[str]


@dataclass
class InstanceServerInfo:
name: str


@dataclass
class KeyManagerKeyInfo:
pass
Expand Down Expand Up @@ -145,6 +151,8 @@ class Resource:

account_organization_info: Optional[AccountOrganizationInfo]

instance_server_info: Optional[InstanceServerInfo]


@dataclass
class ProductService:
Expand Down