Merge branch 'main' into feat/auto-generate-package-readme

jremy42 · web-flow · commit 62c11d5c4aa4 · 2025-10-29T15:10:38.000+01:00
diff --git a/Makefile b/Makefile
@@ -46,6 +46,9 @@ generate-packages:
 generate-global-sdk-package:
 	pnpm run generateGlobalSdkPackage
 
+setup-new-products:
+	pnpm run setupNewProducts
+
 publish: install-dependencies
 	pnpm run build
 	pnpm lerna changed
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "generateAlias": "pnpm dlx tsx ./scripts/generateAlias.ts",
     "generatePackages": "pnpm dlx tsx ./scripts/generatePackages.ts",
     "generateGlobalSdkPackage": "pnpm dlx tsx ./scripts/updateGlobalSdkPackage.ts",
+    "setupNewProducts": "pnpm dlx tsx ./scripts/setupNewProducts.ts",
     "prebuild": "pnpm run generatePackages && pnpm run generateAlias &&  pnpm format",
     "build:packages": "pnpm turbo run build",
     "fix-import-extensions": "pnpm dlx tsx ./scripts/fix-import-extensions.ts",
diff --git a/packages_generated/account/src/v3/api.gen.ts b/packages_generated/account/src/v3/api.gen.ts
@@ -6,7 +6,6 @@ import {
   urlParams,
   validatePathParam,
 } from '@scaleway/sdk-client'
