fix: remove deprecated swagger-cli (#1080)

* fix: remove deprecated swagger-cli * fix: use node:18-alpine
hatchet-dev · Dec 3, 2024 · f821379 · f821379
1 parent 92a96be
commit f821379
Show file tree

Hide file tree

Showing 7 changed files with 1,001 additions and 979 deletions.
diff --git a/api/v1/server/oas/gen/openapi.gen.go b/api/v1/server/oas/gen/openapi.gen.go
diff --git a/api/v1/server/oas/transformers/workflow.go b/api/v1/server/oas/transformers/workflow.go
@@ -148,7 +148,7 @@ func ToWorkflowVersionConcurrency(concurrency *WorkflowConcurrency) *gen.Workflo
 
 	res := &gen.WorkflowConcurrency{
 		MaxRuns:             concurrency.MaxRuns.Int32,
-		LimitStrategy:       gen.WorkflowConcurrencyLimitStrategy(concurrency.LimitStrategy.ConcurrencyLimitStrategy),
+		LimitStrategy:       gen.ConcurrencyLimitStrategy(concurrency.LimitStrategy.ConcurrencyLimitStrategy),
 		GetConcurrencyGroup: sqlchelpers.UUIDToStr(concurrency.GetConcurrencyGroupId),
 	}
 

diff --git a/build/package/servers.dockerfile b/build/package/servers.dockerfile
@@ -28,14 +28,14 @@ RUN go generate ./...
 
 # OpenAPI bundle environment
 # -------------------------
-FROM node:16-alpine as build-openapi
+FROM node:18-alpine as build-openapi
 WORKDIR /openapi
 
-RUN npm install -g [email protected] @apidevtools/swagger-cli prisma
+RUN npm install -g [email protected] @redocly/cli@latest prisma
 
 COPY /api-contracts/openapi ./openapi
 
-RUN swagger-cli bundle ./openapi/openapi.yaml --outfile ./bin/oas/openapi.yaml --type yaml
+RUN npx @redocly/cli bundle ./openapi/openapi.yaml --output ./bin/oas/openapi.yaml --ext yaml
 
 # Go build environment
 # --------------------

diff --git a/frontend/app/src/lib/api/generated/Api.ts b/frontend/app/src/lib/api/generated/Api.ts
@@ -10,12 +10,11 @@
  */
 
 import {
-  AcceptInviteRequest,
   APIError,
   APIErrors,
   APIMeta,
+  AcceptInviteRequest,
   BulkCreateEventRequest,
-  BulkCreateEventResponse,
   CancelEventRequest,
   CreateAPITokenRequest,
   CreateAPITokenResponse,
@@ -36,10 +35,11 @@ import {
   EventOrderByDirection,
   EventOrderByField,
   EventSearch,
+  Events,
   ListAPIMetaIntegration,
   ListAPITokensResponse,
-  ListSlackWebhooks,
   ListSNSIntegrations,
+  ListSlackWebhooks,
   LogLineLevelField,
   LogLineList,
   LogLineOrderByDirection,
@@ -53,12 +53,12 @@ import {
   ReplayWorkflowRunsRequest,
   ReplayWorkflowRunsResponse,
   RerunStepRunRequest,
+  SNSIntegration,
+  ScheduleWorkflowRunRequest,
   ScheduledRunStatus,
   ScheduledWorkflows,
   ScheduledWorkflowsList,
   ScheduledWorkflowsOrderByField,
-  ScheduleWorkflowRunRequest,
-  SNSIntegration,
   StepRun,
   StepRunArchiveList,
   StepRunEventList,
@@ -83,8 +83,8 @@ import {
   UserLoginRequest,
   UserRegisterRequest,
   UserTenantMembershipsList,
-  WebhookWorkerCreated,
   WebhookWorkerCreateRequest,
+  WebhookWorkerCreated,
   WebhookWorkerListResponse,
   WebhookWorkerRequestListResponse,
   Worker,
@@ -98,11 +98,11 @@ import {
   WorkflowRunList,
   WorkflowRunOrderByDirection,
   WorkflowRunOrderByField,
-  WorkflowRunsCancelRequest,
   WorkflowRunShape,
-  WorkflowRunsMetrics,
   WorkflowRunStatus,
   WorkflowRunStatusList,
+  WorkflowRunsCancelRequest,
+  WorkflowRunsMetrics,
   WorkflowUpdateRequest,
   WorkflowVersion,
   WorkflowWorkersCount,
@@ -931,7 +931,7 @@ export class Api<SecurityDataType = unknown> extends HttpClient<SecurityDataType
    * @secure
    */
   eventCreateBulk = (tenant: string, data: BulkCreateEventRequest, params: RequestParams = {}) =>
-    this.request<BulkCreateEventResponse, APIErrors>({
+    this.request<Events, APIErrors>({
       path: `/api/v1/tenants/${tenant}/events/bulk`,
       method: 'POST',
       body: data,