Merge branch 'main' into v1.6527.0

Author: Laure-di

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

@@ -2,6 +2,8 @@
 # If you have any remark or suggestion do not hesitate to open an issue.
 from .types import ListEventsRequestOrderBy
 from .types import ResourceType
+from .types import AccountOrganizationInfo
+from .types import AccountUserInfo
 from .types import KeyManagerKeyInfo
 from .types import KubernetesACLInfo
 from .types import KubernetesClusterInfo
@@ -23,6 +25,8 @@
 __all__ = [
     "ListEventsRequestOrderBy",
     "ResourceType",
+    "AccountOrganizationInfo",
+    "AccountUserInfo",
     "KeyManagerKeyInfo",
     "KubernetesACLInfo",
     "KubernetesClusterInfo",

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

@@ -5,6 +5,8 @@
 from dateutil import parser
 
 from .types import (
+    AccountOrganizationInfo,
+    AccountUserInfo,
     KeyManagerKeyInfo,
     KubernetesACLInfo,
     KubernetesClusterInfo,
@@ -22,6 +24,32 @@
 )
 
 
+def unmarshal_AccountOrganizationInfo(data: Any) -> AccountOrganizationInfo:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'AccountOrganizationInfo' failed as data isn't a dictionary."
+        )
+
+    args: Dict[str, Any] = {}
+
+    return AccountOrganizationInfo(**args)
+
+
+def unmarshal_AccountUserInfo(data: Any) -> AccountUserInfo:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'AccountUserInfo' failed as data isn't a dictionary."
+        )
+
+    args: Dict[str, Any] = {}
+
+    field = data.get("email", None)
+    if field is not None:
+        args["email"] = field
+
+    return AccountUserInfo(**args)
+
+
 def unmarshal_KeyManagerKeyInfo(data: Any) -> KeyManagerKeyInfo:
     if not isinstance(data, dict):
         raise TypeError(
@@ -244,6 +272,18 @@ def unmarshal_Resource(data: Any) -> Resource:
     else:
         args["key_manager_key_info"] = None
 
+    field = data.get("account_user_info", None)
+    if field is not None:
+        args["account_user_info"] = unmarshal_AccountUserInfo(field)
+    else:
+        args["account_user_info"] = None
+
+    field = data.get("account_organization_info", None)
+    if field is not None:
+        args["account_organization_info"] = unmarshal_AccountOrganizationInfo(field)
+    else:
+        args["account_organization_info"] = None
+
     return Resource(**args)
 
 

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

@@ -42,11 +42,23 @@ class ResourceType(str, Enum, metaclass=StrEnumMeta):
     SECRET_MANAGER_SECRET = "secret_manager_secret"
     SECRET_MANAGER_VERSION = "secret_manager_version"
     KEY_MANAGER_KEY = "key_manager_key"
+    ACCOUNT_USER = "account_user"
+    ACCOUNT_ORGANIZATION = "account_organization"
 
     def __str__(self) -> str:
         return str(self.value)
 
 
+@dataclass
+class AccountOrganizationInfo:
+    pass
+
+
+@dataclass
+class AccountUserInfo:
+    email: str
+
+
 @dataclass
 class KeyManagerKeyInfo:
     pass
@@ -125,6 +137,10 @@ class Resource:
 
     key_manager_key_info: Optional[KeyManagerKeyInfo]
 
+    account_user_info: Optional[AccountUserInfo]
+
+    account_organization_info: Optional[AccountOrganizationInfo]
+
 
 @dataclass
 class ProductService:

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

@@ -591,7 +591,7 @@ async def get_current_plan(
 
 class CockpitV1RegionalAPI(API):
     """
-    The Cockpit Regional API allows you to create data sources and tokens to store and query data types such as metrics, logs, and traces. You can also push your data into Cockpit, and send alerts to your contact points when your resources may require your attention, using the regional Alert manager.
+    The Cockpit API allows you to create data sources and Cockpit tokens to store and query data types such as metrics, logs, and traces. You can also push your data into Cockpit, and send alerts to your contact points when your resources may require your attention, using the regional Alert manager.
     """
 
     async def get_config(
@@ -1446,6 +1446,7 @@ async def list_alerts(
         is_enabled: Optional[bool] = None,
         is_preconfigured: Optional[bool] = None,
         state: Optional[AlertState] = None,
+        data_source_id: Optional[str] = None,
     ) -> ListAlertsResponse:
         """
         List alerts.
@@ -1455,6 +1456,7 @@ async def list_alerts(
         :param is_enabled: True returns only enabled alerts. False returns only disabled alerts. If omitted, no alert filtering is applied. Other filters may still apply.
         :param is_preconfigured: True returns only preconfigured alerts. False returns only custom alerts. If omitted, no filtering is applied on alert types. Other filters may still apply.
         :param state: Valid values to filter on are `inactive`, `pending` and `firing`. If omitted, no filtering is applied on alert states. Other filters may still apply.
+        :param data_source_id: If omitted, only alerts from the default scaleway data source will be listed.
         :return: :class:`ListAlertsResponse <ListAlertsResponse>`
 
         Usage:
@@ -1471,6 +1473,7 @@ async def list_alerts(
             "GET",
             f"/cockpit/v1/regions/{param_region}/alerts",
             params={
+                "data_source_id": data_source_id,
                 "is_enabled": is_enabled,
                 "is_preconfigured": is_preconfigured,
                 "project_id": project_id or self.client.default_project_id,

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

@@ -509,6 +509,10 @@ def unmarshal_Alert(data: Any) -> Alert:
     if field is not None:
         args["annotations"] = field
 
+    field = data.get("data_source_id", None)
+    if field is not None:
+        args["data_source_id"] = field
+
     field = data.get("state", None)
     if field is not None:
         args["state"] = field

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

@@ -204,6 +204,11 @@ class Alert:
     Annotations for the alert, used to provide additional information about the alert.
     """
 
+    data_source_id: str
+    """
+    ID of the data source containing the alert rule.
+    """
+
     state: Optional[AlertState]
     """
     Current state of the alert. Possible states are `inactive`, `pending`, and `firing`.
@@ -1239,6 +1244,11 @@ class RegionalApiListAlertsRequest:
     Valid values to filter on are `inactive`, `pending` and `firing`. If omitted, no filtering is applied on alert states. Other filters may still apply.
     """
 
+    data_source_id: Optional[str]
+    """
+    If omitted, only alerts from the default scaleway data source will be listed.
+    """
+
 
 @dataclass
 class RegionalApiListContactPointsRequest:

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

@@ -94,6 +94,7 @@
 from .types import ListUsersResponse
 from .types import LockUserRequest
 from .types import MFAOTP
+from .types import MigrateOrganizationGuestsRequest
 from .types import OrganizationSecuritySettings
 from .types import RemoveGroupMemberRequest
 from .types import SetGroupMembersRequest
@@ -208,6 +209,7 @@
     "ListUsersResponse",
     "LockUserRequest",
     "MFAOTP",
+    "MigrateOrganizationGuestsRequest",
     "OrganizationSecuritySettings",
     "RemoveGroupMemberRequest",
     "SetGroupMembersRequest",

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

@@ -2826,3 +2826,29 @@ async def update_organization_security_settings(
 
         self._throw_on_error(res)
         return unmarshal_OrganizationSecuritySettings(res.json())
+
+    async def migrate_organization_guests(
+        self,
+        *,
+        organization_id: Optional[str] = None,
+    ) -> None:
+        """
+        Migrate the organization's guests to IAM members.
+        :param organization_id: ID of the Organization.
+
+        Usage:
+        ::
+
+            result = await api.migrate_organization_guests()
+        """
+
+        param_organization_id = validate_path_param(
+            "organization_id", organization_id or self.client.default_organization_id
+        )
+
+        res = self._request(
+            "POST",
+            f"/iam/v1alpha1/organizations/{param_organization_id}/migrate-guests",
+        )
+
+        self._throw_on_error(res)

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

@@ -1906,6 +1906,14 @@ class MFAOTP:
     secret: str
 
 
+@dataclass
+class MigrateOrganizationGuestsRequest:
+    organization_id: Optional[str]
+    """
+    ID of the Organization.
+    """
+
+
 @dataclass
 class OrganizationSecuritySettings:
     enforce_password_renewal: bool

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

@@ -75,6 +75,7 @@
 from .types import ListPoolsResponse
 from .types import ListVersionsRequest
 from .types import ListVersionsResponse
+from .types import MigratePoolsToNewImagesRequest
 from .types import NodeMetadata
 from .types import RebootNodeRequest
 from .types import ReplaceNodeRequest
@@ -164,6 +165,7 @@
     "ListPoolsResponse",
     "ListVersionsRequest",
     "ListVersionsResponse",
+    "MigratePoolsToNewImagesRequest",
     "NodeMetadata",
     "RebootNodeRequest",
     "ReplaceNodeRequest",