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 18, 2024 · a4c17db · a4c17db
1 parent d537da4
commit a4c17db
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
@@ -1631,9 +1631,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.
+		if strings.Contains(volume, "/snapshots/") {
+			fields := strings.SplitN(volume, "/snapshots/", 2)
+			customVolumeNames = append(customVolumeNames, fields[0]+"/"+fields[1])
+			continue
+		}
+
 		if shared.ValueInSlice(volType, volumeTypes) {
 			customVolumeNames = append(customVolumeNames, volume)
 		}

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