luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

csi: volume cli prefix matching should accept exact match (#12051) 

The `volume detach`, `volume deregister`, and `volume status` commands
accept a prefix argument for the volume ID. Update the behavior on
exact matches so that if there is more than one volume that matches
the prefix, we should only return an error if one of the volume IDs is
not an exact match. Otherwise we won't be able to use these commands
at all on those volumes. This also makes the behavior of these commands
consistent with `job stop`.
This commit is contained in:
Tim Gross 2022-02-11 08:53:03 -05:00 committed by GitHub
parent 8ffe7aa76f
commit 2f79a260fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12051.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
csi: fixed a bug where `volume detach`, `volume deregister`, and `volume status` commands did not accept an exact ID if multiple volumes matched the prefix
```

22
command/volume_deregister.go
View File

@ -99,20 +99,22 @@ func (c *VolumeDeregisterCommand) Run(args []string) int {
c.Ui.Error(fmt.Sprintf("Error querying volumes: %s", err)) c.Ui.Error(fmt.Sprintf("Error querying volumes: %s", err))
return 1 return 1
} }
if len(vols) > 1 {
sort.Slice(vols, func(i, j int) bool { return vols[i].ID < vols[j].ID })
out, err := csiFormatSortedVolumes(vols, fullId)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error formatting: %s", err))
return 1
}
c.Ui.Error(fmt.Sprintf("Prefix matched multiple volumes\n\n%s", out))
return 1
}
if len(vols) == 0 { if len(vols) == 0 {
c.Ui.Error(fmt.Sprintf("No volumes(s) with prefix or ID %q found", volID)) c.Ui.Error(fmt.Sprintf("No volumes(s) with prefix or ID %q found", volID))
return 1 return 1
} }
if len(vols) > 1 {
if (volID != vols[0].ID) || (c.allNamespaces() && vols[0].ID == vols[1].ID) {
sort.Slice(vols, func(i, j int) bool { return vols[i].ID < vols[j].ID })
out, err := csiFormatSortedVolumes(vols, fullId)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error formatting: %s", err))
return 1
}
c.Ui.Error(fmt.Sprintf("Prefix matched multiple volumes\n\n%s", out))
return 1
}
}
volID = vols[0].ID volID = vols[0].ID
// Confirm the -force flag // Confirm the -force flag

22
command/volume_detach.go
View File

@ -121,20 +121,22 @@ func (c *VolumeDetachCommand) Run(args []string) int {
c.Ui.Error(fmt.Sprintf("Error querying volumes: %s", err)) c.Ui.Error(fmt.Sprintf("Error querying volumes: %s", err))
return 1 return 1
} }
if len(vols) > 1 {
sort.Slice(vols, func(i, j int) bool { return vols[i].ID < vols[j].ID })
out, err := csiFormatSortedVolumes(vols, fullId)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error formatting: %s", err))
return 1
}
c.Ui.Error(fmt.Sprintf("Prefix matched multiple volumes\n\n%s", out))
return 1
}
if len(vols) == 0 { if len(vols) == 0 {
c.Ui.Error(fmt.Sprintf("No volumes(s) with prefix or ID %q found", volID)) c.Ui.Error(fmt.Sprintf("No volumes(s) with prefix or ID %q found", volID))
return 1 return 1
} }
if len(vols) > 1 {
if (volID != vols[0].ID) || (c.allNamespaces() && vols[0].ID == vols[1].ID) {
sort.Slice(vols, func(i, j int) bool { return vols[i].ID < vols[j].ID })
out, err := csiFormatSortedVolumes(vols, fullId)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error formatting: %s", err))
return 1
}
c.Ui.Error(fmt.Sprintf("Prefix matched multiple volumes\n\n%s", out))
return 1
}
}
volID = vols[0].ID volID = vols[0].ID
vol, _, err := client.CSIVolumes().Info(volID, nil) vol, _, err := client.CSIVolumes().Info(volID, nil)

20
command/volume_status_csi.go
View File

@ -29,19 +29,21 @@ func (c *VolumeStatusCommand) csiStatus(client *api.Client, id string) int {
c.Ui.Error(fmt.Sprintf("Error querying volumes: %s", err)) c.Ui.Error(fmt.Sprintf("Error querying volumes: %s", err))
return 1 return 1
} }
if len(vols) > 1 {
out, err := c.csiFormatVolumes(vols)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error formatting: %s", err))
return 1
}
c.Ui.Error(fmt.Sprintf("Prefix matched multiple volumes\n\n%s", out))
return 1
}
if len(vols) == 0 { if len(vols) == 0 {
c.Ui.Error(fmt.Sprintf("No volumes(s) with prefix or ID %q found", id)) c.Ui.Error(fmt.Sprintf("No volumes(s) with prefix or ID %q found", id))
return 1 return 1
} }
if len(vols) > 1 {
if (id != vols[0].ID) || (c.allNamespaces() && vols[0].ID == vols[1].ID) {
out, err := c.csiFormatVolumes(vols)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error formatting: %s", err))
return 1
}
c.Ui.Error(fmt.Sprintf("Prefix matched multiple volumes\n\n%s", out))
return 1
}
}
id = vols[0].ID id = vols[0].ID
// Try querying the volume // Try querying the volume