Merge branch 'main' into v1.5511.0

Author: Laure-di

scaleway-async/scaleway_async/edge_services/v1alpha1/__init__.py

@@ -22,14 +22,14 @@
 from .types import ScalewayS3BackendConfig
 from .types import PipelineError
 from .types import TLSSecret
-from .types import CheckPEMChainRequestSecretChain
 from .types import BackendStage
 from .types import CacheStage
 from .types import DNSStage
 from .types import Pipeline
+from .types import TLSStage
+from .types import CheckPEMChainRequestSecretChain
 from .types import PlanDetails
 from .types import PurgeRequest
-from .types import TLSStage
 from .types import TLSSecretsConfig
 from .types import CheckDomainRequest
 from .types import CheckDomainResponse
@@ -101,14 +101,14 @@
     "ScalewayS3BackendConfig",
     "PipelineError",
     "TLSSecret",
-    "CheckPEMChainRequestSecretChain",
     "BackendStage",
     "CacheStage",
     "DNSStage",
     "Pipeline",
+    "TLSStage",
+    "CheckPEMChainRequestSecretChain",
     "PlanDetails",
     "PurgeRequest",
-    "TLSStage",
     "TLSSecretsConfig",
     "CheckDomainRequest",
     "CheckDomainResponse",

scaleway-async/scaleway_async/edge_services/v1alpha1/api.py

@@ -66,8 +66,8 @@
     unmarshal_CacheStage,
     unmarshal_DNSStage,
     unmarshal_Pipeline,
-    unmarshal_PurgeRequest,
     unmarshal_TLSStage,
+    unmarshal_PurgeRequest,
     unmarshal_CheckDomainResponse,
     unmarshal_CheckLbOriginResponse,
     unmarshal_CheckPEMChainResponse,
