Merge branch 'main' into v1.5562.0

Author: jremy42

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

@@ -90,6 +90,7 @@ export const unmarshalAPIKey = (data: unknown): APIKey => {
     description: data.description,
     editable: data.editable,
     expiresAt: unmarshalDate(data.expires_at),
+    managed: data.managed,
     secretKey: data.secret_key,
     updatedAt: unmarshalDate(data.updated_at),
     userId: data.user_id,
@@ -105,9 +106,11 @@ export const unmarshalApplication = (data: unknown): Application => {
 
   return {
     createdAt: unmarshalDate(data.created_at),
+    deletable: data.deletable,
     description: data.description,
     editable: data.editable,
     id: data.id,
+    managed: data.managed,
     name: data.name,
     nbApiKeys: data.nb_api_keys,
     organizationId: data.organization_id,
@@ -126,8 +129,11 @@ export const unmarshalGroup = (data: unknown): Group => {
   return {
     applicationIds: data.application_ids,
     createdAt: unmarshalDate(data.created_at),
+    deletable: data.deletable,
     description: data.description,
+    editable: data.editable,
     id: data.id,
+    managed: data.managed,
     name: data.name,
     organizationId: data.organization_id,
     tags: data.tags,
@@ -166,10 +172,12 @@ export const unmarshalPolicy = (data: unknown): Policy => {
   return {
     applicationId: data.application_id,
     createdAt: unmarshalDate(data.created_at),
+    deletable: data.deletable,
     description: data.description,
     editable: data.editable,
     groupId: data.group_id,
     id: data.id,
+    managed: data.managed,
     name: data.name,
     nbPermissionSets: data.nb_permission_sets,
     nbRules: data.nb_rules,

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

@@ -169,6 +169,8 @@ export interface APIKey {
   defaultProjectId: string
   /** Defines whether or not the API key is editable. */
   editable: boolean
+  /** Defines whether or not the API key is managed. */
+  managed: boolean
   /** IP address of the device that created the API key. */
   creationIp: string
 }
@@ -188,6 +190,10 @@ export interface Application {
   organizationId: string
   /** Defines whether or not the application is editable. */
   editable: boolean
+  /** Defines whether or not the application is deletable. */
+  deletable: boolean
+  /** Defines whether or not the application is managed. */
+  managed: boolean
   /** Number of API keys attributed to the application. */
   nbApiKeys: number
   /** Tags associated with the user. */
@@ -213,6 +219,12 @@ export interface Group {
   applicationIds: string[]
   /** Tags associated to the group. */
   tags: string[]
+  /** Defines whether or not the group is editable. */
+  editable: boolean
+  /** Defines whether or not the group is deletable. */
+  deletable: boolean
+  /** Defines whether or not the group is managed. */
+  managed: boolean
 }
 
 export interface Log {
@@ -264,6 +276,10 @@ export interface Policy {
   updatedAt?: Date
   /** Defines whether or not a policy is editable. */
   editable: boolean
+  /** Defines whether or not a policy is deletable. */
+  deletable: boolean
+  /** Defines whether or not a policy is managed. */
+  managed: boolean
   /** Number of rules of the policy. */
   nbRules: number
   /** Number of policy scopes. */

packages/clients/src/api/jobs/v1alpha1/api.gen.ts

@@ -9,32 +9,45 @@ import {
 import type { Region } from '../../../bridge'
 import {
   marshalCreateJobDefinitionRequest,
+  marshalCreateJobDefinitionSecretsRequest,
   marshalStartJobDefinitionRequest,
   marshalUpdateJobDefinitionRequest,
+  marshalUpdateJobDefinitionSecretRequest,
+  unmarshalCreateJobDefinitionSecretsResponse,
   unmarshalJobDefinition,
   unmarshalJobRun,
+  unmarshalListJobDefinitionSecretsResponse,
   unmarshalListJobDefinitionsResponse,
   unmarshalListJobRunsResponse,
   unmarshalListJobsResourcesResponse,
+  unmarshalSecret,
   unmarshalStartJobDefinitionResponse,
 } from './marshalling.gen'
 import type {
   CreateJobDefinitionRequest,
+  CreateJobDefinitionSecretsRequest,
+  CreateJobDefinitionSecretsResponse,
   DeleteJobDefinitionRequest,
+  DeleteJobDefinitionSecretRequest,
   GetJobDefinitionRequest,
+  GetJobDefinitionSecretRequest,
   GetJobRunRequest,
   JobDefinition,
   JobRun,
+  ListJobDefinitionSecretsRequest,
+  ListJobDefinitionSecretsResponse,
   ListJobDefinitionsRequest,
   ListJobDefinitionsResponse,
   ListJobRunsRequest,
   ListJobRunsResponse,
   ListJobsResourcesRequest,
   ListJobsResourcesResponse,
+  Secret,
   StartJobDefinitionRequest,
   StartJobDefinitionResponse,
   StopJobRunRequest,
   UpdateJobDefinitionRequest,
+  UpdateJobDefinitionSecretRequest,
 } from './types.gen'
 
 const jsonContentHeaders = {
@@ -169,6 +182,70 @@ export class API extends ParentAPI {
       unmarshalStartJobDefinitionResponse,
     )
 
+  createJobDefinitionSecrets = (
+    request: Readonly<CreateJobDefinitionSecretsRequest>,
+  ) =>
+    this.client.fetch<CreateJobDefinitionSecretsResponse>(
+      {
+        body: JSON.stringify(
+          marshalCreateJobDefinitionSecretsRequest(
+            request,
+            this.client.settings,
+          ),
+        ),
+        headers: jsonContentHeaders,
+        method: 'POST',
+        path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}/secrets`,
+      },
+      unmarshalCreateJobDefinitionSecretsResponse,
+    )
+
+  getJobDefinitionSecret = (request: Readonly<GetJobDefinitionSecretRequest>) =>
+    this.client.fetch<Secret>(
+      {
+        method: 'GET',
+        path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}/secrets/${validatePathParam('secretId', request.secretId)}`,
+      },
+      unmarshalSecret,
+    )
+
+  listJobDefinitionSecrets = (
+    request: Readonly<ListJobDefinitionSecretsRequest>,
+  ) =>
+    this.client.fetch<ListJobDefinitionSecretsResponse>(
+      {
+        method: 'GET',
+        path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}/secrets`,
+      },
+      unmarshalListJobDefinitionSecretsResponse,
+    )
+
+  updateJobDefinitionSecret = (
+    request: Readonly<UpdateJobDefinitionSecretRequest>,
+  ) =>
+    this.client.fetch<Secret>(
+      {
+        body: JSON.stringify(
+          marshalUpdateJobDefinitionSecretRequest(
+            request,
+            this.client.settings,
+          ),
+        ),
+        headers: jsonContentHeaders,
+        method: 'PATCH',
+        path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}/secrets/${validatePathParam('secretId', request.secretId)}`,
+      },
+      unmarshalSecret,
+    )
+
+  deleteJobDefinitionSecret = (
+    request: Readonly<DeleteJobDefinitionSecretRequest>,
+  ) =>
+    this.client.fetch<void>({
+      method: 'DELETE',
+      path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}/secrets/${validatePathParam('secretId', request.secretId)}`,
+    })
+
   /**
    * Get a job run by its unique identifier.
    *

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

@@ -3,26 +3,75 @@
 import randomName from '@scaleway/random-name'
 import {
   isJSONObject,
+  resolveOneOf,
   unmarshalArrayOfObject,
   unmarshalDate,
 } from '../../../bridge'
 import type { DefaultValues } from '../../../bridge'
 import type {
   CreateJobDefinitionRequest,
   CreateJobDefinitionRequestCronScheduleConfig,
+  CreateJobDefinitionSecretsRequest,
+  CreateJobDefinitionSecretsRequestSecretConfig,
+  CreateJobDefinitionSecretsResponse,
   CronSchedule,
   JobDefinition,
   JobRun,
+  ListJobDefinitionSecretsResponse,
   ListJobDefinitionsResponse,
   ListJobRunsResponse,
   ListJobsResourcesResponse,
   Resource,
+  Secret,
+  SecretEnvVar,
+  SecretFile,
   StartJobDefinitionRequest,
   StartJobDefinitionResponse,
   UpdateJobDefinitionRequest,
   UpdateJobDefinitionRequestCronScheduleConfig,
+  UpdateJobDefinitionSecretRequest,
 } from './types.gen'
 
+const unmarshalSecretEnvVar = (data: unknown): SecretEnvVar => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'SecretEnvVar' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    name: data.name,
+  } as SecretEnvVar
+}
+
+const unmarshalSecretFile = (data: unknown): SecretFile => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'SecretFile' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    path: data.path,
+  } as SecretFile
+}
+
+export const unmarshalSecret = (data: unknown): Secret => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'Secret' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    envVar: data.env_var ? unmarshalSecretEnvVar(data.env_var) : undefined,
+    file: data.file ? unmarshalSecretFile(data.file) : undefined,
+    secretId: data.secret_id,
+    secretManagerId: data.secret_manager_id,
+    secretManagerVersion: data.secret_manager_version,
+  } as Secret
+}
+
 const unmarshalCronSchedule = (data: unknown): CronSchedule => {
   if (!isJSONObject(data)) {
     throw new TypeError(
@@ -91,6 +140,35 @@ export const unmarshalJobRun = (data: unknown): JobRun => {
   } as JobRun
 }
 
+export const unmarshalCreateJobDefinitionSecretsResponse = (
+  data: unknown,
+): CreateJobDefinitionSecretsResponse => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'CreateJobDefinitionSecretsResponse' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    secrets: unmarshalArrayOfObject(data.secrets, unmarshalSecret),
+  } as CreateJobDefinitionSecretsResponse
+}
+
+export const unmarshalListJobDefinitionSecretsResponse = (
+  data: unknown,
+): ListJobDefinitionSecretsResponse => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'ListJobDefinitionSecretsResponse' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    secrets: unmarshalArrayOfObject(data.secrets, unmarshalSecret),
+    totalCount: data.total_count,
+  } as ListJobDefinitionSecretsResponse
+}
+
 export const unmarshalListJobDefinitionsResponse = (
   data: unknown,
 ): ListJobDefinitionsResponse => {
@@ -199,6 +277,27 @@ export const marshalCreateJobDefinitionRequest = (
   project_id: request.projectId ?? defaults.defaultProjectId,
 })
 
+const marshalCreateJobDefinitionSecretsRequestSecretConfig = (
+  request: CreateJobDefinitionSecretsRequestSecretConfig,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  secret_manager_id: request.secretManagerId,
+  secret_manager_version: request.secretManagerVersion,
+  ...resolveOneOf([
+    { param: 'path', value: request.path },
+    { param: 'env_var_name', value: request.envVarName },
+  ]),
+})
+
+export const marshalCreateJobDefinitionSecretsRequest = (
+  request: CreateJobDefinitionSecretsRequest,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  secrets: request.secrets.map(elt =>
+    marshalCreateJobDefinitionSecretsRequestSecretConfig(elt, defaults),
+  ),
+})
+
 export const marshalStartJobDefinitionRequest = (
   request: StartJobDefinitionRequest,
   defaults: DefaultValues,
@@ -237,3 +336,14 @@ export const marshalUpdateJobDefinitionRequest = (
   memory_limit: request.memoryLimit,
   name: request.name,
 })
+
+export const marshalUpdateJobDefinitionSecretRequest = (
+  request: UpdateJobDefinitionSecretRequest,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  secret_manager_version: request.secretManagerVersion,
+  ...resolveOneOf([
+    { param: 'path', value: request.path },
+    { param: 'env_var_name', value: request.envVarName },
+  ]),
+})