Add configuration file for golangci-lint. Enable goimports.

Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
crc-org · Mar 30, 2020 · 87f1453 · 87f1453
1 parent 0a318dc
commit 87f1453
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 34 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,8 @@
+run:
+  build-tags:
+    - build
+
+linters:
+  enable:
+    - goimports
+
diff --git a/Makefile b/Makefile
@@ -148,15 +148,14 @@ $(GOPATH)/bin/golangci-lint:
 	GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1
 
 # Run golangci-lint against code
-GOLANGCI_FLAGS=--build-tags build
 .PHONY: lint cross-lint
 lint: $(GOPATH)/bin/golangci-lint
-	$(GOPATH)/bin/golangci-lint $(GOLANGCI_FLAGS) run
+	$(GOPATH)/bin/golangci-lint run
 
 cross-lint: $(GOPATH)/bin/golangci-lint
-	GOOS=darwin $(GOPATH)/bin/golangci-lint $(GOLANGCI_FLAGS) run
-	GOOS=linux $(GOPATH)/bin/golangci-lint $(GOLANGCI_FLAGS) run
-	GOOS=windows $(GOPATH)/bin/golangci-lint $(GOLANGCI_FLAGS) run
+	GOOS=darwin $(GOPATH)/bin/golangci-lint run
+	GOOS=linux $(GOPATH)/bin/golangci-lint run
+	GOOS=windows $(GOPATH)/bin/golangci-lint run
 
 $(GOPATH)/bin/gosec:
 	GO111MODULE=on go get github.com/securego/gosec/cmd/gosec@2.0.0

