From 3501bfe4f8dbc058fb0a0466b13cb4653d7e66f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:12:16 +0200 Subject: [PATCH] fix(deps): update module go.uber.org/zap to v1.26.0 (#7169) * fix(deps): update module go.uber.org/zap to v1.26.0 * make generate --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Morello --- NOTICE.txt | 37 +++------------------------- docs/reference/dependencies.asciidoc | 3 +-- go.mod | 2 +- go.sum | 5 ++-- hack/upgrade-test-harness/go.mod | 2 +- hack/upgrade-test-harness/go.sum | 2 ++ 6 files changed, 10 insertions(+), 41 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 1986aece3c..7aa958b971 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3786,11 +3786,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Module : go.uber.org/zap -Version : v1.25.0 -Time : 2023-08-02T05:47:56Z +Version : v1.26.0 +Time : 2023-09-14T20:29:58Z Licence : MIT -Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.25.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.26.0/LICENSE.txt: Copyright (c) 2016-2017 Uber Technologies, Inc. @@ -5688,37 +5688,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -Module : github.com/benbjohnson/clock -Version : v1.3.0 -Time : 2021-11-15T23:27:27Z -Licence : MIT - -Contents of probable licence file $GOMODCACHE/github.com/benbjohnson/clock@v1.3.0/LICENSE: - -The MIT License (MIT) - -Copyright (c) 2014 Ben Johnson - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - -------------------------------------------------------------------------------- Module : github.com/beorn7/perks Version : v1.0.1 diff --git a/docs/reference/dependencies.asciidoc b/docs/reference/dependencies.asciidoc index 879284af20..2de47985c7 100644 --- a/docs/reference/dependencies.asciidoc +++ b/docs/reference/dependencies.asciidoc @@ -49,7 +49,7 @@ This page lists the third-party dependencies used to build {n}. | link:https://go.elastic.co/apm/module/apmzap/v2[$$go.elastic.co/apm/module/apmzap/v2$$] | v2.4.4 | Apache-2.0 | link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.4.4 | Apache-2.0 | link:https://go.uber.org/automaxprocs[$$go.uber.org/automaxprocs$$] | v1.5.3 | MIT -| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.25.0 | MIT +| link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.26.0 | MIT | link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.13.0 | BSD-3-Clause | link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.1 | MIT | link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.28.2 | Apache-2.0 @@ -74,7 +74,6 @@ This page lists the third-party dependencies used to build {n}. | link:https://github.com/Masterminds/semver[$$github.com/Masterminds/semver/v3$$] | v3.2.0 | MIT | link:https://github.com/armon/go-radix[$$github.com/armon/go-radix$$] | v1.0.0 | MIT | link:https://github.com/armon/go-socks5[$$github.com/armon/go-socks5$$] | v0.0.0-20160902184237-e75332964ef5 | MIT -| link:https://github.com/benbjohnson/clock[$$github.com/benbjohnson/clock$$] | v1.3.0 | MIT | link:https://github.com/beorn7/perks[$$github.com/beorn7/perks$$] | v1.0.1 | MIT | link:https://github.com/cenkalti/backoff[$$github.com/cenkalti/backoff/v3$$] | v3.0.0 | MIT | link:https://github.com/cespare/xxhash[$$github.com/cespare/xxhash/v2$$] | v2.2.0 | MIT diff --git a/go.mod b/go.mod index 14fd9b6dcd..274f9cae01 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( go.elastic.co/apm/module/apmzap/v2 v2.4.4 go.elastic.co/apm/v2 v2.4.4 go.uber.org/automaxprocs v1.5.3 - go.uber.org/zap v1.25.0 + go.uber.org/zap v1.26.0 golang.org/x/crypto v0.13.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.2 diff --git a/go.sum b/go.sum index 147adbd15e..3934a9aaf7 100644 --- a/go.sum +++ b/go.sum @@ -52,7 +52,6 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -408,8 +407,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/hack/upgrade-test-harness/go.mod b/hack/upgrade-test-harness/go.mod index 2a762241cd..5669f3650f 100644 --- a/hack/upgrade-test-harness/go.mod +++ b/hack/upgrade-test-harness/go.mod @@ -8,7 +8,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/jonboulle/clockwork v0.4.0 github.com/spf13/cobra v1.7.0 - go.uber.org/zap v1.25.0 + go.uber.org/zap v1.26.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.22.4 k8s.io/apimachinery v0.22.4 diff --git a/hack/upgrade-test-harness/go.sum b/hack/upgrade-test-harness/go.sum index 76d2461ce0..126c3073f7 100644 --- a/hack/upgrade-test-harness/go.sum +++ b/hack/upgrade-test-harness/go.sum @@ -484,6 +484,8 @@ go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=