Merge branch 'main' into v1.6632.0

Author: remyleone

packages_generated/billing/src/v2beta1/api.gen.ts

@@ -8,13 +8,15 @@ import {
   validatePathParam,
 } from '@scaleway/sdk-client'
 import {
+  unmarshalDiscount,
   unmarshalInvoice,
   unmarshalListConsumptionsResponse,
   unmarshalListDiscountsResponse,
   unmarshalListInvoicesResponse,
   unmarshalListTaxesResponse,
 } from './marshalling.gen'
 import type {
+  Discount,
   DownloadInvoiceRequest,
   ExportInvoicesRequest,
   GetInvoiceRequest,
@@ -27,6 +29,7 @@ import type {
   ListInvoicesResponse,
   ListTaxesRequest,
   ListTaxesResponse,
+  RedeemCouponRequest,
 } from './types.gen'
 
 /**
@@ -227,4 +230,27 @@ export class API extends ParentAPI {
    */
   listDiscounts = (request: Readonly<ListDiscountsRequest> = {}) =>
     enrichForPagination('discounts', this.pageOfListDiscounts, request)
+
+  /**
+   * Redeem coupon. Redeem a coupon given the related code.
+   *
+   * @param request - The request {@link RedeemCouponRequest}
+   * @returns A Promise of Discount
+   */
+  redeemCoupon = (request: Readonly<RedeemCouponRequest>) =>
+    this.client.fetch<Discount>(
+      {
+        method: 'POST',
+        path: `/billing/v2beta1/redeem-coupon`,
+        urlParams: urlParams(
+          ['code', request.code],
+          [
+            'organization_id',
+            request.organizationId ??
+              this.client.settings.defaultOrganizationId,
+          ],
+        ),
+      },
+      unmarshalDiscount,
+    )
 }

packages_generated/billing/src/v2beta1/marshalling.gen.ts

@@ -19,6 +19,55 @@ import type {
   ListTaxesResponseTax,
 } from './types.gen'
 
