Update next-server branch with changes in main#834
Conversation
## What was changed <!-- Describe what has changed in this PR --> Target `main` branch instead of the dev branch I was using when working on the feature ## Why? <!-- Tell your future self why have you made these changes --> Fixing a bug from #796 ## Checklist <!--- add/delete as needed ---> 1. Closes <!-- add issue number here --> 2. How was this tested: <!--- Please describe how you tested your changes/how we can test them --> Untested, this path triggers on release, should be fine to wait for next release to ensure it's fixed. Not the worst case if this pipeline misses a release 3. Any docs updates needed? <!--- update README if applicable or point out where to update docs.temporal.io -->
…#824) <!--- Note to EXTERNAL Contributors --> <!-- Thanks for opening a PR! If it is a significant code change, please **make sure there is an open issue** for this. We work best with you when we have accepted the idea first before you code. --> <!--- For ALL Contributors 👇 --> ## What was changed `temporal activity {pause,unpause,reset}` commands take either an `--activity-id` or `activity-type` argument but not both. If both are provided the command will fail ## Why? We want to fail when both are provided, the user doesn't need to provide activity type and id as type can be inferred from type. ## Checklist <!--- add/delete as needed ---> 1. Closes no issue 2. How was this tested: * new unit test showing failure 3. Any docs updates needed? documentation updates will be needed, @drewhoskins-temporal or @ychebotarev can share where and I will update
<!--- Note to EXTERNAL Contributors --> <!-- Thanks for opening a PR! If it is a significant code change, please **make sure there is an open issue** for this. We work best with you when we have accepted the idea first before you code. --> <!--- For ALL Contributors 👇 --> ## 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 <!--- add/delete as needed ---> 1. Closes: <!-- add issue number here --> N/A 2. How was this tested: Added tests + manually tested 3. Any docs updates needed? N/A
) <!--- For ALL Contributors 👇 --> ## What was changed Updated the `temporal activity {pause,unpause,reset}` commands docstrings and flag info to mirror documentation. documentation PR is https://github.com/temporalio/documentation/pull/3625/files ## Why? Consistency purposes ## Checklist <!--- add/delete as needed ---> 1. Closes <!-- add issue number here --> 2. How was this tested: <!--- Please describe how you tested your changes/how we can test them --> 3. Any docs updates needed? <!--- update README if applicable or point out where to update docs.temporal.io -->
<!--- Note to EXTERNAL Contributors -->
<!-- Thanks for opening a PR!
If it is a significant code change, please **make sure there is an open
issue** for this.
We work best with you when we have accepted the idea first before you
code. -->
<!--- For ALL Contributors 👇 -->
## What was changed
Use imperative verbs in cli
## Why?
Consistency
## Checklist
<!--- add/delete as needed --->
1. Closes <!-- add issue number here -->
2. How was this tested:
<!--- Please describe how you tested your changes/how we can test them
-->
3. Any docs updates needed?
<!--- update README if applicable
or point out where to update docs.temporal.io -->
## What was changed <!-- Describe what has changed in this PR --> Fixed a type with an option-set, added a check in the tool to avoid this bug in the future ## Why? <!-- Tell your future self why have you made these changes --> fix bug ## Checklist <!--- add/delete as needed ---> 1. Closes #825 2. How was this tested: <!--- Please describe how you tested your changes/how we can test them --> tool runs locally with no panic 3. Any docs updates needed? <!--- update README if applicable or point out where to update docs.temporal.io -->
|
I would have preferred a rebase to avoid the history being awkward but this is fine. I hope it doesn't complicate the merge back into main later. |
@bergundy is this rebase from |
We should automate this and even consider blocking merges to We should think about this process a bit more. |
What was changed
Updating
next-serverbranch with changes tomainWhy?
Consistency
Checklist
Closes: NA
How was this tested:
NA
Any docs updates needed?
No