Skip to content

Commit b06ca2f

Browse files
authored
Update activity operator command API routes (#3151)
* Update to use deprecated activity endpoints * Remove unused activity endpoints * Bump API to v1.60.2
1 parent 50d5c96 commit b06ca2f

6 files changed

Lines changed: 7 additions & 76 deletions

File tree

server/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/labstack/echo/v4 v4.13.4
1212
github.com/stretchr/testify v1.10.0
1313
github.com/urfave/cli/v2 v2.3.0
14-
go.temporal.io/api v1.60.1
14+
go.temporal.io/api v1.60.2
1515
golang.org/x/net v0.47.0
1616
golang.org/x/oauth2 v0.30.0
1717
google.golang.org/grpc v1.66.1

server/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
6868
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
6969
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
7070
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
71-
go.temporal.io/api v1.60.1 h1:UO3T3LE69LvKd/WU5TjsAJ+/s/wpiMA2i51xkajsbXY=
72-
go.temporal.io/api v1.60.1/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
71+
go.temporal.io/api v1.60.2 h1:xqUqdPeOu8/HNWVPu51P6tVoBJ5kRh8nBI62xXi+IWg=
72+
go.temporal.io/api v1.60.2/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
7373
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
7474
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
7575
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=

src/lib/services/workflow-activities-service.ts

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ import type {
88
ActivityUpdateOptionsRequest,
99
ActivityUpdateOptionsResponse,
1010
} from '$lib/types';
11-
import type {
12-
CompleteActivityTaskRequest,
13-
CompleteActivityTaskResponse,
14-
FailActivityTaskRequest,
15-
FailActivityTaskResponse,
16-
} from '$lib/types/events';
1711
import { stringifyWithBigInt } from '$lib/utilities/parse-with-big-int';
1812
import { requestFromAPI } from '$lib/utilities/request-from-api';
1913
import { routeForApi } from '$lib/utilities/route-for-api';
@@ -24,56 +18,6 @@ type WorkflowInformation = {
2418
activityId: string;
2519
};
2620

27-
export const failActivityTask = async ({
28-
namespace,
29-
workflowId,
30-
runId,
31-
activityId,
32-
failure,
33-
identity,
34-
lastHeartbeatDetails,
35-
}: FailActivityTaskRequest &
36-
WorkflowInformation): Promise<FailActivityTaskResponse> => {
37-
const route = routeForApi('activity.fail', {
38-
namespace,
39-
});
40-
return requestFromAPI<FailActivityTaskResponse>(route, {
41-
notifyOnError: false,
42-
options: {
43-
body: stringifyWithBigInt({ failure, identity, lastHeartbeatDetails }),
44-
},
45-
params: {
46-
workflowId,
47-
runId,
48-
activityId,
49-
},
50-
});
51-
};
52-
53-
export const completeActivityTask = async ({
54-
namespace,
55-
workflowId,
56-
runId,
57-
activityId,
58-
identity,
59-
result,
60-
}: CompleteActivityTaskRequest &
61-
WorkflowInformation): Promise<CompleteActivityTaskResponse> => {
62-
const route = routeForApi('activity.complete', {
63-
namespace,
64-
});
65-
66-
return requestFromAPI(route, {
67-
notifyOnError: false,
68-
options: { body: stringifyWithBigInt({ identity, result }) },
69-
params: {
70-
workflowId,
71-
runId,
72-
activityId,
73-
},
74-
});
75-
};
76-
7721
export const pauseActivity = async ({
7822
namespace,
7923
execution,

src/lib/types/api.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ export type WorkflowUpdateAPIRoutePath = 'workflow.update';
2323
export type WorkflowQueryAPIRoutePath = 'query';
2424

2525
export type WorkflowActivitiesAPIRoutePath =
26-
| 'activity.complete'
27-
| 'activity.fail'
2826
| 'activity.pause'
2927
| 'activity.unpause'
3028
| 'activity.reset'

src/lib/types/events.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,3 @@ export type NexusOperationCancelRequestedEvent =
272272
EventWithAttributes<'nexusOperationCancelRequestedEventAttributes'>;
273273
export type WorkflowPropertiesModifiedEvent =
274274
EventWithAttributes<'workflowPropertiesModifiedEventAttributes'>;
275-
276-
export type FailActivityTaskRequest =
277-
import('$lib/types').ActivityTaskFailedByIdRequest;
278-
export type FailActivityTaskResponse =
279-
import('$lib/types').ActivityTaskFailedByIdResponse;
280-
export type CompleteActivityTaskRequest =
281-
import('$lib/types').ActivityTaskCompletedByIdRequest;
282-
export type CompleteActivityTaskResponse =
283-
import('$lib/types').ActivityTaskCompletedByIdResponse;

src/lib/utilities/route-for-api.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,10 @@ export function pathForApi(
162162
workflows: `/namespaces/${parameters?.namespace}/workflows`,
163163
'workflows.archived': `/namespaces/${parameters?.namespace}/archived-workflows`,
164164
'workflows.count': `/namespaces/${parameters?.namespace}/workflow-count`,
165-
'activity.complete': `/namespaces/${parameters?.namespace}/activities/complete-by-id`,
166-
'activity.fail': `/namespaces/${parameters?.namespace}/activities/fail-by-id`,
167-
'activity.pause': `/namespaces/${parameters?.namespace}/activities/pause`,
168-
'activity.unpause': `/namespaces/${parameters?.namespace}/activities/unpause`,
169-
'activity.reset': `/namespaces/${parameters?.namespace}/activities/reset`,
170-
'activity.update-options': `/namespaces/${parameters?.namespace}/activities/update-options`,
165+
'activity.pause': `/namespaces/${parameters?.namespace}/activities-deprecated/pause`,
166+
'activity.unpause': `/namespaces/${parameters?.namespace}/activities-deprecated/unpause`,
167+
'activity.reset': `/namespaces/${parameters?.namespace}/activities-deprecated/reset`,
168+
'activity.update-options': `/namespaces/${parameters?.namespace}/activities-deprecated/update-options`,
171169
'batch-operations.list': `/namespaces/${parameters?.namespace}/batch-operations`,
172170
'batch-operations': `/namespaces/${parameters?.namespace}/batch-operations/${parameters?.batchJobId}`,
173171
'nexus-endpoints': '/nexus/endpoints',

0 commit comments

Comments
 (0)