Merge pull request #43385 from thaJeztah/move_IsWindowsClient

pkg/system: remove deprecated/unused consts and move IsWindowsClient()

daemon/daemon_windows.go

@@ -25,6 +25,7 @@ import (
 	"github.com/docker/docker/pkg/containerfs"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/parsers"
+	"github.com/docker/docker/pkg/parsers/operatingsystem"
 	"github.com/docker/docker/pkg/platform"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/pkg/system"
@@ -553,7 +554,7 @@ func (daemon *Daemon) setDefaultIsolation() error {
 	// On client SKUs, default to Hyper-V. @engine maintainers. This
 	// should not be removed. Ping Microsoft folks is there are PRs to
 	// to change this.
-	if system.IsWindowsClient() {
+	if operatingsystem.IsWindowsClient() {
 		daemon.defaultIsolation = containertypes.IsolationHyperV
 	} else {
 		daemon.defaultIsolation = containertypes.IsolationProcess

pkg/parsers/operatingsystem/operatingsystem_windows.go

@@ -62,3 +62,9 @@ func GetOperatingSystemVersion() (string, error) {
 func IsContainerized() (bool, error) {
 	return false, nil
 }
+
+// IsWindowsClient returns true if the SKU is client. It returns false on
+// Windows server.
+func IsWindowsClient() bool {
+	return windows.RtlGetVersion().ProductType == verNTWorkstation
+}

pkg/system/syscall_windows.go

@@ -1,23 +0,0 @@
-package system // import "github.com/docker/docker/pkg/system"
-
-import "golang.org/x/sys/windows"
-
-const (
-	// Deprecated: use github.com/docker/pkg/idtools.SeTakeOwnershipPrivilege
-	SeTakeOwnershipPrivilege = "SeTakeOwnershipPrivilege"
-	// Deprecated: use github.com/docker/pkg/idtools.ContainerAdministratorSidString
-	ContainerAdministratorSidString = "S-1-5-93-2-1"
-	// Deprecated: use github.com/docker/pkg/idtools.ContainerUserSidString
-	ContainerUserSidString = "S-1-5-93-2-2"
-)
-
-// VER_NT_WORKSTATION, see https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-osversioninfoexa
-const verNTWorkstation = 0x00000001 // VER_NT_WORKSTATION
-
-// IsWindowsClient returns true if the SKU is client. It returns false on
-// Windows server, or if an error occurred when making the GetVersionExW
-// syscall.
-func IsWindowsClient() bool {
-	ver := windows.RtlGetVersion()
-	return ver != nil && ver.ProductType == verNTWorkstation
-}