Merge branch 'main' into v1.5540.0

Author: jremy42

packages/clients/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.49.0](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2024-10-04)
+
+### Features
+
+- **iam:** make sur e-mail optional in CreateUser ([#1456](https://github.com/scaleway/scaleway-sdk-js/issues/1456)) ([f37723e](https://github.com/scaleway/scaleway-sdk-js/commit/f37723ecc2c88d4823eaa3d2670ddea5b4ff5346))
+
+### Bug Fixes
+
+- **edge_services:** fix plan endpoints ([#1450](https://github.com/scaleway/scaleway-sdk-js/issues/1450)) ([9e3bd41](https://github.com/scaleway/scaleway-sdk-js/commit/9e3bd41bf53288e760ae209d462e3a85a22181eb))
+- **scw:** decimal json representation ([#1460](https://github.com/scaleway/scaleway-sdk-js/issues/1460)) ([6829c46](https://github.com/scaleway/scaleway-sdk-js/commit/6829c46bdc362b02fe974ca7dd18267c7c0dbd9b))
+
 ## [2.48.0](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2024-09-30)
 
 ### Features

packages/clients/package.json

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

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

@@ -488,6 +488,9 @@ const unmarshalServerInstall = (data: unknown): ServerInstall => {
   return {
     hostname: data.hostname,
     osId: data.os_id,
+    partitioningSchema: data.partitioning_schema
+      ? unmarshalSchema(data.partitioning_schema)
+      : undefined,
     serviceUrl: data.service_url,
     serviceUser: data.service_user,
     sshKeyIds: data.ssh_key_ids,
@@ -759,12 +762,86 @@ export const marshalAddOptionServerRequest = (
   expires_at: request.expiresAt,
 })
 
+const marshalSchemaPartition = (
+  request: SchemaPartition,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  label: request.label,
+  number: request.number,
+  size: request.size,
+})
+
+const marshalSchemaPool = (
+  request: SchemaPool,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  devices: request.devices,
+  filesystem_options: request.filesystemOptions,
+  name: request.name,
+  options: request.options,
+  type: request.type,
+})
+
+const marshalSchemaDisk = (
+  request: SchemaDisk,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  device: request.device,
+  partitions: request.partitions.map(elt =>
+    marshalSchemaPartition(elt, defaults),
+  ),
+})
+
+const marshalSchemaFilesystem = (
+  request: SchemaFilesystem,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  device: request.device,
+  format: request.format,
+  mountpoint: request.mountpoint,
+})
+
+const marshalSchemaRAID = (
+  request: SchemaRAID,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  devices: request.devices,
+  level: request.level,
+  name: request.name,
+})
+
+const marshalSchemaZFS = (
+  request: SchemaZFS,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  pools: request.pools.map(elt => marshalSchemaPool(elt, defaults)),
+})
+
+export const marshalSchema = (
+  request: Schema,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  disks: request.disks.map(elt => marshalSchemaDisk(elt, defaults)),
+  filesystems: request.filesystems.map(elt =>
+    marshalSchemaFilesystem(elt, defaults),
+  ),
+  raids: request.raids.map(elt => marshalSchemaRAID(elt, defaults)),
+  zfs:
+    request.zfs !== undefined
+      ? marshalSchemaZFS(request.zfs, defaults)
+      : undefined,
+})
+
 const marshalCreateServerRequestInstall = (
   request: CreateServerRequestInstall,
   defaults: DefaultValues,
 ): Record<string, unknown> => ({
   hostname: request.hostname,
   os_id: request.osId,
+  partitioning_schema:
+    request.partitioningSchema !== undefined
+      ? marshalSchema(request.partitioningSchema, defaults)
+      : undefined,
   password: request.password,
   service_password: request.servicePassword,
   service_user: request.serviceUser,
@@ -805,6 +882,10 @@ export const marshalInstallServerRequest = (
 ): Record<string, unknown> => ({
   hostname: request.hostname,
   os_id: request.osId,
+  partitioning_schema:
+    request.partitioningSchema !== undefined
+      ? marshalSchema(request.partitioningSchema, defaults)
+      : undefined,
   password: request.password,
   service_password: request.servicePassword,
   service_user: request.serviceUser,
@@ -870,76 +951,6 @@ export const marshalUpdateSettingRequest = (
   enabled: request.enabled,
 })
 
-const marshalSchemaPartition = (
-  request: SchemaPartition,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  label: request.label,
-  number: request.number,
-  size: request.size,
-})
-
-const marshalSchemaPool = (
-  request: SchemaPool,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  devices: request.devices,
-  filesystem_options: request.filesystemOptions,
-  name: request.name,
-  options: request.options,
-  type: request.type,
-})
-
-const marshalSchemaDisk = (
-  request: SchemaDisk,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  device: request.device,
-  partitions: request.partitions.map(elt =>
-    marshalSchemaPartition(elt, defaults),
-  ),
-})
-
-const marshalSchemaFilesystem = (
-  request: SchemaFilesystem,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  device: request.device,
-  format: request.format,
-  mountpoint: request.mountpoint,
-})
-
-const marshalSchemaRAID = (
-  request: SchemaRAID,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  devices: request.devices,
-  level: request.level,
-  name: request.name,
-})
-
-const marshalSchemaZFS = (
-  request: SchemaZFS,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  pools: request.pools.map(elt => marshalSchemaPool(elt, defaults)),
-})
-
-export const marshalSchema = (
-  request: Schema,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  disks: request.disks.map(elt => marshalSchemaDisk(elt, defaults)),
-  filesystems: request.filesystems.map(elt =>
-    marshalSchemaFilesystem(elt, defaults),
-  ),
-  raids: request.raids.map(elt => marshalSchemaRAID(elt, defaults)),
-  zfs:
-    request.zfs !== undefined
-      ? marshalSchemaZFS(request.zfs, defaults)
-      : undefined,
-})
-
 export const marshalValidatePartitioningSchemaRequest = (
   request: ValidatePartitioningSchemaRequest,
   defaults: DefaultValues,

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

@@ -305,6 +305,8 @@ export interface ServerInstall {
   serviceUser: string
   /** Address of the installed service. */
   serviceUrl: string
+  /** Partitioning schema. */
+  partitioningSchema?: Schema
 }
 
 export interface ServerOption {
@@ -377,6 +379,8 @@ export interface CreateServerRequestInstall {
   serviceUser?: string
   /** Password used for the service to install. */
   servicePassword?: string
+  /** Partitioning schema. */
+  partitioningSchema?: Schema
 }
 
 export interface OS {
@@ -748,6 +752,8 @@ export type InstallServerRequest = {
   serviceUser?: string
   /** Password used for the service to install. */
   servicePassword?: string
+  /** Partitioning schema. */
+  partitioningSchema?: Schema
 }
 
 export type ListOSRequest = {

packages/clients/src/scw/__tests__/custom-marshalling.test.ts

@@ -4,12 +4,14 @@ import {
   marshalScwFile,
   marshalTimeSeries,
   marshalTimeSeriesPoint,
+  unmarshalDecimal,
   unmarshalMoney,
   unmarshalScwFile,
   unmarshalServiceInfo,
   unmarshalTimeSeries,
   unmarshalTimeSeriesPoint,
 } from '../custom-marshalling'
+import { Decimal } from '../custom-types'
 
 describe('unmarshalMoney', () => {
   it('returns the proper object', () => {
@@ -123,6 +125,29 @@ describe('unmarshalTimeSeries', () => {
   })
 })
 
+describe('unmarshalDecimal', () => {
+  it('returns the proper object', () => {
+    const decimal = unmarshalDecimal({
+      value: '0.01',
+    })
+    expect(decimal).toBeInstanceOf(Decimal)
+    expect(decimal?.toString()).toStrictEqual('0.01')
+  })
+
+  it('throws for invalid input', () => {
+    expect(unmarshalDecimal(null)).toBeNull()
+    expect(() => {
+      unmarshalDecimal({})
+    }).toThrow()
+    expect(() => {
+      unmarshalDecimal({ value: null })
+    }).toThrow()
+    expect(() => {
+      unmarshalDecimal({ value: 0.02 })
+    }).toThrow()
+  })
+})
+
 describe('marshalScwFile', () => {
   it('returns a the proper object', () =>
     expect(

packages/clients/src/scw/constants.ts

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

packages/clients/src/scw/custom-marshalling.ts

@@ -115,13 +115,28 @@ export const unmarshalTimeSeries = (data: unknown) => {
  * @internal
  */
 export const unmarshalDecimal = (data: unknown) => {
-  if (!(typeof data === 'string')) {
+  if (!(typeof data === 'object')) {
     throw new TypeError(
-      `Unmarshalling the type 'Decimal' failed as data isn't a string.`,
+      `Unmarshalling the type 'Decimal' failed as data isn't an object.`,
+    )
+  }
+  if (data === null) {
+    return null
+  }
+
+  if (!('value' in data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'Decimal' failed as data object does not have a 'value' key.`,
     )
   }
 
-  return new Decimal(data)
+  if (!(typeof data.value === 'string')) {
+    throw new TypeError(
+      `Unmarshalling the type 'Decimal' failed as 'value' is not a string.`,
+    )
+  }
+
+  return new Decimal(data.value)
 }
 
 /**
@@ -189,4 +204,6 @@ export const marshalTimeSeries = (
  *
  * @internal
  */
-export const marshalDecimal = (obj: Decimal): string => obj.toString()
+export const marshalDecimal = (obj: Decimal): { value: string } => ({
+  value: obj.toString(),
+})

packages/clients/src/scw/custom-types.ts

@@ -79,4 +79,6 @@ export class Decimal {
   }
 
   public toString = (): string => this.str
+
+  public marshal = (): object => ({ value: this.str })
 }