-
 import {
   marshalContractApiCheckContractSignatureRequest,
   marshalContractApiCreateContractSignatureRequest,
diff --git a/packages_generated/account/src/v3/types.gen.ts b/packages_generated/account/src/v3/types.gen.ts
@@ -1,6 +1,5 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
-
 import type { LanguageCode as StdLanguageCode } from '@scaleway/sdk-std'
 
 export type ContractType =
diff --git a/packages_generated/autoscaling/src/v1alpha1/api.gen.ts b/packages_generated/autoscaling/src/v1alpha1/api.gen.ts
@@ -6,7 +6,6 @@ import {
   urlParams,
   validatePathParam,
 } from '@scaleway/sdk-client'
-
 import {
   marshalCreateInstanceGroupRequest,
   marshalCreateInstancePolicyRequest,
diff --git a/packages_generated/baremetal/src/v1/marshalling.gen.ts b/packages_generated/baremetal/src/v1/marshalling.gen.ts
@@ -367,6 +367,8 @@ export const unmarshalOS = (data: unknown): OS => {
 
   return {
     allowed: data.allowed,
+    cloudInitSupported: data.cloud_init_supported,
+    cloudInitVersion: data.cloud_init_version,
     customPartitioningSupported: data.custom_partitioning_supported,
     enabled: data.enabled,
     id: data.id,
diff --git a/packages_generated/baremetal/src/v1/types.gen.ts b/packages_generated/baremetal/src/v1/types.gen.ts
@@ -671,6 +671,14 @@ export interface OS {
    * Defines if custom partitioning is supported by this OS.
    */
   customPartitioningSupported: boolean
+  /**
+   * Defines if cloud-init is supported by this OS.
+   */
+  cloudInitSupported: boolean
+  /**
+   * Defines the cloud-init API version used by this OS.
+   */
+  cloudInitVersion?: string
   /**
    * Zone in which is the OS is available.
    */
diff --git a/packages_generated/billing/src/v2beta1/api.gen.ts b/packages_generated/billing/src/v2beta1/api.gen.ts
@@ -7,7 +7,6 @@ import {
   urlParams,
   validatePathParam,
 } from '@scaleway/sdk-client'
-
 import {
   unmarshalDiscount,
   unmarshalInvoice,
diff --git a/packages_generated/billing/src/v2beta1/marshalling.gen.ts b/packages_generated/billing/src/v2beta1/marshalling.gen.ts
@@ -6,7 +6,6 @@ import {
   unmarshalDate,
   unmarshalMoney,
 } from '@scaleway/sdk-client'
-
 import type {
   Discount,
   DiscountCoupon,
@@ -115,6 +114,7 @@ const unmarshalListConsumptionsResponseConsumption = (
   return {
     billedQuantity: data.billed_quantity,
     categoryName: data.category_name,
+    consumerId: data.consumer_id,
     productName: data.product_name,
     projectId: data.project_id,
     resourceName: data.resource_name,
diff --git a/packages_generated/billing/src/v2beta1/types.gen.ts b/packages_generated/billing/src/v2beta1/types.gen.ts
@@ -130,6 +130,10 @@ export interface ListConsumptionsResponseConsumption {
    * Consumed quantity.
    */
   billedQuantity: string
+  /**
+   * Organization ID of the consumer for this consumption.
+   */
+  consumerId: string
 }
 
 export interface Discount {
diff --git a/packages_generated/datawarehouse/src/v1beta1/api.gen.ts b/packages_generated/datawarehouse/src/v1beta1/api.gen.ts
@@ -119,7 +119,7 @@ export class API extends ParentAPI {
     )
 
   /**
-   * List available Clickhouse versions.
+   * List available ClickHouse® versions.
    *
    * @param request - The request {@link ListVersionsRequest}
    * @returns A Promise of ListVersionsResponse
@@ -235,7 +235,7 @@ export class API extends ParentAPI {
     )
 
   /**
-   * Delete a deployment. Delete a given deployment, specified by the `region` and `deployment_id` parameters. Deleting a deployment is permanent, and cannot be undone. Upon deletion, deletion all your data will be lost.
+   * Delete a deployment. Delete a given deployment, specified by the `region` and `deployment_id` parameters. Deleting a deployment is permanent, and cannot be undone. Upon deletion, all your data will be lost.
    *
    * @param request - The request {@link DeleteDeploymentRequest}
    * @returns A Promise of Deployment
diff --git a/packages_generated/datawarehouse/src/v1beta1/types.gen.ts b/packages_generated/datawarehouse/src/v1beta1/types.gen.ts
@@ -138,7 +138,7 @@ export interface Deployment {
    */
   updatedAt?: Date
   /**
-   * Clickhouse version.
+   * ClickHouse® version.
    */
   version: string
   /**
@@ -249,7 +249,7 @@ export type CreateDeploymentRequest = {
    */
   tags?: string[]
   /**
-   * Clickhouse version to use for the deployment.
+   * ClickHouse® version to use for the deployment.
    */
   version: string
   /**
diff --git a/packages_generated/environmental_footprint/src/v1alpha1/api.gen.ts b/packages_generated/environmental_footprint/src/v1alpha1/api.gen.ts
@@ -1,7 +1,6 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import { API as ParentAPI, urlParams } from '@scaleway/sdk-client'
-
 import {
   marshalUserApiDownloadImpactReportRequest,
   unmarshalImpactDataResponse,
diff --git a/packages_generated/marketplace/src/v2/api.gen.ts b/packages_generated/marketplace/src/v2/api.gen.ts
@@ -7,7 +7,6 @@ import {
   urlParams,
   validatePathParam,
 } from '@scaleway/sdk-client'
-
 import {
   unmarshalCategory,
   unmarshalImage,
diff --git a/packages_generated/marketplace/src/v2/marshalling.gen.ts b/packages_generated/marketplace/src/v2/marshalling.gen.ts
@@ -5,7 +5,6 @@ import {
   unmarshalArrayOfObject,
   unmarshalDate,
 } from '@scaleway/sdk-client'
-
 import type {
   Category,
   Image,
diff --git a/packages_generated/product_catalog/src/v2alpha1/marshalling.gen.ts b/packages_generated/product_catalog/src/v2alpha1/marshalling.gen.ts
@@ -6,7 +6,6 @@ import {
   unmarshalDate,
   unmarshalMoney,
 } from '@scaleway/sdk-client'
-
 import type {
   ListPublicCatalogProductsResponse,
   PublicCatalogProduct,
diff --git a/packages_generated/s2s_vpn/src/v1alpha1/marshalling.gen.ts b/packages_generated/s2s_vpn/src/v1alpha1/marshalling.gen.ts
@@ -100,6 +100,8 @@ export const unmarshalConnection = (data: unknown): Connection => {
     projectId: data.project_id,
     region: data.region,
     routePropagationEnabled: data.route_propagation_enabled,
+    secretId: data.secret_id,
+    secretRevision: data.secret_revision,
     status: data.status,
     tags: data.tags,
     tunnelStatus: data.tunnel_status,
diff --git a/packages_generated/s2s_vpn/src/v1alpha1/types.gen.ts b/packages_generated/s2s_vpn/src/v1alpha1/types.gen.ts
@@ -156,6 +156,14 @@ export interface Connection {
    * Who initiates the IPsec tunnel.
    */
   initiationPolicy: ConnectionInitiationPolicy
+  /**
+   * ID of the secret in Secret Manager which contains the PSK.
+   */
+  secretId: string
+  /**
+   * Version number of the secret in Secret Manager which contains the PSK.
+   */
+  secretRevision: number
   /**
    * List of IKE v2 ciphers proposed for the IPsec tunnel.
    */
@@ -450,9 +458,9 @@ export interface CreateConnectionResponse {
    */
   connection?: Connection
   /**
-   * New PSK generated for this connection.
+   * @deprecated Deprecated, use secret_id & secret_revision fields.
    */
-  preSharedKey: string
+  preSharedKey?: string
 }
 
 export type CreateCustomerGatewayRequest = {
@@ -940,9 +948,9 @@ export interface RenewConnectionPskResponse {
    */
   connection?: Connection
   /**
-   * New PSK generated for this connection.
+   * @deprecated Deprecated, use secret_id & secret_revision fields.
    */
-  preSharedKey: string
+  preSharedKey?: string
 }
 
 export type SetRoutingPolicyRequest = {
diff --git a/packages_generated/secret/src/v1beta1/types.gen.ts b/packages_generated/secret/src/v1beta1/types.gen.ts
@@ -20,7 +20,7 @@ export type ListSecretsRequestOrderBy =
   | 'updated_at_asc'
   | 'updated_at_desc'
 
-export type Product = 'unknown_product' | 'edge_services'
+export type Product = 'unknown_product' | 'edge_services' | 's2s_vpn'
 
 export type SecretStatus = 'unknown_status' | 'ready' | 'locked'
 
diff --git a/packages_generated/webhosting/src/v1/api.gen.ts b/packages_generated/webhosting/src/v1/api.gen.ts
@@ -33,6 +33,7 @@ import {
   marshalMailAccountApiChangeMailAccountPasswordRequest,
   marshalMailAccountApiCreateMailAccountRequest,
   marshalMailAccountApiRemoveMailAccountRequest,
+  marshalWebsiteApiCreateWebsiteRequest,
   unmarshalBackup,
   unmarshalCheckFreeDomainAvailabilityResponse,
   unmarshalCheckUserOwnsDomainResponse,
@@ -63,6 +64,7 @@ import {
   unmarshalRestoreBackupResponse,
   unmarshalSearchDomainsResponse,
   unmarshalSession,
+  unmarshalWebsite,
 } from './marshalling.gen.js'
 import type {
   Backup,
@@ -140,6 +142,9 @@ import type {
   RestoreBackupResponse,
   SearchDomainsResponse,
   Session,
+  Website,
+  WebsiteApiCreateWebsiteRequest,
+  WebsiteApiDeleteWebsiteRequest,
   WebsiteApiListWebsitesRequest,
 } from './types.gen.js'
 
@@ -990,7 +995,7 @@ export class HostingAPI extends ParentAPI {
     )
 
   /**
-   * Attach a custom domain to a webhosting.
+   * Attach a custom domain to a webhosting as an alias to the main domain.
    *
    * @param request - The request {@link HostingApiAddCustomDomainRequest}
    * @returns A Promise of HostingSummary
@@ -1365,4 +1370,34 @@ export class WebsiteAPI extends ParentAPI {
    */
   listWebsites = (request: Readonly<WebsiteApiListWebsitesRequest>) =>
     enrichForPagination('websites', this.pageOfListWebsites, request)
+
+  /**
+   * Create a new website and attach it to a webhosting.
+   *
+   * @param request - The request {@link WebsiteApiCreateWebsiteRequest}
+   * @returns A Promise of Website
+   */
+  createWebsite = (request: Readonly<WebsiteApiCreateWebsiteRequest>) =>
+    this.client.fetch<Website>(
+      {
+        body: JSON.stringify(
+          marshalWebsiteApiCreateWebsiteRequest(request, this.client.settings),
+        ),
+        headers: jsonContentHeaders,
+        method: 'POST',
+        path: `/webhosting/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/hostings/${validatePathParam('hostingId', request.hostingId)}/websites`,
+      },
+      unmarshalWebsite,
+    )
+
+  /**
+   * Delete a website from a webhosting.
+   *
+   * @param request - The request {@link WebsiteApiDeleteWebsiteRequest}
+   */
+  deleteWebsite = (request: Readonly<WebsiteApiDeleteWebsiteRequest>) =>
+    this.client.fetch<void>({
+      method: 'DELETE',
+      path: `/webhosting/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/hostings/${validatePathParam('hostingId', request.hostingId)}/websites/${validatePathParam('domainName', request.domainName)}`,
+    })
 }
diff --git a/packages_generated/webhosting/src/v1/index.gen.ts b/packages_generated/webhosting/src/v1/index.gen.ts
@@ -138,6 +138,8 @@ export type {
   Session,
   SyncDomainDnsRecordsRequestRecord,
   Website,
+  WebsiteApiCreateWebsiteRequest,
+  WebsiteApiDeleteWebsiteRequest,
   WebsiteApiListWebsitesRequest,
 } from './types.gen.js'
 export * as ValidationRules from './validation-rules.gen.js'
diff --git a/packages_generated/webhosting/src/v1/marshalling.gen.ts b/packages_generated/webhosting/src/v1/marshalling.gen.ts
@@ -79,6 +79,7 @@ import type {
   Session,
   SyncDomainDnsRecordsRequestRecord,
   Website,
+  WebsiteApiCreateWebsiteRequest,
 } from './types.gen.js'
 
 export const unmarshalBackup = (data: unknown): Backup => {
@@ -224,6 +225,20 @@ export const unmarshalMailAccount = (data: unknown): MailAccount => {
   } as MailAccount
 }
 
+export const unmarshalWebsite = (data: unknown): Website => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'Website' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    domain: data.domain,
+    path: data.path,
+    sslStatus: data.ssl_status,
+  } as Website
+}
+
 const unmarshalFreeDomain = (data: unknown): FreeDomain => {
   if (!isJSONObject(data)) {
     throw new TypeError(
@@ -705,20 +720,6 @@ export const unmarshalListRecentProgressesResponse = (
   } as ListRecentProgressesResponse
 }
 
-const unmarshalWebsite = (data: unknown): Website => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(
-      `Unmarshalling the type 'Website' failed as data isn't a dictionary.`,
-    )
-  }
-
-  return {
-    domain: data.domain,
-    path: data.path,
-    sslStatus: data.ssl_status,
-  } as Website
-}
-
 export const unmarshalListWebsitesResponse = (
   data: unknown,
 ): ListWebsitesResponse => {
@@ -1091,3 +1092,10 @@ export const marshalMailAccountApiRemoveMailAccountRequest = (
   domain: request.domain,
   username: request.username,
 })
+
+export const marshalWebsiteApiCreateWebsiteRequest = (
+  request: WebsiteApiCreateWebsiteRequest,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  domain_name: request.domainName,
+})
diff --git a/packages_generated/webhosting/src/v1/types.gen.ts b/packages_generated/webhosting/src/v1/types.gen.ts
diff --git a/scripts/setupNewProducts.ts b/scripts/setupNewProducts.ts
