Update to Go 1.20.3 and update Go dependencies (#58)

.circleci/config.yml

@@ -10,7 +10,7 @@ executors:
  # also be updated.
  golang:
  docker:
- - image: circleci/golang:1.17
+ - image: cimg/go:1.20.3
 
 jobs:
  test:

.promu.yml

@@ -1,5 +1,5 @@
 go:
- version: 1.17
+ version: 1.20
  cgo: false
 repository:
  path: github.com/treydock/gpfs_exporter

Makefile

@@ -1,7 +1,7 @@
 # Needs to be defined before including Makefile.common to auto-generate targets
 DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
 DOCKER_REPO ?= treydock
-GOLANGCI_LINT_VERSION ?= v1.44.2
+export GOPATH ?= $(firstword $(subst :, ,$(shell go env GOPATH)))
 
 include Makefile.common
 

Makefile.common

@@ -36,29 +36,6 @@ GO_VERSION ?= $(shell $(GO) version)
 GO_VERSION_NUMBER ?= $(word 3, $(GO_VERSION))
 PRE_GO_111 ?= $(shell echo $(GO_VERSION_NUMBER) | grep -E 'go1\.(10|[0-9])\.')
 
-GOVENDOR :=
-GO111MODULE :=
-ifeq (, $(PRE_GO_111))
- ifneq (,$(wildcard go.mod))
- # Enforce Go modules support just in case the directory is inside GOPATH (and for Travis CI).
- GO111MODULE := on
-
- ifneq (,$(wildcard vendor))
- # Always use the local vendor/ directory to satisfy the dependencies.
- GOOPTS := $(GOOPTS) -mod=vendor
- endif
- endif
-else
- ifneq (,$(wildcard go.mod))
- ifneq (,$(wildcard vendor))
-$(warning This repository requires Go >= 1.11 because of Go modules)
-$(warning Some recipes may not work as expected as the current Go runtime is '$(GO_VERSION_NUMBER)')
- endif
- else
- # This repository isn't using Go modules (yet).
- GOVENDOR := $(FIRST_GOPATH)/bin/govendor
- endif
-endif
 PROMU := $(FIRST_GOPATH)/bin/promu
 pkgs = ./...
 
@@ -78,19 +55,22 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.13.0
+PROMU_VERSION ?= 0.14.0
 PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
+SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.42.0
+GOLANGCI_LINT_VERSION ?= v1.51.2
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
  ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
  # If we're in CI and there is an Actions file, that means the linter
  # is being run in Actions, so we don't need to run it here.
- ifeq (,$(CIRCLE_JOB))
+ ifneq (,$(SKIP_GOLANGCI_LINT))
+ GOLANGCI_LINT :=
+ else ifeq (,$(CIRCLE_JOB))
  GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
  else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
  GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
@@ -111,6 +91,8 @@ BUILD_DOCKER_ARCHS = $(addprefix common-docker-,$(DOCKER_ARCHS))
 PUBLISH_DOCKER_ARCHS = $(addprefix common-docker-publish-,$(DOCKER_ARCHS))
 TAG_DOCKER_ARCHS = $(addprefix common-docker-tag-latest-,$(DOCKER_ARCHS))
 
+SANITIZED_DOCKER_IMAGE_TAG := $(subst +,-,$(DOCKER_IMAGE_TAG))
+
 ifeq ($(GOHOSTARCH),amd64)
  ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux freebsd darwin windows))
  # Only supported on amd64
@@ -150,58 +132,47 @@ common-check_license:
 .PHONY: common-deps
 common-deps:
  @echo ">> getting dependencies"
-ifdef GO111MODULE
- GO111MODULE=$(GO111MODULE) $(GO) mod download
-else
- $(GO) get $(GOOPTS) -t ./...
-endif
+ $(GO) mod download
 
 .PHONY: update-go-deps
 update-go-deps:
  @echo ">> updating Go dependencies"
  @for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
  $(GO) get -d $$m; \
  done
- GO111MODULE=$(GO111MODULE) $(GO) mod tidy
-ifneq (,$(wildcard vendor))
- GO111MODULE=$(GO111MODULE) $(GO) mod vendor
-endif
+ $(GO) mod tidy
 
 .PHONY: common-test-short
 common-test-short: $(GOTEST_DIR)
  @echo ">> running short tests"
