govc: add datastore.ls -H option

Use human friendly name by default, rather than vSAN ID for top-level dirs. Note that the datastore.ls command was originally written against vSphere 5.5, the 'FileInfo.FriendlyName' field was not added until 6.5 Signed-off-by: Doug MacEachern <[email protected]>
vmware · Dec 19, 2024 · c60f498 · c60f498
1 parent 3def2df
commit c60f498
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cli/datastore/ls.go b/cli/datastore/ls.go
@@ -42,6 +42,7 @@ type ls struct {
 	slash   bool
 	all     bool
 	recurse bool
+	human   bool
 }
 
 func init() {
@@ -55,6 +56,7 @@ func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
 	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
 	cmd.OutputFlag.Register(ctx, f)
 
+	f.BoolVar(&cmd.human, "H", true, "Display human friendly name") // vSAN top-level dirs are ID by default
 	f.BoolVar(&cmd.long, "l", false, "Long listing format")
 	f.BoolVar(&cmd.slash, "p", false, "Append / indicator to directories")
 	f.BoolVar(&cmd.all, "a", false, "Do not ignore entries starting with .")
@@ -206,10 +208,17 @@ func (o *listOutput) add(r types.HostDatastoreBrowserSearchResults) {
 	res.File = nil
 
 	for _, f := range r.File {
-		if f.GetFileInfo().Path[0] == '.' && !o.cmd.all {
+		info := f.GetFileInfo()
+		if info.Path[0] == '.' && !o.cmd.all {
 			continue
 		}
 
+		if o.cmd.human {
+			if info.FriendlyName != "" {
+				info.Path = info.FriendlyName
+			}
+		}
+
 		if o.cmd.slash {
 			if d, ok := f.(*types.FolderFileInfo); ok {
 				d.Path += "/"

diff --git a/govc/USAGE.md b/govc/USAGE.md
@@ -1458,6 +1458,7 @@ Options:
 Usage: govc datastore.ls [OPTIONS] [FILE]...
 
 Options:
+  -H=true                Display human friendly name
   -R=false               List subdirectories recursively
   -a=false               Do not ignore entries starting with .
   -ds=                   Datastore [GOVC_DATASTORE]