From 797ad679bdc0a09a071bc68879ede289264524e5 Mon Sep 17 00:00:00 2001 From: Xueqin Cui Date: Tue, 22 Sep 2026 10:44:55 +1000 Subject: [PATCH] chore(lint): disable deprecated gomodguard and tidy repo-allowlist-sync - Explicitly disable deprecated 'gomodguard' linter in all .golangci.yaml files in favor of 'gomodguard_v2'. - Run 'go mod tidy' in tools/repo-allowlist-sync to sync indirect dependencies with the local 'go' module replacement. --- bindings/go/.golangci.yaml | 1 + external/.golangci.yaml | 1 + go/.golangci.yaml | 1 + tools/apitester/.golangci.yaml | 1 + tools/repo-allowlist-sync/go.mod | 8 ++++---- tools/repo-allowlist-sync/go.sum | 16 ++++++++-------- vulnfeeds/.golangci.yaml | 1 + 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/bindings/go/.golangci.yaml b/bindings/go/.golangci.yaml index 14c23c589ac..c4f2292a197 100644 --- a/bindings/go/.golangci.yaml +++ b/bindings/go/.golangci.yaml @@ -6,6 +6,7 @@ linters: enable: - gomodguard_v2 # gomodguard is deprecated but it's still in the default disable: + - gomodguard # deprecated in favor of gomodguard_v2 - forbidigo - paralleltest - tparallel diff --git a/external/.golangci.yaml b/external/.golangci.yaml index 14c23c589ac..c4f2292a197 100644 --- a/external/.golangci.yaml +++ b/external/.golangci.yaml @@ -6,6 +6,7 @@ linters: enable: - gomodguard_v2 # gomodguard is deprecated but it's still in the default disable: + - gomodguard # deprecated in favor of gomodguard_v2 - forbidigo - paralleltest - tparallel diff --git a/go/.golangci.yaml b/go/.golangci.yaml index 248cc73f1dd..5e13f5d1353 100644 --- a/go/.golangci.yaml +++ b/go/.golangci.yaml @@ -6,6 +6,7 @@ linters: enable: - gomodguard_v2 # gomodguard is deprecated but it's still in the default disable: + - gomodguard # deprecated in favor of gomodguard_v2 - forbidigo - paralleltest - tparallel diff --git a/tools/apitester/.golangci.yaml b/tools/apitester/.golangci.yaml index 14c23c589ac..c4f2292a197 100644 --- a/tools/apitester/.golangci.yaml +++ b/tools/apitester/.golangci.yaml @@ -6,6 +6,7 @@ linters: enable: - gomodguard_v2 # gomodguard is deprecated but it's still in the default disable: + - gomodguard # deprecated in favor of gomodguard_v2 - forbidigo - paralleltest - tparallel diff --git a/tools/repo-allowlist-sync/go.mod b/tools/repo-allowlist-sync/go.mod index 550d8db0ee7..d1df3498fbc 100644 --- a/tools/repo-allowlist-sync/go.mod +++ b/tools/repo-allowlist-sync/go.mod @@ -50,7 +50,7 @@ require ( github.com/lucasb-eyer/go-colorful v1.4.1 // indirect github.com/mattn/go-runewidth v0.0.24 // indirect github.com/muesli/cancelreader v0.2.2 // indirect - github.com/ossf/osv-schema/bindings/go v0.0.0-20260806060209-f3f826310aec // indirect + github.com/ossf/osv-schema/bindings/go v0.0.0-20260902031056-b388a18021a3 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect @@ -75,12 +75,12 @@ require ( go.uber.org/atomic v1.11.0 // indirect golang.org/x/crypto v0.56.0 // indirect golang.org/x/net v0.58.0 // indirect - golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sync v0.22.0 // indirect + golang.org/x/oauth2 v0.37.0 // indirect + golang.org/x/sync v0.23.0 // indirect golang.org/x/sys v0.47.0 // indirect golang.org/x/text v0.41.0 // indirect golang.org/x/time v0.15.0 // indirect - google.golang.org/api v0.294.0 // indirect + google.golang.org/api v0.297.0 // indirect google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 // indirect diff --git a/tools/repo-allowlist-sync/go.sum b/tools/repo-allowlist-sync/go.sum index 8567e82ecf2..135a5451dc9 100644 --- a/tools/repo-allowlist-sync/go.sum +++ b/tools/repo-allowlist-sync/go.sum @@ -137,8 +137,8 @@ github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/a github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= -github.com/ossf/osv-schema/bindings/go v0.0.0-20260806060209-f3f826310aec h1:A92d74F0MP8hOiPXRnUnuWaluaf3G3sGJfMEcjkZfjA= -github.com/ossf/osv-schema/bindings/go v0.0.0-20260806060209-f3f826310aec/go.mod h1:IrUa4QzZUi03J3WXDzZYXVawYipHownNfqqZrqeGXfg= +github.com/ossf/osv-schema/bindings/go v0.0.0-20260902031056-b388a18021a3 h1:mNqW4tPTIPcx3KL5qZCByAHiTwGcwD/eCEfKOEvLA4g= +github.com/ossf/osv-schema/bindings/go v0.0.0-20260902031056-b388a18021a3/go.mod h1:aW9XJyUJfg0r+HogMGMagTt4hF6ibBkH/FZenG/KiyE= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -226,13 +226,13 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= -golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= +golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= +golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= -golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= +golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -253,8 +253,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/api v0.294.0 h1:8gASjJxdtcIieB3OqbkLcF0FfbXVNqKtU5iozD1ssvA= -google.golang.org/api v0.294.0/go.mod h1:02qB8+Ox1ZFzcaKFMguy1nQLJmSIyvV6Ff4txJEXtl4= +google.golang.org/api v0.297.0 h1:WktxTsnnx0yZNnsR6j0q6hR21RnnK81FHTOPy/ux4OE= +google.golang.org/api v0.297.0/go.mod h1:S4m8x0M6OkQpkOzGk1y9JG2sm4fFQrMh6dxzjCTszhE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= diff --git a/vulnfeeds/.golangci.yaml b/vulnfeeds/.golangci.yaml index 20886a2b7a0..6277d8768fe 100644 --- a/vulnfeeds/.golangci.yaml +++ b/vulnfeeds/.golangci.yaml @@ -6,6 +6,7 @@ linters: enable: - gomodguard_v2 # gomodguard is deprecated but it's still in the default disable: + - gomodguard # deprecated in favor of gomodguard_v2 - forbidigo - paralleltest - tparallel