CSI: sort capabilities in plugin status (#12154)

Also fix `LIST_SNAPSHOTS` capability name
hashicorp · Mar 1, 2022 · c06f31e · c06f31e
1 parent 05034a6
commit c06f31e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/12154.txt b/.changelog/12154.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+csi: Sort allocations in `plugin status` output
+```
diff --git a/command/plugin_status_csi.go b/command/plugin_status_csi.go
@@ -148,7 +148,7 @@ func (c *PluginStatusCommand) formatControllerCaps(controllers map[string]*api.C
 			caps = append(caps, "CREATE_DELETE_SNAPSHOT")
 			fallthrough
 		case info.SupportsListSnapshots:
-			caps = append(caps, "CREATE_LIST_SNAPSHOTS")
+			caps = append(caps, "LIST_SNAPSHOTS")
 			fallthrough
 		case info.SupportsClone:
 			caps = append(caps, "CLONE_VOLUME")
@@ -177,7 +177,7 @@ func (c *PluginStatusCommand) formatControllerCaps(controllers map[string]*api.C
 		return ""
 	}
 
-	return strings.Join(caps, "\n\t")
+	return "  " + strings.Join(sort.StringSlice(caps), "\n  ")
 }
 
 func (c *PluginStatusCommand) formatNodeCaps(nodes map[string]*api.CSIInfo) string {
@@ -205,5 +205,5 @@ func (c *PluginStatusCommand) formatNodeCaps(nodes map[string]*api.CSIInfo) stri
 		return ""
 	}
 
-	return "  " + strings.Join(caps, "\n  ")
+	return "  " + strings.Join(sort.StringSlice(caps), "\n  ")
 }