Skip to content

feat(audit_trail): add IngressRule resource #1802

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
May 26, 2026
Merged

feat(audit_trail): add IngressRule resource #1802

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
2 changes: 2 additions & 0 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 @@ -55,6 +55,7 @@
from .types import VpcConnectorInfo
from .types import VpcGwGatewayInfo
from .types import VpcGwGatewayNetworkInfo
from .types import VpcIngressRuleInfo
from .types import VpcPrivateNetworkInfo
from .types import VpcRouteInfo
from .types import VpcSubnetInfo
Expand Down Expand Up @@ -150,6 +151,7 @@
"VpcConnectorInfo",
"VpcGwGatewayInfo",
"VpcGwGatewayNetworkInfo",
"VpcIngressRuleInfo",
"VpcPrivateNetworkInfo",
"VpcRouteInfo",
"VpcSubnetInfo",
Expand Down
42 changes: 42 additions & 0 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 @@ -64,6 +64,7 @@
VpcConnectorInfo,
VpcGwGatewayInfo,
VpcGwGatewayNetworkInfo,
VpcIngressRuleInfo,
VpcPrivateNetworkInfo,
VpcRouteInfo,
VpcSubnetInfo,
Expand Down Expand Up @@ -1117,6 +1118,41 @@ def unmarshal_VpcGwGatewayNetworkInfo(data: Any) -> VpcGwGatewayNetworkInfo:
return VpcGwGatewayNetworkInfo(**args)


def unmarshal_VpcIngressRuleInfo(data: Any) -> VpcIngressRuleInfo:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'VpcIngressRuleInfo' 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("source", None)
if field is not None:
args["source"] = field
else:
args["source"] = None

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

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

return VpcIngressRuleInfo(**args)


def unmarshal_VpcPrivateNetworkInfo(data: Any) -> VpcPrivateNetworkInfo:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -1530,6 +1566,12 @@ def unmarshal_Resource(data: Any) -> Resource:
else:
args["instance_private_network_interface_info"] = None

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

return Resource(**args)


Expand Down
11 changes: 11 additions & 0 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 @@ -182,6 +182,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
VPC_ROUTE = "vpc_route"
VPC_ACL = "vpc_acl"
VPC_CONNECTOR = "vpc_connector"
VPC_INGRESS_RULE = "vpc_ingress_rule"
EDGE_SERVICES_PLAN = "edge_services_plan"
EDGE_SERVICES_PIPELINE = "edge_services_pipeline"
EDGE_SERVICES_DNS_STAGE = "edge_services_dns_stage"
Expand Down Expand Up @@ -461,6 +462,14 @@ class VpcGwGatewayNetworkInfo:
address: Optional[str] = None


@dataclass
class VpcIngressRuleInfo:
vpc_id: str
source: str
nexthop_private_network_id: str
nexthop_resource_ip: str


@dataclass
class VpcPrivateNetworkInfo:
vpc_id: str
Expand Down Expand Up @@ -581,6 +590,8 @@ class Resource:
InstancePrivateNetworkInterfaceInfo
] = None

vpc_ingress_rule_info: Optional[VpcIngressRuleInfo] = None


@dataclass
class EventPrincipal:
Expand Down
2 changes: 2 additions & 0 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 @@ -55,6 +55,7 @@
from .types import VpcConnectorInfo
from .types import VpcGwGatewayInfo
from .types import VpcGwGatewayNetworkInfo
from .types import VpcIngressRuleInfo
from .types import VpcPrivateNetworkInfo
from .types import VpcRouteInfo
from .types import VpcSubnetInfo
Expand Down Expand Up @@ -150,6 +151,7 @@
"VpcConnectorInfo",
"VpcGwGatewayInfo",
"VpcGwGatewayNetworkInfo",
"VpcIngressRuleInfo",
"VpcPrivateNetworkInfo",
"VpcRouteInfo",
"VpcSubnetInfo",
Expand Down
42 changes: 42 additions & 0 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 @@ -64,6 +64,7 @@
VpcConnectorInfo,
VpcGwGatewayInfo,
VpcGwGatewayNetworkInfo,
VpcIngressRuleInfo,
VpcPrivateNetworkInfo,
VpcRouteInfo,
VpcSubnetInfo,
Expand Down Expand Up @@ -1117,6 +1118,41 @@ def unmarshal_VpcGwGatewayNetworkInfo(data: Any) -> VpcGwGatewayNetworkInfo:
return VpcGwGatewayNetworkInfo(**args)


def unmarshal_VpcIngressRuleInfo(data: Any) -> VpcIngressRuleInfo:
if not isinstance(data, dict):
raise TypeError(
"Unmarshalling the type 'VpcIngressRuleInfo' 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("source", None)
if field is not None:
args["source"] = field
else:
args["source"] = None

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

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

return VpcIngressRuleInfo(**args)


def unmarshal_VpcPrivateNetworkInfo(data: Any) -> VpcPrivateNetworkInfo:
if not isinstance(data, dict):
raise TypeError(
Expand Down Expand Up @@ -1530,6 +1566,12 @@ def unmarshal_Resource(data: Any) -> Resource:
else:
args["instance_private_network_interface_info"] = None

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

return Resource(**args)


Expand Down
11 changes: 11 additions & 0 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 @@ -182,6 +182,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
VPC_ROUTE = "vpc_route"
VPC_ACL = "vpc_acl"
VPC_CONNECTOR = "vpc_connector"
VPC_INGRESS_RULE = "vpc_ingress_rule"
EDGE_SERVICES_PLAN = "edge_services_plan"
EDGE_SERVICES_PIPELINE = "edge_services_pipeline"
EDGE_SERVICES_DNS_STAGE = "edge_services_dns_stage"
Expand Down Expand Up @@ -461,6 +462,14 @@ class VpcGwGatewayNetworkInfo:
address: Optional[str] = None


@dataclass
class VpcIngressRuleInfo:
vpc_id: str
source: str
nexthop_private_network_id: str
nexthop_resource_ip: str


@dataclass
class VpcPrivateNetworkInfo:
vpc_id: str
Expand Down Expand Up @@ -581,6 +590,8 @@ class Resource:
InstancePrivateNetworkInterfaceInfo
] = None

vpc_ingress_rule_info: Optional[VpcIngressRuleInfo] = None


@dataclass
class EventPrincipal:
Expand Down
Loading