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
14 changes: 14 additions & 0 deletions scaleway-async/scaleway_async/lb/v1/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,7 @@ async def create_acl(
action: AclAction,
match: AclMatch,
index: int,
description: str,
region: Optional[Region] = None,
name: Optional[str] = None,
) -> Acl:
Expand All @@ -2097,6 +2098,7 @@ async def create_acl(
- `ip_subnet`, `http_filter` and `http_filter_value` are defined

:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand All @@ -2107,6 +2109,7 @@ async def create_acl(
action=AclAction(...),
match=AclMatch(...),
index=1,
description="example",
)
"""

Expand All @@ -2124,6 +2127,7 @@ async def create_acl(
action=action,
match=match,
index=index,
description=description,
region=region,
name=name or random_name(prefix="acl"),
),
Expand Down Expand Up @@ -2174,6 +2178,7 @@ async def update_acl(
match: AclMatch,
index: int,
region: Optional[Region] = None,
description: Optional[str] = None,
) -> Acl:
"""
Update an ACL
Expand All @@ -2183,6 +2188,7 @@ async def update_acl(
:param action: Action to undertake when an ACL filter matches
:param match: The ACL match rule. At least `ip_subnet` or `http_filter` and `http_filter_value` are required
:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand Down Expand Up @@ -2213,6 +2219,7 @@ async def update_acl(
match=match,
index=index,
region=region,
description=description,
),
self.client,
),
Expand Down Expand Up @@ -4927,6 +4934,7 @@ async def create_acl(
action: AclAction,
match: AclMatch,
index: int,
description: str,
zone: Optional[Zone] = None,
name: Optional[str] = None,
) -> Acl:
Expand All @@ -4943,6 +4951,7 @@ async def create_acl(
- `ip_subnet`, `http_filter` and `http_filter_value` are defined

:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand All @@ -4953,6 +4962,7 @@ async def create_acl(
action=AclAction(...),
match=AclMatch(...),
index=1,
description="example",
)
"""

Expand All @@ -4968,6 +4978,7 @@ async def create_acl(
action=action,
match=match,
index=index,
description=description,
zone=zone,
name=name or random_name(prefix="acl"),
),
Expand Down Expand Up @@ -5016,6 +5027,7 @@ async def update_acl(
match: AclMatch,
index: int,
zone: Optional[Zone] = None,
description: Optional[str] = None,
) -> Acl:
"""
Update an ACL
Expand All @@ -5025,6 +5037,7 @@ async def update_acl(
:param action: Action to undertake when an ACL filter matches
:param match: The ACL match rule. At least `ip_subnet` or `http_filter` and `http_filter_value` are required
:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand Down Expand Up @@ -5053,6 +5066,7 @@ async def update_acl(
match=match,
index=index,
zone=zone,
description=description,
),
self.client,
),
Expand Down
8 changes: 8 additions & 0 deletions scaleway-async/scaleway_async/lb/v1/marshalling.py
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,9 @@ def unmarshal_Acl(data: Any) -> Acl:
field = data.get("created_at")
args["created_at"] = parser.isoparse(field) if type(field) is str else field

field = data.get("description")
args["description"] = field

field = data.get("frontend")
args["frontend"] = unmarshal_Frontend(field) if field is not None else None

Expand Down Expand Up @@ -1195,6 +1198,7 @@ def marshal_AclSpec(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -1388,6 +1392,7 @@ def marshal_CreateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -1670,6 +1675,7 @@ def marshal_UpdateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -1910,6 +1916,7 @@ def marshal_ZonedApiCreateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -2201,6 +2208,7 @@ def marshal_ZonedApiUpdateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down
30 changes: 30 additions & 0 deletions scaleway-async/scaleway_async/lb/v1/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ class Acl:
Date at which the ACL was last updated
"""

description: str
"""
Description of your ACL ressource
"""


@dataclass
class AclAction:
Expand Down Expand Up @@ -382,6 +387,11 @@ class AclSpec:
Order between your Acls (ascending order, 0 is first acl executed)
"""

description: str
"""
Description of your ACL ressource
"""


@dataclass
class Backend:
Expand Down Expand Up @@ -2505,6 +2515,11 @@ class CreateAclRequest:
Order between your Acls (ascending order, 0 is first acl executed)
"""

description: str
"""
Description of your ACL ressource
"""


@dataclass
class GetAclRequest:
Expand Down Expand Up @@ -2551,6 +2566,11 @@ class UpdateAclRequest:
Order between your Acls (ascending order, 0 is first acl executed)
"""

description: Optional[str]
"""
Description of your ACL ressource
"""


@dataclass
class DeleteAclRequest:
Expand Down Expand Up @@ -3991,6 +4011,11 @@ class ZonedApiCreateAclRequest:
Order between your Acls (ascending order, 0 is first acl executed)
"""

description: str
"""
Description of your ACL ressource
"""


@dataclass
class ZonedApiGetAclRequest:
Expand Down Expand Up @@ -4037,6 +4062,11 @@ class ZonedApiUpdateAclRequest:
Order between your Acls (ascending order, 0 is first acl executed)
"""

description: Optional[str]
"""
Description of your ACL ressource
"""


@dataclass
class ZonedApiDeleteAclRequest:
Expand Down
14 changes: 14 additions & 0 deletions scaleway/scaleway/lb/v1/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,7 @@ def create_acl(
action: AclAction,
match: AclMatch,
index: int,
description: str,
region: Optional[Region] = None,
name: Optional[str] = None,
) -> Acl:
Expand All @@ -2097,6 +2098,7 @@ def create_acl(
- `ip_subnet`, `http_filter` and `http_filter_value` are defined

:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand All @@ -2107,6 +2109,7 @@ def create_acl(
action=AclAction(...),
match=AclMatch(...),
index=1,
description="example",
)
"""

Expand All @@ -2124,6 +2127,7 @@ def create_acl(
action=action,
match=match,
index=index,
description=description,
region=region,
name=name or random_name(prefix="acl"),
),
Expand Down Expand Up @@ -2174,6 +2178,7 @@ def update_acl(
match: AclMatch,
index: int,
region: Optional[Region] = None,
description: Optional[str] = None,
) -> Acl:
"""
Update an ACL
Expand All @@ -2183,6 +2188,7 @@ def update_acl(
:param action: Action to undertake when an ACL filter matches
:param match: The ACL match rule. At least `ip_subnet` or `http_filter` and `http_filter_value` are required
:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand Down Expand Up @@ -2213,6 +2219,7 @@ def update_acl(
match=match,
index=index,
region=region,
description=description,
),
self.client,
),
Expand Down Expand Up @@ -4925,6 +4932,7 @@ def create_acl(
action: AclAction,
match: AclMatch,
index: int,
description: str,
zone: Optional[Zone] = None,
name: Optional[str] = None,
) -> Acl:
Expand All @@ -4941,6 +4949,7 @@ def create_acl(
- `ip_subnet`, `http_filter` and `http_filter_value` are defined

:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand All @@ -4951,6 +4960,7 @@ def create_acl(
action=AclAction(...),
match=AclMatch(...),
index=1,
description="example",
)
"""

Expand All @@ -4966,6 +4976,7 @@ def create_acl(
action=action,
match=match,
index=index,
description=description,
zone=zone,
name=name or random_name(prefix="acl"),
),
Expand Down Expand Up @@ -5014,6 +5025,7 @@ def update_acl(
match: AclMatch,
index: int,
zone: Optional[Zone] = None,
description: Optional[str] = None,
) -> Acl:
"""
Update an ACL
Expand All @@ -5023,6 +5035,7 @@ def update_acl(
:param action: Action to undertake when an ACL filter matches
:param match: The ACL match rule. At least `ip_subnet` or `http_filter` and `http_filter_value` are required
:param index: Order between your Acls (ascending order, 0 is first acl executed)
:param description: Description of your ACL ressource
:return: :class:`Acl <Acl>`

Usage:
Expand Down Expand Up @@ -5051,6 +5064,7 @@ def update_acl(
match=match,
index=index,
zone=zone,
description=description,
),
self.client,
),
Expand Down
8 changes: 8 additions & 0 deletions scaleway/scaleway/lb/v1/marshalling.py
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,9 @@ def unmarshal_Acl(data: Any) -> Acl:
field = data.get("created_at")
args["created_at"] = parser.isoparse(field) if type(field) is str else field

field = data.get("description")
args["description"] = field

field = data.get("frontend")
args["frontend"] = unmarshal_Frontend(field) if field is not None else None

Expand Down Expand Up @@ -1195,6 +1198,7 @@ def marshal_AclSpec(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -1388,6 +1392,7 @@ def marshal_CreateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -1670,6 +1675,7 @@ def marshal_UpdateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -1910,6 +1916,7 @@ def marshal_ZonedApiCreateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down Expand Up @@ -2201,6 +2208,7 @@ def marshal_ZonedApiUpdateAclRequest(
) -> Dict[str, Any]:
return {
"action": marshal_AclAction(request.action, defaults),
"description": request.description,
"index": request.index,
"match": marshal_AclMatch(request.match, defaults),
"name": request.name,
Expand Down
Loading