diff --git a/.golangci.yml b/.golangci.yml index 8112468..b565d62 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -43,10 +43,8 @@ linters: disable: - copyloopvar # requires go >=1.22 - cyclop - - deadcode # deprecated - depguard - errname # maybe should be enabled - - exhaustivestruct # deprecated - exhaustruct - forbidigo - funlen @@ -56,32 +54,26 @@ linters: - goconst - godot - godox - - golint # deprecated - - gomnd - - ifshort # deprecated + - gosec - inamedparam - interfacebloat - - interfacer # deprecated - intrange # requires go >=1.22 - ireturn # should be enabled, ironlib needs some changes - lll # not previously enabled, ironlib and mctl both fail this - - maligned # deprecated + - mnd - nestif - nilnil - nlreturn - nolintlint - nonamedreturns # should be enabled, probably - - nosnakecase # deprecated - paralleltest - perfsprint - - scopelint # deprecated - - structcheck # deprecated + - recvcheck - tagliatelle - tenv # should be enabled - testpackage - testifylint # should be enabled - thelper # should be enabled - - varcheck # deprecated - varnamelen - wrapcheck - wsl diff --git a/Makefile b/Makefile index 68c44f0..c760458 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ build: -X $(LDFLAG_LOCATION).Version=$(VERSION) \ -X $(LDFLAG_LOCATION).BuildDate=$(BUILD_DATE)" lint: - go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57 run --config .golangci.yml --timeout=5m --out-format colored-line-number + go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64 run --config .golangci.yml --timeout=5m --out-format colored-line-number lint-fix: - go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57 run --fix --config .golangci.yml --timeout=5m --out-format colored-line-number + go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64 run --fix --config .golangci.yml --timeout=5m --out-format colored-line-number test: lint CGO_ENABLED=0 $(GOBINARY) test -timeout 1m -v -covermode=atomic ./... diff --git a/go.mod b/go.mod index f96ba93..219ca9c 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/metal-toolbox/vogelkop -go 1.22 +go 1.23.0 require ( github.com/Sytten/logrus-zap-hook v0.1.0 github.com/bmc-toolbox/common v0.0.0-20240806132831-ba8adc6a35e3 github.com/freddierice/go-losetup/v2 v2.0.1 github.com/metal-toolbox/bmc-common v1.0.3 - github.com/metal-toolbox/ironlib v1.1.2 + github.com/metal-toolbox/ironlib v1.1.3 github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af github.com/spf13/cobra v1.8.1 go.uber.org/zap v1.27.0 @@ -30,9 +30,9 @@ require ( github.com/ulikunitz/xz v0.5.11 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/net v0.36.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect ) require ( diff --git a/go.sum b/go.sum index d001c6b..6040ae3 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/Sytten/logrus-zap-hook v0.1.0 h1:GPsDlO0b+rvfb6WohFNreI3Fe2I6MDyv1afoYPE2Kzk= github.com/Sytten/logrus-zap-hook v0.1.0/go.mod h1:J0ktevklw/xJNpI2FzfTdJssk4P0vq3K2qzwihJ2gWU= -github.com/beevik/etree v1.4.1 h1:PmQJDDYahBGNKDcpdX8uPy1xRCwoCGVUiW669MEirVI= -github.com/beevik/etree v1.4.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs= github.com/beevik/etree v1.5.0 h1:iaQZFSDS+3kYZiGoc9uKeOkUY3nYMXOKLl6KIJxiJWs= github.com/beevik/etree v1.5.0/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs= github.com/bmc-toolbox/common v0.0.0-20240806132831-ba8adc6a35e3 h1:/BjZSX/sphptIdxpYo4wxAQkgMLyMMgfdl48J9DKNeE= @@ -29,16 +27,10 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/metal-toolbox/bmc-common v1.0.2 h1:AbUhx4tJzz2dYxKaXu8ENSR8+bCupbqwLvYouzpEc5U= -github.com/metal-toolbox/bmc-common v1.0.2/go.mod h1:WxMpaNb7/yTSEW0fMDOWUrhs/CPAzuCSx0p3uv3vRVA= github.com/metal-toolbox/bmc-common v1.0.3 h1:hrX5Q3k+CrHzUtlN5nh6X9l7l7D3chsHKVM8MQmLjMc= github.com/metal-toolbox/bmc-common v1.0.3/go.mod h1:WxMpaNb7/yTSEW0fMDOWUrhs/CPAzuCSx0p3uv3vRVA= -github.com/metal-toolbox/ironlib v1.1.0 h1:09qqcyZudORzYM6XS9ZIUvyuneRaTiH8b3C+SOqL2kg= -github.com/metal-toolbox/ironlib v1.1.0/go.mod h1:4gNs+2vVr99BtshRKGG/RgFUG1qtPHmn9bVmZSRG6ak= -github.com/metal-toolbox/ironlib v1.1.1 h1:QxRjis2CKjznzPix/+nfRgQ5rhCXrmjjy8Tf21Chf7I= -github.com/metal-toolbox/ironlib v1.1.1/go.mod h1:2gxSsXKvoMqomQhnqpXkMH2zmkrd9XFr6NvCv7CMpOg= -github.com/metal-toolbox/ironlib v1.1.2 h1:bLV/wRS4zBXS1HO7UNdqg/eM9xMQP0duKdNfFInzPc0= -github.com/metal-toolbox/ironlib v1.1.2/go.mod h1:vp1j/9/Qm483jtlVl+YDMO9mxgwTR7H/MWfuGBx06c8= +github.com/metal-toolbox/ironlib v1.1.3 h1:fGjozoigP0HMCaYNbQX23Nv1wWSnR/TYAnFGEGaA3oE= +github.com/metal-toolbox/ironlib v1.1.3/go.mod h1:dAaVqMfzSMDdU+zLW5PW3mWXmrfA7kMAmCFqb7CAqDo= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -88,22 +80,16 @@ go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= +golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=