Skip to content

Commit c765266

Browse files
authored
Add activity options to the pending activity info (#586)
_**READ BEFORE MERGING:** All PRs require approval by both Server AND SDK teams before merging! This is why the number of required approvals is "2" and not "1"--two reviewers from the same team is NOT sufficient. If your PR is not approved by someone in BOTH teams, it may be summarily reverted._ <!-- Describe what has changed in this PR --> **What changed?** Add activity options to the pending activity info <!-- Tell your future self why have you made these changes --> **Why?** If activity options where changed - there is no "official" way to users to know what are the current options. UI should display current options, so we will provide them as a part of DescribeWorfklow response. Thus we add activity options to the pending activity info, which will be a part of DescribeWorfklow response. <!-- Are there any breaking changes on binary or code level? --> **Breaking changes** No
1 parent e244d68 commit c765266

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

openapi/openapiv2.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11771,6 +11771,10 @@
1177111771
},
1177211772
"pauseInfo": {
1177311773
"$ref": "#/definitions/PendingActivityInfoPauseInfo"
11774+
},
11775+
"activityOptions": {
11776+
"$ref": "#/definitions/v1ActivityOptions",
11777+
"description": "Current activity options. May be different from the one used to start the activity."
1177411778
}
1177511779
}
1177611780
},

openapi/openapiv3.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8859,6 +8859,10 @@ components:
88598859
description: Priority metadata
88608860
pauseInfo:
88618861
$ref: '#/components/schemas/PendingActivityInfo_PauseInfo'
8862+
activityOptions:
8863+
allOf:
8864+
- $ref: '#/components/schemas/ActivityOptions'
8865+
description: Current activity options. May be different from the one used to start the activity.
88628866
PendingActivityInfo_PauseInfo:
88638867
type: object
88648868
properties:

temporal/api/workflow/v1/message.proto

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import "google/protobuf/empty.proto";
1414
import "google/protobuf/timestamp.proto";
1515
import "google/protobuf/field_mask.proto";
1616

17+
import "temporal/api/activity/v1/message.proto";
1718
import "temporal/api/enums/v1/common.proto";
1819
import "temporal/api/enums/v1/event_type.proto";
1920
import "temporal/api/enums/v1/workflow.proto";
@@ -322,6 +323,9 @@ message PendingActivityInfo {
322323
}
323324

324325
PauseInfo pause_info = 23;
326+
327+
// Current activity options. May be different from the one used to start the activity.
328+
temporal.api.activity.v1.ActivityOptions activity_options = 24;
325329
}
326330

327331
message PendingChildExecutionInfo {

0 commit comments

Comments
 (0)