@@ -1674,12 +1674,13 @@ async def get_current_plan(
             result = await api.get_current_plan()
         """
 
+        param_project_id = validate_path_param(
+            "project_id", project_id or self.client.default_project_id
+        )
+
         res = self._request(
             "GET",
-            "/edge-services/v1alpha1/current-plan",
-            params={
-                "project_id": project_id or self.client.default_project_id,
-            },
+            f"/edge-services/v1alpha1/current-plan/{param_project_id}",
         )
 
         self._throw_on_error(res)
@@ -1699,12 +1700,13 @@ async def delete_current_plan(
             result = await api.delete_current_plan()
         """
 
+        param_project_id = validate_path_param(
+            "project_id", project_id or self.client.default_project_id
+        )
+
         res = self._request(
             "DELETE",
-            "/edge-services/v1alpha1/current-plan",
-            params={
-                "project_id": project_id or self.client.default_project_id,
-            },
+            f"/edge-services/v1alpha1/current-plan/{param_project_id}",
         )
 
         self._throw_on_error(res)

scaleway-async/scaleway_async/edge_services/v1alpha1/marshalling.py

@@ -18,9 +18,9 @@
     DNSStage,
     PipelineError,
     Pipeline,
-    PurgeRequest,
     TLSSecret,
     TLSStage,
+    PurgeRequest,
     CheckDomainResponse,
     CheckLbOriginResponse,
     CheckPEMChainResponse,
@@ -381,53 +381,6 @@ def unmarshal_Pipeline(data: Any) -> Pipeline:
     return Pipeline(**args)
 
 
-def unmarshal_PurgeRequest(data: Any) -> PurgeRequest:
-    if not isinstance(data, dict):
-        raise TypeError(
-            "Unmarshalling the type 'PurgeRequest' failed as data isn't a dictionary."
-        )
-
-    args: Dict[str, Any] = {}
-
-    field = data.get("id", None)
-    if field is not None:
-        args["id"] = field
-
-    field = data.get("pipeline_id", None)
-    if field is not None:
-        args["pipeline_id"] = field
-
-    field = data.get("status", None)
-    if field is not None:
-        args["status"] = field
-
-    field = data.get("assets", None)
-    if field is not None:
-        args["assets"] = field
-    else:
-        args["assets"] = None
-
-    field = data.get("all", None)
-    if field is not None:
-        args["all"] = field
-    else:
-        args["all"] = None
-
-    field = data.get("created_at", None)
-    if field is not None:
-        args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
-    else:
-        args["created_at"] = None
-
-    field = data.get("updated_at", None)
-    if field is not None:
-        args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
-    else:
-        args["updated_at"] = None
-
-    return PurgeRequest(**args)
-
-
 def unmarshal_TLSSecret(data: Any) -> TLSSecret:
     if not isinstance(data, dict):
         raise TypeError(
@@ -514,6 +467,53 @@ def unmarshal_TLSStage(data: Any) -> TLSStage:
     return TLSStage(**args)
 
 
+def unmarshal_PurgeRequest(data: Any) -> PurgeRequest:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'PurgeRequest' failed as data isn't a dictionary."
+        )
+
+    args: Dict[str, Any] = {}
+
+    field = data.get("id", None)
+    if field is not None:
+        args["id"] = field
+
+    field = data.get("pipeline_id", None)
+    if field is not None:
+        args["pipeline_id"] = field
+
+    field = data.get("status", None)
+    if field is not None:
+        args["status"] = field
+
+    field = data.get("assets", None)
+    if field is not None:
+        args["assets"] = field
+    else:
+        args["assets"] = None
+
+    field = data.get("all", None)
+    if field is not None:
+        args["all"] = field
+    else:
+        args["all"] = None
+
+    field = data.get("created_at", None)
+    if field is not None:
+        args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
+    else:
+        args["created_at"] = None
+
+    field = data.get("updated_at", None)
+    if field is not None:
+        args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
+    else:
+        args["updated_at"] = None
+
+    return PurgeRequest(**args)
+
+
 def unmarshal_CheckDomainResponse(data: Any) -> CheckDomainResponse:
     if not isinstance(data, dict):
         raise TypeError(

scaleway-async/scaleway_async/edge_services/v1alpha1/types.py

@@ -259,13 +259,6 @@ class TLSSecret:
     """
 
 
-@dataclass
-class CheckPEMChainRequestSecretChain:
-    secret_id: str
-
-    secret_region: str
-
-
 @dataclass
 class BackendStage:
     id: str
@@ -423,91 +416,98 @@ class Pipeline:
 
 
 @dataclass
-class PlanDetails:
-    plan_name: PlanName
-
-    package_gb: int
+class TLSStage:
+    id: str
+    """
+    ID of the TLS stage.
+    """
 
-    pipeline_limit: int
+    secrets: List[TLSSecret]
+    """
+    Secret (from Scaleway Secret Manager) containing your custom certificate.
+    """
 
+    managed_certificate: bool
+    """
+    True when Scaleway generates and manages a Let's Encrypt certificate for the TLS stage/custom endpoint.
+    """
 
-@dataclass
-class PurgeRequest:
-    id: str
+    project_id: str
     """
-    ID of the purge request.
+    Project ID of the TLS stage.
     """
 
-    pipeline_id: str
+    pipeline_id: Optional[str]
     """
-    Pipeline ID the purge request belongs to.
+    Pipeline ID the TLS stage belongs to.
     """
 
-    status: PurgeRequestStatus
+    certificate_expires_at: Optional[datetime]
     """
-    Status of the purge request.
+    Expiration date of the certificate.
     """
 
     created_at: Optional[datetime]
     """
-    Date the purge request was created.
+    Date the TLS stage was created.
     """
 
     updated_at: Optional[datetime]
     """
-    Date the purge request was last updated.
+    Date the TLS stage was last updated.
     """
 
-    assets: Optional[List[str]]
+    cache_stage_id: Optional[str]
 
-    all: Optional[bool]
+    backend_stage_id: Optional[str]
 
 
 @dataclass
-class TLSStage:
-    id: str
-    """
-    ID of the TLS stage.
-    """
+class CheckPEMChainRequestSecretChain:
+    secret_id: str
 
-    secrets: List[TLSSecret]
-    """
-    Secret (from Scaleway Secret Manager) containing your custom certificate.
-    """
+    secret_region: str
 
-    managed_certificate: bool
-    """
-    True when Scaleway generates and manages a Let's Encrypt certificate for the TLS stage/custom endpoint.
-    """
 
-    project_id: str
+@dataclass
+class PlanDetails:
+    plan_name: PlanName
+
+    package_gb: int
+
+    pipeline_limit: int
+
+
+@dataclass
+class PurgeRequest:
+    id: str
     """
-    Project ID of the TLS stage.
+    ID of the purge request.
     """
 
-    pipeline_id: Optional[str]
+    pipeline_id: str
     """
-    Pipeline ID the TLS stage belongs to.
+    Pipeline ID the purge request belongs to.
     """
 
-    certificate_expires_at: Optional[datetime]
+    status: PurgeRequestStatus
     """
-    Expiration date of the certificate.
+    Status of the purge request.
     """
 
     created_at: Optional[datetime]
     """
-    Date the TLS stage was created.
+    Date the purge request was created.
     """
 
     updated_at: Optional[datetime]
     """
-    Date the TLS stage was last updated.
+    Date the purge request was last updated.
     """
 
-    cache_stage_id: Optional[str]
+    assets: Optional[List[str]]
 
-    backend_stage_id: Optional[str]
+    all: Optional[bool]
 
 
 @dataclass