- GO111MODULE=$(GO111MODULE) $(GOTEST) -short $(GOOPTS) $(pkgs)
+ $(GOTEST) -short $(GOOPTS) $(pkgs)
 
 .PHONY: common-test
 common-test: $(GOTEST_DIR)
  @echo ">> running all tests"
- GO111MODULE=$(GO111MODULE) $(GOTEST) $(test-flags) $(GOOPTS) $(pkgs)
+ $(GOTEST) $(test-flags) $(GOOPTS) $(pkgs)
 
 $(GOTEST_DIR):
  @mkdir -p $@
 
 .PHONY: common-format
 common-format:
  @echo ">> formatting code"
- GO111MODULE=$(GO111MODULE) $(GO) fmt $(pkgs)
+ $(GO) fmt $(pkgs)
 
 .PHONY: common-vet
 common-vet:
  @echo ">> vetting code"
- GO111MODULE=$(GO111MODULE) $(GO) vet $(GOOPTS) $(pkgs)
+ $(GO) vet $(GOOPTS) $(pkgs)
 
 .PHONY: common-lint
 common-lint: $(GOLANGCI_LINT)
 ifdef GOLANGCI_LINT
  @echo ">> running golangci-lint"
-ifdef GO111MODULE
 # 'go list' needs to be executed before staticcheck to prepopulate the modules cache.
 # Otherwise staticcheck might fail randomly for some reason not yet explained.
- GO111MODULE=$(GO111MODULE) $(GO) list -e -compiled -test=true -export=false -deps=true -find=false -tags= -- ./... > /dev/null
- GO111MODULE=$(GO111MODULE) $(GOLANGCI_LINT) run $(GOLANGCI_LINT_OPTS) $(pkgs)
-else
- $(GOLANGCI_LINT) run $(pkgs)
-endif
+ $(GO) list -e -compiled -test=true -export=false -deps=true -find=false -tags= -- ./... > /dev/null
+ $(GOLANGCI_LINT) run $(GOLANGCI_LINT_OPTS) $(pkgs)
 endif
 
 .PHONY: common-yamllint
@@ -218,28 +189,15 @@ endif
 common-staticcheck: lint
 
 .PHONY: common-unused
-common-unused: $(GOVENDOR)
-ifdef GOVENDOR
- @echo ">> running check for unused packages"
- @$(GOVENDOR) list +unused | grep . && exit 1 || echo 'No unused packages'
-else
-ifdef GO111MODULE
+common-unused:
  @echo ">> running check for unused/missing packages in go.mod"
- GO111MODULE=$(GO111MODULE) $(GO) mod tidy
-ifeq (,$(wildcard vendor))
+ $(GO) mod tidy
  @git diff --exit-code -- go.sum go.mod
-else
- @echo ">> running check for unused packages in vendor/"
- GO111MODULE=$(GO111MODULE) $(GO) mod vendor
- @git diff --exit-code -- go.sum go.mod vendor/
-endif
-endif
-endif
 
 .PHONY: common-build
 common-build: promu
  @echo ">> building binaries"
- GO111MODULE=$(GO111MODULE) $(PROMU) build --prefix $(PREFIX) $(PROMU_BINARIES)
+ $(PROMU) build --prefix $(PREFIX) $(PROMU_BINARIES)
 
 .PHONY: common-tarball
 common-tarball: promu
@@ -249,7 +207,7 @@ common-tarball: promu
 .PHONY: common-docker $(BUILD_DOCKER_ARCHS)
 common-docker: $(BUILD_DOCKER_ARCHS)
 $(BUILD_DOCKER_ARCHS): common-docker-%:
- docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" \
+ docker build -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(SANITIZED_DOCKER_IMAGE_TAG)" \
  -f $(DOCKERFILE_PATH) \
  --build-arg ARCH="$*" \
  --build-arg OS="linux" \
@@ -258,19 +216,19 @@ $(BUILD_DOCKER_ARCHS): common-docker-%:
 .PHONY: common-docker-publish $(PUBLISH_DOCKER_ARCHS)
 common-docker-publish: $(PUBLISH_DOCKER_ARCHS)
 $(PUBLISH_DOCKER_ARCHS): common-docker-publish-%:
