feat: print uid/gid for the files in ls -l

This adds information about file ownership in the long listing which is crucial sometimes. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
siderolabs · Aug 12, 2021 · dadaa65 · dadaa65
1 parent e6fa401
commit dadaa65
Show file tree

Hide file tree

Showing 7 changed files with 993 additions and 908 deletions.
diff --git a/api/machine/machine.proto b/api/machine/machine.proto
@@ -363,6 +363,10 @@ message FileInfo {
   string link = 8;
   // RelativeName is the name of the file or directory relative to the RootPath
   string relative_name = 9;
+  // Owner uid
+  uint32 uid = 10;
+  // Owner gid
+  uint32 gid = 11;
 }
 
 // DiskUsageInfo describes a file or directory's information for du command

diff --git a/cmd/talosctl/cmd/talos/list.go b/cmd/talosctl/cmd/talos/list.go
@@ -127,7 +127,7 @@ var lsCmd = &cobra.Command{
 			}
 
 			w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-			fmt.Fprintln(w, "NODE\tMODE\tSIZE(B)\tLASTMOD\tNAME")
+			fmt.Fprintln(w, "NODE\tMODE\tUID\tGID\tSIZE(B)\tLASTMOD\tNAME")
 			for {
 				info, err := stream.Recv()
 				if err != nil {
@@ -179,9 +179,11 @@ var lsCmd = &cobra.Command{
 					}
 				}
 
-				fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n",
+				fmt.Fprintf(w, "%s\t%s\t%d\t%d\t%s\t%s\t%s\n",
 					node,
 					os.FileMode(info.Mode).String(),
+					info.Uid,
+					info.Gid,
 					size,
 					timestampFormatted,
 					display,

diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
@@ -779,6 +779,8 @@ func (s *Server) List(req *machine.ListRequest, obj machine.MachineService_ListS
 				Modified:     fi.FileInfo.ModTime().Unix(),
 				IsDir:        fi.FileInfo.IsDir(),
 				Link:         fi.Link,
+				Uid:          fi.FileInfo.Sys().(*syscall.Stat_t).Uid,
+				Gid:          fi.FileInfo.Sys().(*syscall.Stat_t).Gid,
 			})
 		}
 

diff --git a/internal/integration/cli/diskusage.go b/internal/integration/cli/diskusage.go
@@ -85,7 +85,7 @@ func (suite *DiskUsageSuite) TestSuccess() {
 
 			parts := splitLine(lines[1])
 			var err error
-			folderSize, err = strconv.ParseInt(parts[2], 10, 64)
+			folderSize, err = strconv.ParseInt(parts[4], 10, 64)
 			if err != nil {
 				return err
 			}

diff --git a/pkg/machinery/api/machine/machine.pb.go b/pkg/machinery/api/machine/machine.pb.go
diff --git a/pkg/machinery/api/machine/machine_vtproto.pb.go b/pkg/machinery/api/machine/machine_vtproto.pb.go
diff --git a/website/content/docs/v0.12/Reference/api.md b/website/content/docs/v0.12/Reference/api.md
@@ -1230,6 +1230,8 @@ TODO: unix timestamp or include proto's Date type |
 | error | [string](#string) |  | Error describes any error encountered while trying to read the file information. |
 | link | [string](#string) |  | Link is filled with symlink target |
 | relative_name | [string](#string) |  | RelativeName is the name of the file or directory relative to the RootPath |
+| uid | [uint32](#uint32) |  | Owner uid |
+| gid | [uint32](#uint32) |  | Owner gid |