diff --git a/packages/clients/src/api/function/v1beta1/api.gen.ts b/packages/clients/src/api/function/v1beta1/api.gen.ts index 2266c6ff6..c361a1333 100644 --- a/packages/clients/src/api/function/v1beta1/api.gen.ts +++ b/packages/clients/src/api/function/v1beta1/api.gen.ts @@ -15,7 +15,6 @@ import { FUNCTION_TRANSIENT_STATUSES, NAMESPACE_TRANSIENT_STATUSES, TOKEN_TRANSIENT_STATUSES, - TRIGGER_INPUT_TRANSIENT_STATUSES, TRIGGER_TRANSIENT_STATUSES, } from './content.gen' import { @@ -24,13 +23,10 @@ import { marshalCreateFunctionRequest, marshalCreateNamespaceRequest, marshalCreateTokenRequest, - marshalCreateTriggerInputRequest, marshalCreateTriggerRequest, - marshalSetTriggerInputsRequest, marshalUpdateCronRequest, marshalUpdateFunctionRequest, marshalUpdateNamespaceRequest, - marshalUpdateTriggerInputRequest, marshalUpdateTriggerRequest, unmarshalCron, unmarshalDomain, @@ -43,13 +39,10 @@ import { unmarshalListLogsResponse, unmarshalListNamespacesResponse, unmarshalListTokensResponse, - unmarshalListTriggerInputsResponse, unmarshalListTriggersResponse, unmarshalNamespace, - unmarshalSetTriggerInputsResponse, unmarshalToken, unmarshalTrigger, - unmarshalTriggerInput, unmarshalUploadURL, } from './marshalling.gen' import type { @@ -58,7 +51,6 @@ import type { CreateFunctionRequest, CreateNamespaceRequest, CreateTokenRequest, - CreateTriggerInputRequest, CreateTriggerRequest, Cron, DeleteCronRequest, @@ -66,7 +58,6 @@ import type { DeleteFunctionRequest, DeleteNamespaceRequest, DeleteTokenRequest, - DeleteTriggerInputRequest, DeleteTriggerRequest, DeployFunctionRequest, Domain, @@ -79,7 +70,6 @@ import type { GetFunctionUploadURLRequest, GetNamespaceRequest, GetTokenRequest, - GetTriggerInputRequest, GetTriggerRequest, IssueJWTRequest, ListCronsRequest, @@ -96,20 +86,14 @@ import type { ListNamespacesResponse, ListTokensRequest, ListTokensResponse, - ListTriggerInputsRequest, - ListTriggerInputsResponse, ListTriggersRequest, ListTriggersResponse, Namespace, - SetTriggerInputsRequest, - SetTriggerInputsResponse, Token, Trigger, - TriggerInput, UpdateCronRequest, UpdateFunctionRequest, UpdateNamespaceRequest, - UpdateTriggerInputRequest, UpdateTriggerRequest, UploadURL, } from './types.gen' @@ -948,7 +932,9 @@ export class API extends ParentAPI { options, ) - protected pageOfListTriggers = (request: Readonly) => + protected pageOfListTriggers = ( + request: Readonly = {}, + ) => this.client.fetch( { method: 'GET', @@ -957,19 +943,35 @@ export class API extends ParentAPI { request.region ?? this.client.settings.defaultRegion, )}/triggers`, urlParams: urlParams( - ['function_id', request.functionId], ['order_by', request.orderBy ?? 'created_at_asc'], ['page', request.page], [ 'page_size', request.pageSize ?? this.client.settings.defaultPageSize, ], + ...Object.entries( + resolveOneOf([ + { + default: this.client.settings.defaultProjectId, + param: 'project_id', + value: request.projectId, + }, + { + param: 'function_id', + value: request.functionId, + }, + { + param: 'namespace_id', + value: request.namespaceId, + }, + ]), + ), ), }, unmarshalListTriggersResponse, ) - listTriggers = (request: Readonly) => + listTriggers = (request: Readonly = {}) => enrichForPagination('triggers', this.pageOfListTriggers, request) updateTrigger = (request: Readonly) => @@ -999,133 +1001,4 @@ export class API extends ParentAPI { }, unmarshalTrigger, ) - - createTriggerInput = (request: Readonly) => - this.client.fetch( - { - body: JSON.stringify( - marshalCreateTriggerInputRequest(request, this.client.settings), - ), - headers: jsonContentHeaders, - method: 'POST', - path: `/functions/v1beta1/regions/${validatePathParam( - 'region', - request.region ?? this.client.settings.defaultRegion, - )}/trigger-inputs`, - }, - unmarshalTriggerInput, - ) - - getTriggerInput = (request: Readonly) => - this.client.fetch( - { - method: 'GET', - path: `/functions/v1beta1/regions/${validatePathParam( - 'region', - request.region ?? this.client.settings.defaultRegion, - )}/trigger-inputs/${validatePathParam( - 'triggerInputId', - request.triggerInputId, - )}`, - }, - unmarshalTriggerInput, - ) - - /** - * Waits for {@link TriggerInput} to be in a final state. - * - * @param request - The request {@link GetTriggerInputRequest} - * @param options - The waiting options - * @returns A Promise of TriggerInput - */ - waitForTriggerInput = ( - request: Readonly, - options?: Readonly>, - ) => - waitForResource( - options?.stop ?? - (res => - Promise.resolve( - !TRIGGER_INPUT_TRANSIENT_STATUSES.includes(res.status), - )), - this.getTriggerInput, - request, - options, - ) - - protected pageOfListTriggerInputs = ( - request: Readonly, - ) => - this.client.fetch( - { - method: 'GET', - path: `/functions/v1beta1/regions/${validatePathParam( - 'region', - request.region ?? this.client.settings.defaultRegion, - )}/trigger-inputs`, - urlParams: urlParams( - ['order_by', request.orderBy ?? 'created_at_asc'], - ['page', request.page], - [ - 'page_size', - request.pageSize ?? this.client.settings.defaultPageSize, - ], - ['trigger_id', request.triggerId], - ), - }, - unmarshalListTriggerInputsResponse, - ) - - listTriggerInputs = (request: Readonly) => - enrichForPagination('inputs', this.pageOfListTriggerInputs, request) - - setTriggerInputs = (request: Readonly) => - this.client.fetch( - { - body: JSON.stringify( - marshalSetTriggerInputsRequest(request, this.client.settings), - ), - headers: jsonContentHeaders, - method: 'PUT', - path: `/functions/v1beta1/regions/${validatePathParam( - 'region', - request.region ?? this.client.settings.defaultRegion, - )}/trigger-inputs`, - }, - unmarshalSetTriggerInputsResponse, - ) - - updateTriggerInput = (request: Readonly) => - this.client.fetch( - { - body: JSON.stringify( - marshalUpdateTriggerInputRequest(request, this.client.settings), - ), - headers: jsonContentHeaders, - method: 'PATCH', - path: `/functions/v1beta1/regions/${validatePathParam( - 'region', - request.region ?? this.client.settings.defaultRegion, - )}/trigger-inputs/${validatePathParam( - 'triggerInputId', - request.triggerInputId, - )}`, - }, - unmarshalTriggerInput, - ) - - deleteTriggerInput = (request: Readonly) => - this.client.fetch( - { - method: 'DELETE', - path: `/functions/v1beta1/regions/${validatePathParam( - 'region', - request.region ?? this.client.settings.defaultRegion, - )}/trigger-inputs/${validatePathParam( - 'triggerInputId', - request.triggerInputId, - )}`, - }, - unmarshalTriggerInput, - ) } diff --git a/packages/clients/src/api/function/v1beta1/content.gen.ts b/packages/clients/src/api/function/v1beta1/content.gen.ts index eede27a6b..66e8ce5c1 100644 --- a/packages/clients/src/api/function/v1beta1/content.gen.ts +++ b/packages/clients/src/api/function/v1beta1/content.gen.ts @@ -6,7 +6,6 @@ import type { FunctionStatus, NamespaceStatus, TokenStatus, - TriggerInputStatus, TriggerStatus, } from './types.gen' @@ -41,13 +40,6 @@ export const NAMESPACE_TRANSIENT_STATUSES: NamespaceStatus[] = [ /** Lists transient statutes of the enum {@link TokenStatus}. */ export const TOKEN_TRANSIENT_STATUSES: TokenStatus[] = ['deleting', 'creating'] -/** Lists transient statutes of the enum {@link TriggerInputStatus}. */ -export const TRIGGER_INPUT_TRANSIENT_STATUSES: TriggerInputStatus[] = [ - 'deleting', - 'creating', - 'pending', -] - /** Lists transient statutes of the enum {@link TriggerStatus}. */ export const TRIGGER_TRANSIENT_STATUSES: TriggerStatus[] = [ 'deleting', diff --git a/packages/clients/src/api/function/v1beta1/index.gen.ts b/packages/clients/src/api/function/v1beta1/index.gen.ts index c4e355862..b05289e43 100644 --- a/packages/clients/src/api/function/v1beta1/index.gen.ts +++ b/packages/clients/src/api/function/v1beta1/index.gen.ts @@ -8,15 +8,10 @@ export type { CreateFunctionRequest, CreateNamespaceRequest, CreateTokenRequest, - CreateTriggerInputRequest, - CreateTriggerInputRequestNatsClientConfigSpec, - CreateTriggerInputRequestSqsClientConfigSpec, CreateTriggerRequest, - CreateTriggerRequestNatsFailureHandlingPolicy, - CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter, - CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy, - CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter, - CreateTriggerRequestSqsFailureHandlingPolicy, + CreateTriggerRequestMnqNatsClientConfig, + CreateTriggerRequestMnqSqsClientConfig, + CreateTriggerRequestSqsClientConfig, Cron, CronStatus, DeleteCronRequest, @@ -24,7 +19,6 @@ export type { DeleteFunctionRequest, DeleteNamespaceRequest, DeleteTokenRequest, - DeleteTriggerInputRequest, DeleteTriggerRequest, DeployFunctionRequest, Domain, @@ -42,7 +36,6 @@ export type { GetFunctionUploadURLRequest, GetNamespaceRequest, GetTokenRequest, - GetTriggerInputRequest, GetTriggerRequest, IssueJWTRequest, ListCronsRequest, @@ -65,9 +58,6 @@ export type { ListTokensRequest, ListTokensRequestOrderBy, ListTokensResponse, - ListTriggerInputsRequest, - ListTriggerInputsRequestOrderBy, - ListTriggerInputsResponse, ListTriggersRequest, ListTriggersRequestOrderBy, ListTriggersResponse, @@ -80,30 +70,20 @@ export type { RuntimeStatus, Secret, SecretHashedValue, - SetTriggerInputsRequest, - SetTriggerInputsRequestNatsConfigs, - SetTriggerInputsRequestSqsConfigs, - SetTriggerInputsResponse, Token, TokenStatus, Trigger, - TriggerInput, - TriggerInputNatsClientConfig, - TriggerInputSqsClientConfig, - TriggerInputStatus, - TriggerNatsDeadLetter, - TriggerNatsFailureHandlingPolicy, - TriggerRetryPolicy, - TriggerSqsDeadLetter, - TriggerSqsFailureHandlingPolicy, + TriggerInputType, + TriggerMnqNatsClientConfig, + TriggerMnqSqsClientConfig, + TriggerSqsClientConfig, TriggerStatus, - TriggerType, UpdateCronRequest, UpdateFunctionRequest, UpdateNamespaceRequest, - UpdateTriggerInputRequest, - UpdateTriggerInputRequestNatsClientConfigSpec, - UpdateTriggerInputRequestSqsClientConfigSpec, UpdateTriggerRequest, + UpdateTriggerRequestMnqNatsClientConfig, + UpdateTriggerRequestMnqSqsClientConfig, + UpdateTriggerRequestSqsClientConfig, UploadURL, } from './types.gen' diff --git a/packages/clients/src/api/function/v1beta1/marshalling.gen.ts b/packages/clients/src/api/function/v1beta1/marshalling.gen.ts index 2f6e04679..77b0e99d5 100644 --- a/packages/clients/src/api/function/v1beta1/marshalling.gen.ts +++ b/packages/clients/src/api/function/v1beta1/marshalling.gen.ts @@ -14,15 +14,10 @@ import type { CreateFunctionRequest, CreateNamespaceRequest, CreateTokenRequest, - CreateTriggerInputRequest, - CreateTriggerInputRequestNatsClientConfigSpec, - CreateTriggerInputRequestSqsClientConfigSpec, CreateTriggerRequest, - CreateTriggerRequestNatsFailureHandlingPolicy, - CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter, - CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy, - CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter, - CreateTriggerRequestSqsFailureHandlingPolicy, + CreateTriggerRequestMnqNatsClientConfig, + CreateTriggerRequestMnqSqsClientConfig, + CreateTriggerRequestSqsClientConfig, Cron, Domain, DownloadURL, @@ -34,134 +29,76 @@ import type { ListLogsResponse, ListNamespacesResponse, ListTokensResponse, - ListTriggerInputsResponse, ListTriggersResponse, Log, Namespace, Runtime, Secret, SecretHashedValue, - SetTriggerInputsRequest, - SetTriggerInputsRequestNatsConfigs, - SetTriggerInputsRequestSqsConfigs, - SetTriggerInputsResponse, Token, Trigger, - TriggerInput, - TriggerInputNatsClientConfig, - TriggerInputSqsClientConfig, - TriggerNatsDeadLetter, - TriggerNatsFailureHandlingPolicy, - TriggerRetryPolicy, - TriggerSqsDeadLetter, - TriggerSqsFailureHandlingPolicy, + TriggerMnqNatsClientConfig, + TriggerMnqSqsClientConfig, + TriggerSqsClientConfig, UpdateCronRequest, UpdateFunctionRequest, UpdateNamespaceRequest, - UpdateTriggerInputRequest, - UpdateTriggerInputRequestNatsClientConfigSpec, - UpdateTriggerInputRequestSqsClientConfigSpec, UpdateTriggerRequest, + UpdateTriggerRequestMnqNatsClientConfig, + UpdateTriggerRequestMnqSqsClientConfig, + UpdateTriggerRequestSqsClientConfig, UploadURL, } from './types.gen' -const unmarshalTriggerNatsDeadLetter = (data: unknown) => { +const unmarshalSecretHashedValue = (data: unknown) => { if (!isJSONObject(data)) { throw new TypeError( - `Unmarshalling the type 'TriggerNatsDeadLetter' failed as data isn't a dictionary.`, + `Unmarshalling the type 'SecretHashedValue' failed as data isn't a dictionary.`, ) } - return { - mnqNamespaceId: data.mnq_namespace_id, - subject: data.subject, - } as TriggerNatsDeadLetter + return { hashedValue: data.hashed_value, key: data.key } as SecretHashedValue } -const unmarshalTriggerRetryPolicy = (data: unknown) => { +const unmarshalTriggerMnqNatsClientConfig = (data: unknown) => { if (!isJSONObject(data)) { throw new TypeError( - `Unmarshalling the type 'TriggerRetryPolicy' failed as data isn't a dictionary.`, + `Unmarshalling the type 'TriggerMnqNatsClientConfig' failed as data isn't a dictionary.`, ) } return { - maxRetries: data.max_retries, - retryPeriod: data.retry_period, - } as TriggerRetryPolicy + mnqNamespaceId: data.mnq_namespace_id, + subject: data.subject, + } as TriggerMnqNatsClientConfig } -const unmarshalTriggerSqsDeadLetter = (data: unknown) => { +const unmarshalTriggerMnqSqsClientConfig = (data: unknown) => { if (!isJSONObject(data)) { throw new TypeError( - `Unmarshalling the type 'TriggerSqsDeadLetter' failed as data isn't a dictionary.`, + `Unmarshalling the type 'TriggerMnqSqsClientConfig' failed as data isn't a dictionary.`, ) } return { mnqNamespaceId: data.mnq_namespace_id, queue: data.queue, - } as TriggerSqsDeadLetter -} - -const unmarshalSecretHashedValue = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'SecretHashedValue' failed as data isn't a dictionary.`, - ) - } - - return { hashedValue: data.hashed_value, key: data.key } as SecretHashedValue + } as TriggerMnqSqsClientConfig } -const unmarshalTriggerInputNatsClientConfig = (data: unknown) => { +const unmarshalTriggerSqsClientConfig = (data: unknown) => { if (!isJSONObject(data)) { throw new TypeError( - `Unmarshalling the type 'TriggerInputNatsClientConfig' failed as data isn't a dictionary.`, - ) - } - - return { subject: data.subject } as TriggerInputNatsClientConfig -} - -const unmarshalTriggerInputSqsClientConfig = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'TriggerInputSqsClientConfig' failed as data isn't a dictionary.`, - ) - } - - return { queue: data.queue } as TriggerInputSqsClientConfig -} - -const unmarshalTriggerNatsFailureHandlingPolicy = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'TriggerNatsFailureHandlingPolicy' failed as data isn't a dictionary.`, + `Unmarshalling the type 'TriggerSqsClientConfig' failed as data isn't a dictionary.`, ) } return { - natsDeadLetter: data.nats_dead_letter - ? unmarshalTriggerNatsDeadLetter(data.nats_dead_letter) - : undefined, - retryPolicy: data.retry_policy - ? unmarshalTriggerRetryPolicy(data.retry_policy) - : undefined, - sqsDeadLetter: data.sqs_dead_letter - ? unmarshalTriggerSqsDeadLetter(data.sqs_dead_letter) - : undefined, - } as TriggerNatsFailureHandlingPolicy -} - -const unmarshalTriggerSqsFailureHandlingPolicy = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'TriggerSqsFailureHandlingPolicy' failed as data isn't a dictionary.`, - ) - } - - return {} as TriggerSqsFailureHandlingPolicy + accessKey: data.access_key, + endpoint: data.endpoint, + queueUrl: data.queue_url, + secretKey: data.secret_key, + } as TriggerSqsClientConfig } export const unmarshalCron = (data: unknown) => { @@ -326,41 +263,19 @@ export const unmarshalTrigger = (data: unknown) => { errorMessage: data.error_message, functionId: data.function_id, id: data.id, + inputType: data.input_type, name: data.name, - natsFailureHandlingPolicy: data.nats_failure_handling_policy - ? unmarshalTriggerNatsFailureHandlingPolicy( - data.nats_failure_handling_policy, - ) - : undefined, - sqsFailureHandlingPolicy: data.sqs_failure_handling_policy - ? unmarshalTriggerSqsFailureHandlingPolicy( - data.sqs_failure_handling_policy, - ) + scwNatsConfig: data.scw_nats_config + ? unmarshalTriggerMnqNatsClientConfig(data.scw_nats_config) : undefined, - status: data.status, - type: data.type, - } as Trigger -} - -export const unmarshalTriggerInput = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'TriggerInput' failed as data isn't a dictionary.`, - ) - } - - return { - errorMessage: data.error_message, - id: data.id, - mnqNamespaceId: data.mnq_namespace_id, - natsConfig: data.nats_config - ? unmarshalTriggerInputNatsClientConfig(data.nats_config) + scwSqsConfig: data.scw_sqs_config + ? unmarshalTriggerMnqSqsClientConfig(data.scw_sqs_config) : undefined, sqsConfig: data.sqs_config - ? unmarshalTriggerInputSqsClientConfig(data.sqs_config) + ? unmarshalTriggerSqsClientConfig(data.sqs_config) : undefined, status: data.status, - } as TriggerInput + } as Trigger } export const unmarshalDownloadURL = (data: unknown) => { @@ -464,19 +379,6 @@ export const unmarshalListTokensResponse = (data: unknown) => { } as ListTokensResponse } -export const unmarshalListTriggerInputsResponse = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'ListTriggerInputsResponse' failed as data isn't a dictionary.`, - ) - } - - return { - inputs: unmarshalArrayOfObject(data.inputs, unmarshalTriggerInput), - totalCount: data.total_count, - } as ListTriggerInputsResponse -} - export const unmarshalListTriggersResponse = (data: unknown) => { if (!isJSONObject(data)) { throw new TypeError( @@ -490,21 +392,6 @@ export const unmarshalListTriggersResponse = (data: unknown) => { } as ListTriggersResponse } -export const unmarshalSetTriggerInputsResponse = (data: unknown) => { - if (!isJSONObject(data)) { - throw new TypeError( - `Unmarshalling the type 'SetTriggerInputsResponse' failed as data isn't a dictionary.`, - ) - } - - return { - triggerInputs: unmarshalArrayOfObject( - data.trigger_inputs, - unmarshalTriggerInput, - ), - } as SetTriggerInputsResponse -} - export const unmarshalUploadURL = (data: unknown) => { if (!isJSONObject(data)) { throw new TypeError( @@ -515,81 +402,32 @@ export const unmarshalUploadURL = (data: unknown) => { return { headers: data.headers, url: data.url } as UploadURL } -const marshalCreateTriggerInputRequestNatsClientConfigSpec = ( - request: CreateTriggerInputRequestNatsClientConfigSpec, - defaults: DefaultValues, -): Record => ({ - subject: request.subject, -}) - -const marshalCreateTriggerInputRequestSqsClientConfigSpec = ( - request: CreateTriggerInputRequestSqsClientConfigSpec, - defaults: DefaultValues, -): Record => ({ - queue: request.queue, -}) - -const marshalCreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter = ( - request: CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter, +const marshalCreateTriggerRequestMnqNatsClientConfig = ( + request: CreateTriggerRequestMnqNatsClientConfig, defaults: DefaultValues, ): Record => ({ mnq_namespace_id: request.mnqNamespaceId, subject: request.subject, }) -const marshalCreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy = ( - request: CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy, - defaults: DefaultValues, -): Record => ({ - max_retries: request.maxRetries, - retry_period: request.retryPeriod, -}) - -const marshalCreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter = ( - request: CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter, +const marshalCreateTriggerRequestMnqSqsClientConfig = ( + request: CreateTriggerRequestMnqSqsClientConfig, defaults: DefaultValues, ): Record => ({ mnq_namespace_id: request.mnqNamespaceId, queue: request.queue, }) -const marshalCreateTriggerRequestNatsFailureHandlingPolicy = ( - request: CreateTriggerRequestNatsFailureHandlingPolicy, +const marshalCreateTriggerRequestSqsClientConfig = ( + request: CreateTriggerRequestSqsClientConfig, defaults: DefaultValues, ): Record => ({ - retry_policy: request.retryPolicy - ? marshalCreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy( - request.retryPolicy, - defaults, - ) - : undefined, - ...resolveOneOf([ - { - param: 'nats_dead_letter', - value: request.natsDeadLetter - ? marshalCreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter( - request.natsDeadLetter, - defaults, - ) - : undefined, - }, - { - param: 'sqs_dead_letter', - value: request.sqsDeadLetter - ? marshalCreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter( - request.sqsDeadLetter, - defaults, - ) - : undefined, - }, - ]), + access_key: request.accessKey, + endpoint: request.endpoint, + queue_url: request.queueUrl, + secret_key: request.secretKey, }) -const marshalCreateTriggerRequestSqsFailureHandlingPolicy = ( - request: CreateTriggerRequestSqsFailureHandlingPolicy, - defaults: DefaultValues, -): Record => ({}) - const marshalSecret = ( request: Secret, defaults: DefaultValues, @@ -598,36 +436,30 @@ const marshalSecret = ( value: request.value, }) -const marshalSetTriggerInputsRequestNatsConfigs = ( - request: SetTriggerInputsRequestNatsConfigs, +const marshalUpdateTriggerRequestMnqNatsClientConfig = ( + request: UpdateTriggerRequestMnqNatsClientConfig, defaults: DefaultValues, ): Record => ({ - configs: request.configs.map(elt => - marshalCreateTriggerInputRequestNatsClientConfigSpec(elt, defaults), - ), -}) - -const marshalSetTriggerInputsRequestSqsConfigs = ( - request: SetTriggerInputsRequestSqsConfigs, - defaults: DefaultValues, -): Record => ({ - configs: request.configs.map(elt => - marshalCreateTriggerInputRequestSqsClientConfigSpec(elt, defaults), - ), + mnq_namespace_id: request.mnqNamespaceId, + subject: request.subject, }) -const marshalUpdateTriggerInputRequestNatsClientConfigSpec = ( - request: UpdateTriggerInputRequestNatsClientConfigSpec, +const marshalUpdateTriggerRequestMnqSqsClientConfig = ( + request: UpdateTriggerRequestMnqSqsClientConfig, defaults: DefaultValues, ): Record => ({ - subject: request.subject, + mnq_namespace_id: request.mnqNamespaceId, + queue: request.queue, }) -const marshalUpdateTriggerInputRequestSqsClientConfigSpec = ( - request: UpdateTriggerInputRequestSqsClientConfigSpec, +const marshalUpdateTriggerRequestSqsClientConfig = ( + request: UpdateTriggerRequestSqsClientConfig, defaults: DefaultValues, ): Record => ({ - queue: request.queue, + access_key: request.accessKey, + endpoint: request.endpoint, + queue_url: request.queueUrl, + secret_key: request.secretKey, }) export const marshalCreateCronRequest = ( @@ -704,34 +536,6 @@ export const marshalCreateTokenRequest = ( ]), }) -export const marshalCreateTriggerInputRequest = ( - request: CreateTriggerInputRequest, - defaults: DefaultValues, -): Record => ({ - mnq_namespace_id: request.mnqNamespaceId, - trigger_id: request.triggerId, - ...resolveOneOf([ - { - param: 'nats_config', - value: request.natsConfig - ? marshalCreateTriggerInputRequestNatsClientConfigSpec( - request.natsConfig, - defaults, - ) - : undefined, - }, - { - param: 'sqs_config', - value: request.sqsConfig - ? marshalCreateTriggerInputRequestSqsClientConfigSpec( - request.sqsConfig, - defaults, - ) - : undefined, - }, - ]), -}) - export const marshalCreateTriggerRequest = ( request: CreateTriggerRequest, defaults: DefaultValues, @@ -739,45 +543,32 @@ export const marshalCreateTriggerRequest = ( description: request.description, function_id: request.functionId, name: request.name, - type: request.type ?? 'unknown_trigger_type', ...resolveOneOf([ { - param: 'nats_failure_handling_policy', - value: request.natsFailureHandlingPolicy - ? marshalCreateTriggerRequestNatsFailureHandlingPolicy( - request.natsFailureHandlingPolicy, + param: 'scw_sqs_config', + value: request.scwSqsConfig + ? marshalCreateTriggerRequestMnqSqsClientConfig( + request.scwSqsConfig, defaults, ) : undefined, }, { - param: 'sqs_failure_handling_policy', - value: request.sqsFailureHandlingPolicy - ? marshalCreateTriggerRequestSqsFailureHandlingPolicy( - request.sqsFailureHandlingPolicy, + param: 'sqs_config', + value: request.sqsConfig + ? marshalCreateTriggerRequestSqsClientConfig( + request.sqsConfig, defaults, ) : undefined, }, - ]), -}) - -export const marshalSetTriggerInputsRequest = ( - request: SetTriggerInputsRequest, - defaults: DefaultValues, -): Record => ({ - trigger_input_id: request.triggerInputId, - ...resolveOneOf([ - { - param: 'sqs', - value: request.sqs - ? marshalSetTriggerInputsRequestSqsConfigs(request.sqs, defaults) - : undefined, - }, { - param: 'nats', - value: request.nats - ? marshalSetTriggerInputsRequestNatsConfigs(request.nats, defaults) + param: 'scw_nats_config', + value: request.scwNatsConfig + ? marshalCreateTriggerRequestMnqNatsClientConfig( + request.scwNatsConfig, + defaults, + ) : undefined, }, ]), @@ -828,16 +619,18 @@ export const marshalUpdateNamespaceRequest = ( : undefined, }) -export const marshalUpdateTriggerInputRequest = ( - request: UpdateTriggerInputRequest, +export const marshalUpdateTriggerRequest = ( + request: UpdateTriggerRequest, defaults: DefaultValues, ): Record => ({ + description: request.description, + name: request.name, ...resolveOneOf([ { - param: 'nats_config', - value: request.natsConfig - ? marshalUpdateTriggerInputRequestNatsClientConfigSpec( - request.natsConfig, + param: 'scw_sqs_config', + value: request.scwSqsConfig + ? marshalUpdateTriggerRequestMnqSqsClientConfig( + request.scwSqsConfig, defaults, ) : undefined, @@ -845,36 +638,17 @@ export const marshalUpdateTriggerInputRequest = ( { param: 'sqs_config', value: request.sqsConfig - ? marshalUpdateTriggerInputRequestSqsClientConfigSpec( + ? marshalUpdateTriggerRequestSqsClientConfig( request.sqsConfig, defaults, ) : undefined, }, - ]), -}) - -export const marshalUpdateTriggerRequest = ( - request: UpdateTriggerRequest, - defaults: DefaultValues, -): Record => ({ - description: request.description, - name: request.name, - ...resolveOneOf([ - { - param: 'nats_config', - value: request.natsConfig - ? marshalCreateTriggerRequestNatsFailureHandlingPolicy( - request.natsConfig, - defaults, - ) - : undefined, - }, { - param: 'sqs_config', - value: request.sqsConfig - ? marshalCreateTriggerRequestSqsFailureHandlingPolicy( - request.sqsConfig, + param: 'scw_nats_config', + value: request.scwNatsConfig + ? marshalUpdateTriggerRequestMnqNatsClientConfig( + request.scwNatsConfig, defaults, ) : undefined, diff --git a/packages/clients/src/api/function/v1beta1/types.gen.ts b/packages/clients/src/api/function/v1beta1/types.gen.ts index 61c9d0f01..9d7cbbcfb 100644 --- a/packages/clients/src/api/function/v1beta1/types.gen.ts +++ b/packages/clients/src/api/function/v1beta1/types.gen.ts @@ -84,10 +84,6 @@ export type ListNamespacesRequestOrderBy = export type ListTokensRequestOrderBy = 'created_at_asc' | 'created_at_desc' -export type ListTriggerInputsRequestOrderBy = - | 'created_at_asc' - | 'created_at_desc' - export type ListTriggersRequestOrderBy = 'created_at_asc' | 'created_at_desc' export type LogStream = 'unknown' | 'stdout' | 'stderr' @@ -118,13 +114,12 @@ export type TokenStatus = | 'error' | 'creating' -export type TriggerInputStatus = - | 'unknown' - | 'ready' - | 'deleting' - | 'error' - | 'creating' - | 'pending' +export type TriggerInputType = + | 'unknown_input_type' + | 'sqs' + | 'scw_sqs' + | 'nats' + | 'scw_nats' export type TriggerStatus = | 'unknown_status' @@ -134,47 +129,23 @@ export type TriggerStatus = | 'creating' | 'pending' -export type TriggerType = 'unknown_trigger_type' | 'nats' | 'sqs' - -export interface CreateTriggerInputRequestNatsClientConfigSpec { +export interface CreateTriggerRequestMnqNatsClientConfig { + mnqNamespaceId: string subject: string } -export interface CreateTriggerInputRequestSqsClientConfigSpec { +export interface CreateTriggerRequestMnqSqsClientConfig { + mnqNamespaceId: string queue: string } -export interface CreateTriggerRequestNatsFailureHandlingPolicy { - retryPolicy?: CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy - /** - * One-of ('deadLetter'): at most one of 'natsDeadLetter', 'sqsDeadLetter' - * could be set. - */ - natsDeadLetter?: CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter - /** - * One-of ('deadLetter'): at most one of 'natsDeadLetter', 'sqsDeadLetter' - * could be set. - */ - sqsDeadLetter?: CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter -} - -export interface CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter { - mnqNamespaceId?: string - subject?: string +export interface CreateTriggerRequestSqsClientConfig { + endpoint: string + queueUrl: string + accessKey: string + secretKey: string } -export interface CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy { - maxRetries?: number - retryPeriod?: string -} - -export interface CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter { - mnqNamespaceId?: string - queue?: string -} - -export interface CreateTriggerRequestSqsFailureHandlingPolicy {} - /** Cron */ export interface Cron { id: string @@ -272,11 +243,6 @@ export interface ListTokensResponse { totalCount: number } -export interface ListTriggerInputsResponse { - inputs: TriggerInput[] - totalCount: number -} - export interface ListTriggersResponse { triggers: Trigger[] totalCount: number @@ -333,18 +299,6 @@ export interface SecretHashedValue { hashedValue: string } -export interface SetTriggerInputsRequestNatsConfigs { - configs: CreateTriggerInputRequestNatsClientConfigSpec[] -} - -export interface SetTriggerInputsRequestSqsConfigs { - configs: CreateTriggerInputRequestSqsClientConfigSpec[] -} - -export interface SetTriggerInputsResponse { - triggerInputs: TriggerInput[] -} - /** Token */ export interface Token { id: string @@ -364,78 +318,59 @@ export interface Trigger { id: string name: string description: string - type: TriggerType + inputType: TriggerInputType status: TriggerStatus errorMessage?: string functionId: string /** - * One-of ('failureHandlingPolicy'): at most one of - * 'natsFailureHandlingPolicy', 'sqsFailureHandlingPolicy' could be set. + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. */ - natsFailureHandlingPolicy?: TriggerNatsFailureHandlingPolicy + scwSqsConfig?: TriggerMnqSqsClientConfig /** - * One-of ('failureHandlingPolicy'): at most one of - * 'natsFailureHandlingPolicy', 'sqsFailureHandlingPolicy' could be set. + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. */ - sqsFailureHandlingPolicy?: TriggerSqsFailureHandlingPolicy -} - -export interface TriggerInput { - id: string - mnqNamespaceId?: string - status: TriggerInputStatus - errorMessage?: string - /** One-of ('config'): at most one of 'natsConfig', 'sqsConfig' could be set. */ - natsConfig?: TriggerInputNatsClientConfig - /** One-of ('config'): at most one of 'natsConfig', 'sqsConfig' could be set. */ - sqsConfig?: TriggerInputSqsClientConfig + sqsConfig?: TriggerSqsClientConfig + /** + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. + */ + scwNatsConfig?: TriggerMnqNatsClientConfig } -export interface TriggerInputNatsClientConfig { +export interface TriggerMnqNatsClientConfig { + mnqNamespaceId: string subject: string } -export interface TriggerInputSqsClientConfig { - queue: string -} - -export interface TriggerNatsDeadLetter { +export interface TriggerMnqSqsClientConfig { mnqNamespaceId: string - subject: string + queue: string } -export interface TriggerNatsFailureHandlingPolicy { - retryPolicy?: TriggerRetryPolicy - /** - * One-of ('deadLetter'): at most one of 'natsDeadLetter', 'sqsDeadLetter' - * could be set. - */ - natsDeadLetter?: TriggerNatsDeadLetter - /** - * One-of ('deadLetter'): at most one of 'natsDeadLetter', 'sqsDeadLetter' - * could be set. - */ - sqsDeadLetter?: TriggerSqsDeadLetter +export interface TriggerSqsClientConfig { + endpoint: string + queueUrl: string + accessKey: string + secretKey: string } -export interface TriggerRetryPolicy { - maxRetries: number - retryPeriod?: string +export interface UpdateTriggerRequestMnqNatsClientConfig { + mnqNamespaceId: string + subject: string } -export interface TriggerSqsDeadLetter { +export interface UpdateTriggerRequestMnqSqsClientConfig { mnqNamespaceId: string queue: string } -export interface TriggerSqsFailureHandlingPolicy {} - -export interface UpdateTriggerInputRequestNatsClientConfigSpec { - subject?: string -} - -export interface UpdateTriggerInputRequestSqsClientConfigSpec { - queue?: string +export interface UpdateTriggerRequestSqsClientConfig { + endpoint: string + queueUrl: string + accessKey: string + secretKey: string } /** Upload url */ @@ -710,17 +645,21 @@ export type CreateTriggerRequest = { name: string description: string functionId: string - type?: TriggerType /** - * One-of ('failureHandlingPolicy'): at most one of - * 'natsFailureHandlingPolicy', 'sqsFailureHandlingPolicy' could be set. + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. + */ + scwSqsConfig?: CreateTriggerRequestMnqSqsClientConfig + /** + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. */ - natsFailureHandlingPolicy?: CreateTriggerRequestNatsFailureHandlingPolicy + sqsConfig?: CreateTriggerRequestSqsClientConfig /** - * One-of ('failureHandlingPolicy'): at most one of - * 'natsFailureHandlingPolicy', 'sqsFailureHandlingPolicy' could be set. + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. */ - sqsFailureHandlingPolicy?: CreateTriggerRequestSqsFailureHandlingPolicy + scwNatsConfig?: CreateTriggerRequestMnqNatsClientConfig } export type GetTriggerRequest = { @@ -735,7 +674,21 @@ export type ListTriggersRequest = { page?: number pageSize?: number orderBy?: ListTriggersRequestOrderBy - functionId: string + /** + * One-of ('scope'): at most one of 'functionId', 'namespaceId', 'projectId' + * could be set. + */ + functionId?: string + /** + * One-of ('scope'): at most one of 'functionId', 'namespaceId', 'projectId' + * could be set. + */ + namespaceId?: string + /** + * One-of ('scope'): at most one of 'functionId', 'namespaceId', 'projectId' + * could be set. + */ + projectId?: string } export type UpdateTriggerRequest = { @@ -745,15 +698,20 @@ export type UpdateTriggerRequest = { name?: string description?: string /** - * One-of ('failureHandlingPolicy'): at most one of 'natsConfig', 'sqsConfig' - * could be set. + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. */ - natsConfig?: CreateTriggerRequestNatsFailureHandlingPolicy + scwSqsConfig?: UpdateTriggerRequestMnqSqsClientConfig /** - * One-of ('failureHandlingPolicy'): at most one of 'natsConfig', 'sqsConfig' - * could be set. + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. + */ + sqsConfig?: UpdateTriggerRequestSqsClientConfig + /** + * One-of ('config'): at most one of 'scwSqsConfig', 'sqsConfig', + * 'scwNatsConfig' could be set. */ - sqsConfig?: CreateTriggerRequestSqsFailureHandlingPolicy + scwNatsConfig?: UpdateTriggerRequestMnqNatsClientConfig } export type DeleteTriggerRequest = { @@ -761,55 +719,3 @@ export type DeleteTriggerRequest = { region?: Region triggerId: string } - -export type CreateTriggerInputRequest = { - /** Region to target. If none is passed will use default region from the config */ - region?: Region - triggerId: string - mnqNamespaceId?: string - /** One-of ('config'): at most one of 'natsConfig', 'sqsConfig' could be set. */ - natsConfig?: CreateTriggerInputRequestNatsClientConfigSpec - /** One-of ('config'): at most one of 'natsConfig', 'sqsConfig' could be set. */ - sqsConfig?: CreateTriggerInputRequestSqsClientConfigSpec -} - -export type GetTriggerInputRequest = { - /** Region to target. If none is passed will use default region from the config */ - region?: Region - triggerInputId: string -} - -export type ListTriggerInputsRequest = { - /** Region to target. If none is passed will use default region from the config */ - region?: Region - page?: number - pageSize?: number - orderBy?: ListTriggerInputsRequestOrderBy - triggerId: string -} - -export type SetTriggerInputsRequest = { - /** Region to target. If none is passed will use default region from the config */ - region?: Region - triggerInputId: string - /** One-of ('configs'): at most one of 'sqs', 'nats' could be set. */ - sqs?: SetTriggerInputsRequestSqsConfigs - /** One-of ('configs'): at most one of 'sqs', 'nats' could be set. */ - nats?: SetTriggerInputsRequestNatsConfigs -} - -export type UpdateTriggerInputRequest = { - /** Region to target. If none is passed will use default region from the config */ - region?: Region - triggerInputId: string - /** One-of ('config'): at most one of 'natsConfig', 'sqsConfig' could be set. */ - natsConfig?: UpdateTriggerInputRequestNatsClientConfigSpec - /** One-of ('config'): at most one of 'natsConfig', 'sqsConfig' could be set. */ - sqsConfig?: UpdateTriggerInputRequestSqsClientConfigSpec -} - -export type DeleteTriggerInputRequest = { - /** Region to target. If none is passed will use default region from the config */ - region?: Region - triggerInputId: string -}