- docker push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)"
+ docker push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(SANITIZED_DOCKER_IMAGE_TAG)"
 
 DOCKER_MAJOR_VERSION_TAG = $(firstword $(subst ., ,$(shell cat VERSION)))
 .PHONY: common-docker-tag-latest $(TAG_DOCKER_ARCHS)
 common-docker-tag-latest: $(TAG_DOCKER_ARCHS)
 $(TAG_DOCKER_ARCHS): common-docker-tag-latest-%:
- docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:latest"
- docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:v$(DOCKER_MAJOR_VERSION_TAG)"
+ docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(SANITIZED_DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:latest"
+ docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(SANITIZED_DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:v$(DOCKER_MAJOR_VERSION_TAG)"
 
 .PHONY: common-docker-manifest
 common-docker-manifest:
- DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create -a "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" $(foreach ARCH,$(DOCKER_ARCHS),$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$(ARCH):$(DOCKER_IMAGE_TAG))
- DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
+ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create -a "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)" $(foreach ARCH,$(DOCKER_ARCHS),$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$(ARCH):$(SANITIZED_DOCKER_IMAGE_TAG))
+ DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)"
 
 .PHONY: promu
 promu: $(PROMU)
@@ -295,12 +253,6 @@ $(GOLANGCI_LINT):
  | sh -s -- -b $(FIRST_GOPATH)/bin $(GOLANGCI_LINT_VERSION)
 endif
 
-ifdef GOVENDOR
-.PHONY: $(GOVENDOR)
-$(GOVENDOR):
- GOOS= GOARCH= $(GO) get -u github.com/kardianos/govendor
-endif
-
 .PHONY: precheck
 precheck::
 

cmd/gpfs_exporter/main.go

@@ -18,6 +18,7 @@ import (
  "net/http"
  "os"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/prometheus/client_golang/prometheus"
@@ -26,7 +27,6 @@ import (
  "github.com/prometheus/common/promlog/flag"
  "github.com/prometheus/common/version"
  "github.com/treydock/gpfs_exporter/collectors"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

cmd/gpfs_exporter/main_test.go

@@ -16,16 +16,16 @@ package main
 import (
  "context"
  "fmt"
- "io/ioutil"
+ "io"
  "net/http"
  "os"
  "strings"
  "testing"
  "time"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/treydock/gpfs_exporter/collectors"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 const (
@@ -95,7 +95,7 @@ func queryExporter() (string, error) {
  if err != nil {
  return "", err
  }
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
  if err != nil {
  return "", err
  }

cmd/gpfs_mmdf_exporter/main.go

@@ -20,6 +20,7 @@ import (
  "sort"
  "strings"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/gofrs/flock"
@@ -30,7 +31,6 @@ import (
  "github.com/prometheus/common/promlog/flag"
  "github.com/prometheus/common/version"
  "github.com/treydock/gpfs_exporter/collectors"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

cmd/gpfs_mmdf_exporter/main_test.go

@@ -20,9 +20,9 @@ import (
  "strings"
  "testing"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/treydock/gpfs_exporter/collectors"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

cmd/gpfs_mmlssnapshot_exporter/main.go

@@ -20,6 +20,7 @@ import (
  "sort"
  "strings"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/gofrs/flock"
@@ -30,7 +31,6 @@ import (
  "github.com/prometheus/common/promlog/flag"
  "github.com/prometheus/common/version"
  "github.com/treydock/gpfs_exporter/collectors"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

cmd/gpfs_mmlssnapshot_exporter/main_test.go

@@ -21,9 +21,9 @@ import (
  "testing"
  "time"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/treydock/gpfs_exporter/collectors"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

collectors/collector.go

@@ -26,10 +26,10 @@ import (
  "sync"
  "time"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/prometheus/client_golang/prometheus"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 const (

collectors/collector_test.go

@@ -22,8 +22,8 @@ import (
  "testing"
  "time"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/prometheus/client_golang/prometheus"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

collectors/config.go

@@ -20,10 +20,10 @@ import (
  "strings"
  "time"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/prometheus/client_golang/prometheus"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

collectors/config_test.go

@@ -19,9 +19,9 @@ import (
  "strings"
  "testing"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/prometheus/client_golang/prometheus/testutil"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (

collectors/mmces.go

@@ -22,10 +22,10 @@ import (
  "strings"
  "time"
 
+ "github.com/alecthomas/kingpin/v2"
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/prometheus/client_golang/prometheus"
- "gopkg.in/alecthomas/kingpin.v2"
 )
 
 var (