Merge branch 'main' into v1.5525.0

Author: Laure-di

.github/workflows/checks.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install dependencies and library
         run: poetry install
       - name: Check format
-        run: poetry run ruff format -q
+        run: poetry run ruff format --check
 
   typing:
     runs-on: ubuntu-latest

scaleway-async/poetry.lock

@@ -28,12 +28,12 @@ scaleway-core = "*"
 
 [tool.poetry.group.dev.dependencies]
 scaleway-core = { path = "../scaleway-core", develop = true }
-ruff = ">=0.5.0,<0.6.4"
+ruff = ">=0.5.0,<0.6.9"
 mypy = "^1.5.1"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.ruff]
+[tool.ruff.lint]
 ignore = ["E501"]

scaleway-async/pyproject.toml

@@ -1,8 +1,8 @@
 """Scaleway SDK for Python - Async"""
 
-import pkg_resources
+import importlib.metadata
 
-__version__: str = pkg_resources.get_distribution(__name__).version
+__version__: str = importlib.metadata.version(__name__)
 
 from scaleway_core.api import (
     API,

scaleway-async/scaleway_async/__init__.py

@@ -398,6 +398,7 @@ async def install_server(
         password: Optional[str] = None,
         service_user: Optional[str] = None,
         service_password: Optional[str] = None,
+        partitioning_schema: Optional[Schema] = None,
     ) -> Server:
         """
         Install an Elastic Metal server.
@@ -411,6 +412,7 @@ async def install_server(
         :param password: Password used for the installation.
         :param service_user: User used for the service to install.
         :param service_password: Password used for the service to install.
+        :param partitioning_schema: Partitioning schema.
         :return: :class:`Server <Server>`
 
         Usage:
@@ -441,6 +443,7 @@ async def install_server(
                     password=password,
                     service_user=service_user,
                     service_password=service_password,
+                    partitioning_schema=partitioning_schema,
                 ),
                 self.client,
             ),

scaleway-async/scaleway_async/baremetal/v1/api.py

@@ -894,6 +894,12 @@ def unmarshal_ServerInstall(data: Any) -> ServerInstall:
     if field is not None:
         args["service_url"] = field
 
+    field = data.get("partitioning_schema", None)
+    if field is not None:
+        args["partitioning_schema"] = unmarshal_Schema(field)
+    else:
+        args["partitioning_schema"] = None
+
     return ServerInstall(**args)
 
 
@@ -1362,6 +1368,136 @@ def marshal_AddOptionServerRequest(
     return output
 
 
+def marshal_SchemaPartition(
+    request: SchemaPartition,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.label is not None:
+        output["label"] = str(request.label)
+
+    if request.number is not None:
+        output["number"] = request.number
+
+    if request.size is not None:
+        output["size"] = request.size
+
+    return output
+
+
+def marshal_SchemaPool(
+    request: SchemaPool,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.name is not None:
+        output["name"] = request.name
+
+    if request.type_ is not None:
+        output["type"] = str(request.type_)
+
+    if request.devices is not None:
+        output["devices"] = request.devices
+
+    if request.options is not None:
+        output["options"] = request.options
+
+    if request.filesystem_options is not None:
+        output["filesystem_options"] = request.filesystem_options
+
+    return output
+
+
+def marshal_SchemaDisk(
+    request: SchemaDisk,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.device is not None:
+        output["device"] = request.device
+
+    if request.partitions is not None:
+        output["partitions"] = [
+            marshal_SchemaPartition(item, defaults) for item in request.partitions
+        ]
+
+    return output
+
+
+def marshal_SchemaFilesystem(
+    request: SchemaFilesystem,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.device is not None:
+        output["device"] = request.device
+
+    if request.format is not None:
+        output["format"] = str(request.format)
+
+    if request.mountpoint is not None:
+        output["mountpoint"] = request.mountpoint
+
+    return output
+
+
+def marshal_SchemaRAID(
+    request: SchemaRAID,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.name is not None:
+        output["name"] = request.name
+
+    if request.level is not None:
+        output["level"] = str(request.level)
+
+    if request.devices is not None:
+        output["devices"] = request.devices
+
+    return output
+
+
+def marshal_SchemaZFS(
+    request: SchemaZFS,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.pools is not None:
+        output["pools"] = [marshal_SchemaPool(item, defaults) for item in request.pools]
+
+    return output
+
+
+def marshal_Schema(
+    request: Schema,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.disks is not None:
+        output["disks"] = [marshal_SchemaDisk(item, defaults) for item in request.disks]
+
+    if request.raids is not None:
+        output["raids"] = [marshal_SchemaRAID(item, defaults) for item in request.raids]
+
+    if request.filesystems is not None:
+        output["filesystems"] = [
+            marshal_SchemaFilesystem(item, defaults) for item in request.filesystems
+        ]
+
+    if request.zfs is not None:
+        output["zfs"] = marshal_SchemaZFS(request.zfs, defaults)
+
+    return output
+
+
 def marshal_CreateServerRequestInstall(
     request: CreateServerRequestInstall,
     defaults: ProfileDefaults,
@@ -1389,6 +1525,11 @@ def marshal_CreateServerRequestInstall(
     if request.service_password is not None:
         output["service_password"] = request.service_password
 
+    if request.partitioning_schema is not None:
+        output["partitioning_schema"] = marshal_Schema(
+            request.partitioning_schema, defaults
+        )
+
     return output
 
 
@@ -1462,6 +1603,11 @@ def marshal_InstallServerRequest(
     if request.service_password is not None:
         output["service_password"] = request.service_password
 
+    if request.partitioning_schema is not None:
+        output["partitioning_schema"] = marshal_Schema(
+            request.partitioning_schema, defaults
+        )
+
     return output
 
 
@@ -1567,6 +1713,7 @@ def marshal_UpdateSettingRequest(
     return output
 
 
+
 def marshal_SchemaPartition(
     request: SchemaPartition,
     defaults: ProfileDefaults,
@@ -1697,6 +1844,7 @@ def marshal_Schema(
     return output
 
 
+
 def marshal_ValidatePartitioningSchemaRequest(
     request: ValidatePartitioningSchemaRequest,
     defaults: ProfileDefaults,

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

@@ -521,6 +521,11 @@ class ServerInstall:
     Address of the installed service.
     """
 
+    partitioning_schema: Optional[Schema]
+    """
+    Partitioning schema.
+    """
+
 
 @dataclass
 class ServerOption:
@@ -610,6 +615,11 @@ class CreateServerRequestInstall:
     Password used for the service to install.
     """
 
+    partitioning_schema: Optional[Schema]
+    """
+    Partitioning schema.
+    """
+
 
 @dataclass
 class OS:
@@ -1282,6 +1292,11 @@ class InstallServerRequest:
     Password used for the service to install.
     """
 
+    partitioning_schema: Optional[Schema]
+    """
+    Partitioning schema.
+    """
+
 
 @dataclass
 class ListOSRequest:

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

@@ -362,6 +362,7 @@ class MemoryType(str, Enum, metaclass=StrEnumMeta):
     DDR2 = "ddr2"
     DDR3 = "ddr3"
     DDR4 = "ddr4"
+    DDR5 = "ddr5"
 
     def __str__(self) -> str:
         return str(self.value)

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

@@ -931,12 +931,11 @@ async def server_action(
         * `stop_in_place`: Stop the Instance, but keep the slot on the hypervisor.
         * `reboot`: Stop the instance and restart it.
         * `backup`:  Create an image with all the volumes of an Instance.
-        * `terminate`: Delete the Instance along with all attached volumes.
+        * `terminate`: Delete the Instance along with its attached volumes, except for SBS volumes.
         * `enable_routed_ip`: Migrate the Instance to the new network stack.
 
-        Keep in mind that terminating an Instance will result in the deletion of all attached volumes, including local and block storage.
-        If you want to preserve your local volumes, you should use the `archive` action instead of `terminate`. Similarly, if you want to keep your block storage volumes, you must first detach them before issuing the `terminate` command.
-        For more information, read the [Volumes](#path-volumes-list-volumes) documentation.
+        Keep in mind that `terminate` an Instance will result in the deletion of `l_ssd`, `b_ssd` and `scratch` volumes types, `sbs_volume` volumes type will only be detached.
+        If you want to preserve your volumes, you should detach them before the Instance deletion or `terminate` action.
         :param server_id: UUID of the Instance.
         :param zone: Zone to target. If none is passed will use default zone from the config.
         :param action: Action to perform on the Instance.