+const unmarshalDiscountCoupon = (data: unknown): DiscountCoupon => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'DiscountCoupon' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    description: data.description,
+  } as DiscountCoupon
+}
+
+const unmarshalDiscountFilter = (data: unknown): DiscountFilter => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'DiscountFilter' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    exclude: data.exclude,
+    type: data.type,
+    value: data.value,
+  } as DiscountFilter
+}
+
+export const unmarshalDiscount = (data: unknown): Discount => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'Discount' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    coupon: data.coupon ? unmarshalDiscountCoupon(data.coupon) : undefined,
+    creationDate: unmarshalDate(data.creation_date),
+    description: data.description,
+    filters: unmarshalArrayOfObject(data.filters, unmarshalDiscountFilter),
+    id: data.id,
+    mode: data.mode,
+    organizationId: data.organization_id,
+    startDate: unmarshalDate(data.start_date),
+    stopDate: unmarshalDate(data.stop_date),
+    value: data.value,
+    valueRemaining: data.value_remaining,
+    valueUsed: data.value_used,
+  } as Discount
+}
+
 export const unmarshalInvoice = (data: unknown): Invoice => {
   if (!isJSONObject(data)) {
     throw new TypeError(
@@ -94,55 +143,6 @@ export const unmarshalListConsumptionsResponse = (
   } as ListConsumptionsResponse
 }
 
-const unmarshalDiscountCoupon = (data: unknown): DiscountCoupon => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(
-      `Unmarshalling the type 'DiscountCoupon' failed as data isn't a dictionary.`,
-    )
-  }
-
-  return {
-    description: data.description,
-  } as DiscountCoupon
-}
-
-const unmarshalDiscountFilter = (data: unknown): DiscountFilter => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(
-      `Unmarshalling the type 'DiscountFilter' failed as data isn't a dictionary.`,
-    )
-  }
-
-  return {
-    exclude: data.exclude,
-    type: data.type,
-    value: data.value,
-  } as DiscountFilter
-}
-
-const unmarshalDiscount = (data: unknown): Discount => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(
-      `Unmarshalling the type 'Discount' failed as data isn't a dictionary.`,
-    )
-  }
-
-  return {
-    coupon: data.coupon ? unmarshalDiscountCoupon(data.coupon) : undefined,
-    creationDate: unmarshalDate(data.creation_date),
-    description: data.description,
-    filters: unmarshalArrayOfObject(data.filters, unmarshalDiscountFilter),
-    id: data.id,
-    mode: data.mode,
-    organizationId: data.organization_id,
-    startDate: unmarshalDate(data.start_date),
-    stopDate: unmarshalDate(data.stop_date),
-    value: data.value,
-    valueRemaining: data.value_remaining,
-    valueUsed: data.value_used,
-  } as Discount
-}
-
 export const unmarshalListDiscountsResponse = (
   data: unknown,
 ): ListDiscountsResponse => {

packages_generated/billing/src/v2beta1/types.gen.ts

@@ -480,3 +480,14 @@ export interface ListTaxesResponse {
    */
   updatedAt?: Date
 }
+
+export type RedeemCouponRequest = {
+  /**
+   * The Organization ID of the discount.
+   */
+  organizationId?: string
+  /**
+   * The code of the coupon to redeem.
+   */
+  code: string
+}

packages_generated/function/src/v1beta1/api.gen.ts

@@ -185,7 +185,7 @@ export class API extends ParentAPI {
    * @param request - The request {@link CreateNamespaceRequest}
    * @returns A Promise of Namespace
    */
-  createNamespace = (request: Readonly<CreateNamespaceRequest> = {}) =>
+  createNamespace = (request: Readonly<CreateNamespaceRequest>) =>
     this.client.fetch<Namespace>(
       {
         body: JSON.stringify(

packages_generated/function/src/v1beta1/marshalling.gen.ts

@@ -117,6 +117,7 @@ export const unmarshalFunction = (data: unknown): Function => {
     name: data.name,
     namespaceId: data.namespace_id,
     privacy: data.privacy,
+    privateNetworkId: data.private_network_id,
     readyAt: unmarshalDate(data.ready_at),
     region: data.region,
     runtime: data.runtime,
@@ -159,6 +160,7 @@ export const unmarshalNamespace = (data: unknown): Namespace => {
     status: data.status,
     tags: data.tags,
     updatedAt: unmarshalDate(data.updated_at),
+    vpcIntegrationActivated: data.vpc_integration_activated,
   } as Namespace
 }
 
@@ -452,6 +454,7 @@ export const marshalCreateFunctionRequest = (
   name: request.name || randomName('fn'),
   namespace_id: request.namespaceId,
   privacy: request.privacy,
+  private_network_id: request.privateNetworkId,
   runtime: request.runtime,
   sandbox: request.sandbox,
   secret_environment_variables:
@@ -468,6 +471,7 @@ export const marshalCreateNamespaceRequest = (
   request: CreateNamespaceRequest,
   defaults: DefaultValues,
 ): Record<string, unknown> => ({
+  activate_vpc_integration: request.activateVpcIntegration,
   description: request.description,
   environment_variables: request.environmentVariables,
   name: request.name || randomName('ns'),
@@ -585,6 +589,7 @@ export const marshalUpdateFunctionRequest = (
   memory_limit: request.memoryLimit,
   min_scale: request.minScale,
   privacy: request.privacy,
+  private_network_id: request.privateNetworkId,
   redeploy: request.redeploy,
   runtime: request.runtime,
   sandbox: request.sandbox,

packages_generated/function/src/v1beta1/types.gen.ts

@@ -409,6 +409,10 @@ export interface Function {
    * List of tags applied to the Serverless Function.
    */
   tags: string[]
+  /**
+   * When connected to a Private Network, the function can access other Scaleway resources in this Private Network.
+   */
+  privateNetworkId?: string
 }
 
 export interface Namespace {
@@ -472,6 +476,11 @@ export interface Namespace {
    * Last update date of the namespace.
    */
   updatedAt?: Date
+  /**
+   * @deprecated When activated, functions in the namespace can be connected to a Private Network.
+Note that activating the VPC integration can only be done when creating a new namespace.
+   */
+  vpcIntegrationActivated?: boolean
 }
 
 export interface Token {
@@ -669,6 +678,12 @@ export type CreateFunctionRequest = {
    * Tags of the Serverless Function.
    */
   tags?: string[]
+  /**
+   * When connected to a Private Network, the function can access other Scaleway resources in this Private Network.
+
+Note: this feature is currently in beta and requires a namespace with VPC integration activated, using the `activate_vpc_integration` flag.
+   */
+  privateNetworkId?: string
 }
 
 export type CreateNamespaceRequest = {
@@ -697,6 +712,10 @@ export type CreateNamespaceRequest = {
    * Tags of the Serverless Function Namespace.
    */
   tags?: string[]
+  /**
+   * When activated, functions in the namespace can be connected to a Private Network.
+   */
+  activateVpcIntegration: boolean
 }
 
 export type CreateTokenRequest = {
@@ -1282,6 +1301,12 @@ export type UpdateFunctionRequest = {
    * Tags of the Serverless Function.
    */
   tags?: string[]
+  /**
+   * When connected to a Private Network, the function can access other Scaleway resources in this Private Network.
+
+Note: this feature is currently in beta and requires a namespace with VPC integration activated, using the `activate_vpc_integration` flag.
+   */
+  privateNetworkId?: string
 }
 
 export type UpdateNamespaceRequest = {

packages_generated/iam/src/v1alpha1/validation-rules.gen.ts

@@ -226,7 +226,7 @@ export const ListUsersRequest = {
 
 export const RuleSpecs = {
   condition: {
-    maxLength: 1024,
+    maxLength: 2048,
   },
 }
 

packages_generated/instance/src/v1/content.gen.ts

@@ -5,6 +5,7 @@ import type {
   IpState,
   PrivateNICState,
   SecurityGroupState,
+  ServerFilesystemState,
   ServerIpState,
   ServerState,
   SnapshotState,
@@ -27,6 +28,12 @@ export const SECURITY_GROUP_TRANSIENT_STATUSES: SecurityGroupState[] = [
   'syncing',
 ]
 
+/** Lists transient statutes of the enum {@link ServerFilesystemState}. */
+export const SERVER_FILESYSTEM_TRANSIENT_STATUSES: ServerFilesystemState[] = [
+  'attaching',
+  'detaching',
+]
+
 /** Lists transient statutes of the enum {@link ServerIpState}. */
 export const SERVER_IP_TRANSIENT_STATUSES: ServerIpState[] = ['pending']
 

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

@@ -84,6 +84,7 @@ import type {
   ServerActionRequestVolumeBackupTemplate,
   ServerActionResponse,
   ServerCompatibleTypes,
+  ServerFilesystem,
   ServerIp,
   ServerIpv6,
   ServerLocation,
@@ -303,6 +304,19 @@ const unmarshalSecurityGroupSummary = (data: unknown): SecurityGroupSummary => {
   } as SecurityGroupSummary
 }
 
+const unmarshalServerFilesystem = (data: unknown): ServerFilesystem => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'ServerFilesystem' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    filesystemId: data.filesystem_id,
+    state: data.state,
+  } as ServerFilesystem
+}
+
 const unmarshalServerIp = (data: unknown): ServerIp => {
   if (!isJSONObject(data)) {
     throw new TypeError(
@@ -409,6 +423,10 @@ const unmarshalServer = (data: unknown): Server => {
     dynamicIpRequired: data.dynamic_ip_required,
     enableIpv6: data.enable_ipv6,
     endOfService: data.end_of_service,
+    filesystems: unmarshalArrayOfObject(
+      data.filesystems,
+      unmarshalServerFilesystem,
+    ),
     hostname: data.hostname,
     id: data.id,
     image: data.image ? unmarshalImage(data.image) : undefined,

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

@@ -62,6 +62,12 @@ export type ServerAction =
   | 'reboot'
   | 'enable_routed_ip'
 
+export type ServerFilesystemState =
+  | 'unknown_state'
+  | 'attaching'
+  | 'available'
+  | 'detaching'
+
 export type ServerIpIpFamily = 'inet' | 'inet6'
 
 export type ServerIpProvisioningMode = 'manual' | 'dhcp' | 'slaac'
@@ -334,6 +340,11 @@ export interface SecurityGroupSummary {
   name: string
 }
 
+export interface ServerFilesystem {
+  filesystemId: string
+  state: ServerFilesystemState
+}
+
 export interface ServerIp {
   /**
    * Unique ID of the IP address.
@@ -636,6 +647,10 @@ export interface Server {
    * This value is reset when admin_password_encryption_ssh_key_id is set to an empty string.
    */
   adminPasswordEncryptedValue?: string
+  /**
+   * List of attached filesystems.
+   */
+  filesystems: ServerFilesystem[]
   /**
    * True if the Instance type has reached end of service.
    */