Merge branch 'main' into v1.6723.0

Author: jremy42

packages/sdk/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.76.7](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-06-30)
+
+**Note:** Version bump only for package @scaleway/sdk
+
 ## [2.76.6](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-06-23)
 
 **Note:** Version bump only for package @scaleway/sdk

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/sdk",
-  "version": "2.76.6",
+  "version": "2.76.7",
   "description": "Scaleway SDK TS.",
   "license": "Apache-2.0",
   "files": [

packages_generated/audit_trail/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.3.0 (2025-06-30)
+
+### Features
+
+- **audit_trail:** add instance server resource type ([#2213](https://github.com/scaleway/scaleway-sdk-js/issues/2213)) ([ecb4983](https://github.com/scaleway/scaleway-sdk-js/commit/ecb4983fd015a05fb9a834f34bcb4c0facfbac87))
+
 # 1.2.0 (2025-06-18)
 
 ### Bug Fixes

packages_generated/audit_trail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/sdk-audit-trail",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Scaleway SDK audit-trail",
   "license": "Apache-2.0",
   "files": [

packages_generated/cockpit/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.4.0 (2025-06-30)
+
+### Features
+
+- **cockpit:** add getRulesCount endpoint ([#2219](https://github.com/scaleway/scaleway-sdk-js/issues/2219)) ([06dcd76](https://github.com/scaleway/scaleway-sdk-js/commit/06dcd76aff6034d297e5268ca376078fcc9d466a))
+
 ## [1.3.2](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-06-18)
 
 ### Bug Fixes

packages_generated/cockpit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/sdk-cockpit",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Scaleway SDK cockpit",
   "license": "Apache-2.0",
   "files": [

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

@@ -32,6 +32,7 @@ import {
   unmarshalDisableAlertRulesResponse,
   unmarshalEnableAlertRulesResponse,
   unmarshalGetConfigResponse,
+  unmarshalGetRulesCountResponse,
   unmarshalGrafana,
   unmarshalGrafanaProductDashboard,
   unmarshalGrafanaUser,
@@ -53,6 +54,7 @@ import type {
   DisableAlertRulesResponse,
   EnableAlertRulesResponse,
   GetConfigResponse,
+  GetRulesCountResponse,
   GlobalApiCreateGrafanaUserRequest,
   GlobalApiDeleteGrafanaUserRequest,
   GlobalApiGetCurrentPlanRequest,
@@ -90,6 +92,7 @@ import type {
   RegionalApiGetAlertManagerRequest,
   RegionalApiGetConfigRequest,
   RegionalApiGetDataSourceRequest,
+  RegionalApiGetRulesCountRequest,
   RegionalApiGetTokenRequest,
   RegionalApiGetUsageOverviewRequest,
   RegionalApiListAlertsRequest,
@@ -690,6 +693,25 @@ The output returned displays a URL to access the Alert manager, and whether the
       unmarshalAlertManager,
     )
 
+  /**
+   * Get a detailed count of enabled rules in the specified Project. Includes preconfigured and custom alerting and recording rules.. Get a detailed count of enabled rules in the specified Project. Includes preconfigured and custom alerting and recording rules.
+   *
+   * @param request - The request {@link RegionalApiGetRulesCountRequest}
+   * @returns A Promise of GetRulesCountResponse
+   */
+  getRulesCount = (request: Readonly<RegionalApiGetRulesCountRequest> = {}) =>
+    this.client.fetch<GetRulesCountResponse>(
+      {
+        method: 'GET',
+        path: `/cockpit/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/rules/count`,
+        urlParams: urlParams([
+          'project_id',
+          request.projectId ?? this.client.settings.defaultProjectId,
+        ]),
+      },
+      unmarshalGetRulesCountResponse,
+    )
+
   /**
    * Create a contact point. Contact points are email addresses associated with the default receiver, that the Alert manager sends alerts to.
 The source of the alerts are data sources within the same Project and region as the Alert manager.

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

@@ -17,6 +17,7 @@ import type {
   EnableAlertRulesResponse,
   GetConfigResponse,
   GetConfigResponseRetention,
+  GetRulesCountResponse,
   GlobalApiCreateGrafanaUserRequest,
   GlobalApiResetGrafanaUserPasswordRequest,
   GlobalApiSelectPlanRequest,
@@ -46,6 +47,7 @@ import type {
   RegionalApiTriggerTestAlertRequest,
   RegionalApiUpdateContactPointRequest,
   RegionalApiUpdateDataSourceRequest,
+  RulesCount,
   Token,
   Usage,
   UsageOverview,
@@ -257,6 +259,39 @@ export const unmarshalGetConfigResponse = (
   } as GetConfigResponse
 }
 
+const unmarshalRulesCount = (data: unknown): RulesCount => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'RulesCount' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    dataSourceId: data.data_source_id,
+    dataSourceName: data.data_source_name,
+    rulesCount: data.rules_count,
+  } as RulesCount
+}
+
+export const unmarshalGetRulesCountResponse = (
+  data: unknown,
+): GetRulesCountResponse => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'GetRulesCountResponse' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    customRulesCount: data.custom_rules_count,
+    preconfiguredRulesCount: data.preconfigured_rules_count,
+    rulesCountByDatasource: unmarshalArrayOfObject(
+      data.rules_count_by_datasource,
+      unmarshalRulesCount,
+    ),
+  } as GetRulesCountResponse
+}
+
 export const unmarshalGrafana = (data: unknown): Grafana => {
   if (!isJSONObject(data)) {
     throw new TypeError(

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

@@ -84,6 +84,21 @@ export interface GetConfigResponseRetention {
   defaultDays: number
 }
 
+export interface RulesCount {
+  /**
+   * ID of the data source.
+   */
+  dataSourceId: string
+  /**
+   * Name of the data source.
+   */
+  dataSourceName: string
+  /**
+   * Total count of rules associated with this data source.
+   */
+  rulesCount: number
+}
+
 /**
  * Structure representing an alert.
  */
@@ -430,6 +445,21 @@ export interface GetConfigResponse {
   productLogsRetention?: GetConfigResponseRetention
 }
 
+export interface GetRulesCountResponse {
+  /**
+   * Total count of rules grouped by data source.
+   */
+  rulesCountByDatasource: RulesCount[]
+  /**
+   * Total count of preconfigured rules.
+   */
+  preconfiguredRulesCount: number
+  /**
+   * Total count of custom rules.
+   */
+  customRulesCount: number
+}
+
 /**
  * Create a Grafana user.
  */
@@ -953,6 +983,17 @@ export type RegionalApiGetDataSourceRequest = {
   dataSourceId: string
 }
 
+export type RegionalApiGetRulesCountRequest = {
+  /**
+   * Region to target. If none is passed will use default region from the config.
+   */
+  region?: ScwRegion
+  /**
+   * ID of the Project to retrieve the rule count for.
+   */
+  projectId?: string
+}
+
 /**
  * Get a token.
  */

packages_generated/edge_services/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.1.0 (2025-06-30)
+
+### Features
+
+- **edge_services:** add include_cookies to cache-stage ([#2211](https://github.com/scaleway/scaleway-sdk-js/issues/2211)) ([d390ad5](https://github.com/scaleway/scaleway-sdk-js/commit/d390ad55e606a4b376bb0327bb983be667a9ef64))
+
 ## 1.0.5 (2025-06-18)
 
 **Note:** Version bump only for package @scaleway/sdk-edge-services