Skip to content

Commit a238b69

Browse files
scaleway-botscaleway-bot
authored
refactor(audit_trail): rename vpc_vpc_connector (scaleway#1655)
1 parent 1efff0a commit a238b69

6 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎scaleway-async/scaleway_async/audit_trail/v1alpha1/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
from .types import LoadBalancerRouteInfo
5252
from .types import SecretManagerSecretInfo
5353
from .types import SecretManagerSecretVersionInfo
54+
from .types import VpcConnectorInfo
5455
from .types import VpcGwGatewayInfo
5556
from .types import VpcGwGatewayNetworkInfo
5657
from .types import VpcPrivateNetworkInfo
5758
from .types import VpcRouteInfo
5859
from .types import VpcSubnetInfo
59-
from .types import VpcVpcConnectorInfo
6060
from .types import Resource
6161
from .types import EventPrincipal
6262
from .types import AuthenticationEvent
@@ -145,12 +145,12 @@
145145
"LoadBalancerRouteInfo",
146146
"SecretManagerSecretInfo",
147147
"SecretManagerSecretVersionInfo",
148+
"VpcConnectorInfo",
148149
"VpcGwGatewayInfo",
149150
"VpcGwGatewayNetworkInfo",
150151
"VpcPrivateNetworkInfo",
151152
"VpcRouteInfo",
152153
"VpcSubnetInfo",
153-
"VpcVpcConnectorInfo",
154154
"Resource",
155155
"EventPrincipal",
156156
"AuthenticationEvent",

‎scaleway-async/scaleway_async/audit_trail/v1alpha1/marshalling.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
LoadBalancerRouteInfo,
6161
SecretManagerSecretInfo,
6262
SecretManagerSecretVersionInfo,
63+
VpcConnectorInfo,
6364
VpcGwGatewayInfo,
6465
VpcGwGatewayNetworkInfo,
6566
VpcPrivateNetworkInfo,
6667
VpcRouteInfo,
6768
VpcSubnetInfo,
68-
VpcVpcConnectorInfo,
6969
Resource,
7070
AuthenticationEvent,
7171
ListAuthenticationEventsResponse,
@@ -1004,6 +1004,29 @@ def unmarshal_SecretManagerSecretVersionInfo(
10041004
return SecretManagerSecretVersionInfo(**args)
10051005

10061006

1007+
def unmarshal_VpcConnectorInfo(data: Any) -> VpcConnectorInfo:
1008+
if not isinstance(data, dict):
1009+
raise TypeError(
1010+
"Unmarshalling the type 'VpcConnectorInfo' failed as data isn't a dictionary."
1011+
)
1012+
1013+
args: dict[str, Any] = {}
1014+
1015+
field = data.get("vpc_id", None)
1016+
if field is not None:
1017+
args["vpc_id"] = field
1018+
else:
1019+
args["vpc_id"] = None
1020+
1021+
field = data.get("target_vpc_id", None)
1022+
if field is not None:
1023+
args["target_vpc_id"] = field
1024+
else:
1025+
args["target_vpc_id"] = None
1026+
1027+
return VpcConnectorInfo(**args)
1028+
1029+
10071030
def unmarshal_VpcGwGatewayInfo(data: Any) -> VpcGwGatewayInfo:
10081031
if not isinstance(data, dict):
10091032
raise TypeError(
@@ -1143,29 +1166,6 @@ def unmarshal_VpcSubnetInfo(data: Any) -> VpcSubnetInfo:
11431166
return VpcSubnetInfo(**args)
11441167

11451168

1146-
def unmarshal_VpcVpcConnectorInfo(data: Any) -> VpcVpcConnectorInfo:
1147-
if not isinstance(data, dict):
1148-
raise TypeError(
1149-
"Unmarshalling the type 'VpcVpcConnectorInfo' failed as data isn't a dictionary."
1150-
)
1151-
1152-
args: dict[str, Any] = {}
1153-
1154-
field = data.get("vpc_id", None)
1155-
if field is not None:
1156-
args["vpc_id"] = field
1157-
else:
1158-
args["vpc_id"] = None
1159-
1160-
field = data.get("target_vpc_id", None)
1161-
if field is not None:
1162-
args["target_vpc_id"] = field
1163-
else:
1164-
args["target_vpc_id"] = None
1165-
1166-
return VpcVpcConnectorInfo(**args)
1167-
1168-
11691169
def unmarshal_Resource(data: Any) -> Resource:
11701170
if not isinstance(data, dict):
11711171
raise TypeError(
@@ -1484,11 +1484,11 @@ def unmarshal_Resource(data: Any) -> Resource:
14841484
else:
14851485
args["audit_trail_alert_rule_info"] = None
14861486

1487-
field = data.get("vpc_vpc_connector_info", None)
1487+
field = data.get("vpc_connector_info", None)
14881488
if field is not None:
1489-
args["vpc_vpc_connector_info"] = unmarshal_VpcVpcConnectorInfo(field)
1489+
args["vpc_connector_info"] = unmarshal_VpcConnectorInfo(field)
14901490
else:
1491-
args["vpc_vpc_connector_info"] = None
1491+
args["vpc_connector_info"] = None
14921492

14931493
return Resource(**args)
14941494

‎scaleway-async/scaleway_async/audit_trail/v1alpha1/types.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
180180
VPC_SUBNET = "vpc_subnet"
181181
VPC_ROUTE = "vpc_route"
182182
VPC_ACL = "vpc_acl"
183-
VPC_VPC_CONNECTOR = "vpc_vpc_connector"
183+
VPC_CONNECTOR = "vpc_connector"
184184
EDGE_SERVICES_PLAN = "edge_services_plan"
185185
EDGE_SERVICES_PIPELINE = "edge_services_pipeline"
186186
EDGE_SERVICES_DNS_STAGE = "edge_services_dns_stage"
@@ -426,6 +426,12 @@ class SecretManagerSecretVersionInfo:
426426
revision: int
427427

428428

429+
@dataclass
430+
class VpcConnectorInfo:
431+
vpc_id: str
432+
target_vpc_id: str
433+
434+
429435
@dataclass
430436
class VpcGwGatewayInfo:
431437
gateway_type_id: str
@@ -460,12 +466,6 @@ class VpcSubnetInfo:
460466
vpc_id: str
461467

462468

463-
@dataclass
464-
class VpcVpcConnectorInfo:
465-
vpc_id: str
466-
target_vpc_id: str
467-
468-
469469
@dataclass
470470
class Resource:
471471
id: str
@@ -560,7 +560,7 @@ class Resource:
560560

561561
audit_trail_alert_rule_info: Optional[AuditTrailAlertRuleInfo] = None
562562

563-
vpc_vpc_connector_info: Optional[VpcVpcConnectorInfo] = None
563+
vpc_connector_info: Optional[VpcConnectorInfo] = None
564564

565565

566566
@dataclass

‎scaleway/scaleway/audit_trail/v1alpha1/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
from .types import LoadBalancerRouteInfo
5252
from .types import SecretManagerSecretInfo
5353
from .types import SecretManagerSecretVersionInfo
54+
from .types import VpcConnectorInfo
5455
from .types import VpcGwGatewayInfo
5556
from .types import VpcGwGatewayNetworkInfo
5657
from .types import VpcPrivateNetworkInfo
5758
from .types import VpcRouteInfo
5859
from .types import VpcSubnetInfo
59-
from .types import VpcVpcConnectorInfo
6060
from .types import Resource
6161
from .types import EventPrincipal
6262
from .types import AuthenticationEvent
@@ -145,12 +145,12 @@
145145
"LoadBalancerRouteInfo",
146146
"SecretManagerSecretInfo",
147147
"SecretManagerSecretVersionInfo",
148+
"VpcConnectorInfo",
148149
"VpcGwGatewayInfo",
149150
"VpcGwGatewayNetworkInfo",
150151
"VpcPrivateNetworkInfo",
151152
"VpcRouteInfo",
152153
"VpcSubnetInfo",
153-
"VpcVpcConnectorInfo",
154154
"Resource",
155155
"EventPrincipal",
156156
"AuthenticationEvent",

‎scaleway/scaleway/audit_trail/v1alpha1/marshalling.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
LoadBalancerRouteInfo,
6161
SecretManagerSecretInfo,
6262
SecretManagerSecretVersionInfo,
63+
VpcConnectorInfo,
6364
VpcGwGatewayInfo,
6465
VpcGwGatewayNetworkInfo,
6566
VpcPrivateNetworkInfo,
6667
VpcRouteInfo,
6768
VpcSubnetInfo,
68-
VpcVpcConnectorInfo,
6969
Resource,
7070
AuthenticationEvent,
7171
ListAuthenticationEventsResponse,
@@ -1004,6 +1004,29 @@ def unmarshal_SecretManagerSecretVersionInfo(
10041004
return SecretManagerSecretVersionInfo(**args)
10051005

10061006

1007+
def unmarshal_VpcConnectorInfo(data: Any) -> VpcConnectorInfo:
1008+
if not isinstance(data, dict):
1009+
raise TypeError(
1010+
"Unmarshalling the type 'VpcConnectorInfo' failed as data isn't a dictionary."
1011+
)
1012+
1013+
args: dict[str, Any] = {}
1014+
1015+
field = data.get("vpc_id", None)
1016+
if field is not None:
1017+
args["vpc_id"] = field
1018+
else:
1019+
args["vpc_id"] = None
1020+
1021+
field = data.get("target_vpc_id", None)
1022+
if field is not None:
1023+
args["target_vpc_id"] = field
1024+
else:
1025+
args["target_vpc_id"] = None
1026+
1027+
return VpcConnectorInfo(**args)
1028+
1029+
10071030
def unmarshal_VpcGwGatewayInfo(data: Any) -> VpcGwGatewayInfo:
10081031
if not isinstance(data, dict):
10091032
raise TypeError(
@@ -1143,29 +1166,6 @@ def unmarshal_VpcSubnetInfo(data: Any) -> VpcSubnetInfo:
11431166
return VpcSubnetInfo(**args)
11441167

11451168

1146-
def unmarshal_VpcVpcConnectorInfo(data: Any) -> VpcVpcConnectorInfo:
1147-
if not isinstance(data, dict):
1148-
raise TypeError(
1149-
"Unmarshalling the type 'VpcVpcConnectorInfo' failed as data isn't a dictionary."
1150-
)
1151-
1152-
args: dict[str, Any] = {}
1153-
1154-
field = data.get("vpc_id", None)
1155-
if field is not None:
1156-
args["vpc_id"] = field
1157-
else:
1158-
args["vpc_id"] = None
1159-
1160-
field = data.get("target_vpc_id", None)
1161-
if field is not None:
1162-
args["target_vpc_id"] = field
1163-
else:
1164-
args["target_vpc_id"] = None
1165-
1166-
return VpcVpcConnectorInfo(**args)
1167-
1168-
11691169
def unmarshal_Resource(data: Any) -> Resource:
11701170
if not isinstance(data, dict):
11711171
raise TypeError(
@@ -1484,11 +1484,11 @@ def unmarshal_Resource(data: Any) -> Resource:
14841484
else:
14851485
args["audit_trail_alert_rule_info"] = None
14861486

1487-
field = data.get("vpc_vpc_connector_info", None)
1487+
field = data.get("vpc_connector_info", None)
14881488
if field is not None:
1489-
args["vpc_vpc_connector_info"] = unmarshal_VpcVpcConnectorInfo(field)
1489+
args["vpc_connector_info"] = unmarshal_VpcConnectorInfo(field)
14901490
else:
1491-
args["vpc_vpc_connector_info"] = None
1491+
args["vpc_connector_info"] = None
14921492

14931493
return Resource(**args)
14941494

‎scaleway/scaleway/audit_trail/v1alpha1/types.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
180180
VPC_SUBNET = "vpc_subnet"
181181
VPC_ROUTE = "vpc_route"
182182
VPC_ACL = "vpc_acl"
183-
VPC_VPC_CONNECTOR = "vpc_vpc_connector"
183+
VPC_CONNECTOR = "vpc_connector"
184184
EDGE_SERVICES_PLAN = "edge_services_plan"
185185
EDGE_SERVICES_PIPELINE = "edge_services_pipeline"
186186
EDGE_SERVICES_DNS_STAGE = "edge_services_dns_stage"
@@ -426,6 +426,12 @@ class SecretManagerSecretVersionInfo:
426426
revision: int
427427

428428

429+
@dataclass
430+
class VpcConnectorInfo:
431+
vpc_id: str
432+
target_vpc_id: str
433+
434+
429435
@dataclass
430436
class VpcGwGatewayInfo:
431437
gateway_type_id: str
@@ -460,12 +466,6 @@ class VpcSubnetInfo:
460466
vpc_id: str
461467

462468

463-
@dataclass
464-
class VpcVpcConnectorInfo:
465-
vpc_id: str
466-
target_vpc_id: str
467-
468-
469469
@dataclass
470470
class Resource:
471471
id: str
@@ -560,7 +560,7 @@ class Resource:
560560

561561
audit_trail_alert_rule_info: Optional[AuditTrailAlertRuleInfo] = None
562562

563-
vpc_vpc_connector_info: Optional[VpcVpcConnectorInfo] = None
563+
vpc_connector_info: Optional[VpcConnectorInfo] = None
564564

565565

566566
@dataclass

0 commit comments

Comments
 (0)