lxc/completion: Fix snapshot shell completions for `lxc storage volum…

…e show` Fixes canonical#14682. This commit fixes shell completions for snapshots when running `lxc storage volume show`. `GetStoragePoolVolumeNames` returns the full volume name including "/snapshots/", which is incorrect in the context of the CLI. Signed-off-by: Kadin Sayani <[email protected]>
kadinsayani · Dec 19, 2024 · 1bcc8b3 · 1bcc8b3
1 parent 2b27096
commit 1bcc8b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lxc/completion.go b/lxc/completion.go
@@ -1634,9 +1634,17 @@ func (g *cmdGlobal) cmpStoragePoolVolumes(poolName string, volumeTypes ...string
 
 	customVolumeNames := make([]string, 0, customKeyCount)
 
-	// Only include custom volumes
+	// Only complete volumes specified by volumeTypes.
 	for _, volume := range volumes {
 		_, volType := parseVolume("custom", volume)
+
+		// Parse snapshots returned by GetStoragePoolVolumeNames.
+		volumeName, snapshotName, found := strings.Cut(volume, "/snapshots")
+		if found {
+			customVolumeNames = append(customVolumeNames, volumeName+snapshotName)
+			continue
+		}
+
 		if shared.ValueInSlice(volType, volumeTypes) {
 			customVolumeNames = append(customVolumeNames, volume)
 		}

diff --git a/lxc/storage_volume.go b/lxc/storage_volume.go
@@ -2268,7 +2268,7 @@ lxc storage volume show default virtual-machine/data/snap0
 		}
 
 		if len(args) == 1 {
-			return c.global.cmpStoragePoolVolumes(args[0])
+			return c.global.cmpStoragePoolVolumes(args[0], "custom")
 		}
 
 		return nil, cobra.ShellCompDirectiveNoFileComp