Merge pull request #2962 from kolyshkin/imports

Fix local imports, add appropriate linter

Author: bobbypage

.github/workflows/test.yml

@@ -1,35 +1,6 @@
 name: Test
 on: [push, pull_request]
 jobs:
-  lint:
-    env:
-      GOLANGCI_LINT_V: 1.34.1
-    strategy:
-      matrix:
-        environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
-    runs-on: ubuntu-20.04
-    timeout-minutes: 10
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.17
-    - name: Install golangci-lint
-      run: >
-        cd /tmp &&
-        mkdir -p $(go env GOPATH)/bin &&
-        wget -q https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_V}/golangci-lint-${GOLANGCI_LINT_V}-linux-amd64.tar.gz &&
-        tar xf golangci-lint-${GOLANGCI_LINT_V}-linux-amd64.tar.gz &&
-        mv golangci-lint-${GOLANGCI_LINT_V}-linux-amd64/golangci-lint $(go env GOPATH)/bin &&
-        rm -fr golangci-lint-*
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Run golangci-lint
-      run: |
-        set -e
-        source ${{ matrix.environment-variables }}
-        if [[ "${BUILD_PACKAGES}" != "" ]]; then sudo apt-get update; sudo apt-get install ${BUILD_PACKAGES}; fi
-        make -e lint
   test:
     strategy:
       matrix:
@@ -40,13 +11,16 @@ jobs:
     timeout-minutes: 30
     steps:
     - name: Install Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
       with:
         go-version: ${{ matrix.go-versions }}
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Run presubmit checks
-      run: GOFLAGS="$GO_FLAGS" make presubmit
+      run: |
+        source ${{ matrix.environment-variables }}
+        if [[ "${BUILD_PACKAGES}" != "" ]]; then sudo apt-get update; sudo apt-get install ${BUILD_PACKAGES}; fi
+        make -e presubmit
     - name: Run tests
       env:
         GOLANG_VERSION: ${{ matrix.go-versions }}

.golangci.yml

@@ -7,6 +7,8 @@ run:
       min-confidence: 0
     gofmt:
       simplify: true
+    goimports:
+      local-prefixes: github.com/google/cadvisor
 linters:
   disable-all: true
   enable:
@@ -22,6 +24,7 @@ linters:
     - typecheck
     - golint
     - gofmt
+    - goimports
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0

Makefile

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 GO := go
+GOLANGCI_VER := v1.42.1
 pkgs     = $(shell $(GO) list ./... | grep -v vendor)
 cmd_pkgs = $(shell cd cmd && $(GO) list ./... | grep -v vendor)
 arch ?= $(shell go env GOARCH)
-go_path = $(shell go env GOPATH)
 
 ifeq ($(arch), amd64)
   Dockerfile_tag := ''
@@ -62,13 +62,8 @@ tidy:
 
 format:
 	@echo ">> formatting code"
-	@$(GO) fmt $(pkgs)
-	@cd cmd && $(GO) fmt $(cmd_pkgs)
-
-vet:
-	@echo ">> vetting code"
-	@$(GO) vet $(pkgs)
-	@cd cmd && $(GO) vet $(cmd_pkgs)
+	@# goimports is a superset of gofmt.
+	@goimports -w -local github.com/google/cadvisor .
 
 build: assets
 	@echo ">> building binaries"
@@ -88,19 +83,22 @@ docker-%:
 docker-build:
 	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.17 make build
 
-presubmit: vet
-	@echo ">> checking go formatting"
-	@./build/check_gofmt.sh
+presubmit: lint
 	@echo ">> checking go mod tidy"
 	@./build/check_gotidy.sh
 	@echo ">> checking file boilerplate"
 	@./build/check_boilerplate.sh
 
 lint:
+	@# This assumes GOPATH/bin is in $PATH -- if not, the target will fail.
+	@if ! golangci-lint version; then \
+		echo ">> installing golangci-lint $(GOLANGCI_VER)"; \
+		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin $(GOLANGCI_VER); \
+	fi
 	@echo ">> running golangci-lint using configuration at .golangci.yml"
-	@GOFLAGS="$(GO_FLAGS)" $(go_path)/bin/golangci-lint run
+	@golangci-lint run
 
 clean:
 	@rm -f *.test cadvisor
 
-.PHONY: all build docker format release test test-integration vet presubmit tidy
+.PHONY: all build docker format release test test-integration lint presubmit tidy

accelerators/nvidia_test.go

@@ -14,12 +14,13 @@
 package accelerators
 
 import (
-	"github.com/google/cadvisor/stats"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/google/cadvisor/stats"
+
 	"github.com/mindprince/gonvml"
 	"github.com/stretchr/testify/assert"
 )

build/check_gofmt.sh

@@ -28,7 +28,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/google/cadvisor/info/v1"
+	v1 "github.com/google/cadvisor/info/v1"
 
 	"k8s.io/klog/v2"
 )

client/client.go

@@ -27,7 +27,7 @@ import (
 	"strings"
 
 	v1 "github.com/google/cadvisor/info/v1"
-	"github.com/google/cadvisor/info/v2"
+	v2 "github.com/google/cadvisor/info/v2"
 )
 
 // Client represents the base URL for a cAdvisor client.

client/v2/client.go

@@ -24,9 +24,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/cadvisor/info/v1"
-	"github.com/google/cadvisor/info/v2"
 	"github.com/stretchr/testify/assert"
+
+	v1 "github.com/google/cadvisor/info/v1"
+	v2 "github.com/google/cadvisor/info/v2"
 )
 
 func cadvisorTestClient(path string, expectedPostObj *v1.ContainerInfoRequest, replyObj interface{}, t *testing.T) (*Client, *httptest.Server, error) {

client/v2/client_test.go

@@ -18,8 +18,9 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/google/cadvisor/container"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/google/cadvisor/container"
 )
 
 func TestTcpMetricsAreDisabledByDefault(t *testing.T) {

cmd/cadvisor_test.go

@@ -16,16 +16,17 @@ package mesos
 
 import (
 	"fmt"
+	"net/url"
+	"sync"
+
 	"github.com/Rican7/retry"
 	"github.com/Rican7/retry/strategy"
-	"github.com/mesos/mesos-go/api/v1/lib"
+	mesos "github.com/mesos/mesos-go/api/v1/lib"
 	"github.com/mesos/mesos-go/api/v1/lib/agent"
 	"github.com/mesos/mesos-go/api/v1/lib/agent/calls"
 	mclient "github.com/mesos/mesos-go/api/v1/lib/client"
 	"github.com/mesos/mesos-go/api/v1/lib/encoding/codecs"
 	"github.com/mesos/mesos-go/api/v1/lib/httpcli"
-	"net/url"
-	"sync"
 )
 
 const (