chore: fix the output of etcdctl watch -i
#19397
Conversation
|
Hi @JalinWang. Thanks for your PR. I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
JalinWang
changed the title
watch -ietcdctl watch -i
Codecov ReportAttention: Patch coverage is
Additional details and impacted files
... and 66 files with indirect coverage changes @@ Coverage Diff @@
## main #19397 +/- ##
==========================================
+ Coverage 68.94% 70.29% +1.34%
==========================================
Files 420 424 +4
Lines 35759 37961 +2202
==========================================
+ Hits 24654 26684 +2030
- Misses 9684 9845 +161
- Partials 1421 1432 +11 Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
JalinWang
force-pushed
the
JalinWang-patch-1
branch
from
acdab4d to
76065c1
Compare
|
/ok-to-test |
There was a problem hiding this comment.
Thanks for the pull request, @JalinWang. Please take a look at my comment :)
| @@ -131,7 +131,7 @@ func watchInteractiveFunc(cmd *cobra.Command, osArgs []string, envKey, envRange | |||
| cobrautl.ExitWithError(cobrautl.ExitError, err) | |||
| } | |||
| default: | |||
| fmt.Fprintf(os.Stderr, "Invalid command %s (only support watch)\n", l) | |||
| fmt.Fprintf(os.Stderr, "Invalid command %s (only support `watch` & `progress`)\n", l) | |||
There was a problem hiding this comment.
I'd like to suggest having the same message in both places for consistency (and use the opportunity to improve the grammar :). i.e.,
| fmt.Fprintf(os.Stderr, "Invalid command %s (only support `watch` & `progress`)\n", l) | |
| fmt.Fprintf(os.Stderr, `Invalid command %s (only "watch" and "progress" are supported)\n`, l) |
And apply the same to line 108.
There was a problem hiding this comment.
There is a \n here, so we can't use back quotes ``
|
/ok-to-test @JalinWang, can you squash your commits? |
Signed-off-by: Jalin Wang <[email protected]>
JalinWang
force-pushed
the
JalinWang-patch-1
branch
from
ce61a1f to
16b3c80
Compare
|
done~ |
|
/retest |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed after 21 days if no further activity occurs. Thank you for your contributions. |
|
cc. @jmhbnz, @ahrtr, @serathius, @fuweid |
There was a problem hiding this comment.
LGTM - Thanks @JalinWang the new output is much clearer imo
| Output | |
|---|---|
| Current | > Invalid command w (only support watch) > Invalid command: (watch and progress supported) |
| This PR | > Invalid command: 'w' (only watch and progress are supported) > Invalid command: '' (only watch and progress are supported) |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ivanvc, JalinWang, jmhbnz The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| continue | ||
| } | ||
| switch args[0] { | ||
| case "watch": | ||
| if len(args) < 2 && envKey == "" { | ||
| fmt.Fprintf(os.Stderr, "Invalid command %s (command type or key is not provided)\n", l) | ||
| fmt.Fprintf(os.Stderr, "Invalid command: '%s' (the key/prefix is not provided)\n", l) |
There was a problem hiding this comment.
This seems not correct. If you read parseWatchArgs, the args may not just be key/prefix.
|
Apart from #19397 (comment), other changes in this PR look good to me. thx |
|
@JalinWang: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.
Although the interactive mode of
etcdctl watchsupportsprogresscommand now, the output is a little bit out-of-date :(