Merge pull request #17581 from Microsoft/10662-factoroutexecuser

Windows: Factor out user in execdriver\driver
Upstream-commit: 342e6bb99fd965dad51a79de3886e89f4ca336e4
Component: engine

components/engine/daemon/execdriver/driver.go

@@ -121,13 +121,6 @@ type ResourceStats struct {
 	SystemUsage uint64    `json:"system_usage"`
 }
 
-// User contains the uid and gid representing a Unix user
-// TODO Windows: Factor out User
-type User struct {
-	UID int `json:"root_uid"`
-	GID int `json:"root_gid"`
-}
-
 // ProcessConfig describes a process that will be run inside a container.
 type ProcessConfig struct {
 	exec.Cmd `json:"-"`

components/engine/daemon/execdriver/driver_unix.go

@@ -256,3 +256,9 @@ func Stats(containerDir string, containerMemoryLimit int64, machineMemory int64)
 		MemoryLimit: memoryLimit,
 	}, nil
 }
+
+// User contains the uid and gid representing a Unix user
+type User struct {
+	UID int `json:"root_uid"`
+	GID int `json:"root_gid"`
+}