From 8af77a61b1306cc9ee359f34c72c27ae61f6ae80 Mon Sep 17 00:00:00 2001 From: Fedor Partanskiy Date: Wed, 15 Jul 2026 22:47:33 +0300 Subject: [PATCH] golint is deprecated, it is being replaced by staticcheck. staticcheck is already enabled in fabric Signed-off-by: Fedor Partanskiy --- Makefile | 4 ++-- gotools.mk | 3 +-- tools/go.mod | 2 -- tools/go.sum | 9 --------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index d37879adc6c..d1511416517 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # - docker-tag-stable - re-tags the images made by 'make docker' with the :stable tag # - docker-thirdparty - pulls thirdparty images (couchdb, etc) # - docs - builds the documentation in html format -# - gotools - installs go tools like golint +# - gotools - installs go tools # - help-docs - generate the command reference docs # - integration-test-prereqs - setup prerequisites for integration tests # - integration-test - runs the integration tests @@ -149,7 +149,7 @@ trailing-spaces: ## Check for trailing spaces @scripts/check_trailingspaces.sh .PHONY: gotools -gotools: gotools-install ## Install go tools like golint +gotools: gotools-install ## Install go tools .PHONY: check-go-version check-go-version: ## Check for the correct go version diff --git a/gotools.mk b/gotools.mk index 875dd493400..6be2ec3b63e 100644 --- a/gotools.mk +++ b/gotools.mk @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 -GOTOOLS = counterfeiter gendoc ginkgo gocov gocov-xml gofumpt goimports golint govulncheck misspell mockery protoc-gen-go protoc-gen-go-grpc staticcheck swagger +GOTOOLS = counterfeiter gendoc ginkgo gocov gocov-xml gofumpt goimports govulncheck misspell mockery protoc-gen-go protoc-gen-go-grpc staticcheck swagger BUILD_DIR ?= build GOTOOLS_BINDIR ?= $(shell go env GOPATH)/bin @@ -15,7 +15,6 @@ go.fqp.gocov := github.com/axw/gocov/gocov go.fqp.gocov-xml := github.com/AlekSi/gocov-xml go.fqp.gofumpt := mvdan.cc/gofumpt go.fqp.goimports := golang.org/x/tools/cmd/goimports -go.fqp.golint := golang.org/x/lint/golint go.fqp.misspell := github.com/client9/misspell/cmd/misspell go.fqp.mockery := github.com/vektra/mockery/v2 go.fqp.protoc-gen-go := google.golang.org/protobuf/cmd/protoc-gen-go diff --git a/tools/go.mod b/tools/go.mod index 2980551c456..ee2c7e2a68c 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -11,7 +11,6 @@ tool ( github.com/maxbrunsfeld/counterfeiter/v6 github.com/onsi/ginkgo/v2/ginkgo github.com/vektra/mockery/v2 - golang.org/x/lint/golint golang.org/x/tools/cmd/goimports google.golang.org/grpc/cmd/protoc-gen-go-grpc google.golang.org/protobuf/cmd/protoc-gen-go @@ -92,7 +91,6 @@ require ( go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.52.0 // indirect golang.org/x/exp/typeparams v0.0.0-20260527015227-08cc5374adb3 // indirect - golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect golang.org/x/mod v0.36.0 // indirect golang.org/x/net v0.55.0 // indirect golang.org/x/sync v0.20.0 // indirect diff --git a/tools/go.sum b/tools/go.sum index 41b4397c75d..c80f6694904 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -206,26 +206,19 @@ github.com/vektra/mockery/v2 v2.53.6/go.mod h1:fjxC+mskIZqf67+z34pHxRRyyZnPnWNA3 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/exp/typeparams v0.0.0-20260527015227-08cc5374adb3 h1:g5AvsPIBEVcTgNCAgH3wY0ghc61eE0R26C4SPHvO8GA= golang.org/x/exp/typeparams v0.0.0-20260527015227-08cc5374adb3/go.mod h1:PqrXSW65cXDZH0k4IeUbhmg/bcAZDbzNz3byBpKCsXo= -golang.org/x/lint v0.0.0-20241112194109-818c5a804067 h1:adDmSQyFTCiv19j015EGKJBoaa7ElV0Q1Wovb/4G7NA= -golang.org/x/lint v0.0.0-20241112194109-818c5a804067/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -239,12 +232,10 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM= golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=