From 2838ae448b9e2d5366e769b466e61775568db398 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Fri, 19 Jun 2026 11:10:49 +0000 Subject: [PATCH] feat: update generated APIs --- .../scaleway_async/k8s/v1/marshalling.py | 12 +-- scaleway-async/scaleway_async/k8s/v1/types.py | 10 +- .../scaleway_async/search/v1alpha1/types.py | 1 + .../scaleway_async/searchdb/v1alpha1/api.py | 14 ++- .../searchdb/v1alpha1/marshalling.py | 12 +-- .../scaleway_async/searchdb/v1alpha1/types.py | 20 ++-- .../scaleway_async/vpc/v2/__init__.py | 8 -- scaleway-async/scaleway_async/vpc/v2/api.py | 100 ------------------ .../scaleway_async/vpc/v2/marshalling.py | 62 ----------- scaleway-async/scaleway_async/vpc/v2/types.py | 46 -------- scaleway/scaleway/k8s/v1/marshalling.py | 12 +-- scaleway/scaleway/k8s/v1/types.py | 10 +- scaleway/scaleway/search/v1alpha1/types.py | 1 + scaleway/scaleway/searchdb/v1alpha1/api.py | 14 ++- .../scaleway/searchdb/v1alpha1/marshalling.py | 12 +-- scaleway/scaleway/searchdb/v1alpha1/types.py | 20 ++-- scaleway/scaleway/vpc/v2/__init__.py | 8 -- scaleway/scaleway/vpc/v2/api.py | 100 ------------------ scaleway/scaleway/vpc/v2/marshalling.py | 62 ----------- scaleway/scaleway/vpc/v2/types.py | 46 -------- 20 files changed, 68 insertions(+), 502 deletions(-) diff --git a/scaleway-async/scaleway_async/k8s/v1/marshalling.py b/scaleway-async/scaleway_async/k8s/v1/marshalling.py index 16dcd5b04..73026fd8b 100644 --- a/scaleway-async/scaleway_async/k8s/v1/marshalling.py +++ b/scaleway-async/scaleway_async/k8s/v1/marshalling.py @@ -838,18 +838,18 @@ def unmarshal_Pool(data: Any) -> Pool: else: args["startup_taints"] = [] - field = data.get("private_network_id", None) - if field is not None: - args["private_network_id"] = field - else: - args["private_network_id"] = None - field = data.get("region", None) if field is not None: args["region"] = field else: args["region"] = None + field = data.get("private_network_id", None) + if field is not None: + args["private_network_id"] = field + else: + args["private_network_id"] = None + return Pool(**args) diff --git a/scaleway-async/scaleway_async/k8s/v1/types.py b/scaleway-async/scaleway_async/k8s/v1/types.py index ada47d10e..e50e09fae 100644 --- a/scaleway-async/scaleway_async/k8s/v1/types.py +++ b/scaleway-async/scaleway_async/k8s/v1/types.py @@ -1078,11 +1078,6 @@ class Pool: Kubernetes taints applied at node creation but not reconciled afterwards. """ - private_network_id: str - """ - Private network where the nodes are attached. Should be member of the same VPC as the API Server. - """ - region: ScwRegion """ Cluster region of the pool. @@ -1113,6 +1108,11 @@ class Pool: System volume disk size. """ + private_network_id: Optional[str] = None + """ + Private network where the nodes are attached. Should be member of the same VPC as the API Server. + """ + @dataclass class NodeMetadataCoreV1Taint: diff --git a/scaleway-async/scaleway_async/search/v1alpha1/types.py b/scaleway-async/scaleway_async/search/v1alpha1/types.py index c59b8af7b..c0eb0155e 100644 --- a/scaleway-async/scaleway_async/search/v1alpha1/types.py +++ b/scaleway-async/scaleway_async/search/v1alpha1/types.py @@ -122,6 +122,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta): IAM_GROUP = "iam_group" IAM_POLICY = "iam_policy" SEDB_CLUSTER = "sedb_cluster" + AUTOSCALING_GROUP = "autoscaling_group" def __str__(self) -> str: return str(self.value) diff --git a/scaleway-async/scaleway_async/searchdb/v1alpha1/api.py b/scaleway-async/scaleway_async/searchdb/v1alpha1/api.py index ce4806834..0ef280013 100644 --- a/scaleway-async/scaleway_async/searchdb/v1alpha1/api.py +++ b/scaleway-async/scaleway_async/searchdb/v1alpha1/api.py @@ -67,13 +67,13 @@ async def create_deployment( self, *, name: str, - node_amount: int, - node_count: int, node_type: str, version: str, region: Optional[ScwRegion] = None, project_id: Optional[str] = None, tags: Optional[list[str]] = None, + node_amount: Optional[int] = None, + node_count: Optional[int] = None, user_name: Optional[str] = None, password: Optional[str] = None, volume: Optional[Volume] = None, @@ -82,13 +82,13 @@ async def create_deployment( """ Create a new Cloud Essentials for OpenSearch deployment. :param name: Name of the deployment. - :param node_amount: DEPRECATED: Use node_count instead. Number of nodes. - :param node_count: Number of nodes. :param node_type: Node type. :param version: The Opensearch version to use. :param region: Region to target. If none is passed will use default region from the config. :param project_id: Project ID in which to create the deployment. :param tags: Tags. + :param node_amount: DEPRECATED: Use node_count instead. Number of nodes. + :param node_count: Number of nodes. :param user_name: Username for the deployment user. :param password: Password for the deployment user. :param volume: Volume. @@ -100,8 +100,6 @@ async def create_deployment( result = await api.create_deployment( name="example", - node_amount=1, - node_count=1, node_type="example", version="example", ) @@ -117,13 +115,13 @@ async def create_deployment( body=marshal_CreateDeploymentRequest( CreateDeploymentRequest( name=name, - node_amount=node_amount, - node_count=node_count, node_type=node_type, version=version, region=region, project_id=project_id, tags=tags, + node_amount=node_amount, + node_count=node_count, user_name=user_name, password=password, volume=volume, diff --git a/scaleway-async/scaleway_async/searchdb/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/searchdb/v1alpha1/marshalling.py index b86dc5620..fc8600257 100644 --- a/scaleway-async/scaleway_async/searchdb/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/searchdb/v1alpha1/marshalling.py @@ -599,12 +599,6 @@ def marshal_CreateDeploymentRequest( if request.name is not None: output["name"] = request.name - if request.node_amount is not None: - output["node_amount"] = request.node_amount - - if request.node_count is not None: - output["node_count"] = request.node_count - if request.node_type is not None: output["node_type"] = request.node_type @@ -619,6 +613,12 @@ def marshal_CreateDeploymentRequest( if request.tags is not None: output["tags"] = request.tags + if request.node_amount is not None: + output["node_amount"] = request.node_amount + + if request.node_count is not None: + output["node_count"] = request.node_count + if request.user_name is not None: output["user_name"] = request.user_name diff --git a/scaleway-async/scaleway_async/searchdb/v1alpha1/types.py b/scaleway-async/scaleway_async/searchdb/v1alpha1/types.py index d8802b4d5..c01281cb4 100644 --- a/scaleway-async/scaleway_async/searchdb/v1alpha1/types.py +++ b/scaleway-async/scaleway_async/searchdb/v1alpha1/types.py @@ -353,16 +353,6 @@ class CreateDeploymentRequest: Name of the deployment. """ - node_amount: int - """ - DEPRECATED: Use node_count instead. Number of nodes. - """ - - node_count: int - """ - Number of nodes. - """ - node_type: str """ Node type. @@ -388,6 +378,16 @@ class CreateDeploymentRequest: Tags. """ + node_amount: Optional[int] = 0 + """ + DEPRECATED: Use node_count instead. Number of nodes. + """ + + node_count: Optional[int] = 0 + """ + Number of nodes. + """ + user_name: Optional[str] = None """ Username for the deployment user. diff --git a/scaleway-async/scaleway_async/vpc/v2/__init__.py b/scaleway-async/scaleway_async/vpc/v2/__init__.py index 7efd3eea0..41ef83f45 100644 --- a/scaleway-async/scaleway_async/vpc/v2/__init__.py +++ b/scaleway-async/scaleway_async/vpc/v2/__init__.py @@ -19,8 +19,6 @@ from .types import ListSubnetOverlapsResponseSubnetOverlap from .types import VPCConnector from .types import VPC -from .types import AddSubnetsRequest -from .types import AddSubnetsResponse from .types import CreateIngressRuleRequest from .types import CreatePrivateNetworkRequest from .types import CreateRouteRequest @@ -29,8 +27,6 @@ from .types import DeleteIngressRuleRequest from .types import DeletePrivateNetworkRequest from .types import DeleteRouteRequest -from .types import DeleteSubnetsRequest -from .types import DeleteSubnetsResponse from .types import DeleteVPCConnectorRequest from .types import DeleteVPCRequest from .types import EnableCustomRoutesPropagationRequest @@ -84,8 +80,6 @@ "ListSubnetOverlapsResponseSubnetOverlap", "VPCConnector", "VPC", - "AddSubnetsRequest", - "AddSubnetsResponse", "CreateIngressRuleRequest", "CreatePrivateNetworkRequest", "CreateRouteRequest", @@ -94,8 +88,6 @@ "DeleteIngressRuleRequest", "DeletePrivateNetworkRequest", "DeleteRouteRequest", - "DeleteSubnetsRequest", - "DeleteSubnetsResponse", "DeleteVPCConnectorRequest", "DeleteVPCRequest", "EnableCustomRoutesPropagationRequest", diff --git a/scaleway-async/scaleway_async/vpc/v2/api.py b/scaleway-async/scaleway_async/vpc/v2/api.py index d5f42c24e..8058b9ace 100644 --- a/scaleway-async/scaleway_async/vpc/v2/api.py +++ b/scaleway-async/scaleway_async/vpc/v2/api.py @@ -22,15 +22,11 @@ ListVPCsRequestOrderBy, VPCConnectorStatus, AclRule, - AddSubnetsRequest, - AddSubnetsResponse, CreateIngressRuleRequest, CreatePrivateNetworkRequest, CreateRouteRequest, CreateVPCConnectorRequest, CreateVPCRequest, - DeleteSubnetsRequest, - DeleteSubnetsResponse, GetAclResponse, IngressRule, ListIngressRulesResponse, @@ -59,8 +55,6 @@ unmarshal_IngressRule, unmarshal_VPCConnector, unmarshal_VPC, - unmarshal_AddSubnetsResponse, - unmarshal_DeleteSubnetsResponse, unmarshal_GetAclResponse, unmarshal_ListIngressRulesResponse, unmarshal_ListPrivateNetworksResponse, @@ -69,13 +63,11 @@ unmarshal_ListVPCConnectorsResponse, unmarshal_ListVPCsResponse, unmarshal_SetAclResponse, - marshal_AddSubnetsRequest, marshal_CreateIngressRuleRequest, marshal_CreatePrivateNetworkRequest, marshal_CreateRouteRequest, marshal_CreateVPCConnectorRequest, marshal_CreateVPCRequest, - marshal_DeleteSubnetsRequest, marshal_SetAclRequest, marshal_UpdateIngressRuleRequest, marshal_UpdatePrivateNetworkRequest, @@ -870,98 +862,6 @@ async def list_subnets_all( }, ) - async def add_subnets( - self, - *, - private_network_id: str, - region: Optional[ScwRegion] = None, - subnets: Optional[list[str]] = None, - ) -> AddSubnetsResponse: - """ - Add subnets to a Private Network. - Add new subnets to an existing Private Network. - :param private_network_id: Private Network ID. - :param region: Region to target. If none is passed will use default region from the config. - :param subnets: Private Network subnets CIDR. - :return: :class:`AddSubnetsResponse ` - - Usage: - :: - - result = await api.add_subnets( - private_network_id="example", - ) - """ - - param_region = validate_path_param( - "region", region or self.client.default_region - ) - param_private_network_id = validate_path_param( - "private_network_id", private_network_id - ) - - res = self._request( - "POST", - f"/vpc/v2/regions/{param_region}/private-networks/{param_private_network_id}/subnets", - body=marshal_AddSubnetsRequest( - AddSubnetsRequest( - private_network_id=private_network_id, - region=region, - subnets=subnets, - ), - self.client, - ), - ) - - self._throw_on_error(res) - return unmarshal_AddSubnetsResponse(res.json()) - - async def delete_subnets( - self, - *, - private_network_id: str, - region: Optional[ScwRegion] = None, - subnets: Optional[list[str]] = None, - ) -> DeleteSubnetsResponse: - """ - Delete subnets from a Private Network. - Delete the specified subnets from a Private Network. - :param private_network_id: Private Network ID. - :param region: Region to target. If none is passed will use default region from the config. - :param subnets: Private Network subnets CIDR. - :return: :class:`DeleteSubnetsResponse ` - - Usage: - :: - - result = await api.delete_subnets( - private_network_id="example", - ) - """ - - param_region = validate_path_param( - "region", region or self.client.default_region - ) - param_private_network_id = validate_path_param( - "private_network_id", private_network_id - ) - - res = self._request( - "DELETE", - f"/vpc/v2/regions/{param_region}/private-networks/{param_private_network_id}/subnets", - body=marshal_DeleteSubnetsRequest( - DeleteSubnetsRequest( - private_network_id=private_network_id, - region=region, - subnets=subnets, - ), - self.client, - ), - ) - - self._throw_on_error(res) - return unmarshal_DeleteSubnetsResponse(res.json()) - async def create_route( self, *, diff --git a/scaleway-async/scaleway_async/vpc/v2/marshalling.py b/scaleway-async/scaleway_async/vpc/v2/marshalling.py index 1a7d00818..c7c6c7cb1 100644 --- a/scaleway-async/scaleway_async/vpc/v2/marshalling.py +++ b/scaleway-async/scaleway_async/vpc/v2/marshalling.py @@ -15,8 +15,6 @@ VPCConnectorPeerInfo, VPCConnector, VPC, - AddSubnetsResponse, - DeleteSubnetsResponse, AclRule, GetAclResponse, ListIngressRulesResponse, @@ -27,13 +25,11 @@ ListVPCConnectorsResponse, ListVPCsResponse, SetAclResponse, - AddSubnetsRequest, CreateIngressRuleRequest, CreatePrivateNetworkRequest, CreateRouteRequest, CreateVPCConnectorRequest, CreateVPCRequest, - DeleteSubnetsRequest, SetAclRequest, UpdateIngressRuleRequest, UpdatePrivateNetworkRequest, @@ -566,40 +562,6 @@ def unmarshal_VPC(data: Any) -> VPC: return VPC(**args) -def unmarshal_AddSubnetsResponse(data: Any) -> AddSubnetsResponse: - if not isinstance(data, dict): - raise TypeError( - "Unmarshalling the type 'AddSubnetsResponse' failed as data isn't a dictionary." - ) - - args: dict[str, Any] = {} - - field = data.get("subnets", None) - if field is not None: - args["subnets"] = field - else: - args["subnets"] = None - - return AddSubnetsResponse(**args) - - -def unmarshal_DeleteSubnetsResponse(data: Any) -> DeleteSubnetsResponse: - if not isinstance(data, dict): - raise TypeError( - "Unmarshalling the type 'DeleteSubnetsResponse' failed as data isn't a dictionary." - ) - - args: dict[str, Any] = {} - - field = data.get("subnets", None) - if field is not None: - args["subnets"] = field - else: - args["subnets"] = None - - return DeleteSubnetsResponse(**args) - - def unmarshal_AclRule(data: Any) -> AclRule: if not isinstance(data, dict): raise TypeError( @@ -902,18 +864,6 @@ def unmarshal_SetAclResponse(data: Any) -> SetAclResponse: return SetAclResponse(**args) -def marshal_AddSubnetsRequest( - request: AddSubnetsRequest, - defaults: ProfileDefaults, -) -> dict[str, Any]: - output: dict[str, Any] = {} - - if request.subnets is not None: - output["subnets"] = request.subnets - - return output - - def marshal_CreateIngressRuleRequest( request: CreateIngressRuleRequest, defaults: ProfileDefaults, @@ -1049,18 +999,6 @@ def marshal_CreateVPCRequest( return output -def marshal_DeleteSubnetsRequest( - request: DeleteSubnetsRequest, - defaults: ProfileDefaults, -) -> dict[str, Any]: - output: dict[str, Any] = {} - - if request.subnets is not None: - output["subnets"] = request.subnets - - return output - - def marshal_AclRule( request: AclRule, defaults: ProfileDefaults, diff --git a/scaleway-async/scaleway_async/vpc/v2/types.py b/scaleway-async/scaleway_async/vpc/v2/types.py index 1d070c6c4..55d615025 100644 --- a/scaleway-async/scaleway_async/vpc/v2/types.py +++ b/scaleway-async/scaleway_async/vpc/v2/types.py @@ -505,29 +505,6 @@ class VPC: """ -@dataclass -class AddSubnetsRequest: - private_network_id: str - """ - Private Network ID. - """ - - region: Optional[ScwRegion] = None - """ - Region to target. If none is passed will use default region from the config. - """ - - subnets: Optional[list[str]] = field(default_factory=list) - """ - Private Network subnets CIDR. - """ - - -@dataclass -class AddSubnetsResponse: - subnets: list[str] - - @dataclass class CreateIngressRuleRequest: vpc_id: str @@ -720,29 +697,6 @@ class DeleteRouteRequest: """ -@dataclass -class DeleteSubnetsRequest: - private_network_id: str - """ - Private Network ID. - """ - - region: Optional[ScwRegion] = None - """ - Region to target. If none is passed will use default region from the config. - """ - - subnets: Optional[list[str]] = field(default_factory=list) - """ - Private Network subnets CIDR. - """ - - -@dataclass -class DeleteSubnetsResponse: - subnets: list[str] - - @dataclass class DeleteVPCConnectorRequest: vpc_connector_id: str diff --git a/scaleway/scaleway/k8s/v1/marshalling.py b/scaleway/scaleway/k8s/v1/marshalling.py index 16dcd5b04..73026fd8b 100644 --- a/scaleway/scaleway/k8s/v1/marshalling.py +++ b/scaleway/scaleway/k8s/v1/marshalling.py @@ -838,18 +838,18 @@ def unmarshal_Pool(data: Any) -> Pool: else: args["startup_taints"] = [] - field = data.get("private_network_id", None) - if field is not None: - args["private_network_id"] = field - else: - args["private_network_id"] = None - field = data.get("region", None) if field is not None: args["region"] = field else: args["region"] = None + field = data.get("private_network_id", None) + if field is not None: + args["private_network_id"] = field + else: + args["private_network_id"] = None + return Pool(**args) diff --git a/scaleway/scaleway/k8s/v1/types.py b/scaleway/scaleway/k8s/v1/types.py index ada47d10e..e50e09fae 100644 --- a/scaleway/scaleway/k8s/v1/types.py +++ b/scaleway/scaleway/k8s/v1/types.py @@ -1078,11 +1078,6 @@ class Pool: Kubernetes taints applied at node creation but not reconciled afterwards. """ - private_network_id: str - """ - Private network where the nodes are attached. Should be member of the same VPC as the API Server. - """ - region: ScwRegion """ Cluster region of the pool. @@ -1113,6 +1108,11 @@ class Pool: System volume disk size. """ + private_network_id: Optional[str] = None + """ + Private network where the nodes are attached. Should be member of the same VPC as the API Server. + """ + @dataclass class NodeMetadataCoreV1Taint: diff --git a/scaleway/scaleway/search/v1alpha1/types.py b/scaleway/scaleway/search/v1alpha1/types.py index c59b8af7b..c0eb0155e 100644 --- a/scaleway/scaleway/search/v1alpha1/types.py +++ b/scaleway/scaleway/search/v1alpha1/types.py @@ -122,6 +122,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta): IAM_GROUP = "iam_group" IAM_POLICY = "iam_policy" SEDB_CLUSTER = "sedb_cluster" + AUTOSCALING_GROUP = "autoscaling_group" def __str__(self) -> str: return str(self.value) diff --git a/scaleway/scaleway/searchdb/v1alpha1/api.py b/scaleway/scaleway/searchdb/v1alpha1/api.py index 513cbdf83..d6cacd54d 100644 --- a/scaleway/scaleway/searchdb/v1alpha1/api.py +++ b/scaleway/scaleway/searchdb/v1alpha1/api.py @@ -67,13 +67,13 @@ def create_deployment( self, *, name: str, - node_amount: int, - node_count: int, node_type: str, version: str, region: Optional[ScwRegion] = None, project_id: Optional[str] = None, tags: Optional[list[str]] = None, + node_amount: Optional[int] = None, + node_count: Optional[int] = None, user_name: Optional[str] = None, password: Optional[str] = None, volume: Optional[Volume] = None, @@ -82,13 +82,13 @@ def create_deployment( """ Create a new Cloud Essentials for OpenSearch deployment. :param name: Name of the deployment. - :param node_amount: DEPRECATED: Use node_count instead. Number of nodes. - :param node_count: Number of nodes. :param node_type: Node type. :param version: The Opensearch version to use. :param region: Region to target. If none is passed will use default region from the config. :param project_id: Project ID in which to create the deployment. :param tags: Tags. + :param node_amount: DEPRECATED: Use node_count instead. Number of nodes. + :param node_count: Number of nodes. :param user_name: Username for the deployment user. :param password: Password for the deployment user. :param volume: Volume. @@ -100,8 +100,6 @@ def create_deployment( result = api.create_deployment( name="example", - node_amount=1, - node_count=1, node_type="example", version="example", ) @@ -117,13 +115,13 @@ def create_deployment( body=marshal_CreateDeploymentRequest( CreateDeploymentRequest( name=name, - node_amount=node_amount, - node_count=node_count, node_type=node_type, version=version, region=region, project_id=project_id, tags=tags, + node_amount=node_amount, + node_count=node_count, user_name=user_name, password=password, volume=volume, diff --git a/scaleway/scaleway/searchdb/v1alpha1/marshalling.py b/scaleway/scaleway/searchdb/v1alpha1/marshalling.py index b86dc5620..fc8600257 100644 --- a/scaleway/scaleway/searchdb/v1alpha1/marshalling.py +++ b/scaleway/scaleway/searchdb/v1alpha1/marshalling.py @@ -599,12 +599,6 @@ def marshal_CreateDeploymentRequest( if request.name is not None: output["name"] = request.name - if request.node_amount is not None: - output["node_amount"] = request.node_amount - - if request.node_count is not None: - output["node_count"] = request.node_count - if request.node_type is not None: output["node_type"] = request.node_type @@ -619,6 +613,12 @@ def marshal_CreateDeploymentRequest( if request.tags is not None: output["tags"] = request.tags + if request.node_amount is not None: + output["node_amount"] = request.node_amount + + if request.node_count is not None: + output["node_count"] = request.node_count + if request.user_name is not None: output["user_name"] = request.user_name diff --git a/scaleway/scaleway/searchdb/v1alpha1/types.py b/scaleway/scaleway/searchdb/v1alpha1/types.py index d8802b4d5..c01281cb4 100644 --- a/scaleway/scaleway/searchdb/v1alpha1/types.py +++ b/scaleway/scaleway/searchdb/v1alpha1/types.py @@ -353,16 +353,6 @@ class CreateDeploymentRequest: Name of the deployment. """ - node_amount: int - """ - DEPRECATED: Use node_count instead. Number of nodes. - """ - - node_count: int - """ - Number of nodes. - """ - node_type: str """ Node type. @@ -388,6 +378,16 @@ class CreateDeploymentRequest: Tags. """ + node_amount: Optional[int] = 0 + """ + DEPRECATED: Use node_count instead. Number of nodes. + """ + + node_count: Optional[int] = 0 + """ + Number of nodes. + """ + user_name: Optional[str] = None """ Username for the deployment user. diff --git a/scaleway/scaleway/vpc/v2/__init__.py b/scaleway/scaleway/vpc/v2/__init__.py index 7efd3eea0..41ef83f45 100644 --- a/scaleway/scaleway/vpc/v2/__init__.py +++ b/scaleway/scaleway/vpc/v2/__init__.py @@ -19,8 +19,6 @@ from .types import ListSubnetOverlapsResponseSubnetOverlap from .types import VPCConnector from .types import VPC -from .types import AddSubnetsRequest -from .types import AddSubnetsResponse from .types import CreateIngressRuleRequest from .types import CreatePrivateNetworkRequest from .types import CreateRouteRequest @@ -29,8 +27,6 @@ from .types import DeleteIngressRuleRequest from .types import DeletePrivateNetworkRequest from .types import DeleteRouteRequest -from .types import DeleteSubnetsRequest -from .types import DeleteSubnetsResponse from .types import DeleteVPCConnectorRequest from .types import DeleteVPCRequest from .types import EnableCustomRoutesPropagationRequest @@ -84,8 +80,6 @@ "ListSubnetOverlapsResponseSubnetOverlap", "VPCConnector", "VPC", - "AddSubnetsRequest", - "AddSubnetsResponse", "CreateIngressRuleRequest", "CreatePrivateNetworkRequest", "CreateRouteRequest", @@ -94,8 +88,6 @@ "DeleteIngressRuleRequest", "DeletePrivateNetworkRequest", "DeleteRouteRequest", - "DeleteSubnetsRequest", - "DeleteSubnetsResponse", "DeleteVPCConnectorRequest", "DeleteVPCRequest", "EnableCustomRoutesPropagationRequest", diff --git a/scaleway/scaleway/vpc/v2/api.py b/scaleway/scaleway/vpc/v2/api.py index 8af7bedbb..ce72f5063 100644 --- a/scaleway/scaleway/vpc/v2/api.py +++ b/scaleway/scaleway/vpc/v2/api.py @@ -22,15 +22,11 @@ ListVPCsRequestOrderBy, VPCConnectorStatus, AclRule, - AddSubnetsRequest, - AddSubnetsResponse, CreateIngressRuleRequest, CreatePrivateNetworkRequest, CreateRouteRequest, CreateVPCConnectorRequest, CreateVPCRequest, - DeleteSubnetsRequest, - DeleteSubnetsResponse, GetAclResponse, IngressRule, ListIngressRulesResponse, @@ -59,8 +55,6 @@ unmarshal_IngressRule, unmarshal_VPCConnector, unmarshal_VPC, - unmarshal_AddSubnetsResponse, - unmarshal_DeleteSubnetsResponse, unmarshal_GetAclResponse, unmarshal_ListIngressRulesResponse, unmarshal_ListPrivateNetworksResponse, @@ -69,13 +63,11 @@ unmarshal_ListVPCConnectorsResponse, unmarshal_ListVPCsResponse, unmarshal_SetAclResponse, - marshal_AddSubnetsRequest, marshal_CreateIngressRuleRequest, marshal_CreatePrivateNetworkRequest, marshal_CreateRouteRequest, marshal_CreateVPCConnectorRequest, marshal_CreateVPCRequest, - marshal_DeleteSubnetsRequest, marshal_SetAclRequest, marshal_UpdateIngressRuleRequest, marshal_UpdatePrivateNetworkRequest, @@ -870,98 +862,6 @@ def list_subnets_all( }, ) - def add_subnets( - self, - *, - private_network_id: str, - region: Optional[ScwRegion] = None, - subnets: Optional[list[str]] = None, - ) -> AddSubnetsResponse: - """ - Add subnets to a Private Network. - Add new subnets to an existing Private Network. - :param private_network_id: Private Network ID. - :param region: Region to target. If none is passed will use default region from the config. - :param subnets: Private Network subnets CIDR. - :return: :class:`AddSubnetsResponse ` - - Usage: - :: - - result = api.add_subnets( - private_network_id="example", - ) - """ - - param_region = validate_path_param( - "region", region or self.client.default_region - ) - param_private_network_id = validate_path_param( - "private_network_id", private_network_id - ) - - res = self._request( - "POST", - f"/vpc/v2/regions/{param_region}/private-networks/{param_private_network_id}/subnets", - body=marshal_AddSubnetsRequest( - AddSubnetsRequest( - private_network_id=private_network_id, - region=region, - subnets=subnets, - ), - self.client, - ), - ) - - self._throw_on_error(res) - return unmarshal_AddSubnetsResponse(res.json()) - - def delete_subnets( - self, - *, - private_network_id: str, - region: Optional[ScwRegion] = None, - subnets: Optional[list[str]] = None, - ) -> DeleteSubnetsResponse: - """ - Delete subnets from a Private Network. - Delete the specified subnets from a Private Network. - :param private_network_id: Private Network ID. - :param region: Region to target. If none is passed will use default region from the config. - :param subnets: Private Network subnets CIDR. - :return: :class:`DeleteSubnetsResponse ` - - Usage: - :: - - result = api.delete_subnets( - private_network_id="example", - ) - """ - - param_region = validate_path_param( - "region", region or self.client.default_region - ) - param_private_network_id = validate_path_param( - "private_network_id", private_network_id - ) - - res = self._request( - "DELETE", - f"/vpc/v2/regions/{param_region}/private-networks/{param_private_network_id}/subnets", - body=marshal_DeleteSubnetsRequest( - DeleteSubnetsRequest( - private_network_id=private_network_id, - region=region, - subnets=subnets, - ), - self.client, - ), - ) - - self._throw_on_error(res) - return unmarshal_DeleteSubnetsResponse(res.json()) - def create_route( self, *, diff --git a/scaleway/scaleway/vpc/v2/marshalling.py b/scaleway/scaleway/vpc/v2/marshalling.py index 1a7d00818..c7c6c7cb1 100644 --- a/scaleway/scaleway/vpc/v2/marshalling.py +++ b/scaleway/scaleway/vpc/v2/marshalling.py @@ -15,8 +15,6 @@ VPCConnectorPeerInfo, VPCConnector, VPC, - AddSubnetsResponse, - DeleteSubnetsResponse, AclRule, GetAclResponse, ListIngressRulesResponse, @@ -27,13 +25,11 @@ ListVPCConnectorsResponse, ListVPCsResponse, SetAclResponse, - AddSubnetsRequest, CreateIngressRuleRequest, CreatePrivateNetworkRequest, CreateRouteRequest, CreateVPCConnectorRequest, CreateVPCRequest, - DeleteSubnetsRequest, SetAclRequest, UpdateIngressRuleRequest, UpdatePrivateNetworkRequest, @@ -566,40 +562,6 @@ def unmarshal_VPC(data: Any) -> VPC: return VPC(**args) -def unmarshal_AddSubnetsResponse(data: Any) -> AddSubnetsResponse: - if not isinstance(data, dict): - raise TypeError( - "Unmarshalling the type 'AddSubnetsResponse' failed as data isn't a dictionary." - ) - - args: dict[str, Any] = {} - - field = data.get("subnets", None) - if field is not None: - args["subnets"] = field - else: - args["subnets"] = None - - return AddSubnetsResponse(**args) - - -def unmarshal_DeleteSubnetsResponse(data: Any) -> DeleteSubnetsResponse: - if not isinstance(data, dict): - raise TypeError( - "Unmarshalling the type 'DeleteSubnetsResponse' failed as data isn't a dictionary." - ) - - args: dict[str, Any] = {} - - field = data.get("subnets", None) - if field is not None: - args["subnets"] = field - else: - args["subnets"] = None - - return DeleteSubnetsResponse(**args) - - def unmarshal_AclRule(data: Any) -> AclRule: if not isinstance(data, dict): raise TypeError( @@ -902,18 +864,6 @@ def unmarshal_SetAclResponse(data: Any) -> SetAclResponse: return SetAclResponse(**args) -def marshal_AddSubnetsRequest( - request: AddSubnetsRequest, - defaults: ProfileDefaults, -) -> dict[str, Any]: - output: dict[str, Any] = {} - - if request.subnets is not None: - output["subnets"] = request.subnets - - return output - - def marshal_CreateIngressRuleRequest( request: CreateIngressRuleRequest, defaults: ProfileDefaults, @@ -1049,18 +999,6 @@ def marshal_CreateVPCRequest( return output -def marshal_DeleteSubnetsRequest( - request: DeleteSubnetsRequest, - defaults: ProfileDefaults, -) -> dict[str, Any]: - output: dict[str, Any] = {} - - if request.subnets is not None: - output["subnets"] = request.subnets - - return output - - def marshal_AclRule( request: AclRule, defaults: ProfileDefaults, diff --git a/scaleway/scaleway/vpc/v2/types.py b/scaleway/scaleway/vpc/v2/types.py index 1d070c6c4..55d615025 100644 --- a/scaleway/scaleway/vpc/v2/types.py +++ b/scaleway/scaleway/vpc/v2/types.py @@ -505,29 +505,6 @@ class VPC: """ -@dataclass -class AddSubnetsRequest: - private_network_id: str - """ - Private Network ID. - """ - - region: Optional[ScwRegion] = None - """ - Region to target. If none is passed will use default region from the config. - """ - - subnets: Optional[list[str]] = field(default_factory=list) - """ - Private Network subnets CIDR. - """ - - -@dataclass -class AddSubnetsResponse: - subnets: list[str] - - @dataclass class CreateIngressRuleRequest: vpc_id: str @@ -720,29 +697,6 @@ class DeleteRouteRequest: """ -@dataclass -class DeleteSubnetsRequest: - private_network_id: str - """ - Private Network ID. - """ - - region: Optional[ScwRegion] = None - """ - Region to target. If none is passed will use default region from the config. - """ - - subnets: Optional[list[str]] = field(default_factory=list) - """ - Private Network subnets CIDR. - """ - - -@dataclass -class DeleteSubnetsResponse: - subnets: list[str] - - @dataclass class DeleteVPCConnectorRequest: vpc_connector_id: str