feat(serverless): simplify the triggers by merging Trigger and TriggerInput (#452)

Author: scaleway-bot

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,15 +51,13 @@ import type {
   CreateFunctionRequest,
   CreateNamespaceRequest,
   CreateTokenRequest,
-  CreateTriggerInputRequest,
   CreateTriggerRequest,
   Cron,
   DeleteCronRequest,
   DeleteDomainRequest,
   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<ListTriggersRequest>) =>
+  protected pageOfListTriggers = (
+    request: Readonly<ListTriggersRequest> = {},
+  ) =>
     this.client.fetch<ListTriggersResponse>(
       {
         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<ListTriggersRequest>) =>
+  listTriggers = (request: Readonly<ListTriggersRequest> = {}) =>
     enrichForPagination('triggers', this.pageOfListTriggers, request)
 
   updateTrigger = (request: Readonly<UpdateTriggerRequest>) =>
@@ -999,133 +1001,4 @@ export class API extends ParentAPI {
       },
       unmarshalTrigger,
     )
-
-  createTriggerInput = (request: Readonly<CreateTriggerInputRequest>) =>
-    this.client.fetch<TriggerInput>(
-      {
-        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<GetTriggerInputRequest>) =>
-    this.client.fetch<TriggerInput>(
-      {
-        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<GetTriggerInputRequest>,
-    options?: Readonly<WaitForOptions<TriggerInput>>,
-  ) =>
-    waitForResource(
-      options?.stop ??
-        (res =>
-          Promise.resolve(
-            !TRIGGER_INPUT_TRANSIENT_STATUSES.includes(res.status),
-          )),
-      this.getTriggerInput,
-      request,
-      options,
-    )
-
-  protected pageOfListTriggerInputs = (
-    request: Readonly<ListTriggerInputsRequest>,
-  ) =>
-    this.client.fetch<ListTriggerInputsResponse>(
-      {
-        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<ListTriggerInputsRequest>) =>
-    enrichForPagination('inputs', this.pageOfListTriggerInputs, request)
-
-  setTriggerInputs = (request: Readonly<SetTriggerInputsRequest>) =>
-    this.client.fetch<SetTriggerInputsResponse>(
-      {
-        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<UpdateTriggerInputRequest>) =>
-    this.client.fetch<TriggerInput>(
-      {
-        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<DeleteTriggerInputRequest>) =>
-    this.client.fetch<TriggerInput>(
-      {
-        method: 'DELETE',
-        path: `/functions/v1beta1/regions/${validatePathParam(
-          'region',
-          request.region ?? this.client.settings.defaultRegion,
-        )}/trigger-inputs/${validatePathParam(
-          'triggerInputId',
-          request.triggerInputId,
-        )}`,
-      },
-      unmarshalTriggerInput,
-    )
 }

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',

packages/clients/src/api/function/v1beta1/index.gen.ts

@@ -8,23 +8,17 @@ export type {
   CreateFunctionRequest,
   CreateNamespaceRequest,
   CreateTokenRequest,
-  CreateTriggerInputRequest,
-  CreateTriggerInputRequestNatsClientConfigSpec,
-  CreateTriggerInputRequestSqsClientConfigSpec,
   CreateTriggerRequest,
-  CreateTriggerRequestNatsFailureHandlingPolicy,
-  CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter,
-  CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy,
-  CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter,
-  CreateTriggerRequestSqsFailureHandlingPolicy,
+  CreateTriggerRequestMnqNatsClientConfig,
+  CreateTriggerRequestMnqSqsClientConfig,
+  CreateTriggerRequestSqsClientConfig,
   Cron,
   CronStatus,
   DeleteCronRequest,
   DeleteDomainRequest,
   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'