etcdctl: fix quotes in txn and watch #6325
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| rqs := []txnRequests{ | ||
| txnRequests{ | ||
| compare: []string{`version("key1") = "1"`, `version("key2") = "1"`}, | ||
| ifSucess: []string{"get key1", "get key2", `put "key \"with\" space" "value \x23"`}, |
There was a problem hiding this comment.
So this should fail without this patch?
There was a problem hiding this comment.
yeah, the regex was completely broken
heyitsanthony
force-pushed
the
etcdctl-txn-quotes
branch
from
18ff804 to
fc90fa9
Compare
| @@ -48,8 +48,23 @@ func addHexPrefix(s string) string { | |||
| } | |||
|
|
|||
| func argify(s string) []string { | |||
| r := regexp.MustCompile("'.+'|\".+\"|\\S+") | |||
| return r.FindAllString(s, -1) | |||
| r := regexp.MustCompile(`"(\\.|[^"])*"|'[^']*'|[^'"\s]\S*[^'"\s]?`) | |||
There was a problem hiding this comment.
the single quote and non-quote one looks fine to me.
It seems like people use /"(?:[^"\\]|\\.)*"/ for double quote to deal with backslash.
See http://stackoverflow.com/questions/249791/regex-for-quoted-string-with-escaping-quotes.
Not sure if it necessary for us though, since we will do scanf %q later.
|
lgtm |
heyitsanthony
force-pushed
the
etcdctl-txn-quotes
branch
from
fc90fa9 to
666e7bd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6315