Skip to content

Commit d62d858

Browse files
authored
Merge branch 'main' into v1.5511.0
2 parents a1403ab + 1fd3001 commit d62d858

File tree

12 files changed

+58
-0
lines changed

12 files changed

+58
-0
lines changed

scaleway-async/scaleway_async/billing/v2alpha1/marshalling.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ def unmarshal_DiscountFilter(data: Any) -> DiscountFilter:
112112
if field is not None:
113113
args["value"] = field
114114

115+
field = data.get("exclude", None)
116+
if field is not None:
117+
args["exclude"] = field
118+
115119
return DiscountFilter(**args)
116120

117121

scaleway-async/scaleway_async/billing/v2alpha1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ class DiscountFilter:
102102
Value of filter, it can be a product/range/region/zone value.
103103
"""
104104

105+
exclude: bool
106+
"""
107+
Boolean to describe if filter is an excluding filter.
108+
"""
109+
105110

106111
@dataclass
107112
class GetConsumptionResponseConsumption:

scaleway-async/scaleway_async/billing/v2beta1/marshalling.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ def unmarshal_DiscountFilter(data: Any) -> DiscountFilter:
237237
if field is not None:
238238
args["value"] = field
239239

240+
field = data.get("exclude", None)
241+
if field is not None:
242+
args["exclude"] = field
243+
240244
return DiscountFilter(**args)
241245

242246

scaleway-async/scaleway_async/billing/v2beta1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@ class DiscountFilter:
149149
Value of filter.
150150
"""
151151

152+
exclude: bool
153+
"""
154+
Boolean to describe if filter is an excluding filter.
155+
"""
156+
152157

153158
@dataclass
154159
class ListConsumptionsResponseConsumption:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,12 @@ def unmarshal_Cluster(data: Any) -> Cluster:
493493
else:
494494
args["sbs_csi_enabled"] = None
495495

496+
field = data.get("full_vpc_integraton_enabled", None)
497+
if field is not None:
498+
args["full_vpc_integraton_enabled"] = field
499+
else:
500+
args["full_vpc_integraton_enabled"] = None
501+
496502
return Cluster(**args)
497503

498504

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,11 @@ class Cluster:
872872
Defines whether the SBS-enabled CSI starting from v0.3 is installed on the cluster.
873873
"""
874874

875+
full_vpc_integraton_enabled: Optional[bool]
876+
"""
877+
Defines whether VPC is fully integrated on the cluster.
878+
"""
879+
875880

876881
@dataclass
877882
class Node:

scaleway/scaleway/billing/v2alpha1/marshalling.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ def unmarshal_DiscountFilter(data: Any) -> DiscountFilter:
112112
if field is not None:
113113
args["value"] = field
114114

115+
field = data.get("exclude", None)
116+
if field is not None:
117+
args["exclude"] = field
118+
115119
return DiscountFilter(**args)
116120

117121

scaleway/scaleway/billing/v2alpha1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ class DiscountFilter:
102102
Value of filter, it can be a product/range/region/zone value.
103103
"""
104104

105+
exclude: bool
106+
"""
107+
Boolean to describe if filter is an excluding filter.
108+
"""
109+
105110

106111
@dataclass
107112
class GetConsumptionResponseConsumption:

scaleway/scaleway/billing/v2beta1/marshalling.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ def unmarshal_DiscountFilter(data: Any) -> DiscountFilter:
237237
if field is not None:
238238
args["value"] = field
239239

240+
field = data.get("exclude", None)
241+
if field is not None:
242+
args["exclude"] = field
243+
240244
return DiscountFilter(**args)
241245

242246

scaleway/scaleway/billing/v2beta1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@ class DiscountFilter:
149149
Value of filter.
150150
"""
151151

152+
exclude: bool
153+
"""
154+
Boolean to describe if filter is an excluding filter.
155+
"""
156+
152157

153158
@dataclass
154159
class ListConsumptionsResponseConsumption:

0 commit comments

Comments
 (0)