Merge branch 'main' into v1.6111.0

Author: remyleone

packages/clients/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.66.0](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-02-17)
+
+### Features
+
+- **apple_silicon:** introduce monthly commitment handling ([#1803](https://github.com/scaleway/scaleway-sdk-js/issues/1803)) ([0972b37](https://github.com/scaleway/scaleway-sdk-js/commit/0972b37b4592b0112e6f800426b8129a85192d76))
+- **audit_trail:** add key manager to resource api ([#1786](https://github.com/scaleway/scaleway-sdk-js/issues/1786)) ([b985b98](https://github.com/scaleway/scaleway-sdk-js/commit/b985b981e60650c72ed4b8faf2422e3cf4063f08))
+- **edge_services:** add WAF billing ([#1800](https://github.com/scaleway/scaleway-sdk-js/issues/1800)) ([84a9ec5](https://github.com/scaleway/scaleway-sdk-js/commit/84a9ec517b24259cf6beef3277790a4764750bbb))
+
+### Bug Fixes
+
+- add prefix to Zone and Region import ([#1802](https://github.com/scaleway/scaleway-sdk-js/issues/1802)) ([ce59650](https://github.com/scaleway/scaleway-sdk-js/commit/ce596501b569b3387a76e12e7d00a90d94ca803e))
+- **types:** unknown property accessKey in createClient ([#1781](https://github.com/scaleway/scaleway-sdk-js/issues/1781)) ([865b8c7](https://github.com/scaleway/scaleway-sdk-js/commit/865b8c7b6854314ebc209b5bba6ea836cb792b73))
+
 ## [2.65.0](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-02-10)
 
 ### Features

packages/clients/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/sdk",
-  "version": "2.65.0",
+  "version": "2.66.0",
   "license": "Apache-2.0",
   "description": "Scaleway SDK.",
   "keywords": [

packages/clients/src/api/applesilicon/v1alpha1/marshalling.gen.ts

@@ -8,6 +8,8 @@ import {
 } from '../../../bridge'
 import type { DefaultValues } from '../../../bridge'
 import type {
+  Commitment,
+  CommitmentTypeValue,
   ConnectivityDiagnostic,
   ConnectivityDiagnosticServerHealth,
   CreateServerRequest,
@@ -161,6 +163,19 @@ export const unmarshalServerType = (data: unknown): ServerType => {
   } as ServerType
 }
 
+const unmarshalCommitment = (data: unknown): Commitment => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'Commitment' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    cancelled: data.cancelled,
+    type: data.type,
+  } as Commitment
+}
+
 export const unmarshalServer = (data: unknown): Server => {
   if (!isJSONObject(data)) {
     throw new TypeError(
@@ -169,6 +184,9 @@ export const unmarshalServer = (data: unknown): Server => {
   }
 
   return {
+    commitment: data.commitment
+      ? unmarshalCommitment(data.commitment)
+      : undefined,
     createdAt: unmarshalDate(data.created_at),
     deletableAt: unmarshalDate(data.deletable_at),
     deletionScheduled: data.deletion_scheduled,
@@ -326,6 +344,7 @@ export const marshalCreateServerRequest = (
   request: CreateServerRequest,
   defaults: DefaultValues,
 ): Record<string, unknown> => ({
+  commitment_type: request.commitmentType,
   enable_vpc: request.enableVpc,
   name: request.name || randomName('as'),
   os_id: request.osId,
@@ -362,10 +381,21 @@ export const marshalStartConnectivityDiagnosticRequest = (
   server_id: request.serverId,
 })
 
+const marshalCommitmentTypeValue = (
+  request: CommitmentTypeValue,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  commitment_type: request.commitmentType,
+})
+
 export const marshalUpdateServerRequest = (
   request: UpdateServerRequest,
   defaults: DefaultValues,
 ): Record<string, unknown> => ({
+  commitment_type:
+    request.commitmentType !== undefined
+      ? marshalCommitmentTypeValue(request.commitmentType, defaults)
+      : undefined,
   enable_vpc: request.enableVpc,
   name: request.name,
   schedule_deletion: request.scheduleDeletion,

packages/clients/src/api/applesilicon/v1alpha1/types.gen.ts

@@ -2,6 +2,8 @@
 // If you have any remark or suggestion do not hesitate to open an issue.
 import type { Zone as ScwZone } from '../../../bridge'
 
+export type CommitmentType = 'duration_24h' | 'renewed_monthly' | 'none'
+
 export type ConnectivityDiagnosticActionType =
   | 'reboot_server'
   | 'reinstall_server'
@@ -98,6 +100,11 @@ export interface ServerTypeNetwork {
   publicBandwidthBps: number
 }
 
+export interface Commitment {
+  type: CommitmentType
+  cancelled: boolean
+}
+
 export interface ConnectivityDiagnosticServerHealth {
   lastCheckinDate?: Date
   isServerAlive: boolean
@@ -204,6 +211,12 @@ export interface Server {
    * server.
    */
   vpcStatus: ServerPrivateNetworkStatus
+  /** Commitment scheme applied to this server. */
+  commitment?: Commitment
+}
+
+export interface CommitmentTypeValue {
+  commitmentType: CommitmentType
 }
 
 export interface ConnectivityDiagnostic {
@@ -235,6 +248,12 @@ export type CreateServerRequest = {
    * configured through the Apple Silicon - Private Networks API.
    */
   enableVpc: boolean
+  /**
+   * Activate commitment for this server. If not specified, there is a 24h
+   * commitment due to Apple licensing. It can be updated with the Update Server
+   * request. Available commitment depends on server type.
+   */
+  commitmentType?: CommitmentType
 }
 
 export type DeleteServerRequest = {
@@ -444,4 +463,9 @@ export type UpdateServerRequest = {
   scheduleDeletion?: boolean
   /** Activate or deactivate Private Network support for this server. */
   enableVpc?: boolean
+  /**
+   * Change commitment. Use 'none' to automatically cancel a renewing
+   * commitment.
+   */
+  commitmentType?: CommitmentTypeValue
 }

packages/clients/src/scw/constants.ts

@@ -1,3 +1,3 @@
-export const version = 'v2.65.0'
+export const version = 'v2.66.0'
 
 export const userAgent = `scaleway-sdk-js/${version}`