From 8fe4f005555a0552e6e3559e073417ff5157b642 Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Thu, 10 Oct 2024 16:47:57 +0400 Subject: [PATCH] Log MongoDB URI and bump deps (#1060) --- .github/workflows/dance.yml | 2 +- cmd/dance/main.go | 6 ++-- go.mod | 14 ++++----- go.sum | 24 +++++++-------- internal/configload/configload.go | 4 +-- internal/pusher/logger.go | 49 +++++++++++++++++++++++++++++++ internal/pusher/pusher.go | 18 ++++++++---- internal/pusher/pusher_test.go | 2 +- projects/enmeshed-runtime | 2 +- projects/meteor | 2 +- projects/mongo | 2 +- projects/mongo-go-driver | 2 +- projects/restheart | 2 +- tools/go.mod | 20 ++++++------- tools/go.sum | 36 +++++++++++------------ tools/golangci/go.mod | 2 +- 16 files changed, 121 insertions(+), 66 deletions(-) create mode 100644 internal/pusher/logger.go diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 08b0b14b..74fe00f3 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -95,7 +95,7 @@ jobs: version: 1.72.1 - name: Run init - run: bin/task init + run: bin/task init build - name: Dance! run: bin/task dance CONFIG=${{ matrix.project }}.yml diff --git a/cmd/dance/main.go b/cmd/dance/main.go index 1d745774..4984af4b 100644 --- a/cmd/dance/main.go +++ b/cmd/dance/main.go @@ -145,7 +145,7 @@ func main() { log.Fatal(err) } - log.Printf("Waiting for port %d for %s / %s to be up...", port, db, uri) + log.Printf("Waiting for port %d for %s / %s to be up...", port, db, u.Redacted()) if err = waitForPort(ctx, port); err != nil { log.Fatal(err) @@ -155,10 +155,8 @@ func main() { var pusherClient *pusher.Client if cli.Push != "" { - log.Print("Connecting to MongoDB URI to push results...") - var err error - if pusherClient, err = pusher.New(cli.Push); err != nil { + if pusherClient, err = pusher.New(cli.Push, l.With(slog.String("name", "pusher"))); err != nil { log.Fatal(err) } diff --git a/go.mod b/go.mod index 5958cfa9..784cad59 100644 --- a/go.mod +++ b/go.mod @@ -2,16 +2,16 @@ module github.com/FerretDB/dance go 1.23 -toolchain go1.23.1 +toolchain go1.23.2 require ( github.com/alecthomas/kong v1.2.1 github.com/pmezard/go-difflib v1.0.0 github.com/sethvargo/go-githubactions v1.3.0 github.com/stretchr/testify v1.9.0 - go.mongodb.org/mongo-driver v1.16.1 - golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 - golang.org/x/sys v0.25.0 + go.mongodb.org/mongo-driver v1.17.1 + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c + golang.org/x/sys v0.26.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -23,8 +23,8 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - golang.org/x/crypto v0.22.0 // indirect + github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/text v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index 26d84b90..32fa03d6 100644 --- a/go.sum +++ b/go.sum @@ -28,17 +28,17 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8= -go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= +go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM= +go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -52,16 +52,16 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/internal/configload/configload.go b/internal/configload/configload.go index 65d4122d..fb219e5e 100644 --- a/internal/configload/configload.go +++ b/internal/configload/configload.go @@ -128,7 +128,7 @@ func loadContent(content, db string) (*config.Config, error) { return nil, fmt.Errorf("no MongoDB URI for %q", db) } - uri, err := url.Parse(mongodbURI) + u, err := url.Parse(mongodbURI) if err != nil { return nil, fmt.Errorf("failed to parse MongoDB URI %q for %q: %w", mongodbURI, db, err) } @@ -138,7 +138,7 @@ func loadContent(content, db string) (*config.Config, error) { return nil, fmt.Errorf("failed to parse project config file template: %w", err) } - data, err := templateData(*uri) + data, err := templateData(*u) if err != nil { return nil, err } diff --git a/internal/pusher/logger.go b/internal/pusher/logger.go new file mode 100644 index 00000000..c9956f0f --- /dev/null +++ b/internal/pusher/logger.go @@ -0,0 +1,49 @@ +// Copyright 2021 FerretDB Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package pusher + +import ( + "io" + "log/slog" + "strings" + "testing" +) + +// logWriter provides [io.Writer] for [testing.TB]. +type logWriter struct { + tb testing.TB +} + +// Write implements [io.Writer]. +func (lw *logWriter) Write(p []byte) (int, error) { + // "logging.go:xx" is added by testing.TB.Log itself; there is nothing we can do about it. + // lw.tb.Helper() does not help. See: + // https://github.com/golang/go/issues/59928 + // https://github.com/neilotoole/slogt/tree/v1.1.0?tab=readme-ov-file#deficiency + lw.tb.Log(strings.TrimSuffix(string(p), "\n")) + return len(p), nil +} + +// Logger returns slog test logger. +func Logger(tb testing.TB) *slog.Logger { + return slog.New(slog.NewTextHandler(&logWriter{tb: tb}, &slog.HandlerOptions{ + Level: slog.LevelDebug, + })) +} + +// check interfaces +var ( + _ io.Writer = (*logWriter)(nil) +) diff --git a/internal/pusher/pusher.go b/internal/pusher/pusher.go index 1f2b127b..1c650916 100644 --- a/internal/pusher/pusher.go +++ b/internal/pusher/pusher.go @@ -17,6 +17,8 @@ package pusher import ( "context" + "fmt" + "log/slog" "net/url" "os" "strings" @@ -31,6 +33,7 @@ import ( // Client represents a MongoDB client. type Client struct { + l *slog.Logger c *mongo.Client database string hostname string @@ -39,10 +42,7 @@ type Client struct { } // New creates a new MongoDB client with given URI. -func New(uri string) (*Client, error) { - ctx, cancel := context.WithTimeout(context.TODO(), 10*time.Second) - defer cancel() - +func New(uri string, l *slog.Logger) (*Client, error) { u, err := url.Parse(uri) if err != nil { return nil, err @@ -50,9 +50,14 @@ func New(uri string) (*Client, error) { database := strings.TrimPrefix(u.Path, "/") if database == "" { - database = "dance" + return nil, fmt.Errorf("database name is empty in the URL") } + ctx, cancel := context.WithTimeout(context.TODO(), 10*time.Second) + defer cancel() + + l.InfoContext(ctx, "Connecting to MongoDB URI to push results...", slog.String("uri", u.Redacted())) + c, err := mongo.Connect(ctx, options.Client().ApplyURI(uri)) if err != nil { return nil, err @@ -69,6 +74,7 @@ func New(uri string) (*Client, error) { } return &Client{ + l: l, c: c, database: database, hostname: hostname, @@ -98,6 +104,8 @@ func (c *Client) Push(ctx context.Context, config, database string, res map[stri {"passed", passed}, } + c.l.InfoContext(ctx, "Pushing results to MongoDB URI...", slog.Any("doc", doc)) + _, err := c.c.Database(c.database).Collection("incoming").InsertOne(ctx, doc) return err diff --git a/internal/pusher/pusher_test.go b/internal/pusher/pusher_test.go index 3c2ac47a..028632ba 100644 --- a/internal/pusher/pusher_test.go +++ b/internal/pusher/pusher_test.go @@ -27,7 +27,7 @@ import ( func TestPusher(t *testing.T) { t.Parallel() - c, err := New("mongodb://localhost:27001/dance") + c, err := New("mongodb://localhost:27001/dance", Logger(t)) require.NoError(t, err) t.Cleanup(c.Close) diff --git a/projects/enmeshed-runtime b/projects/enmeshed-runtime index 8510f91f..745e05d1 160000 --- a/projects/enmeshed-runtime +++ b/projects/enmeshed-runtime @@ -1 +1 @@ -Subproject commit 8510f91f0580b57e3e20e54ca17998c0bc4acd2e +Subproject commit 745e05d122466109cc805c5f10a17ed3ac776f0f diff --git a/projects/meteor b/projects/meteor index cdcb4d13..0f986bc4 160000 --- a/projects/meteor +++ b/projects/meteor @@ -1 +1 @@ -Subproject commit cdcb4d131435bfe08071428135bb494088f7af05 +Subproject commit 0f986bc4023dd71cf990a82b201a9865de4fb7d6 diff --git a/projects/mongo b/projects/mongo index 1a2abbab..6ad9b1b6 160000 --- a/projects/mongo +++ b/projects/mongo @@ -1 +1 @@ -Subproject commit 1a2abbab88ec6368e24f9243410759e7ddbae958 +Subproject commit 6ad9b1b6b508075ffc40791dd81163a4c0e9193d diff --git a/projects/mongo-go-driver b/projects/mongo-go-driver index 92c3d6e5..78b0f611 160000 --- a/projects/mongo-go-driver +++ b/projects/mongo-go-driver @@ -1 +1 @@ -Subproject commit 92c3d6e5425fe7b9b3b5c70b18683d9c7c5ffc98 +Subproject commit 78b0f6119ce856d16c12f99009986bb4dc125fb4 diff --git a/projects/restheart b/projects/restheart index 044db877..4f0eefe8 160000 --- a/projects/restheart +++ b/projects/restheart @@ -1 +1 @@ -Subproject commit 044db87742e309c5cac72bc53f5efd94e14753d0 +Subproject commit 4f0eefe84f6f75d6d0c07c648b0271931dc61766 diff --git a/tools/go.mod b/tools/go.mod index 4e768fcf..1463926b 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -2,15 +2,15 @@ module github.com/FerretDB/dance/tools go 1.23 -toolchain go1.23.1 +toolchain go1.23.2 require ( - github.com/go-task/task/v3 v3.39.0 + github.com/go-task/task/v3 v3.39.2 github.com/pingcap/go-ycsb v1.0.1 github.com/quasilyte/go-consistent v0.6.1 - golang.org/x/perf v0.0.0-20240910214617-f1a715d501dd - golang.org/x/pkgsite v0.0.0-20240913130837-7d0ea0a0e8cd - golang.org/x/tools v0.25.0 + golang.org/x/perf v0.0.0-20241004173025-94b0db8a2472 + golang.org/x/pkgsite v0.0.0-20241004190937-78391ec0fb95 + golang.org/x/tools v0.26.0 golang.org/x/vuln v1.1.3 mvdan.cc/gofumpt v0.7.0 ) @@ -153,15 +153,15 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect go.uber.org/zap v1.20.0 // indirect - golang.org/x/crypto v0.27.0 // indirect + golang.org/x/crypto v0.28.0 // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.29.0 // indirect + golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.25.0 // indirect + golang.org/x/sys v0.26.0 // indirect golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/tools/go.sum b/tools/go.sum index cb0a5697..53280986 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -201,8 +201,8 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/go-task/task/v3 v3.39.0 h1:Loe6ppP1x38Puv1M2wigp91bH/garCt0vLWkJsiTWNI= -github.com/go-task/task/v3 v3.39.0/go.mod h1:NJKIMDw2+SicDcdF+CHnJU7/PP9ZmQExKrXSOwgikpk= +github.com/go-task/task/v3 v3.39.2 h1:Zt7KXHmMNq5xWZ1ihphDb+n2zYLCo4BdRe09AnMMIgA= +github.com/go-task/task/v3 v3.39.2/go.mod h1:NJKIMDw2+SicDcdF+CHnJU7/PP9ZmQExKrXSOwgikpk= github.com/go-task/template v0.1.0 h1:ym/r2G937RZA1bsgiWedNnY9e5kxDT+3YcoAnuIetTE= github.com/go-task/template v0.1.0/go.mod h1:RgwRaZK+kni/hJJ7/AaOE2lPQFPbAdji/DyhC6pxo4k= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= @@ -572,8 +572,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -622,17 +622,17 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/perf v0.0.0-20240910214617-f1a715d501dd h1:l5GKMQRDraD2wt8CE86tdfOd39FdQM8T+yaElVLQle8= -golang.org/x/perf v0.0.0-20240910214617-f1a715d501dd/go.mod h1:m63Bhbt9hBaCdTpgrZsBjV9hgEtT7i55ernIePKse5o= -golang.org/x/pkgsite v0.0.0-20240913130837-7d0ea0a0e8cd h1:qHNaB6IGaSu2VYjIUJ1JHHCBaxhi+eKUnZx5XfTTVBI= -golang.org/x/pkgsite v0.0.0-20240913130837-7d0ea0a0e8cd/go.mod h1:nBSruJOdmmGUxPbve1bO8NqwFbuw9tK0XPhXZFCagJE= +golang.org/x/perf v0.0.0-20241004173025-94b0db8a2472 h1:kifBcAOhV9fBI1RN0vai5zSvvOjhBTjvymGbRIKB0M4= +golang.org/x/perf v0.0.0-20241004173025-94b0db8a2472/go.mod h1:wLQChX6XSStqGCueXQW/40U3ucTK44jnINeZ0omqPIQ= +golang.org/x/pkgsite v0.0.0-20241004190937-78391ec0fb95 h1:nIInVSe8lgGApT7YLaxb/1vjXqMZQpAhJGvcTR/z7xw= +golang.org/x/pkgsite v0.0.0-20241004190937-78391ec0fb95/go.mod h1:WQqRi7ukuWdiolvnJMxvLGNJKtUw2zo8B7qt/sp1y00= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -670,14 +670,14 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 h1:FemxDzfMUcK2f3YY4H+05K9CDzbSVr2+q/JKN45pey0= golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -685,8 +685,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -711,8 +711,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= -golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/vuln v1.1.3 h1:NPGnvPOTgnjBc9HTaUx+nj+EaUYxl5SJOWqaDYGaFYw= golang.org/x/vuln v1.1.3/go.mod h1:7Le6Fadm5FOqE9C926BCD0g12NWyhg7cxV4BwcPFuNY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tools/golangci/go.mod b/tools/golangci/go.mod index b3484935..f6b94001 100644 --- a/tools/golangci/go.mod +++ b/tools/golangci/go.mod @@ -4,7 +4,7 @@ module github.com/FerretDB/dance/tools/golangci go 1.23 -toolchain go1.23.1 +toolchain go1.23.2 require github.com/golangci/golangci-lint v1.61.0