Merge branch 'main' into v1.6267.0

Author: Laure-di

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

@@ -2172,9 +2172,9 @@ def unmarshal_ServerType(data: Any) -> ServerType:
     if field is not None:
         args["arch"] = field
 
-    field = data.get("baremetal", None)
+    field = data.get("end_of_service", None)
     if field is not None:
-        args["baremetal"] = field
+        args["end_of_service"] = field
 
     field = data.get("per_volume_constraint", None)
     if field is not None:
@@ -2196,10 +2196,6 @@ def unmarshal_ServerType(data: Any) -> ServerType:
     else:
         args["gpu"] = None
 
-    field = data.get("end_of_service", None)
-    if field is not None:
-        args["end_of_service"] = field
-
     field = data.get("gpu_info", None)
     if field is not None:
         args["gpu_info"] = unmarshal_ServerTypeGPUInfo(field)

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

@@ -1355,9 +1355,9 @@ class ServerType:
     CPU architecture.
     """
 
-    baremetal: bool
+    end_of_service: bool
     """
-    True if it is a baremetal Instance.
+    True if this Instance type has reached end of service.
     """
 
     per_volume_constraint: Optional[ServerTypeVolumeConstraintsByType]
@@ -1375,11 +1375,6 @@ class ServerType:
     Number of GPU.
     """
 
-    end_of_service: bool
-    """
-    True if this Instance type has reached end of service.
-    """
-
     gpu_info: Optional[ServerTypeGPUInfo]
     """
     GPU information.

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

@@ -297,7 +297,7 @@ class SubscriberWebhookConfig:
 class HealthCheckHttpConfig:
     uri: str
     """
-    The HTTP URI to use when performing a health check on backend servers.
+    The HTTP path to use when performing a health check on backend servers.
     """
 
     method: str
@@ -320,7 +320,7 @@ class HealthCheckHttpConfig:
 class HealthCheckHttpsConfig:
     uri: str
     """
-    The HTTP URI to use when performing a health check on backend servers.
+    The HTTP path to use when performing a health check on backend servers.
     """
 
     method: str

scaleway/scaleway/instance/v1/marshalling.py

@@ -2172,9 +2172,9 @@ def unmarshal_ServerType(data: Any) -> ServerType:
     if field is not None:
         args["arch"] = field
 
-    field = data.get("baremetal", None)
+    field = data.get("end_of_service", None)
     if field is not None:
-        args["baremetal"] = field
+        args["end_of_service"] = field
 
     field = data.get("per_volume_constraint", None)
     if field is not None:
@@ -2196,10 +2196,6 @@ def unmarshal_ServerType(data: Any) -> ServerType:
     else:
         args["gpu"] = None
 
-    field = data.get("end_of_service", None)
-    if field is not None:
-        args["end_of_service"] = field
-
     field = data.get("gpu_info", None)
     if field is not None:
         args["gpu_info"] = unmarshal_ServerTypeGPUInfo(field)

scaleway/scaleway/instance/v1/types.py

@@ -1355,9 +1355,9 @@ class ServerType:
     CPU architecture.
     """
 
-    baremetal: bool
+    end_of_service: bool
     """
-    True if it is a baremetal Instance.
+    True if this Instance type has reached end of service.
     """
 
     per_volume_constraint: Optional[ServerTypeVolumeConstraintsByType]
@@ -1375,11 +1375,6 @@ class ServerType:
     Number of GPU.
     """
 
-    end_of_service: bool
-    """
-    True if this Instance type has reached end of service.
-    """
-
     gpu_info: Optional[ServerTypeGPUInfo]
     """
     GPU information.

scaleway/scaleway/lb/v1/types.py

@@ -297,7 +297,7 @@ class SubscriberWebhookConfig:
 class HealthCheckHttpConfig:
     uri: str
     """
-    The HTTP URI to use when performing a health check on backend servers.
+    The HTTP path to use when performing a health check on backend servers.
     """
 
     method: str
@@ -320,7 +320,7 @@ class HealthCheckHttpConfig:
 class HealthCheckHttpsConfig:
     uri: str
     """
-    The HTTP URI to use when performing a health check on backend servers.
+    The HTTP path to use when performing a health check on backend servers.
     """
 
     method: str