Update dependencies

Signed-off-by: Xabier Larrakoetxea <me@slok.dev>

.github/workflows/ci.yaml

@@ -7,10 +7,14 @@ jobs:
     name: Check
     runs-on: ubuntu-latest
     # Execute the checks inside the container instead the VM.
-    container: golangci/golangci-lint:v1.50.1-alpine
+    container: golangci/golangci-lint:v1.58.0-alpine
     steps:
       - uses: actions/checkout@v3
-      - run: ./scripts/check/check.sh
+      - run: |
+          # We need this go flag because it started to error after golangci-lint is using Go 1.21.
+          # TODO(slok): Remove it on next (>1.54.1) golangci-lint upgrade to check if this problem has gone.
+          export GOFLAGS="-buildvcs=false"
+          ./scripts/check/check.sh
 
   unit-test:
     name: Unit test

.golangci.yml

@@ -10,5 +10,12 @@ linters:
     - goimports
     - revive
     - gofmt
-    - depguard
+    #- depguard
     - godot
+
+linters-settings:
+  revive:
+    rules:
+      # Spammy linter and complex to fix on lots of parameters. Makes more harm that it solves.
+      - name: unused-parameter
+        disabled: true

cmd/tfe-drift/commands/commands.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"gopkg.in/alecthomas/kingpin.v2"
+	"github.com/alecthomas/kingpin/v2"
 
 	"github.com/hashicorp/go-tfe"
 	"github.com/slok/tfe-drift/internal/log"

cmd/tfe-drift/commands/controller.go

@@ -7,11 +7,11 @@ import (
 	"net/http/pprof"
 	"time"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/hashicorp/go-tfe"
 	"github.com/oklog/run"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/slok/tfe-drift/internal/controller"
 	"github.com/slok/tfe-drift/internal/log"

cmd/tfe-drift/commands/run.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/hashicorp/go-tfe"
-	"gopkg.in/alecthomas/kingpin.v2"
 
 	tfestorage "github.com/slok/tfe-drift/internal/storage/tfe"
 	"github.com/slok/tfe-drift/internal/workspace/process"

cmd/tfe-drift/commands/version.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"gopkg.in/alecthomas/kingpin.v2"
+	"github.com/alecthomas/kingpin/v2"
 
 	"github.com/slok/tfe-drift/internal/info"
 )

cmd/tfe-drift/main.go

@@ -9,9 +9,9 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/oklog/run"
 	"github.com/sirupsen/logrus"
-	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/slok/tfe-drift/cmd/tfe-drift/commands"
 	"github.com/slok/tfe-drift/internal/info"

docker/dev/Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.19
+FROM golang:1.21
 
 LABEL org.opencontainers.image.source https://github.com/slok/tfe-drift
 
-ARG GOLANGCI_LINT_VERSION="1.50.1"
-ARG MOCKERY_VERSION="2.14.1"
+ARG GOLANGCI_LINT_VERSION="1.58.0"
+ARG MOCKERY_VERSION="2.43.0"
 ARG ostype=Linux
 
 RUN apt-get update && apt-get install -y \

docker/prod/Dockerfile

@@ -1,7 +1,7 @@
 # Set also `ARCH` ARG here so we can use it on all the `FROM`s. 
 ARG ARCH
 
-FROM golang:1.19-alpine as build-stage
+FROM golang:1.21-alpine as build-stage
 
 LABEL org.opencontainers.image.source https://github.com/slok/tfe-drift
 

go.mod

@@ -1,37 +1,37 @@
 module github.com/slok/tfe-drift
 
-go 1.19
+go 1.21
 
 require (
-	github.com/hashicorp/go-tfe v1.17.0
+	github.com/alecthomas/kingpin/v2 v2.4.0
+	github.com/hashicorp/go-tfe v1.52.0
 	github.com/oklog/run v1.1.0
-	github.com/prometheus/client_golang v1.14.0
-	github.com/sirupsen/logrus v1.9.0
-	github.com/stretchr/testify v1.8.1
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+	github.com/prometheus/client_golang v1.19.0
+	github.com/sirupsen/logrus v1.9.3
+	github.com/stretchr/testify v1.9.0
 )
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
-	github.com/hashicorp/go-slug v0.10.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
+	github.com/hashicorp/go-slug v0.15.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/hashicorp/jsonapi v1.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.53.0 // indirect
+	github.com/prometheus/procfs v0.14.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )