Reset subcommand to update version #812

gow · 2025-06-12T03:29:17Z

What was changed

Added reset subcommands so that we can do reset + update version info atomically in one operation. The server changes were made in temporalio/temporal#7719. This is the CLI counterpart.

To allow subcommands we added a new flag subcommands-optional. When this flag is present a parent command can be run in isolation without any subcommands (i.e subcommands will be optional)

Why?

So that we can reset + update_version at the same time.

Checklist

Closes: N/A
How was this tested:
Added tests + manually tested
Any docs updates needed?
N/A

CLAassistant · 2025-06-12T03:29:23Z

All committers have signed the CLA.

cretz · 2025-06-20T18:40:57Z

.github/CODEOWNERS

Do we need a separate PR to backport main into next-server? It is a bit hard to follow this PR on what changes are yours and what changes are in main.

Yeah. Looks like next-server is a lot of commits behind main?
I don't fully understand the purpose of next-server branch. I just set it as the base to get the failing tests pass. I've changed the base back to main so that the PR shows just my commits.

I don't fully understand the purpose of next-server branch

It's for server features without a stable server tag

Sushisource

This all looks good to me, though I'm not sure what's the problem with the test.

Regardless, I'll need to update this slightly after my refactor & next-server are merged. So potentially we can just let this sit until after that since everything needs to be together in the next release anyway.

cretz · 2025-06-23T21:55:38Z

go.mod

+	go.temporal.io/api v1.49.2-0.20250605210325-e57aa581185c
+	go.temporal.io/sdk v1.34.0
 	go.temporal.io/sdk/contrib/envconfig v0.1.0
-	go.temporal.io/server v1.27.1
+	go.temporal.io/server v1.29.0-135.2


Will have to wait for stable API and OSS server tags since this now targets main

cretz · 2025-06-23T21:58:53Z

temporalcli/commandsgen/commands.yml

+#     Commands with subcommands can't be run on their own unless
+#     subcommands-optional is set to true.


When designing commands, we had intentionally decided that a command either houses children or is a standalone command. We intentionally avoided hybrids in all of our designs so that it's clear when you execute a parent command you don't have a side effect. It's also clearer from a docs/usability standpoint to know that commands cannot serve two purposes.

I'm not completely against the change in our long-held stance, but it is a change and worth confirming the CLI is ok deviating from its existing stance.

We agreed on this decision quite some ways back when this went through design review: https://www.notion.so/temporalio/Multi-commands-with-reset-PRD-1d38fc5677388025a756ca7241453e32

Ah, I wasn't aware the matter was settled, ok

cretz · 2025-06-23T21:59:58Z

temporalcli/commandsgen/commands.yml

          Don't prompt to confirm.
          Only allowed when `--query` is present.

+  - name: temporal workflow reset with-workflow-update-options


I think if this is a separate command, it's reset-and-update-workflow-options but is it really a separate command or is it just a "post reset operation" on top of reset?

This is not a separate command. It's a "subcommand" of workflow reset in cli. In server rpc it's just a post reset operation param to reset request.

cretz

LGTM, but will have to wait until there is a stable tag for API and server before merging in to main

gow · 2025-06-24T21:57:45Z

LGTM, but will have to wait until there is a stable tag for API and server before merging in to main

Got it. Will wait for new server release, then rebase on main and check everything before merging.

gow · 2025-07-03T22:31:56Z

@cretz @Sushisource Please take a final look? I'll merge it on Monday evening.

Sushisource · 2025-07-04T00:11:49Z

temporalcli/commandsgen/commands.yml

+      - name: versioning-override-pinned-version
+        type: string
+        description: Override Pinned Version for a Worker Deployment (Only for pinned).


This will need to change to match my PR #811 after it goes in, so you can do that now if you want or I can do it before we cut the release, either way is fine.

Sushisource · 2025-07-04T00:12:08Z

Looking good to me. Thanks!

Sushisource · 2025-07-08T16:32:41Z

Now that my PR was merged, I think we'll want to update this to use the explicit deployment name / build ID args rather than the string before merging.

gow · 2025-07-08T17:34:01Z

Now that my PR was merged, I think we'll want to update this to use the explicit deployment name / build ID args rather than the string before merging.

