From 775dcab7a2c0898971268a57b1351b4424f6087e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 2 Nov 2022 10:44:50 +0100 Subject: [PATCH 1/2] pkg/parsers/kernel: remove duplicate Package godoc It was present both in kernel.go and kernel_unix.go. Signed-off-by: Sebastiaan van Stijn --- pkg/parsers/kernel/kernel_unix.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/parsers/kernel/kernel_unix.go b/pkg/parsers/kernel/kernel_unix.go index d0f6a9ed0d..52c20f32aa 100644 --- a/pkg/parsers/kernel/kernel_unix.go +++ b/pkg/parsers/kernel/kernel_unix.go @@ -1,8 +1,6 @@ //go:build linux || freebsd || openbsd // +build linux freebsd openbsd -// Package kernel provides helper function to get, parse and compare kernel -// versions for different platforms. package kernel // import "github.com/docker/docker/pkg/parsers/kernel" import ( From 4386e3f7c0bbf8d3369bcc019fd2ff7427fe59cb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 2 Nov 2022 10:53:25 +0100 Subject: [PATCH 2/2] pkg/parsers/kernel: un-export Utsname It's only used internally to allow the "unsupported" stub. Signed-off-by: Sebastiaan van Stijn --- pkg/parsers/kernel/uname_linux.go | 5 ----- pkg/parsers/kernel/uname_unsupported.go | 11 +++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkg/parsers/kernel/uname_linux.go b/pkg/parsers/kernel/uname_linux.go index 212ff4502b..22c2d6d661 100644 --- a/pkg/parsers/kernel/uname_linux.go +++ b/pkg/parsers/kernel/uname_linux.go @@ -2,11 +2,6 @@ package kernel // import "github.com/docker/docker/pkg/parsers/kernel" import "golang.org/x/sys/unix" -// Utsname represents the system name structure. -// It is passthrough for unix.Utsname in order to make it portable with -// other platforms where it is not available. -type Utsname unix.Utsname - func uname() (*unix.Utsname, error) { uts := &unix.Utsname{} diff --git a/pkg/parsers/kernel/uname_unsupported.go b/pkg/parsers/kernel/uname_unsupported.go index ed356310c4..156a5ea8ed 100644 --- a/pkg/parsers/kernel/uname_unsupported.go +++ b/pkg/parsers/kernel/uname_unsupported.go @@ -7,13 +7,12 @@ import ( "errors" ) -// Utsname represents the system name structure. -// It is defined here to make it portable as it is available on linux but not -// on windows. -type Utsname struct { +// utsName represents the system name structure. It is defined here to make it +// portable as it is available on Linux but not on Windows. +type utsName struct { Release [65]byte } -func uname() (*Utsname, error) { - return nil, errors.New("Kernel version detection is available only on linux") +func uname() (*utsName, error) { + return nil, errors.New("kernel version detection is only available on linux") }