Merge branch 'main' into v1.6960.0

Author: Laure-di

.github/workflows/deploy-package.yml

@@ -20,19 +20,6 @@ jobs:
           persist-credentials: false
           token: ${{ secrets.GH_TOKEN }}
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-
-      - name: Setup SSH signing
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_SIGNING_PRIVATE_KEY }}" > ~/.ssh/signing_key
-          chmod 600 ~/.ssh/signing_key
-          echo "${{ secrets.SSH_SIGNING_PUBLIC_KEY }}" > ~/.ssh/signing_key.pub
-          chmod 644 ~/.ssh/signing_key.pub
-          git config --global gpg.format ssh
-          git config --global user.signingkey ~/.ssh/signing_key.pub
-          git config --global commit.gpgsign true
-          git config --global tag.gpgsign true
-
       - name: Git Identity
         run: |
           git config --global user.name 'scaleway-bot'
@@ -48,16 +35,11 @@ jobs:
           registry-url: 'https://registry.npmjs.org/'
           node-version: 20
           check-latest: true
-      - run: make install-dependencies
-      - run: make build
+      - run: pnpm install
+      - run: pnpm run build
 
       - name: Version package with lerna
-        run: |
-          pnpm lerna changed
-          # Commit any generated files before versioning
-          git add .
-          git commit -m "chore: update generated files" || true
-          pnpm lerna version -y --no-private --force-git-tag --create-release github
+        run: pnpm lerna version -y --no-private --force-git-tag --create-release github
         env:
           HUSKY: 0
           GH_TOKEN: ${{ secrets.GH_TOKEN }}

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

