From f812de58e1b9759a610590be64db09c4fc61fff8 Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Mon, 17 Feb 2025 19:20:13 +0400 Subject: [PATCH] Use Go 1.24.0 (#4775) --- .editorconfig | 9 ++++ .golangci.yml | 2 +- CONTRIBUTING.md | 2 +- build/ferretdb/development.Dockerfile | 6 +-- build/ferretdb/evaluation.Dockerfile | 4 +- build/ferretdb/production.Dockerfile | 4 +- build/version/version.go | 9 ++-- cmd/ferretdb/main.go | 1 + go.mod | 4 +- integration/.golangci.yml | 2 +- integration/commands_administration_test.go | 50 ++++++++++++++------- integration/go.mod | 4 +- integration/integration.go | 20 +++++++++ internal/util/logging/handler_test.go | 6 +-- internal/util/state/metrics_test.go | 8 ++-- tools/checkcomments/checkcomments.go | 2 +- tools/checkcomments/checkcomments_test.go | 2 +- tools/checkdocs/checkdocs.go | 2 +- tools/checkdocs/checkdocs_test.go | 2 +- tools/go.mod | 47 +++++++++++++------ tools/go.sum | 8 ++-- tools/golangci/go.mod | 27 +++++------ tools/golangci/go.sum | 41 +++++++++-------- tools/golangci/golangci.go | 4 -- tools/tools.go | 36 +-------------- website/go.mod | 4 +- 26 files changed, 167 insertions(+), 139 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..d6974fa1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +# https://editorconfig.org + +root = true + +[*] +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true +charset = utf-8 diff --git a/.golangci.yml b/.golangci.yml index 3f545e46..c5eda671 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -103,7 +103,7 @@ linters-settings: sections: - standard - default - - prefix(github.com/FerretDB/FerretDB) # both /v2 and /tools + - prefix(github.com/FerretDB/FerretDB/v2/) goconst: min-occurrences: 5 ignore-tests: true diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 92ce3ea9..658c8c92 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,7 +30,7 @@ On macOS and Windows, [Docker Desktop](https://www.docker.com/products/docker-de On Windows, it should be [configured to use WSL 2](https://docs.docker.com/desktop/windows/wsl/) without any distro; all commands should be run on the host. -You will need Go 1.23 or later on the host. +You will need Go 1.24 or later on the host. If your package manager doesn't provide it yet, please install it from [go.dev](https://go.dev/dl/). diff --git a/build/ferretdb/development.Dockerfile b/build/ferretdb/development.Dockerfile index 6d5304f7..c10f44b6 100644 --- a/build/ferretdb/development.Dockerfile +++ b/build/ferretdb/development.Dockerfile @@ -12,7 +12,7 @@ ARG LABEL_COMMIT # prepare stage -FROM --platform=$BUILDPLATFORM golang:1.23.6 AS development-prepare +FROM --platform=$BUILDPLATFORM golang:1.24.0 AS development-prepare # use a single directory for all Go caches to simplify RUN --mount commands below ENV GOPATH=/cache/gopath @@ -36,7 +36,7 @@ EOF # build stage -FROM golang:1.23.6 AS development-build +FROM golang:1.24.0 AS development-build ARG TARGETARCH @@ -103,7 +103,7 @@ COPY --from=development-build /src/bin/ferretdb /ferretdb # final stage -FROM golang:1.23.6 AS development +FROM golang:1.24.0 AS development ENV GOCOVERDIR=/tmp/cover ENV GORACE=halt_on_error=1,history_size=2 diff --git a/build/ferretdb/evaluation.Dockerfile b/build/ferretdb/evaluation.Dockerfile index 5b9176bb..19a9ce86 100644 --- a/build/ferretdb/evaluation.Dockerfile +++ b/build/ferretdb/evaluation.Dockerfile @@ -12,7 +12,7 @@ ARG LABEL_COMMIT # prepare stage -FROM --platform=$BUILDPLATFORM golang:1.23.6 AS evaluation-prepare +FROM --platform=$BUILDPLATFORM golang:1.24.0 AS evaluation-prepare # use a single directory for all Go caches to simplify RUN --mount commands below ENV GOPATH=/cache/gopath @@ -36,7 +36,7 @@ EOF # build stage -FROM golang:1.23.6 AS evaluation-build +FROM golang:1.24.0 AS evaluation-build ARG TARGETARCH diff --git a/build/ferretdb/production.Dockerfile b/build/ferretdb/production.Dockerfile index 360f53b8..4c9cd54d 100644 --- a/build/ferretdb/production.Dockerfile +++ b/build/ferretdb/production.Dockerfile @@ -12,7 +12,7 @@ ARG LABEL_COMMIT # prepare stage -FROM --platform=$BUILDPLATFORM golang:1.23.6 AS production-prepare +FROM --platform=$BUILDPLATFORM golang:1.24.0 AS production-prepare # use a single directory for all Go caches to simplify RUN --mount commands below ENV GOPATH=/cache/gopath @@ -36,7 +36,7 @@ EOF # build stage -FROM golang:1.23.6 AS production-build +FROM golang:1.24.0 AS production-build ARG TARGETARCH diff --git a/build/version/version.go b/build/version/version.go index 6201b4dd..d6814be1 100644 --- a/build/version/version.go +++ b/build/version/version.go @@ -147,6 +147,10 @@ func init() { info.BuildEnvironment["go.version"] = buildInfo.GoVersion for _, s := range buildInfo.Settings { + if v := s.Value; v != "" { + info.BuildEnvironment[s.Key] = v + } + switch s.Key { case "vcs.revision": if s.Value != info.Commit { @@ -163,11 +167,6 @@ func init() { case "vcs.modified": info.Dirty = must.NotFail(strconv.ParseBool(s.Value)) - - default: - if v := s.Value; v != "" { - info.BuildEnvironment[s.Key] = v - } } } } diff --git a/cmd/ferretdb/main.go b/cmd/ferretdb/main.go index 98475118..907be0eb 100644 --- a/cmd/ferretdb/main.go +++ b/cmd/ferretdb/main.go @@ -286,6 +286,7 @@ func run() { _, _ = fmt.Fprintln(os.Stdout, "dirty:", info.Dirty) _, _ = fmt.Fprintln(os.Stdout, "package:", info.Package) _, _ = fmt.Fprintln(os.Stdout, "devBuild:", info.DevBuild) + _, _ = fmt.Fprintf(os.Stdout, "buildEnvironment: %+v\n", info.BuildEnvironment) return } diff --git a/go.mod b/go.mod index d1991caf..8fc60987 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/FerretDB/FerretDB/v2 -go 1.23 +go 1.24 -toolchain go1.23.6 +toolchain go1.24.0 require ( github.com/AlekSi/pointer v1.2.0 diff --git a/integration/.golangci.yml b/integration/.golangci.yml index afe0fd8e..3b5fda0f 100644 --- a/integration/.golangci.yml +++ b/integration/.golangci.yml @@ -29,7 +29,7 @@ linters-settings: sections: - standard - default - - prefix(github.com/FerretDB/FerretDB/v2) + - prefix(github.com/FerretDB/FerretDB/v2/) - prefix(github.com/FerretDB/FerretDB/v2/integration) goconst: min-occurrences: 5 diff --git a/integration/commands_administration_test.go b/integration/commands_administration_test.go index 3096cec9..a18a85c8 100644 --- a/integration/commands_administration_test.go +++ b/integration/commands_administration_test.go @@ -857,6 +857,8 @@ func TestBuildInfoCommand(t *testing.T) { t.Parallel() ctx, collection := setup.Setup(t) + info := version.Get() + var actual bson.D command := bson.D{{"buildInfo", int32(1)}} err := collection.Database().RunCommand(ctx, command).Decode(&actual) @@ -869,7 +871,7 @@ func TestBuildInfoCommand(t *testing.T) { case "ferretdb": value, ok := field.Value.(bson.D) require.True(t, ok) - AssertEqualDocuments(t, bson.D{{"package", "unknown"}, {"version", "unknown"}}, value) + AssertEqualDocuments(t, bson.D{{"package", info.Package}, {"version", info.Version}}, value) case "version": assert.IsType(t, "", field.Value) @@ -903,7 +905,7 @@ func TestBuildInfoCommand(t *testing.T) { actualComparable = append(actualComparable, bson.E{Key: field.Key, Value: bson.D{}}) case "openssl", "storageEngines", "allocator", "javascriptEngine": - // exclusive to MongoDB + // exclusive to MongoDB default: actualComparable = append(actualComparable, field) @@ -1865,6 +1867,8 @@ func TestDBStatsCommandFreeStorage(tt *testing.T) { func TestServerStatusCommand(t *testing.T) { ctx, collection := setup.Setup(t) + info := version.Get() + var actual bson.D command := bson.D{{"serverStatus", int32(1)}} err := collection.Database().RunCommand(ctx, command).Decode(&actual) @@ -1876,18 +1880,18 @@ func TestServerStatusCommand(t *testing.T) { for _, field := range actual { switch field.Key { case "ferretdb": - value, ok := field.Value.(bson.D) - require.True(t, ok) + ferretdb, buildEnvironment := RemoveKey(t, field.Value.(bson.D), "buildEnvironment") + assert.IsType(t, bson.D{}, buildEnvironment) + expected := bson.D{ - {"version", "unknown"}, - {"gitVersion", "unknown"}, - {"buildEnvironment", bson.D{}}, + {"version", info.Version}, + {"gitVersion", info.Commit}, {"debug", true}, - {"package", "unknown"}, + {"package", info.Package}, {"postgresql", expectedPostgreSQLVersion}, {"documentdb", version.DocumentDB}, } - AssertEqualDocuments(t, expected, value) + AssertEqualDocuments(t, expected, ferretdb) case "freeMonitoring": freeMonitoring, ok := field.Value.(bson.D) @@ -1998,6 +2002,8 @@ func TestServerStatusCommandMetrics(t *testing.T) { t.Parallel() + info := version.Get() + for name, tc := range map[string]struct { cmds []bson.D expectedNonZero []string @@ -2042,6 +2048,11 @@ func TestServerStatusCommandMetrics(t *testing.T) { for _, field := range actual { switch field.Key { + case "ferretdb": + f, buildEnvironment := RemoveKey(t, field.Value.(bson.D), "buildEnvironment") + assert.IsType(t, bson.D{}, buildEnvironment) + actualComparable = append(actualComparable, bson.E{Key: field.Key, Value: f}) + case "host": host, ok := field.Value.(string) require.True(t, ok) @@ -2143,11 +2154,10 @@ func TestServerStatusCommandMetrics(t *testing.T) { {"views", int32(0)}, }}, {"ferretdb", bson.D{ - {"version", "unknown"}, - {"gitVersion", "unknown"}, - {"buildEnvironment", bson.D{}}, + {"version", info.Version}, + {"gitVersion", info.Commit}, {"debug", true}, - {"package", "unknown"}, + {"package", info.Package}, {"postgresql", expectedPostgreSQLVersion}, {"documentdb", version.DocumentDB}, }}, @@ -2177,6 +2187,8 @@ func TestServerStatusCommandFreeMonitoring(t *testing.T) { DatabaseName: "admin", }) + info := version.Get() + for name, tc := range map[string]struct { command bson.D expectedStatus string @@ -2205,6 +2217,11 @@ func TestServerStatusCommandFreeMonitoring(t *testing.T) { for _, field := range actual { switch field.Key { + case "ferretdb": + f, buildEnvironment := RemoveKey(t, field.Value.(bson.D), "buildEnvironment") + assert.IsType(t, bson.D{}, buildEnvironment) + actualComparable = append(actualComparable, bson.E{Key: field.Key, Value: f}) + case "host": host, ok := field.Value.(string) require.True(t, ok) @@ -2319,11 +2336,10 @@ func TestServerStatusCommandFreeMonitoring(t *testing.T) { {"views", int32(0)}, }}, {"ferretdb", bson.D{ - {"version", "unknown"}, - {"gitVersion", "unknown"}, - {"buildEnvironment", bson.D{}}, + {"version", info.Version}, + {"gitVersion", info.Commit}, {"debug", true}, - {"package", "unknown"}, + {"package", info.Package}, {"postgresql", expectedPostgreSQLVersion}, {"documentdb", version.DocumentDB}, }}, diff --git a/integration/go.mod b/integration/go.mod index 3704803a..3f0ef4d4 100644 --- a/integration/go.mod +++ b/integration/go.mod @@ -1,8 +1,8 @@ module github.com/FerretDB/FerretDB/v2/integration -go 1.23 +go 1.24 -toolchain go1.23.6 +toolchain go1.24.0 replace github.com/FerretDB/FerretDB/v2 => ../ diff --git a/integration/integration.go b/integration/integration.go index 27f2b396..3a319fbe 100644 --- a/integration/integration.go +++ b/integration/integration.go @@ -460,6 +460,26 @@ func AssertEqualAltWriteError(t testing.TB, expected mongo.WriteError, altMessag return assert.Equal(t, expected, a) } +// RemoveKey returns a copy of the document with the given key removed, +// and the value of that key (that could be nil if the key was not found). +func RemoveKey(t testing.TB, doc bson.D, key string) (bson.D, any) { + t.Helper() + + res := make(bson.D, 0, len(doc)) + var v any + + for _, field := range doc { + if field.Key == key { + v = field.Value + continue + } + + res = append(res, field) + } + + return res, v +} + // UnsetRaw returns error with all Raw fields unset. It returns nil if err is nil. // // Error is checked using a regular type assertion; wrapped errors (errors.As) are not checked. diff --git a/internal/util/logging/handler_test.go b/internal/util/logging/handler_test.go index 4b7a219a..c0e96a75 100644 --- a/internal/util/logging/handler_test.go +++ b/internal/util/logging/handler_test.go @@ -87,7 +87,7 @@ func TestShortPath(t *testing.T) { assert.Equal(t, "dir3/file.go", shortPath("/dir1/dir2/dir3/file.go")) // with -trimpath - assert.Equal(t, "debug/debug.go", shortPath("github.com/FerretDB/FerretDB/internal/util/debug/debug.go")) - assert.Equal(t, "util/debug.go", shortPath("github.com/FerretDB/FerretDB/internal/util/debug.go")) - assert.Equal(t, "internal/debug.go", shortPath("github.com/FerretDB/FerretDB/internal/debug.go")) + assert.Equal(t, "debug/debug.go", shortPath("github.com/FerretDB/FerretDB/v2/internal/util/debug/debug.go")) + assert.Equal(t, "util/debug.go", shortPath("github.com/FerretDB/FerretDB/v2/internal/util/debug.go")) + assert.Equal(t, "internal/debug.go", shortPath("github.com/FerretDB/FerretDB/v2/internal/debug.go")) } diff --git a/internal/util/state/metrics_test.go b/internal/util/state/metrics_test.go index bedd2849..478da3f1 100644 --- a/internal/util/state/metrics_test.go +++ b/internal/util/state/metrics_test.go @@ -56,9 +56,9 @@ func TestMetrics(t *testing.T) { ` # HELP ferretdb_up FerretDB instance state. # TYPE ferretdb_up gauge - ferretdb_up{branch=%q,commit=%q,dev="%t",dirty="%t",documentdb="documentdb",package="unknown",postgresql="postgres",telemetry="enabled",update_available="false",uuid=%q,version=%q} 1 + ferretdb_up{branch=%q,commit=%q,dev="%t",dirty="%t",documentdb="documentdb",package=%q,postgresql="postgres",telemetry="enabled",update_available="false",uuid=%q,version=%q} 1 `, - info.Branch, info.Commit, info.DevBuild, info.Dirty, uuid, info.Version, + info.Branch, info.Commit, info.DevBuild, info.Dirty, info.Package, uuid, info.Version, ) assert.NoError(t, testutil.CollectAndCompare(mc, strings.NewReader(expected))) }) @@ -76,9 +76,9 @@ func TestMetrics(t *testing.T) { ` # HELP ferretdb_up FerretDB instance state. # TYPE ferretdb_up gauge - ferretdb_up{branch=%q,commit=%q,dev="%t",dirty="%t",documentdb="documentdb",package="unknown",postgresql="postgres",telemetry="enabled",update_available="false",version=%q} 1 + ferretdb_up{branch=%q,commit=%q,dev="%t",dirty="%t",documentdb="documentdb",package=%q,postgresql="postgres",telemetry="enabled",update_available="false",version=%q} 1 `, - info.Branch, info.Commit, info.DevBuild, info.Dirty, info.Version, + info.Branch, info.Commit, info.DevBuild, info.Dirty, info.Package, info.Version, ) assert.NoError(t, testutil.CollectAndCompare(mc, strings.NewReader(expected))) }) diff --git a/tools/checkcomments/checkcomments.go b/tools/checkcomments/checkcomments.go index 4a1d4719..a65e2d34 100644 --- a/tools/checkcomments/checkcomments.go +++ b/tools/checkcomments/checkcomments.go @@ -27,7 +27,7 @@ import ( "golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis/singlechecker" - "github.com/FerretDB/FerretDB/tools/github" + "github.com/FerretDB/FerretDB/v2/tools/github" ) // todoRE represents correct "// TODO" comment format. diff --git a/tools/checkcomments/checkcomments_test.go b/tools/checkcomments/checkcomments_test.go index c850d21c..768cda61 100644 --- a/tools/checkcomments/checkcomments_test.go +++ b/tools/checkcomments/checkcomments_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/tools/go/analysis/analysistest" - "github.com/FerretDB/FerretDB/tools/github" + "github.com/FerretDB/FerretDB/v2/tools/github" ) func TestCheckCommentIssue(t *testing.T) { diff --git a/tools/checkdocs/checkdocs.go b/tools/checkdocs/checkdocs.go index 1c43b42a..1e9ae633 100644 --- a/tools/checkdocs/checkdocs.go +++ b/tools/checkdocs/checkdocs.go @@ -28,7 +28,7 @@ import ( "strconv" "strings" - "github.com/FerretDB/FerretDB/tools/github" + "github.com/FerretDB/FerretDB/v2/tools/github" ) func main() { diff --git a/tools/checkdocs/checkdocs_test.go b/tools/checkdocs/checkdocs_test.go index bc2933d6..30d4999e 100644 --- a/tools/checkdocs/checkdocs_test.go +++ b/tools/checkdocs/checkdocs_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/FerretDB/FerretDB/tools/github" + "github.com/FerretDB/FerretDB/v2/tools/github" ) func TestReal(t *testing.T) { diff --git a/tools/go.mod b/tools/go.mod index 84648860..0e46dc94 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,28 +1,39 @@ -module github.com/FerretDB/FerretDB/tools +module github.com/FerretDB/FerretDB/v2/tools -go 1.23 +go 1.24 -toolchain go1.23.6 +toolchain go1.24.0 + +tool ( + github.com/FerretDB/FerretDB/v2/tools/checkcomments + github.com/FerretDB/FerretDB/v2/tools/checkdocs + github.com/FerretDB/FerretDB/v2/tools/checkswitch + github.com/FerretDB/FerretDB/v2/tools/definedockertag + github.com/FerretDB/FerretDB/v2/tools/generatechangelog + github.com/OpenDocDB/cts/opendocdb-cts + github.com/go-task/task/v3/cmd/task + github.com/goreleaser/nfpm/v2/cmd/nfpm + github.com/kisielk/godepgraph + github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen + github.com/quasilyte/go-consistent + golang.org/x/perf/cmd/benchstat + golang.org/x/pkgsite/cmd/pkgsite + golang.org/x/tools/cmd/deadcode + golang.org/x/tools/cmd/goimports + golang.org/x/tools/cmd/stringer + golang.org/x/vuln/cmd/govulncheck + mvdan.cc/gofumpt +) require ( github.com/AlekSi/pointer v1.2.0 github.com/FerretDB/gh v0.1.6 - github.com/OpenDocDB/cts/opendocdb-cts v0.0.0-20250130175644-5bb54314b11d - github.com/go-task/task/v3 v3.41.0 github.com/google/go-github/v66 v66.0.0 - github.com/goreleaser/nfpm/v2 v2.41.2 - github.com/kisielk/godepgraph v0.0.0-20240411160502-0f324ca7e282 - github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 - github.com/quasilyte/go-consistent v0.6.1 github.com/rogpeppe/go-internal v1.13.1 github.com/sethvargo/go-githubactions v1.3.0 github.com/stretchr/testify v1.10.0 - golang.org/x/perf v0.0.0-20250210164336-884df5810d28 - golang.org/x/pkgsite v0.0.0-20250210190023-b866f8692660 golang.org/x/tools v0.30.0 - golang.org/x/vuln v1.1.4 gopkg.in/yaml.v3 v3.0.1 - mvdan.cc/gofumpt v0.7.0 ) require ( @@ -33,6 +44,7 @@ require ( github.com/Masterminds/semver/v3 v3.3.1 // indirect github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/OpenDocDB/cts/opendocdb-cts v0.0.0-20250130175644-5bb54314b11d // indirect github.com/ProtonMail/go-crypto v1.1.4 // indirect github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect @@ -60,6 +72,7 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/go-task/task/v3 v3.41.0 // indirect github.com/go-task/template v0.1.0 // indirect github.com/go-toolsmith/astcast v1.0.0 // indirect github.com/go-toolsmith/astequal v1.0.0 // indirect @@ -76,6 +89,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/goreleaser/chglog v0.6.2 // indirect github.com/goreleaser/fileglob v1.3.0 // indirect + github.com/goreleaser/nfpm/v2 v2.41.2 // indirect github.com/huandu/xstrings v1.5.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/invopop/jsonschema v0.13.0 // indirect @@ -84,6 +98,7 @@ require ( github.com/joho/godotenv v1.5.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/kisielk/godepgraph v0.0.0-20240411160502-0f324ca7e282 // indirect github.com/kisielk/gotool v1.0.0 // indirect github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect @@ -101,9 +116,11 @@ require ( github.com/muesli/mango-cobra v1.2.0 // indirect github.com/muesli/mango-pflag v0.1.0 // indirect github.com/muesli/roff v0.1.0 // indirect + github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/quasilyte/go-consistent v0.6.1 // indirect github.com/radovskyb/watcher v1.0.7 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sajari/fuzzy v1.0.0 // indirect @@ -129,13 +146,17 @@ require ( golang.org/x/mod v0.23.0 // indirect golang.org/x/net v0.35.0 // indirect golang.org/x/oauth2 v0.26.0 // indirect + golang.org/x/perf v0.0.0-20250214215153-c95ad7d5b636 // indirect + golang.org/x/pkgsite v0.0.0-20250214205047-dd488e5da97a // indirect golang.org/x/sync v0.11.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect golang.org/x/term v0.29.0 // indirect golang.org/x/text v0.22.0 // indirect + golang.org/x/vuln v1.1.4 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + mvdan.cc/gofumpt v0.7.0 // indirect mvdan.cc/sh/v3 v3.10.0 // indirect rsc.io/markdown v0.0.0-20231214224604-88bb533a6020 // indirect ) diff --git a/tools/go.sum b/tools/go.sum index afb993a0..03a31ab3 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -369,10 +369,10 @@ golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/perf v0.0.0-20250210164336-884df5810d28 h1:qf30QczstSuZOhoOeQ2pMe665nSxygR9oF04uVgtek4= -golang.org/x/perf v0.0.0-20250210164336-884df5810d28/go.mod h1:1RNgVBEvoPEzE+/JNOsrJ+jjnFbzwp1wbnz+wPN1Qh0= -golang.org/x/pkgsite v0.0.0-20250210190023-b866f8692660 h1:Kcyjcq7veA8ayU5/CXfj85a6wUWVI0Z+/aVmiPwuSTo= -golang.org/x/pkgsite v0.0.0-20250210190023-b866f8692660/go.mod h1:8OazZd0McXcf+pKcTTL90fYlNZyE62+AQbEpxbE7lHk= +golang.org/x/perf v0.0.0-20250214215153-c95ad7d5b636 h1:MqbkwAT6CqEIjLPIjXz5ggsU+u3s5tWKRG24FaFVB6s= +golang.org/x/perf v0.0.0-20250214215153-c95ad7d5b636/go.mod h1:icvmpsXVagfHXXvKGjV9OCZRIVvB7Y/HpqVHqOevFy8= +golang.org/x/pkgsite v0.0.0-20250214205047-dd488e5da97a h1:kCR3oJNguchcd+dDsr60kYG02n1u5m3o3mkTsmPzWZ4= +golang.org/x/pkgsite v0.0.0-20250214205047-dd488e5da97a/go.mod h1:8OazZd0McXcf+pKcTTL90fYlNZyE62+AQbEpxbE7lHk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/tools/golangci/go.mod b/tools/golangci/go.mod index c39140a5..59b998ee 100644 --- a/tools/golangci/go.mod +++ b/tools/golangci/go.mod @@ -1,13 +1,13 @@ // Use separate (sub-)module to prevent dependabot timeouts. -module github.com/FerretDB/FerretDB/tools/golangci +module github.com/FerretDB/FerretDB/v2/tools/golangci // TODO https://github.com/golangci/golangci-lint/pull/5396 -go 1.23.0 +go 1.24 -toolchain go1.23.6 +toolchain go1.24.0 -require github.com/golangci/golangci-lint v1.64.2 +tool github.com/golangci/golangci-lint/cmd/golangci-lint require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect @@ -55,7 +55,7 @@ require ( github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect github.com/ghostiam/protogetter v0.3.9 // indirect - github.com/go-critic/go-critic v0.11.5 // indirect + github.com/go-critic/go-critic v0.12.0 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect github.com/go-toolsmith/astequal v1.2.0 // indirect @@ -71,6 +71,7 @@ require ( github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect github.com/golangci/go-printf-func-name v0.1.0 // indirect github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect + github.com/golangci/golangci-lint v1.64.5 // indirect github.com/golangci/misspell v0.6.0 // indirect github.com/golangci/plugin-module-register v0.1.1 // indirect github.com/golangci/revgrep v0.8.0 // indirect @@ -79,7 +80,7 @@ require ( github.com/gordonklaus/ineffassign v0.1.0 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect github.com/gostaticanalysis/comment v1.4.2 // indirect - github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect + github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect github.com/gostaticanalysis/nilerr v0.1.1 // indirect github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect @@ -112,14 +113,14 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mgechev/revive v1.6.0 // indirect + github.com/mgechev/revive v1.6.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moricho/tparallel v0.3.2 // indirect github.com/nakabonne/nestif v0.3.1 // indirect github.com/nishanths/exhaustive v0.12.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect - github.com/nunnatsa/ginkgolinter v0.18.4 // indirect + github.com/nunnatsa/ginkgolinter v0.19.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect @@ -143,7 +144,7 @@ require ( github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect - github.com/securego/gosec/v2 v2.22.0 // indirect + github.com/securego/gosec/v2 v2.22.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sivchari/containedctx v1.0.3 // indirect github.com/sivchari/tenv v1.12.1 // indirect @@ -160,7 +161,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/stretchr/testify v1.10.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect - github.com/tdakkota/asciicheck v0.3.0 // indirect + github.com/tdakkota/asciicheck v0.4.0 // indirect github.com/tetafro/godot v1.4.20 // indirect github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect github.com/timonwong/loggercheck v0.10.1 // indirect @@ -181,13 +182,13 @@ require ( go.uber.org/automaxprocs v1.6.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect + golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect golang.org/x/mod v0.23.0 // indirect golang.org/x/sync v0.11.0 // indirect golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/text v0.22.0 // indirect golang.org/x/tools v0.30.0 // indirect - google.golang.org/protobuf v1.36.1 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tools/golangci/go.sum b/tools/golangci/go.sum index ffedc44a..ad7fb72f 100644 --- a/tools/golangci/go.sum +++ b/tools/golangci/go.sum @@ -154,8 +154,8 @@ github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/ghostiam/protogetter v0.3.9 h1:j+zlLLWzqLay22Cz/aYwTHKQ88GE2DQ6GkWSYFOI4lQ= github.com/ghostiam/protogetter v0.3.9/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA= -github.com/go-critic/go-critic v0.11.5 h1:TkDTOn5v7EEngMxu8KbuFqFR43USaaH8XRJLz1jhVYA= -github.com/go-critic/go-critic v0.11.5/go.mod h1:wu6U7ny9PiaHaZHcvMDmdysMqvDem162Rh3zWTrqk8M= +github.com/go-critic/go-critic v0.12.0 h1:iLosHZuye812wnkEz1Xu3aBwn5ocCPfc9yqmFG9pa6w= +github.com/go-critic/go-critic v0.12.0/go.mod h1:DpE0P6OVc6JzVYzmM5gq5jMU31zLr4am5mB/VfFK64w= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -235,8 +235,8 @@ github.com/golangci/go-printf-func-name v0.1.0 h1:dVokQP+NMTO7jwO4bwsRwLWeudOVUP github.com/golangci/go-printf-func-name v0.1.0/go.mod h1:wqhWFH5mUdJQhweRnldEywnR5021wTdZSNgwYceV14s= github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE= github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY= -github.com/golangci/golangci-lint v1.64.2 h1:+os/Y7xzFKmVfYRzYayEpVItp/8eTR4VDODaCgcGOHA= -github.com/golangci/golangci-lint v1.64.2/go.mod h1:NTiG5Pmn7rkG6TuTPLcyT18Qbfijzcwir4NRiOoVcpw= +github.com/golangci/golangci-lint v1.64.5 h1:5omC86XFBKXZgCrVdUWU+WNHKd+CWCxNx717KXnzKZY= +github.com/golangci/golangci-lint v1.64.5/go.mod h1:WZnwq8TF0z61h3jLQ7Sk5trcP7b3kUFxLD6l1ivtdvU= github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c= @@ -283,8 +283,8 @@ github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/o github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q= github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= -github.com/gostaticanalysis/forcetypeassert v0.1.0 h1:6eUflI3DiGusXGK6X7cCcIgVCpZ2CiZ1Q7jl6ZxNV70= -github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= +github.com/gostaticanalysis/forcetypeassert v0.2.0 h1:uSnWrrUEYDr86OCxWa4/Tp2jeYDlogZiZHzGkWFefTk= +github.com/gostaticanalysis/forcetypeassert v0.2.0/go.mod h1:M5iPavzE9pPqWyeiVXSFghQjljW1+l/Uke3PXHS6ILY= github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk= github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= @@ -381,8 +381,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mgechev/revive v1.6.0 h1:NsdaDzYcWZd3ikrWbdbFsvk+DvEAmP6A21LAdZEomZg= -github.com/mgechev/revive v1.6.0/go.mod h1:YpafN9JKjfKxG/UDGUHU1kPJKalHx7fHIgclT04SjBs= +github.com/mgechev/revive v1.6.1 h1:ncK0ZCMWtb8GXwVAmk+IeWF2ULIDsvRxSRfg5sTwQ2w= +github.com/mgechev/revive v1.6.1/go.mod h1:/2tfHWVO8UQi/hqJsIYNEKELi+DJy/e+PQpLgTB1v88= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -402,8 +402,8 @@ github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhK github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/nunnatsa/ginkgolinter v0.18.4 h1:zmX4KUR+6fk/vhUFt8DOP6KwznekhkmVSzzVJve2vyM= -github.com/nunnatsa/ginkgolinter v0.18.4/go.mod h1:AMEane4QQ6JwFz5GgjI5xLUM9S/CylO+UyM97fN2iBI= +github.com/nunnatsa/ginkgolinter v0.19.0 h1:CnHRFAeBS3LdLI9h+Jidbcc5KH71GKOmaBZQk8Srnto= +github.com/nunnatsa/ginkgolinter v0.19.0/go.mod h1:jkQ3naZDmxaZMXPWaS9rblH+i+GWXQCaS/JFIWcOH2s= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= @@ -484,8 +484,8 @@ github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tM github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= github.com/sashamelentyev/usestdlibvars v1.28.0 h1:jZnudE2zKCtYlGzLVreNp5pmCdOxXUzwsMDBkR21cyQ= github.com/sashamelentyev/usestdlibvars v1.28.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= -github.com/securego/gosec/v2 v2.22.0 h1:bV/Ii5YSQtbobXuIFBXrfr91l5N4qslEdFHE9E0I/10= -github.com/securego/gosec/v2 v2.22.0/go.mod h1:sR5n3LzZ/52rn4xxRBJk38iPe/hjiA0CkVcyiAHNCrM= +github.com/securego/gosec/v2 v2.22.1 h1:IcBt3TpI5Y9VN1YlwjSpM2cHu0i3Iw52QM+PQeg7jN8= +github.com/securego/gosec/v2 v2.22.1/go.mod h1:4bb95X4Jz7VSEPdVjC0hD7C/yR6kdeUBvCPOy9gDQ0g= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -536,8 +536,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/tdakkota/asciicheck v0.3.0 h1:LqDGgZdholxZMaJgpM6b0U9CFIjDCbFdUF00bDnBKOQ= -github.com/tdakkota/asciicheck v0.3.0/go.mod h1:KoJKXuX/Z/lt6XzLo8WMBfQGzak0SrAKZlvRr4tg8Ac= +github.com/tdakkota/asciicheck v0.4.0 h1:VZ13Itw4k1i7d+dpDSNS8Op645XgGHpkCEh/WHicgWw= +github.com/tdakkota/asciicheck v0.4.0/go.mod h1:0k7M3rCfRXb0Z6bwgvkEIMleKH3kXNz9UqJ9Xuqopr8= github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= @@ -621,8 +621,8 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f h1:WTyX8eCCyfdqiPYkRGm0MqElSfYFH3yR1+rl/mct9sA= -golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac h1:TSSpLIG4v+p0rPv1pNOQtl1I8knsO4S9trOxNMOLVP4= +golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -793,8 +793,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -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/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -804,7 +804,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -936,8 +935,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= -google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/tools/golangci/golangci.go b/tools/golangci/golangci.go index c4ff7d1a..99f63241 100644 --- a/tools/golangci/golangci.go +++ b/tools/golangci/golangci.go @@ -14,8 +14,4 @@ package golangci -import ( - _ "github.com/golangci/golangci-lint/cmd/golangci-lint" -) - //go:generate go build -v -o ../../bin/ github.com/golangci/golangci-lint/cmd/golangci-lint diff --git a/tools/tools.go b/tools/tools.go index 39e3a6b6..ee10bbcc 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -14,38 +14,4 @@ package tools -import ( - _ "github.com/OpenDocDB/cts/opendocdb-cts" - _ "github.com/go-task/task/v3/cmd/task" - _ "github.com/goreleaser/nfpm/v2/cmd/nfpm" - _ "github.com/kisielk/godepgraph" - _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" - _ "github.com/quasilyte/go-consistent" - _ "golang.org/x/perf/cmd/benchstat" - _ "golang.org/x/pkgsite/cmd/pkgsite" - _ "golang.org/x/tools/cmd/deadcode" - _ "golang.org/x/tools/cmd/goimports" - _ "golang.org/x/tools/cmd/stringer" - _ "golang.org/x/vuln/cmd/govulncheck" - _ "mvdan.cc/gofumpt" -) - -//go:generate go build -v -o ../bin/ ./checkcomments -//go:generate go build -v -o ../bin/ ./checkdocs -//go:generate go build -v -o ../bin/ ./checkswitch -//go:generate go build -v -o ../bin/ ./definedockertag -//go:generate go build -v -o ../bin/ ./generatechangelog - -//go:generate go build -v -o ../bin/ github.com/OpenDocDB/cts/opendocdb-cts -//go:generate go build -v -o ../bin/ github.com/go-task/task/v3/cmd/task -//go:generate go build -v -o ../bin/ github.com/goreleaser/nfpm/v2/cmd/nfpm -//go:generate go build -v -o ../bin/ github.com/kisielk/godepgraph -//go:generate go build -v -o ../bin/ github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -//go:generate go build -v -o ../bin/ github.com/quasilyte/go-consistent -//go:generate go build -v -o ../bin/ golang.org/x/perf/cmd/benchstat -//go:generate go build -v -o ../bin/ golang.org/x/pkgsite/cmd/pkgsite -//go:generate go build -v -o ../bin/ golang.org/x/tools/cmd/deadcode -//go:generate go build -v -o ../bin/ golang.org/x/tools/cmd/goimports -//go:generate go build -v -o ../bin/ golang.org/x/tools/cmd/stringer -//go:generate go build -v -o ../bin/ golang.org/x/vuln/cmd/govulncheck -//go:generate go build -v -o ../bin/ mvdan.cc/gofumpt +//go:generate go build -v -o ../bin/ tool diff --git a/website/go.mod b/website/go.mod index ed87e225..4c7d7b7a 100644 --- a/website/go.mod +++ b/website/go.mod @@ -3,6 +3,6 @@ module ferretdb.com/website -go 1.23 +go 1.24 -toolchain go1.23.6 +toolchain go1.24.0