status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 13:26:07 +00:00
Code Issues Projects Releases Wiki Activity

command: fix cas put when index=0 and better errors in put and delete

Browse Source
This commit is contained in:
Kit Patella 2020-07-17 13:03:36 -07:00
parent e07b20e75a
commit f530fe558f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/kv/del/kv_delete.go
View File

@ -78,7 +78,7 @@ func (c *cmd) Run(args []string) int {
// ModifyIndex is required for CAS // ModifyIndex is required for CAS
if c.cas && c.modifyIndex == 0 { if c.cas && c.modifyIndex == 0 {
c.UI.Error("Must specify -modify-index with -cas!") c.UI.Error("Cannot delete a key that does not exist. Provide a -modify-index greater than than 0.")
return 1 return 1
} }

10
command/kv/put/kv_put.go
View File

@ -99,12 +99,6 @@ func (c *cmd) Run(args []string) int {
return 1 return 1
} }
// ModifyIndex is required for CAS
if c.cas && c.modifyIndex == 0 {
c.UI.Error("Must specify -modify-index with -cas!")
return 1
}
// Create and test the HTTP client // Create and test the HTTP client
client, err := c.http.APIClient() client, err := c.http.APIClient()
if err != nil { if err != nil {
@ -127,6 +121,10 @@ func (c *cmd) Run(args []string) int {
c.UI.Error(fmt.Sprintf("Error! Did not write to %s: %s", key, err)) c.UI.Error(fmt.Sprintf("Error! Did not write to %s: %s", key, err))
return 1 return 1
} }
if !ok && c.modifyIndex == 0 {
c.UI.Error(fmt.Sprintf("Error! Did not write to %s: CAS performed with index=0 and key already exists.", key))
return 1
}
if !ok { if !ok {
c.UI.Error(fmt.Sprintf("Error! Did not write to %s: CAS failed", key)) c.UI.Error(fmt.Sprintf("Error! Did not write to %s: CAS failed", key))
return 1 return 1