Upgrade (#100)

* update golangci config

* update ci golang

* refactor using an error object

* update dependencies

* cover containerd cve

* update viper

* upgrade cobra

* update uber mock

* tidy mod

* add newline to yamls

* upgrade to log v2

* gofmt

Author: mfleader

.github/workflows/build.yaml

@@ -6,18 +6,23 @@ on:
     tags:
       - "**"
   pull_request:
-
+env:
+  go_version: 1.21.6
 jobs:
   golangci-lint:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.go_version }}
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.55.2
 
   test:
     runs-on: ubuntu-latest
@@ -26,9 +31,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: ${{ env.go_version }}
 
       - name: Set up gotestfmt
         uses: gotesttools/gotestfmt-action@v2
@@ -53,7 +58,7 @@ jobs:
           go test -coverprofile=test.cov -json -v ./... 2>&1 | tee /tmp/gotest.log | gotestfmt
 
       - name: upload test log
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-log
@@ -67,7 +72,7 @@ jobs:
           cat limgo_cov.md >> $GITHUB_STEP_SUMMARY
 
       - name: upload coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: limgo_cov.md
@@ -89,10 +94,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Go
-        uses: actions/setup-go@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.18
+          go-version: ${{ env.go_version }}
 
       - name: Setup go mockgen
         run: go install github.com/golang/mock/[email protected]
@@ -114,7 +119,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: binaries
-          path: dist
+          path: dist

.golangci.yaml

@@ -77,19 +77,21 @@ linters-settings:
   revive:
     severity: error
   depguard:
-    list-type: whitelist
-    include-go-root: false
-    packages:
-      - go.flow.arcalot.io/
-      - go.arcalot.io/
-      - gopkg.in/yaml.v3
-      - github.com/arcalot/arcaflow-container-toolkit
-      - github.com/docker/docker
-      - github.com/spf13/viper
-      - github.com/spf13/cobra
-      - github.com/creasty/defaults
-      - go.uber.org/mock/gomock
-      - github.com/golang/mock/gomock
+    rules:
+      main:
+        list-mode: strict
+        allow:
+          - $gostd
+          - go.flow.arcalot.io/
+          - go.arcalot.io/
+          - gopkg.in/yaml.v3
+          - github.com/arcalot/arcaflow-container-toolkit
+          - github.com/docker/docker
+          - github.com/spf13/viper
+          - github.com/spf13/cobra
+          - github.com/creasty/defaults
+          - go.uber.org/mock/gomock
+          - github.com/golang/mock/gomock
   govet:
     enable-all: true
     check-shadowing: false
@@ -101,4 +103,4 @@ linters-settings:
     checks:
       - all
 issues:
-  exclude-use-default: false
+  exclude-use-default: false

cmd/root.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"go.arcalot.io/log"
+	"go.arcalot.io/log/v2"
 )
 
 var cfgFile string

go.mod

@@ -1,52 +1,62 @@
 module go.arcalot.io/arcaflow-container-toolkit
 
-go 1.18
+go 1.21
 
 require (
 	github.com/creasty/defaults v1.7.0
-	github.com/docker/docker v24.0.7+incompatible
-	github.com/spf13/cobra v1.7.0
-	github.com/spf13/viper v1.16.0
-	go.arcalot.io/assert v1.6.0
-	go.arcalot.io/log v1.2.0
-	go.uber.org/mock v0.3.0
+	github.com/docker/docker v25.0.2+incompatible
+	github.com/spf13/cobra v1.8.0
+	github.com/spf13/viper v1.18.2
+	go.arcalot.io/assert v1.7.0
+	go.arcalot.io/log/v2 v2.1.0
+	go.uber.org/mock v0.4.0
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/Microsoft/hcsshim v0.11.1 // indirect
-	github.com/containerd/containerd v1.7.6 // indirect
+	github.com/containerd/containerd v1.7.13 // indirect
+	github.com/containerd/log v0.1.0 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/compress v1.17.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
+	github.com/moby/sys/user v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc5.0.20230922152145-93f6e65855a1 // indirect
-	github.com/opencontainers/runc v1.1.9 // indirect
-	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/afero v1.10.0 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.1 // indirect