Skip to content

refactor(audit_trail): rename vpc_vpc_connector #1655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estellesoulard merged 1 commit into from
Mar 18, 2026
Merged

refactor(audit_trail): rename vpc_vpc_connector #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions scaleway-async/scaleway_async/audit_trail/v1alpha1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
from .types import LoadBalancerRouteInfo
from .types import SecretManagerSecretInfo
from .types import SecretManagerSecretVersionInfo
from .types import VpcConnectorInfo
from .types import VpcGwGatewayInfo
from .types import VpcGwGatewayNetworkInfo
from .types import VpcPrivateNetworkInfo
from .types import VpcRouteInfo
from .types import VpcSubnetInfo
from .types import VpcVpcConnectorInfo
from .types import Resource
from .types import EventPrincipal
from .types import AuthenticationEvent
Expand Down Expand Up @@ -145,12 +145,12 @@
"LoadBalancerRouteInfo",
"SecretManagerSecretInfo",
"SecretManagerSecretVersionInfo",
"VpcConnectorInfo",
"VpcGwGatewayInfo",
"VpcGwGatewayNetworkInfo",
"VpcPrivateNetworkInfo",
"VpcRouteInfo",
"VpcSubnetInfo",
"VpcVpcConnectorInfo",
"Resource",
"EventPrincipal",
"AuthenticationEvent",
Expand Down
54 changes: 27 additions & 27 deletions scaleway-async/scaleway_async/audit_trail/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
LoadBalancerRouteInfo,
SecretManagerSecretInfo,
SecretManagerSecretVersionInfo,
VpcConnectorInfo,
VpcGwGatewayInfo,
VpcGwGatewayNetworkInfo,
VpcPrivateNetworkInfo,
VpcRouteInfo,
VpcSubnetInfo,
VpcVpcConnectorInfo,
Resource,
AuthenticationEvent,
ListAuthenticationEventsResponse,
Expand Down Expand Up @@ -1004,6 +1004,29 @@ def unmarshal_SecretManagerSecretVersionInfo(
return SecretManagerSecretVersionInfo(**args)


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

args: dict[str, Any] = {}

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

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

return VpcConnectorInfo(**args)


def unmarshal_VpcGwGatewayInfo(data: Any) -> VpcGwGatewayInfo:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -1143,29 +1166,6 @@ def unmarshal_VpcSubnetInfo(data: Any) -> VpcSubnetInfo:
return VpcSubnetInfo(**args)


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

args: dict[str, Any] = {}

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

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

return VpcVpcConnectorInfo(**args)


def unmarshal_Resource(data: Any) -> Resource:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -1484,11 +1484,11 @@ def unmarshal_Resource(data: Any) -> Resource:
else:
args["audit_trail_alert_rule_info"] = None

field = data.get("vpc_vpc_connector_info", None)
field = data.get("vpc_connector_info", None)
if field is not None:
args["vpc_vpc_connector_info"] = unmarshal_VpcVpcConnectorInfo(field)
args["vpc_connector_info"] = unmarshal_VpcConnectorInfo(field)
else:
args["vpc_vpc_connector_info"] = None
args["vpc_connector_info"] = None

return Resource(**args)

Expand Down
16 changes: 8 additions & 8 deletions scaleway-async/scaleway_async/audit_trail/v1alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
VPC_SUBNET = "vpc_subnet"
VPC_ROUTE = "vpc_route"
VPC_ACL = "vpc_acl"
VPC_VPC_CONNECTOR = "vpc_vpc_connector"
VPC_CONNECTOR = "vpc_connector"
EDGE_SERVICES_PLAN = "edge_services_plan"
EDGE_SERVICES_PIPELINE = "edge_services_pipeline"
EDGE_SERVICES_DNS_STAGE = "edge_services_dns_stage"
Expand Down Expand Up @@ -426,6 +426,12 @@ class SecretManagerSecretVersionInfo:
revision: int


@dataclass
class VpcConnectorInfo:
vpc_id: str
target_vpc_id: str


@dataclass
class VpcGwGatewayInfo:
gateway_type_id: str
Expand Down Expand Up @@ -460,12 +466,6 @@ class VpcSubnetInfo:
vpc_id: str


@dataclass
class VpcVpcConnectorInfo:
vpc_id: str
target_vpc_id: str


@dataclass
class Resource:
id: str
Expand Down Expand Up @@ -560,7 +560,7 @@ class Resource:

audit_trail_alert_rule_info: Optional[AuditTrailAlertRuleInfo] = None

vpc_vpc_connector_info: Optional[VpcVpcConnectorInfo] = None
vpc_connector_info: Optional[VpcConnectorInfo] = None


@dataclass
Expand Down
4 changes: 2 additions & 2 deletions scaleway/scaleway/audit_trail/v1alpha1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
from .types import LoadBalancerRouteInfo
from .types import SecretManagerSecretInfo
from .types import SecretManagerSecretVersionInfo
from .types import VpcConnectorInfo
from .types import VpcGwGatewayInfo
from .types import VpcGwGatewayNetworkInfo
from .types import VpcPrivateNetworkInfo
from .types import VpcRouteInfo
from .types import VpcSubnetInfo
from .types import VpcVpcConnectorInfo
from .types import Resource
from .types import EventPrincipal
from .types import AuthenticationEvent
Expand Down Expand Up @@ -145,12 +145,12 @@
"LoadBalancerRouteInfo",
"SecretManagerSecretInfo",
"SecretManagerSecretVersionInfo",
"VpcConnectorInfo",
"VpcGwGatewayInfo",
"VpcGwGatewayNetworkInfo",
"VpcPrivateNetworkInfo",
"VpcRouteInfo",
"VpcSubnetInfo",
"VpcVpcConnectorInfo",
"Resource",
"EventPrincipal",
"AuthenticationEvent",
Expand Down
54 changes: 27 additions & 27 deletions scaleway/scaleway/audit_trail/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
LoadBalancerRouteInfo,
SecretManagerSecretInfo,
SecretManagerSecretVersionInfo,
VpcConnectorInfo,
VpcGwGatewayInfo,
VpcGwGatewayNetworkInfo,
VpcPrivateNetworkInfo,
VpcRouteInfo,
VpcSubnetInfo,
VpcVpcConnectorInfo,
Resource,
AuthenticationEvent,
ListAuthenticationEventsResponse,
Expand Down Expand Up @@ -1004,6 +1004,29 @@ def unmarshal_SecretManagerSecretVersionInfo(
return SecretManagerSecretVersionInfo(**args)


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

args: dict[str, Any] = {}

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

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

return VpcConnectorInfo(**args)


def unmarshal_VpcGwGatewayInfo(data: Any) -> VpcGwGatewayInfo:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -1143,29 +1166,6 @@ def unmarshal_VpcSubnetInfo(data: Any) -> VpcSubnetInfo:
return VpcSubnetInfo(**args)


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

args: dict[str, Any] = {}

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

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

return VpcVpcConnectorInfo(**args)


def unmarshal_Resource(data: Any) -> Resource:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -1484,11 +1484,11 @@ def unmarshal_Resource(data: Any) -> Resource:
else:
args["audit_trail_alert_rule_info"] = None

field = data.get("vpc_vpc_connector_info", None)
field = data.get("vpc_connector_info", None)
if field is not None:
args["vpc_vpc_connector_info"] = unmarshal_VpcVpcConnectorInfo(field)
args["vpc_connector_info"] = unmarshal_VpcConnectorInfo(field)
else:
args["vpc_vpc_connector_info"] = None
args["vpc_connector_info"] = None

return Resource(**args)

Expand Down
16 changes: 8 additions & 8 deletions scaleway/scaleway/audit_trail/v1alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
VPC_SUBNET = "vpc_subnet"
VPC_ROUTE = "vpc_route"
VPC_ACL = "vpc_acl"
VPC_VPC_CONNECTOR = "vpc_vpc_connector"
VPC_CONNECTOR = "vpc_connector"
EDGE_SERVICES_PLAN = "edge_services_plan"
EDGE_SERVICES_PIPELINE = "edge_services_pipeline"
EDGE_SERVICES_DNS_STAGE = "edge_services_dns_stage"
Expand Down Expand Up @@ -426,6 +426,12 @@ class SecretManagerSecretVersionInfo:
revision: int


@dataclass
class VpcConnectorInfo:
vpc_id: str
target_vpc_id: str


@dataclass
class VpcGwGatewayInfo:
gateway_type_id: str
Expand Down Expand Up @@ -460,12 +466,6 @@ class VpcSubnetInfo:
vpc_id: str


@dataclass
class VpcVpcConnectorInfo:
vpc_id: str
target_vpc_id: str


@dataclass
class Resource:
id: str
Expand Down Expand Up @@ -560,7 +560,7 @@ class Resource:

audit_trail_alert_rule_info: Optional[AuditTrailAlertRuleInfo] = None

vpc_vpc_connector_info: Optional[VpcVpcConnectorInfo] = None
vpc_connector_info: Optional[VpcConnectorInfo] = None


@dataclass
Expand Down
Loading