From f902491783bc823172e060bd0c0b59de60f906f5 Mon Sep 17 00:00:00 2001
From: Ruslan Aliev <raliev@mirantis.com>
Date: Fri, 18 Dec 2020 14:21:55 -0600
Subject: [PATCH] Fix golint check

Currently golint check zuul job does nothing because of
bug inside tools/golint script. This patch fixes this issue.

Change-Id: Iaab1741b2a3f5f61c49549d8e4ce88be6212d570
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
---
 go.mod                          | 1 +
 go.sum                          | 4 ++++
 pkg/bootstrap/isogen/command.go | 1 +
 tools/golint                    | 5 +++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index c19b567a2..48d80f92f 100644
--- a/go.mod
+++ b/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.6.1
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	k8s.io/api v0.17.9
 	k8s.io/apiextensions-apiserver v0.17.9
 	k8s.io/apimachinery v0.17.9
diff --git a/go.sum b/go.sum
index f4e479d42..f85d162ce 100644
--- a/go.sum
+++ b/go.sum
@@ -804,6 +804,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dD
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -854,6 +856,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/pkg/bootstrap/isogen/command.go b/pkg/bootstrap/isogen/command.go
index 537b578e2..7de20c2b3 100644
--- a/pkg/bootstrap/isogen/command.go
+++ b/pkg/bootstrap/isogen/command.go
@@ -49,6 +49,7 @@ type BootstrapIsoOptions struct {
 	Writer io.Writer
 }
 
+// VerifyInputs verifies image configuration
 func VerifyInputs(cfg *v1alpha1.IsoConfiguration) error {
 	if cfg.IsoContainer.Volume == "" {
 		return config.ErrMissingConfig{
diff --git a/tools/golint b/tools/golint
index 1c2c6bbe7..82d10ea34 100755
--- a/tools/golint
+++ b/tools/golint
@@ -18,8 +18,9 @@
 # standard golint will catch, but it will fail to catch missing documentation.
 # The purpose of this script is to produce a nonzero return code if the
 # standard golint detects any issues.
-go install golang.org/x/lint/golint
-issues="$(golint ./...)"
+go get -u golang.org/x/lint/golint
+golint=`go list -f {{.Target}} golang.org/x/lint/golint`
+issues="$($golint ./...)"
 
 if [[ -n "$issues" ]]; then
   printf "ERROR: issues found when running 'golint ./...':\n"