Merge branch 'main' into v1.5771.0

Author: yfodil

packages/clients/src/api/cockpit/v1/api.gen.ts

@@ -23,7 +23,6 @@ import {
   marshalRegionalApiTriggerTestAlertRequest,
   marshalRegionalApiUpdateDataSourceRequest,
   unmarshalAlertManager,
-  unmarshalCockpitMetrics,
   unmarshalContactPoint,
   unmarshalDataSource,
   unmarshalGetConfigResponse,
@@ -43,7 +42,6 @@ import {
 } from './marshalling.gen'
 import type {
   AlertManager,
-  CockpitMetrics,
   ContactPoint,
   DataSource,
   GetConfigResponse,
@@ -80,7 +78,6 @@ import type {
   RegionalApiEnableAlertManagerRequest,
   RegionalApiEnableManagedAlertsRequest,
   RegionalApiGetAlertManagerRequest,
-  RegionalApiGetCockpitMetricsRequest,
   RegionalApiGetConfigRequest,
   RegionalApiGetDataSourceRequest,
   RegionalApiGetTokenRequest,
@@ -918,24 +915,4 @@ export class RegionalAPI extends ParentAPI {
       method: 'POST',
       path: `/cockpit/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/alert-manager/trigger-test-alert`,
     })
-
-  getCockpitMetrics = (
-    request: Readonly<RegionalApiGetCockpitMetricsRequest>,
-  ) =>
-    this.client.fetch<CockpitMetrics>(
-      {
-        method: 'GET',
-        path: `/cockpit/v1beta1/cockpit/metrics`,
-        urlParams: urlParams(
-          ['end_date', request.endDate],
-          [
-            'project_id',
-            request.projectId ?? this.client.settings.defaultProjectId,
-          ],
-          ['query', request.query],
-          ['start_date', request.startDate],
-        ),
-      },
-      unmarshalCockpitMetrics,
-    )
 }

packages/clients/src/api/cockpit/v1/marshalling.gen.ts

@@ -5,13 +5,11 @@ import {
   resolveOneOf,
   unmarshalArrayOfObject,
   unmarshalDate,
-  unmarshalTimeSeries,
 } from '../../../bridge'
 import type { DefaultValues } from '../../../bridge'
 import type {
   Alert,
   AlertManager,
-  CockpitMetrics,
   ContactPoint,
   ContactPointEmail,
   DataSource,
@@ -180,18 +178,6 @@ export const unmarshalAlertManager = (data: unknown): AlertManager => {
   } as AlertManager
 }
 
-export const unmarshalCockpitMetrics = (data: unknown): CockpitMetrics => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(
-      `Unmarshalling the type 'CockpitMetrics' failed as data isn't a dictionary.`,
-    )
-  }
-
-  return {
-    timeseries: unmarshalArrayOfObject(data.timeseries, unmarshalTimeSeries),
-  } as CockpitMetrics
-}
-
 const unmarshalGetConfigResponseRetention = (
   data: unknown,
 ): GetConfigResponseRetention => {

packages/clients/src/api/cockpit/v1/types.gen.ts

@@ -1,8 +1,12 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
-import type { Region, TimeSeries } from '../../../bridge'
+import type { Region } from '../../../bridge'
 
-export type DataSourceOrigin = 'unknown_origin' | 'scaleway' | 'custom'
+export type DataSourceOrigin =
+  | 'unknown_origin'
+  | 'scaleway'
+  | 'external'
+  | 'custom'
 
 export type DataSourceType = 'unknown_type' | 'metrics' | 'logs' | 'traces'
 
@@ -207,10 +211,6 @@ export interface AlertManager {
   region: Region
 }
 
-export interface CockpitMetrics {
-  timeseries: TimeSeries[]
-}
-
 /** Cockpit configuration. */
 export interface GetConfigResponse {
   /** Custom metrics retention configuration. */
@@ -539,13 +539,6 @@ export type RegionalApiGetAlertManagerRequest = {
   projectId?: string
 }
 
-export type RegionalApiGetCockpitMetricsRequest = {
-  projectId?: string
-  startDate?: Date
-  endDate?: Date
-  query: string
-}
-
 /** Get Cockpit configuration. */
 export type RegionalApiGetConfigRequest = {
   /**

packages/clients/src/scw/client.ts

@@ -1,7 +1,10 @@
 import { getLogger } from '../internal/logger'
 import type { ClientConfig } from './client-ini-factory'
-import { withLegacyInterceptors, withProfile } from './client-ini-factory'
-import type { Profile } from './client-ini-profile'
+import {
+  withAdditionalInterceptors,
+  withLegacyInterceptors,
+  withProfile,
+} from './client-ini-factory'
 import type { Settings } from './client-settings'
 import { assertValidSettings } from './client-settings'
 import { userAgent, version } from './constants'
@@ -99,5 +102,8 @@ export const createAdvancedClient = (...configs: ClientConfig[]): Client => {
  *
  * @public
  */
-export const createClient = (profile: Profile = {}): Client =>
-  createAdvancedClient(withProfile(profile))
+export const createClient = (settings: Partial<Settings> = {}): Client =>
+  createAdvancedClient(
+    withProfile(settings),
+    withAdditionalInterceptors(settings.interceptors ?? []),
+  )