I don't see your changes. Did you merge it into main? This PR is against main.

Sushisource · 2025-07-08T18:00:29Z

Now that my PR was merged, I think we'll want to update this to use the explicit deployment name / build ID args rather than the string before merging.

I don't see your changes. Did you merge it into main? This PR is against main.

Yes. All my changes to versioning-related commands are in main. For example:

cli/temporalcli/commandsgen/commands.yml

Line 860 in 106fc34

temporal worker deployment set-current-version \

- Add validation tests for argument checking - Add functional tests for all versioning behaviors - Add integration tests for flag inheritance and different reset types

…tions_PinnedBehavior

Sushisource

Awesome, thanks for updating.

gow requested a review from a team as a code owner June 12, 2025 03:29

gow marked this pull request as draft June 12, 2025 03:29

gow changed the title ~~Reset subcommand to update version~~ [WIP] Reset subcommand to update version Jun 12, 2025

gow changed the title ~~[WIP] Reset subcommand to update version~~ Reset subcommand to update version Jun 17, 2025

gow requested review from Sushisource, carlydf and cretz June 17, 2025 00:30

gow force-pushed the cg/reset branch from 2893be4 to 4a0ec46 Compare June 17, 2025 00:30

gow marked this pull request as ready for review June 17, 2025 00:40

gow changed the base branch from main to next-server June 18, 2025 00:52

cretz reviewed Jun 20, 2025

View reviewed changes

gow changed the base branch from next-server to main June 20, 2025 18:46

Sushisource approved these changes Jun 23, 2025

View reviewed changes

cretz reviewed Jun 23, 2025

View reviewed changes

cretz reviewed Jun 24, 2025

View reviewed changes

gow force-pushed the cg/reset branch from 6c2bc1d to 82f4efa Compare July 1, 2025 03:31

gow requested a review from a team as a code owner July 1, 2025 03:31

Sushisource reviewed Jul 4, 2025

View reviewed changes

cretz approved these changes Jul 7, 2025

View reviewed changes

cretz mentioned this pull request Jul 8, 2025

Update Server to v1.28 #819

Merged

gow added 3 commits July 9, 2025 11:56

Reset subcommand to update version

5e38527

Add tests

770ae2f

- Add validation tests for argument checking - Add functional tests for all versioning behaviors - Add integration tests for flag inheritance and different reset types

Fix test

5096e58

gow added 6 commits July 9, 2025 11:57

Cleanup

3c4f4bc

Allow optional subcommands

02dd916

Make subcommands optional for reset

56d3e4e

Cleanup

11b7a6a

Fix TestSharedServerSuite/TestWorkflow_ResetBatchWithWorkflowUpdateOp…

6aebe9e

…tions_PinnedBehavior

Fix versioning stuff

526b29c

gow force-pushed the cg/reset branch from 82f4efa to 526b29c Compare July 9, 2025 21:17

Remove unspecified value

95b6885

Sushisource approved these changes Jul 9, 2025

View reviewed changes

gow merged commit b9a57ef into main Jul 9, 2025
9 checks passed

gow deleted the cg/reset branch July 9, 2025 22:32

BrewTestBot mentioned this pull request Jul 14, 2025

temporal 1.4.1 Homebrew/homebrew-core#230011

Merged

		# Commands with subcommands can't be run on their own unless
		# subcommands-optional is set to true.

Reset subcommand to update version #812

Reset subcommand to update version #812

Uh oh!

Conversation

gow commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What was changed

Why?

Checklist

Uh oh!

CLAassistant commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cretz Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sushisource left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cretz Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cretz left a comment

Choose a reason for hiding this comment

Uh oh!

gow commented Jun 24, 2025

Uh oh!

gow commented Jul 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sushisource commented Jul 4, 2025

Uh oh!

Sushisource commented Jul 8, 2025

Uh oh!

gow commented Jul 8, 2025

Uh oh!

Sushisource commented Jul 8, 2025

Uh oh!

Sushisource left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gow commented Jun 12, 2025 •

edited

Loading

CLAassistant commented Jun 12, 2025 •

edited

Loading

cretz Jun 24, 2025 •

edited

Loading

cretz Jun 23, 2025 •

edited

Loading