From ca74d32e4c3a6087f8813e02959d27d7982b2f4e Mon Sep 17 00:00:00 2001 From: qingsenLi Date: Fri, 26 Oct 2018 23:58:30 +0800 Subject: [PATCH] fix golint for /pkg/util/ipconfig and /pkg/util/resourcecontainer-2 --- hack/.golint_failures | 2 -- pkg/proxy/winuserspace/proxysocket.go | 2 +- pkg/util/ipconfig/ipconfig.go | 8 ++++---- pkg/util/ipconfig/ipconfig_test.go | 4 ++-- pkg/util/resourcecontainer/resource_container_linux.go | 2 +- .../resourcecontainer/resource_container_unsupported.go | 1 + 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index eebcb996ff..7674e9c377 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -380,7 +380,6 @@ pkg/util/env pkg/util/file pkg/util/goroutinemap/exponentialbackoff pkg/util/initsystem -pkg/util/ipconfig pkg/util/iptables pkg/util/iptables/testing pkg/util/labels @@ -391,7 +390,6 @@ pkg/util/oom pkg/util/parsers pkg/util/procfs pkg/util/removeall -pkg/util/resourcecontainer pkg/util/rlimit pkg/util/selinux pkg/util/sysctl diff --git a/pkg/proxy/winuserspace/proxysocket.go b/pkg/proxy/winuserspace/proxysocket.go index df7d334d94..23782d6209 100644 --- a/pkg/proxy/winuserspace/proxysocket.go +++ b/pkg/proxy/winuserspace/proxysocket.go @@ -505,7 +505,7 @@ func (udp *udpProxySocket) ProxyLoop(service ServicePortPortalName, myInfo *serv dnsSearch = []string{"", namespaceServiceDomain, serviceDomain, clusterDomain} execer := exec.New() ipconfigInterface := ipconfig.New(execer) - suffixList, err := ipconfigInterface.GetDnsSuffixSearchList() + suffixList, err := ipconfigInterface.GetDNSSuffixSearchList() if err == nil { for _, suffix := range suffixList { dnsSearch = append(dnsSearch, suffix) diff --git a/pkg/util/ipconfig/ipconfig.go b/pkg/util/ipconfig/ipconfig.go index 907c087f8e..924c20b94a 100644 --- a/pkg/util/ipconfig/ipconfig.go +++ b/pkg/util/ipconfig/ipconfig.go @@ -28,8 +28,8 @@ import ( // Interface is an injectable interface for running ipconfig commands. Implementations must be goroutine-safe. type Interface interface { - // GetDnsSuffixSearchList returns the list of DNS suffix to search - GetDnsSuffixSearchList() ([]string, error) + // GetDNSSuffixSearchList returns the list of DNS suffix to search + GetDNSSuffixSearchList() ([]string, error) } const ( @@ -54,8 +54,8 @@ func New(exec utilexec.Interface) Interface { return runner } -// GetDnsSuffixSearchList returns the list of DNS suffix to search -func (runner *runner) GetDnsSuffixSearchList() ([]string, error) { +// GetDNSSuffixSearchList returns the list of DNS suffix to search +func (runner *runner) GetDNSSuffixSearchList() ([]string, error) { // Parse the DNS suffix search list from ipconfig output // ipconfig /all on Windows displays the entry of DNS suffix search list // An example output contains: diff --git a/pkg/util/ipconfig/ipconfig_test.go b/pkg/util/ipconfig/ipconfig_test.go index d598d961d7..a047311813 100644 --- a/pkg/util/ipconfig/ipconfig_test.go +++ b/pkg/util/ipconfig/ipconfig_test.go @@ -22,11 +22,11 @@ import ( "k8s.io/utils/exec" ) -func TestGetDnsSuffixSearchList(t *testing.T) { +func TestGetDNSSuffixSearchList(t *testing.T) { // Simple test ipconfigInterface := New(exec.New()) - _, err := ipconfigInterface.GetDnsSuffixSearchList() + _, err := ipconfigInterface.GetDNSSuffixSearchList() if err != nil { t.Errorf("expected success, got %v", err) } diff --git a/pkg/util/resourcecontainer/resource_container_linux.go b/pkg/util/resourcecontainer/resource_container_linux.go index 86477c5aa2..efb6546857 100644 --- a/pkg/util/resourcecontainer/resource_container_linux.go +++ b/pkg/util/resourcecontainer/resource_container_linux.go @@ -25,7 +25,7 @@ import ( "github.com/opencontainers/runc/libcontainer/configs" ) -// Creates resource-only containerName if it does not already exist and moves +// RunInResourceContainer creates resource-only containerName if it does not already exist and moves // the current process to it. // // containerName must be an absolute container name. diff --git a/pkg/util/resourcecontainer/resource_container_unsupported.go b/pkg/util/resourcecontainer/resource_container_unsupported.go index da47131265..2c9db7b064 100644 --- a/pkg/util/resourcecontainer/resource_container_unsupported.go +++ b/pkg/util/resourcecontainer/resource_container_unsupported.go @@ -22,6 +22,7 @@ import ( "errors" ) +// RunInResourceContainer creates resource-only containerName unsupported. func RunInResourceContainer(containerName string) error { return errors.New("resource-only containers unsupported in this platform") }