diff --git a/server/go.mod b/server/go.mod index 5b4b7143f4..e70b950318 100644 --- a/server/go.mod +++ b/server/go.mod @@ -11,7 +11,7 @@ require ( github.com/labstack/echo/v4 v4.13.4 github.com/stretchr/testify v1.10.0 github.com/urfave/cli/v2 v2.3.0 - go.temporal.io/api v1.60.1 + go.temporal.io/api v1.60.2 golang.org/x/net v0.47.0 golang.org/x/oauth2 v0.30.0 google.golang.org/grpc v1.66.1 diff --git a/server/go.sum b/server/go.sum index 2c3a4dc62c..94cf1f3e5d 100644 --- a/server/go.sum +++ b/server/go.sum @@ -68,8 +68,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -go.temporal.io/api v1.60.1 h1:UO3T3LE69LvKd/WU5TjsAJ+/s/wpiMA2i51xkajsbXY= -go.temporal.io/api v1.60.1/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM= +go.temporal.io/api v1.60.2 h1:xqUqdPeOu8/HNWVPu51P6tVoBJ5kRh8nBI62xXi+IWg= +go.temporal.io/api v1.60.2/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM= golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= diff --git a/src/lib/services/workflow-activities-service.ts b/src/lib/services/workflow-activities-service.ts index 28cf0b35f6..e20b78746a 100644 --- a/src/lib/services/workflow-activities-service.ts +++ b/src/lib/services/workflow-activities-service.ts @@ -8,12 +8,6 @@ import type { ActivityUpdateOptionsRequest, ActivityUpdateOptionsResponse, } from '$lib/types'; -import type { - CompleteActivityTaskRequest, - CompleteActivityTaskResponse, - FailActivityTaskRequest, - FailActivityTaskResponse, -} from '$lib/types/events'; import { stringifyWithBigInt } from '$lib/utilities/parse-with-big-int'; import { requestFromAPI } from '$lib/utilities/request-from-api'; import { routeForApi } from '$lib/utilities/route-for-api'; @@ -24,56 +18,6 @@ type WorkflowInformation = { activityId: string; }; -export const failActivityTask = async ({ - namespace, - workflowId, - runId, - activityId, - failure, - identity, - lastHeartbeatDetails, -}: FailActivityTaskRequest & - WorkflowInformation): Promise => { - const route = routeForApi('activity.fail', { - namespace, - }); - return requestFromAPI(route, { - notifyOnError: false, - options: { - body: stringifyWithBigInt({ failure, identity, lastHeartbeatDetails }), - }, - params: { - workflowId, - runId, - activityId, - }, - }); -}; - -export const completeActivityTask = async ({ - namespace, - workflowId, - runId, - activityId, - identity, - result, -}: CompleteActivityTaskRequest & - WorkflowInformation): Promise => { - const route = routeForApi('activity.complete', { - namespace, - }); - - return requestFromAPI(route, { - notifyOnError: false, - options: { body: stringifyWithBigInt({ identity, result }) }, - params: { - workflowId, - runId, - activityId, - }, - }); -}; - export const pauseActivity = async ({ namespace, execution, diff --git a/src/lib/types/api.ts b/src/lib/types/api.ts index 439247d82a..ad8b19c279 100644 --- a/src/lib/types/api.ts +++ b/src/lib/types/api.ts @@ -23,8 +23,6 @@ export type WorkflowUpdateAPIRoutePath = 'workflow.update'; export type WorkflowQueryAPIRoutePath = 'query'; export type WorkflowActivitiesAPIRoutePath = - | 'activity.complete' - | 'activity.fail' | 'activity.pause' | 'activity.unpause' | 'activity.reset' diff --git a/src/lib/types/events.ts b/src/lib/types/events.ts index 4dd61d1802..9fdb51c043 100644 --- a/src/lib/types/events.ts +++ b/src/lib/types/events.ts @@ -272,12 +272,3 @@ export type NexusOperationCancelRequestedEvent = EventWithAttributes<'nexusOperationCancelRequestedEventAttributes'>; export type WorkflowPropertiesModifiedEvent = EventWithAttributes<'workflowPropertiesModifiedEventAttributes'>; - -export type FailActivityTaskRequest = - import('$lib/types').ActivityTaskFailedByIdRequest; -export type FailActivityTaskResponse = - import('$lib/types').ActivityTaskFailedByIdResponse; -export type CompleteActivityTaskRequest = - import('$lib/types').ActivityTaskCompletedByIdRequest; -export type CompleteActivityTaskResponse = - import('$lib/types').ActivityTaskCompletedByIdResponse; diff --git a/src/lib/utilities/route-for-api.ts b/src/lib/utilities/route-for-api.ts index 2bdc7a2e7c..68241a08d2 100644 --- a/src/lib/utilities/route-for-api.ts +++ b/src/lib/utilities/route-for-api.ts @@ -162,12 +162,10 @@ export function pathForApi( workflows: `/namespaces/${parameters?.namespace}/workflows`, 'workflows.archived': `/namespaces/${parameters?.namespace}/archived-workflows`, 'workflows.count': `/namespaces/${parameters?.namespace}/workflow-count`, - 'activity.complete': `/namespaces/${parameters?.namespace}/activities/complete-by-id`, - 'activity.fail': `/namespaces/${parameters?.namespace}/activities/fail-by-id`, - 'activity.pause': `/namespaces/${parameters?.namespace}/activities/pause`, - 'activity.unpause': `/namespaces/${parameters?.namespace}/activities/unpause`, - 'activity.reset': `/namespaces/${parameters?.namespace}/activities/reset`, - 'activity.update-options': `/namespaces/${parameters?.namespace}/activities/update-options`, + 'activity.pause': `/namespaces/${parameters?.namespace}/activities-deprecated/pause`, + 'activity.unpause': `/namespaces/${parameters?.namespace}/activities-deprecated/unpause`, + 'activity.reset': `/namespaces/${parameters?.namespace}/activities-deprecated/reset`, + 'activity.update-options': `/namespaces/${parameters?.namespace}/activities-deprecated/update-options`, 'batch-operations.list': `/namespaces/${parameters?.namespace}/batch-operations`, 'batch-operations': `/namespaces/${parameters?.namespace}/batch-operations/${parameters?.batchJobId}`, 'nexus-endpoints': '/nexus/endpoints',