diff --git a/cmd/crc/cmd/config/get.go b/cmd/crc/cmd/config/get.go
@@ -1,11 +1,12 @@
 package config
 
 import (
+	"os"
+
 	"github.com/code-ready/crc/pkg/crc/config"
 	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/crc/pkg/crc/output"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 func init() {

diff --git a/cmd/crc/cmd/config/view.go b/cmd/crc/cmd/config/view.go
@@ -3,13 +3,14 @@ package config
 import (
 	"bytes"
 	"fmt"
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/spf13/cobra"
 	"io"
 	"os"
 	"sort"
 	"text/template"
+
+	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/spf13/cobra"
 )
 
 const (

diff --git a/cmd/crc/cmd/daemon.go b/cmd/crc/cmd/daemon.go
@@ -1,11 +1,12 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/code-ready/crc/pkg/crc/api"
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 func init() {

diff --git a/cmd/crc/cmd/status.go b/cmd/crc/cmd/status.go
@@ -2,15 +2,15 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
 	"os"
 	"path/filepath"
 	"text/template"
 
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/crc/pkg/crc/machine"
+	"github.com/docker/go-units"
+	"github.com/spf13/cobra"
 )
 
 func init() {

diff --git a/pkg/crc/machine/hyperkit/driver_darwin.go b/pkg/crc/machine/hyperkit/driver_darwin.go
@@ -1,10 +1,11 @@
 package hyperkit
 
 import (
+	"path/filepath"
+
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/machine/config"
 	"github.com/code-ready/machine/libmachine/drivers"
-	"path/filepath"
 )
 
 type hyperkitDriver struct {

diff --git a/pkg/crc/machine/libvirt/driver_linux.go b/pkg/crc/machine/libvirt/driver_linux.go
@@ -1,11 +1,10 @@
 package libvirt
 
 import (
-	"github.com/code-ready/crc/pkg/crc/constants"
 	"path/filepath"
 
+	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/machine/config"
-
 	"github.com/code-ready/machine/libmachine/drivers"
 )
 

diff --git a/pkg/crc/network/utils.go b/pkg/crc/network/utils.go
@@ -2,15 +2,14 @@ package network
 
 import (
 	"fmt"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	"net"
 	"net/url"
 	"runtime"
 
 	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/ssh"
-
+	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/code-ready/crc/pkg/crc/machine/bundle"
+	"github.com/code-ready/crc/pkg/crc/ssh"
 )
 
 func executeCommandOrExit(sshRunner *ssh.SSHRunner, command string, errorMessage string) string {

diff --git a/pkg/crc/oc/clusteroperator.go b/pkg/crc/oc/clusteroperator.go
@@ -3,8 +3,9 @@ package oc
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	"time"
+
+	"github.com/code-ready/crc/pkg/crc/logging"
 )
 
 var ignoreClusterOperators = []string{"monitoring", "machine-config", "marketplace", "insights"}

diff --git a/pkg/crc/preflight/preflight_checks_darwin.go b/pkg/crc/preflight/preflight_checks_darwin.go
@@ -2,7 +2,6 @@ package preflight
 
 import (
 	"fmt"
-	"golang.org/x/sys/unix"
 	neturl "net/url"
 	"os"
 	"os/user"
@@ -16,6 +15,7 @@ import (
 	"github.com/code-ready/crc/pkg/crc/machine/hyperkit"
 	dl "github.com/code-ready/crc/pkg/download"
 	crcos "github.com/code-ready/crc/pkg/os"
+	"golang.org/x/sys/unix"
 )
 
 const (

diff --git a/pkg/crc/preflight/preflight_checks_linux.go b/pkg/crc/preflight/preflight_checks_linux.go
@@ -3,7 +3,6 @@ package preflight
 import (
 	"bytes"
 	"fmt"
-	"golang.org/x/sys/unix"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -13,15 +12,14 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/Masterminds/semver"
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/code-ready/crc/pkg/crc/machine/libvirt"
 	"github.com/code-ready/crc/pkg/crc/systemd"
 	"github.com/code-ready/crc/pkg/download"
-
-	"github.com/Masterminds/semver"
-
 	crcos "github.com/code-ready/crc/pkg/os"
+	"golang.org/x/sys/unix"
 )
 
 const (

diff --git a/pkg/crc/preflight/preflight_linux.go b/pkg/crc/preflight/preflight_linux.go
@@ -1,7 +1,5 @@
 package preflight
 
-import ()
-
 var libvirtPreflightChecks = [...]PreflightCheck{
 	{
 		configKeySuffix:  "check-virt-enabled",

diff --git a/pkg/crc/preflight/preflight_windows.go b/pkg/crc/preflight/preflight_windows.go
@@ -1,7 +1,5 @@
 package preflight
 
-import ()
-
 var hypervPreflightChecks = [...]PreflightCheck{
 	{
 		configKeySuffix:  "check-administrator-user",

diff --git a/pkg/crc/services/dns/dns.go b/pkg/crc/services/dns/dns.go
@@ -2,9 +2,9 @@ package dns
 
 import (
 	"fmt"
-	"github.com/code-ready/crc/pkg/crc/errors"
 	"time"
 
+	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/crc/pkg/crc/network"
 	"github.com/code-ready/crc/pkg/crc/services"
 )

diff --git a/pkg/crc/services/dns/dns_darwin.go b/pkg/crc/services/dns/dns_darwin.go
@@ -3,12 +3,12 @@ package dns
 import (
 	"bytes"
 	"fmt"
-	"github.com/code-ready/crc/pkg/crc/errors"
 	"path/filepath"
 	"strings"
 	"text/template"
 	"time"
 
+	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/code-ready/crc/pkg/crc/network"
 	"github.com/code-ready/crc/pkg/crc/services"

diff --git a/pkg/crc/validation/validation.go b/pkg/crc/validation/validation.go
@@ -3,14 +3,14 @@ package validation
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/code-ready/crc/pkg/crc/version"
 	"net"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/errors"
+	"github.com/code-ready/crc/pkg/crc/version"
 )
 
 // ValidateCPUs checks if provided cpus count is valid

diff --git a/pkg/crc/version/version.go b/pkg/crc/version/version.go
@@ -19,10 +19,11 @@ package version
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/Masterminds/semver"
 	"io/ioutil"
 	"net/http"
 	"time"
+
+	"github.com/Masterminds/semver"
 )
 
 // The following variables are private fields and should be set when compiling with ldflags, for example --ldflags="-X github.com/code-ready/crc/pkg/version.crcVersion=vX.Y.Z

diff --git a/pkg/os/exec.go b/pkg/os/exec.go
@@ -2,10 +2,11 @@ package os
 
 import (
 	"bytes"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/code-ready/crc/pkg/crc/logging"
 )
 
 func runCmd(command string, args []string, env map[string]string) (string, string, error) {

diff --git a/pkg/os/windows/win32/shell32_windows.go b/pkg/os/windows/win32/shell32_windows.go
@@ -1,9 +1,10 @@
 package win32
 
 import (
+	"syscall"
+
 	"github.com/code-ready/crc/pkg/crc/logging"
 	"golang.org/x/sys/windows"
-	"syscall"
 )
 
 const (