From 845e8a1283adbcb36487ef3c33acede9c01337b7 Mon Sep 17 00:00:00 2001 From: solimant Date: Thu, 2 Jan 2025 00:26:13 +0000 Subject: [PATCH] Skip SSE Signed-off-by: solimant --- .../src/schema/openapi.yaml | 28 ++++++------- .../openapi/generated/apis/Api.server.ts | 14 ------- .../src/schema/openapi/generated/router.ts | 26 ------------- .../openapi/generated/apis/Api.client.ts | 39 ------------------- 4 files changed, 14 insertions(+), 93 deletions(-) diff --git a/plugins/scaffolder-backend/src/schema/openapi.yaml b/plugins/scaffolder-backend/src/schema/openapi.yaml index d967912abd..c6e832f0e0 100644 --- a/plugins/scaffolder-backend/src/schema/openapi.yaml +++ b/plugins/scaffolder-backend/src/schema/openapi.yaml @@ -1163,20 +1163,20 @@ paths: parameters: - $ref: '#/components/parameters/taskId' - /v2/tasks/{taskId}/eventstream: - get: - operationId: StreamLogsEventStream - description: Get event stream for a task by ID. - responses: - '200': - description: Ok - content: - text/event-stream: - schema: - type: string - parameters: - - $ref: '#/components/parameters/eventsAfter' - - $ref: '#/components/parameters/taskId' + # /v2/tasks/{taskId}/eventstream: + # get: + # operationId: StreamLogsEventStream + # description: Get event stream for a task by ID. + # responses: + # '200': + # description: Ok + # content: + # text/event-stream: + # schema: + # type: string + # parameters: + # - $ref: '#/components/parameters/eventsAfter' + # - $ref: '#/components/parameters/taskId' /v2/tasks/{taskId}/events: get: diff --git a/plugins/scaffolder-backend/src/schema/openapi/generated/apis/Api.server.ts b/plugins/scaffolder-backend/src/schema/openapi/generated/apis/Api.server.ts index 2e3ea7fa3c..c81638fdf4 100644 --- a/plugins/scaffolder-backend/src/schema/openapi/generated/apis/Api.server.ts +++ b/plugins/scaffolder-backend/src/schema/openapi/generated/apis/Api.server.ts @@ -118,18 +118,6 @@ export type Scaffold = { body: ScaffolderScaffoldOptions; response: Scaffold201Response | Scaffold400Response; }; -/** - * @public - */ -export type StreamLogsEventStream = { - path: { - taskId: string; - }; - query: { - after?: number; - }; - response: string; -}; /** * @public */ @@ -162,7 +150,5 @@ export type EndpointMap = { '#post|/v2/tasks': Scaffold; - '#get|/v2/tasks/{taskId}/eventstream': StreamLogsEventStream; - '#get|/v2/tasks/{taskId}/events': StreamLogsPolling; }; diff --git a/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts b/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts index 104bfcd29b..3078fb9c4b 100644 --- a/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts +++ b/plugins/scaffolder-backend/src/schema/openapi/generated/router.ts @@ -907,32 +907,6 @@ export const spec = { ], }, }, - '/v2/tasks/{taskId}/eventstream': { - get: { - operationId: 'StreamLogsEventStream', - description: 'Get event stream for a task by ID.', - responses: { - '200': { - description: 'Ok', - content: { - 'text/event-stream': { - schema: { - type: 'string', - }, - }, - }, - }, - }, - parameters: [ - { - $ref: '#/components/parameters/eventsAfter', - }, - { - $ref: '#/components/parameters/taskId', - }, - ], - }, - }, '/v2/tasks/{taskId}/events': { get: { operationId: 'StreamLogsPolling', diff --git a/plugins/scaffolder-common/client/src/schema/openapi/generated/apis/Api.client.ts b/plugins/scaffolder-common/client/src/schema/openapi/generated/apis/Api.client.ts index 600ae7bc86..9bb691b922 100644 --- a/plugins/scaffolder-common/client/src/schema/openapi/generated/apis/Api.client.ts +++ b/plugins/scaffolder-common/client/src/schema/openapi/generated/apis/Api.client.ts @@ -126,17 +126,6 @@ export type Retry = { export type Scaffold = { body: ScaffolderScaffoldOptions; }; -/** - * @public - */ -export type StreamLogsEventStream = { - path: { - taskId: string; - }; - query: { - after?: number; - }; -}; /** * @public */ @@ -407,34 +396,6 @@ export class DefaultApiClient { }); } - /** - * Get event stream for a task by ID. - * @param taskId - - * @param after - Offset event ID to stream events after. - */ - public async streamLogsEventStream( - // @ts-ignore - request: StreamLogsEventStream, - options?: RequestOptions, - ): Promise> { - const baseUrl = await this.discoveryApi.getBaseUrl(pluginId); - - const uriTemplate = `/v2/tasks/{taskId}/eventstream{?after}`; - - const uri = parser.parse(uriTemplate).expand({ - taskId: request.path.taskId, - ...request.query, - }); - - return await this.fetchApi.fetch(`${baseUrl}${uri}`, { - headers: { - 'Content-Type': 'application/json', - ...(options?.token && { Authorization: `Bearer ${options?.token}` }), - }, - method: 'GET', - }); - } - /** * Get events for a task by ID. * @param taskId -