Skip to content

Commit f88cfd5

Browse files
authored
Merge branch 'main' into v1.6503.0
2 parents c36f4f9 + 9c670ee commit f88cfd5

File tree

6 files changed

+20
-0
lines changed

6 files changed

+20
-0
lines changed

scaleway-async/scaleway_async/ipam/v1/types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
5151
SERVERLESS_CONTAINER = "serverless_container"
5252
SERVERLESS_FUNCTION = "serverless_function"
5353
VPN_GATEWAY = "vpn_gateway"
54+
DDL_DATALAB = "ddl_datalab"
5455

5556
def __str__(self) -> str:
5657
return str(self.value)

scaleway-async/scaleway_async/lb/v1/marshalling.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,12 @@ def unmarshal_RouteMatch(data: Any) -> RouteMatch:
11331133
else:
11341134
args["host_header"] = None
11351135

1136+
field = data.get("path_begin", None)
1137+
if field is not None:
1138+
args["path_begin"] = field
1139+
else:
1140+
args["path_begin"] = None
1141+
11361142
return RouteMatch(**args)
11371143

11381144

@@ -2044,6 +2050,7 @@ def marshal_RouteMatch(
20442050
[
20452051
OneOfPossibility("sni", request.sni),
20462052
OneOfPossibility("host_header", request.host_header),
2053+
OneOfPossibility("path_begin", request.path_begin),
20472054
]
20482055
),
20492056
)

scaleway-async/scaleway_async/lb/v1/types.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,8 @@ class RouteMatch:
984984

985985
host_header: Optional[str]
986986

987+
path_begin: Optional[str]
988+
987989

988990
@dataclass
989991
class CreateCertificateRequestCustomCertificate:

scaleway/scaleway/ipam/v1/types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
5151
SERVERLESS_CONTAINER = "serverless_container"
5252
SERVERLESS_FUNCTION = "serverless_function"
5353
VPN_GATEWAY = "vpn_gateway"
54+
DDL_DATALAB = "ddl_datalab"
5455

5556
def __str__(self) -> str:
5657
return str(self.value)

scaleway/scaleway/lb/v1/marshalling.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,12 @@ def unmarshal_RouteMatch(data: Any) -> RouteMatch:
11331133
else:
11341134
args["host_header"] = None
11351135

1136+
field = data.get("path_begin", None)
1137+
if field is not None:
1138+
args["path_begin"] = field
1139+
else:
1140+
args["path_begin"] = None
1141+
11361142
return RouteMatch(**args)
11371143

11381144

@@ -2044,6 +2050,7 @@ def marshal_RouteMatch(
20442050
[
20452051
OneOfPossibility("sni", request.sni),
20462052
OneOfPossibility("host_header", request.host_header),
2053+
OneOfPossibility("path_begin", request.path_begin),
20472054
]
20482055
),
20492056
)

scaleway/scaleway/lb/v1/types.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,8 @@ class RouteMatch:
984984

985985
host_header: Optional[str]
986986

987+
path_begin: Optional[str]
988+
987989

988990
@dataclass
989991
class CreateCertificateRequestCustomCertificate:

0 commit comments

Comments
 (0)