@@ -1282,7 +1282,18 @@ export type UpdateContainerRequest = {
    */
   port?: number
   /**
-   * Secret environment variables of the container.
+   * During an update, secret environment variables that are not specified in this field will be kept unchanged.
+
+In order to delete a specific secret environment variable, you must reference its key, but not provide any value for it.
+For example, the following payload will delete the `TO_DELETE` secret environment variable:
+
+```json
+{
+  "secret_environment_variables":[
+    {"key":"TO_DELETE"}
+  ]
+}
+```.
    */
   secretEnvironmentVariables?: Secret[]
   /**

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

@@ -1281,7 +1281,18 @@ export type UpdateFunctionRequest = {
    */
   description?: string
   /**
-   * Secret environment variables of the function.
+   * During an update, secret environment variables that are not specified in this field will be kept unchanged.
+
+In order to delete a specific secret environment variable, you must reference its key, but not provide any value for it.
+For example, the following payload will delete the `TO_DELETE` secret environment variable:
+
+```json
+{
+ "secret_environment_variables":[
+   {"key":"TO_DELETE"}
+ ]
+}
+```.
    */
   secretEnvironmentVariables?: Secret[]
   /**

packages_generated/iam/src/v1alpha1/api.gen.ts

@@ -15,7 +15,6 @@ import {
   marshalCreateApplicationRequest,
   marshalCreateGroupRequest,
   marshalCreateJWTRequest,
-  marshalCreateOrganizationSamlRequest,
   marshalCreatePolicyRequest,
   marshalCreateSSHKeyRequest,
   marshalCreateUserRequest,
@@ -28,9 +27,9 @@ import {
   marshalUpdateAPIKeyRequest,
   marshalUpdateApplicationRequest,
   marshalUpdateGroupRequest,
-  marshalUpdateOrganizationSamlRequest,
   marshalUpdateOrganizationSecuritySettingsRequest,
   marshalUpdatePolicyRequest,
+  marshalUpdateSamlRequest,
   marshalUpdateSSHKeyRequest,
   marshalUpdateUserPasswordRequest,
   marshalUpdateUserRequest,
@@ -64,7 +63,6 @@ import {
   unmarshalQuotum,
   unmarshalSaml,
   unmarshalSamlCertificate,
-  unmarshalSamlInformation,
   unmarshalSetRulesResponse,
   unmarshalSSHKey,
   unmarshalUser,
@@ -81,7 +79,6 @@ import type {
   CreateApplicationRequest,
   CreateGroupRequest,
   CreateJWTRequest,
-  CreateOrganizationSamlRequest,
   CreatePolicyRequest,
   CreateSSHKeyRequest,
   CreateUserMFAOTPRequest,
@@ -90,12 +87,13 @@ import type {
   DeleteApplicationRequest,
   DeleteGroupRequest,
   DeleteJWTRequest,
-  DeleteOrganizationSamlRequest,
   DeletePolicyRequest,
   DeleteSamlCertificateRequest,
+  DeleteSamlRequest,
   DeleteSSHKeyRequest,
   DeleteUserMFAOTPRequest,
   DeleteUserRequest,
+  EnableOrganizationSamlRequest,
   EncodedJWT,
   GetAPIKeyRequest,
   GetApplicationRequest,
@@ -107,7 +105,6 @@ import type {
   GetOrganizationSecuritySettingsRequest,
   GetPolicyRequest,
   GetQuotumRequest,
-  GetSamlInformationRequest,
   GetSSHKeyRequest,
   GetUserConnectionsRequest,
   GetUserConnectionsResponse,
@@ -155,7 +152,6 @@ import type {
   RemoveUserConnectionRequest,
   Saml,
   SamlCertificate,
-  SamlInformation,
   SetGroupMembersRequest,
   SetOrganizationAliasRequest,
   SetRulesRequest,
@@ -165,9 +161,9 @@ import type {
   UpdateAPIKeyRequest,
   UpdateApplicationRequest,
   UpdateGroupRequest,
-  UpdateOrganizationSamlRequest,
   UpdateOrganizationSecuritySettingsRequest,
   UpdatePolicyRequest,
+  UpdateSamlRequest,
   UpdateSSHKeyRequest,
   UpdateUserPasswordRequest,
   UpdateUserRequest,
@@ -1425,17 +1421,17 @@ export class API extends ParentAPI {
     )
 
   /**
-   * Create a SAML Identity Provider configuration for an Organization.
+   * Enable SAML Identity Provider for an Organization.
    *
-   * @param request - The request {@link CreateOrganizationSamlRequest}
+   * @param request - The request {@link EnableOrganizationSamlRequest}
    * @returns A Promise of Saml
    */
-  createOrganizationSaml = (request: Readonly<CreateOrganizationSamlRequest>) =>
+  enableOrganizationSaml = (
+    request: Readonly<EnableOrganizationSamlRequest> = {},
+  ) =>
     this.client.fetch<Saml>(
       {
-        body: JSON.stringify(
-          marshalCreateOrganizationSamlRequest(request, this.client.settings),
-        ),
+        body: '{}',
         headers: jsonContentHeaders,
         method: 'POST',
         path: `/iam/v1alpha1/organizations/${validatePathParam('organizationId', request.organizationId ?? this.client.settings.defaultOrganizationId)}/saml`,
@@ -1444,37 +1440,33 @@ export class API extends ParentAPI {
     )
 
   /**
-   * Update a SAML Identity Provider configuration for an Organization.
+   * Update SAML Identity Provider configuration.
    *
-   * @param request - The request {@link UpdateOrganizationSamlRequest}
+   * @param request - The request {@link UpdateSamlRequest}
    * @returns A Promise of Saml
    */
-  updateOrganizationSaml = (
-    request: Readonly<UpdateOrganizationSamlRequest> = {},
-  ) =>
+  updateSaml = (request: Readonly<UpdateSamlRequest>) =>
     this.client.fetch<Saml>(
       {
         body: JSON.stringify(
-          marshalUpdateOrganizationSamlRequest(request, this.client.settings),
+          marshalUpdateSamlRequest(request, this.client.settings),
         ),
         headers: jsonContentHeaders,
         method: 'PATCH',
-        path: `/iam/v1alpha1/organizations/${validatePathParam('organizationId', request.organizationId ?? this.client.settings.defaultOrganizationId)}/saml`,
+        path: `/iam/v1alpha1/saml/${validatePathParam('samlId', request.samlId)}`,
       },
       unmarshalSaml,
     )
 
   /**
-   * Delete a SAML Identity Provider configuration for an Organization.
+   * Disable SAML Identity Provider for an Organization.
    *
-   * @param request - The request {@link DeleteOrganizationSamlRequest}
+   * @param request - The request {@link DeleteSamlRequest}
    */
-  deleteOrganizationSaml = (
-    request: Readonly<DeleteOrganizationSamlRequest> = {},
-  ) =>
+  deleteSaml = (request: Readonly<DeleteSamlRequest>) =>
     this.client.fetch<void>({
       method: 'DELETE',
-      path: `/iam/v1alpha1/organizations/${validatePathParam('organizationId', request.organizationId ?? this.client.settings.defaultOrganizationId)}/saml`,
+      path: `/iam/v1alpha1/saml/${validatePathParam('samlId', request.samlId)}`,
     })
 
   /**
@@ -1521,19 +1513,4 @@ export class API extends ParentAPI {
       method: 'DELETE',
       path: `/iam/v1alpha1/saml-certificates/${validatePathParam('certificateId', request.certificateId)}`,
     })
-
-  /**
-   * Get SAML information.
-   *
-   * @param request - The request {@link GetSamlInformationRequest}
-   * @returns A Promise of SamlInformation
-   */
-  getSamlInformation = (request: Readonly<GetSamlInformationRequest> = {}) =>
-    this.client.fetch<SamlInformation>(
-      {
-        method: 'GET',
-        path: `/iam/v1alpha1/saml-information`,
-      },
-      unmarshalSamlInformation,
-    )
 }

packages_generated/iam/src/v1alpha1/marshalling.gen.ts

@@ -21,7 +21,6 @@ import type {
   CreateApplicationRequest,
   CreateGroupRequest,
   CreateJWTRequest,
-  CreateOrganizationSamlRequest,
   CreatePolicyRequest,
   CreateSSHKeyRequest,
   CreateUserRequest,
@@ -60,7 +59,7 @@ import type {
   RuleSpecs,
   Saml,
   SamlCertificate,
-  SamlInformation,
+  SamlServiceProvider,
   SetGroupMembersRequest,
   SetOrganizationAliasRequest,
   SetRulesRequest,
@@ -69,9 +68,9 @@ import type {
   UpdateAPIKeyRequest,
   UpdateApplicationRequest,
   UpdateGroupRequest,
-  UpdateOrganizationSamlRequest,
   UpdateOrganizationSecuritySettingsRequest,
   UpdatePolicyRequest,
+  UpdateSamlRequest,
   UpdateSSHKeyRequest,
   UpdateUserPasswordRequest,
   UpdateUserRequest,
@@ -698,31 +697,35 @@ export const unmarshalOrganizationSecuritySettings = (
   } as OrganizationSecuritySettings
 }
 
-export const unmarshalSaml = (data: unknown): Saml => {
+const unmarshalSamlServiceProvider = (data: unknown): SamlServiceProvider => {
   if (!isJSONObject(data)) {
     throw new TypeError(
-      `Unmarshalling the type 'Saml' failed as data isn't a dictionary.`,
+      `Unmarshalling the type 'SamlServiceProvider' failed as data isn't a dictionary.`,
     )
   }
 
   return {
+    assertionConsumerServiceUrl: data.assertion_consumer_service_url,
     entityId: data.entity_id,
-    id: data.id,
-    singleSignOnUrl: data.single_sign_on_url,
-  } as Saml
+  } as SamlServiceProvider
 }
 
-export const unmarshalSamlInformation = (data: unknown): SamlInformation => {
+export const unmarshalSaml = (data: unknown): Saml => {
   if (!isJSONObject(data)) {
     throw new TypeError(
-      `Unmarshalling the type 'SamlInformation' failed as data isn't a dictionary.`,
+      `Unmarshalling the type 'Saml' failed as data isn't a dictionary.`,
     )
   }
 
   return {
-    assertionConsumerServiceUrl: data.assertion_consumer_service_url,
     entityId: data.entity_id,
-  } as SamlInformation
+    id: data.id,
+    serviceProvider: data.service_provider
+      ? unmarshalSamlServiceProvider(data.service_provider)
+      : undefined,
+    singleSignOnUrl: data.single_sign_on_url,
+    status: data.status,
+  } as Saml
 }
 
 export const unmarshalSetRulesResponse = (data: unknown): SetRulesResponse => {
@@ -818,14 +821,6 @@ export const marshalCreateJWTRequest = (
   user_id: request.userId,
 })
 
-export const marshalCreateOrganizationSamlRequest = (
-  request: CreateOrganizationSamlRequest,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  entity_id: request.entityId,
-  single_sign_on_url: request.singleSignOnUrl,
-})
-
 const marshalRuleSpecs = (
   request: RuleSpecs,
   defaults: DefaultValues,
@@ -973,14 +968,6 @@ export const marshalUpdateGroupRequest = (
   tags: request.tags,
 })
 
-export const marshalUpdateOrganizationSamlRequest = (
-  request: UpdateOrganizationSamlRequest,
-  defaults: DefaultValues,
-): Record<string, unknown> => ({
-  entity_id: request.entityId,
-  single_sign_on_url: request.singleSignOnUrl,
-})
-
 export const marshalUpdateOrganizationSecuritySettingsRequest = (
   request: UpdateOrganizationSecuritySettingsRequest,
   defaults: DefaultValues,
@@ -1013,6 +1000,14 @@ export const marshalUpdateSSHKeyRequest = (
   name: request.name,
 })
 
+export const marshalUpdateSamlRequest = (
+  request: UpdateSamlRequest,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  entity_id: request.entityId,
+  single_sign_on_url: request.singleSignOnUrl,
+})
+
 export const marshalUpdateUserPasswordRequest = (
   request: UpdateUserPasswordRequest,
   defaults: DefaultValues,