Merge branch 'main' into v1.6515.0

Author: jremy42

packages_generated/cockpit/src/v1/api.gen.ts

@@ -801,6 +801,7 @@ If you need to receive alerts for other receivers, you can create additional con
         method: 'GET',
         path: `/cockpit/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/alerts`,
         urlParams: urlParams(
+          ['data_source_id', request.dataSourceId],
           ['is_enabled', request.isEnabled],
           ['is_preconfigured', request.isPreconfigured],
           [

packages_generated/cockpit/src/v1/marshalling.gen.ts

@@ -294,6 +294,7 @@ const unmarshalAlert = (data: unknown): Alert => {
 
   return {
     annotations: data.annotations,
+    dataSourceId: data.data_source_id,
     duration: data.duration,
     enabled: data.enabled,
     name: data.name,

packages_generated/cockpit/src/v1/types.gen.ts

@@ -116,6 +116,10 @@ export interface Alert {
    * Contains additional data for preconfigured alerts, such as the rule ID, display name, and description. Only present if the alert is preconfigured.
    */
   preconfiguredData?: PreconfiguredAlertData
+  /**
+   * ID of the data source containing the alert rule.
+   */
+  dataSourceId: string
 }
 
 /**
@@ -964,6 +968,10 @@ export type 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.
    */
   state?: AlertState
+  /**
+   * If omitted, only alerts from the default scaleway data source will be listed.
+   */
+  dataSourceId?: string
 }
 
 /**

packages_generated/key_manager/src/v1alpha1/api.gen.ts

@@ -251,6 +251,7 @@ export class API extends ParentAPI {
           ],
           ['project_id', request.projectId],
           ['tags', request.tags],
+          ['usage', request.usage],
         ),
       },
       unmarshalListKeysResponse,

packages_generated/key_manager/src/v1alpha1/types.gen.ts

@@ -43,6 +43,12 @@ export type ListKeysRequestOrderBy =
   | 'updated_at_asc'
   | 'updated_at_desc'
 
+export type ListKeysRequestUsage =
+  | 'unknown_usage'
+  | 'symmetric_encryption'
+  | 'asymmetric_encryption'
+  | 'asymmetric_signing'
+
 export interface KeyRotationPolicy {
   /**
    * Time interval between two key rotations. The minimum duration is 24 hours and the maximum duration is 1 year (876000 hours).
@@ -395,6 +401,10 @@ export type ListKeysRequest = {
    * (Optional) Filter by key name.
    */
   name?: string
+  /**
+   * Select from symmetric encryption, asymmetric encryption, or asymmetric signing.
+   */
+  usage?: ListKeysRequestUsage
 }
 
 export interface ListKeysResponse {