Windows: Report Version and UBR by lowenna · Pull Request #36451 · moby/moby

lowenna · 2018-02-28T22:59:56Z

Signed-off-by: John Howard jhoward@microsoft.com

@johnstep as talked about offline. Reports back the ReleaseID (aka Version) and UBR in the operating system string reported by Docker Info. Also switches this to use the golang built in registry reader rather than direct API while I was there.

…
Default Isolation: process
Kernel Version: 10.0 17111 (17111.1.amd64fre.rs4_release.180226-1411)
Operating System: Windows Server Datacenter Version 1803, Update Build Revision 1
OSType: windows
Architecture: x86_64
CPUs: 8
…

codecov · 2018-03-01T19:57:05Z

Codecov Report

❗ No coverage uploaded for pull request base (master@61cb026). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #36451   +/-   ##
=========================================
  Coverage          ?   34.63%           
=========================================
  Files             ?      613           
  Lines             ?    45385           
  Branches          ?        0           
=========================================
  Hits              ?    15721           
  Misses            ?    27602           
  Partials          ?     2062

johnstep

LGTM

johnstep · 2018-03-05T09:53:56Z

pkg/parsers/operatingsystem/operatingsystem_windows.go

 		return ret, err
 	}
-	ret = windows.UTF16ToString(buf[:])
+	ret = fmt.Sprintf("%s, Update Build Revision %d", ret, ubr)


The format looks okay, and should look like this for Windows Server 1709:
Windows Server Standard Version 1709, Update Build Revision 248

However, did you consider something more consistent with winver.exe?
Windows Server Standard Version 1709 (OS Build 16299.248)

Sure updated.

Client (RS4 Pre-release)

Swarm: inactive Default Isolation: hyperv Kernel Version: 10.0 17114 (17114.1000.amd64fre.rs4_release_base.180301-1503) Operating System: Windows 10 Enterprise Insider Preview Version 1803 (OS Build 17114.1000) OSType: windows Architecture: x86_64 CPUs: 8 Total Memory: 15.93GiB

And server RS3

Default Isolation: process Kernel Version: 10.0 16299 (16299.248.amd64fre.rs3_release_svc_escrow.180209-1727) Operating System: Windows Server Datacenter Version 1709 (OS Build 16299.248) OSType: windows Architecture: x86_64 CPUs: 32 Total Memory: 16.01GiB

thaJeztah

LGTM

ping @salah-khan PTAL

thaJeztah · 2018-03-05T12:59:41Z

pkg/parsers/operatingsystem/operatingsystem_windows.go

-		0,
-		windows.KEY_READ,
-		&h); err != nil {
+	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\WIndows NT\CurrentVersion`, registry.QUERY_VALUE)


Should pkg/parsers/kernel/ also be updated to use the registry package?

moby/pkg/parsers/kernel/kernel_windows.go

Lines 33 to 53 in 4f0d95f

if err = windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE,

windows.StringToUTF16Ptr(`SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\`),

0,

windows.KEY_READ,

&h); err != nil {

return KVI, err

}

defer windows.RegCloseKey(h)

var buf [1 << 10]uint16

var typ uint32

n := uint32(len(buf) * 2) // api expects array of bytes, not uint16

if err = windows.RegQueryValueEx(h,

windows.StringToUTF16Ptr("BuildLabEx"),

nil,

&typ,

(*byte)(unsafe.Pointer(&buf[0])),

&n); err != nil {

return KVI, err

}

Sure but orthogonal to this PR itself. Can be addressed as a follow-up

oh, definitely not needed in this PR 👍

thaJeztah · 2018-03-05T13:03:57Z

Actually, let's move this back to design review for a bit, so that we can discuss @johnstep's suggestion for the format #36451 (comment)

Signed-off-by: John Howard <jhoward@microsoft.com>

GordonTheTurtle added the status/0-triage label Feb 28, 2018

lowenna force-pushed the jjh/ubr branch from b17da75 to 2d00371 Compare February 28, 2018 23:49

lowenna added status/2-code-review rebuild/powerpc and removed status/0-triage labels Mar 1, 2018

GordonTheTurtle removed rebuild/powerpc labels Mar 1, 2018

lowenna added the rebuild/z label Mar 1, 2018

GordonTheTurtle removed the rebuild/z label Mar 1, 2018

johnstep approved these changes Mar 5, 2018

View reviewed changes

thaJeztah added the platform/windows label Mar 5, 2018

thaJeztah approved these changes Mar 5, 2018

View reviewed changes

thaJeztah added status/1-design-review and removed status/2-code-review labels Mar 5, 2018

Windows: Report Version and UBR

6de9f90

Signed-off-by: John Howard <jhoward@microsoft.com>

lowenna force-pushed the jjh/ubr branch from 2d00371 to 6de9f90 Compare March 5, 2018 16:20

thaJeztah added the rebuild/* label Mar 6, 2018

GordonTheTurtle removed the rebuild/* label Mar 6, 2018

johnstep added status/4-merge and removed status/1-design-review labels Mar 7, 2018

johnstep merged commit 8cf8fe9 into moby:master Mar 7, 2018

lowenna deleted the jjh/ubr branch March 7, 2018 16:28

thaJeztah mentioned this pull request Mar 15, 2018

Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702 docker/cli#946

Merged

lowenna mentioned this pull request Mar 16, 2018

Windows: Move kernel_windows to use golang registry functions #36617

Merged

thaJeztah mentioned this pull request Feb 23, 2022

Wrong operating system reported by docker info on Windows #43284

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Windows: Report Version and UBR#36451

Windows: Report Version and UBR#36451
johnstep merged 1 commit intomoby:masterfrom
microsoft:jjh/ubr

lowenna commented Feb 28, 2018

Uh oh!

codecov bot commented Mar 1, 2018 •

edited

Loading

Uh oh!

johnstep left a comment

Uh oh!

johnstep Mar 5, 2018

Uh oh!

lowenna Mar 5, 2018

Uh oh!

lowenna Mar 5, 2018

Uh oh!

thaJeztah left a comment

Uh oh!

thaJeztah Mar 5, 2018

Uh oh!

lowenna Mar 5, 2018

Uh oh!

thaJeztah Mar 6, 2018

Uh oh!

thaJeztah commented Mar 5, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	if err = windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE,
	windows.StringToUTF16Ptr(`SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\`),
	0,
	windows.KEY_READ,
	&h); err != nil {
	return KVI, err
	}
	defer windows.RegCloseKey(h)

	var buf [1 << 10]uint16
	var typ uint32
	n := uint32(len(buf) * 2) // api expects array of bytes, not uint16

	if err = windows.RegQueryValueEx(h,
	windows.StringToUTF16Ptr("BuildLabEx"),
	nil,
	&typ,
	(*byte)(unsafe.Pointer(&buf[0])),
	&n); err != nil {
	return KVI, err
	}

Conversation

lowenna commented Feb 28, 2018

Uh oh!

codecov bot commented Mar 1, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

johnstep left a comment

Choose a reason for hiding this comment

Uh oh!

johnstep Mar 5, 2018

Choose a reason for hiding this comment

Uh oh!

lowenna Mar 5, 2018

Choose a reason for hiding this comment

Uh oh!

lowenna Mar 5, 2018

Choose a reason for hiding this comment

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah Mar 5, 2018

Choose a reason for hiding this comment

Uh oh!

lowenna Mar 5, 2018

Choose a reason for hiding this comment

Uh oh!

thaJeztah Mar 6, 2018

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Mar 5, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Mar 1, 2018 •

edited

Loading