From 439229417b09a72b2f03e9a1aa50c672aed66cab Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Mon, 25 Jul 2022 11:39:23 -0400 Subject: [PATCH] pull in latest knative.dev/hack changes (#5132) --- go.mod | 2 +- go.sum | 4 +-- .../VENDOR-LICENSE/golang.org/x/sys/LICENSE | 27 ------------------- vendor/knative.dev/hack/library.sh | 6 +---- vendor/modules.txt | 2 +- 5 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 third_party/VENDOR-LICENSE/golang.org/x/sys/LICENSE diff --git a/go.mod b/go.mod index 46f166cce..0329b8461 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 // indirect - knative.dev/hack v0.0.0-20220722185521-123a2783c4d8 + knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1 ) replace go.opencensus.io => go.opencensus.io v0.20.2 diff --git a/go.sum b/go.sum index 748a052e2..0d9471ce8 100644 --- a/go.sum +++ b/go.sum @@ -538,8 +538,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -knative.dev/hack v0.0.0-20220722185521-123a2783c4d8 h1:nqgnAXhOPokDf/BumO5aTqEo7R1+mhMVcjmGVft7vUM= -knative.dev/hack v0.0.0-20220722185521-123a2783c4d8/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I= +knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1 h1:90z6q68YSEUuPR5P5j8W6viTO8Pi/MhNnHEIhX3Uvnk= +knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/third_party/VENDOR-LICENSE/golang.org/x/sys/LICENSE b/third_party/VENDOR-LICENSE/golang.org/x/sys/LICENSE deleted file mode 100644 index 6a66aea5e..000000000 --- a/third_party/VENDOR-LICENSE/golang.org/x/sys/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index c736af325..26cd00cb8 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -558,9 +558,6 @@ function go_run() { if [[ "$package" != *@* ]]; then abort 'Package for "go_run" needs to have @version' fi - if [[ "$package" == *@latest ]] && [[ "$package" != knative.dev* ]]; then - warning 'Using @latest version for external dependencies is unsafe. Use numbered version!' - fi shift 1 GORUN_PATH="${GORUN_PATH:-$(go env GOPATH)}" # Some CI environments may have non-writable GOPATH @@ -580,7 +577,6 @@ function go_run() { # $3..$n - parameters passed to the tool. # Deprecated: use go_run instead function run_go_tool() { - warning 'The "run_go_tool" function is deprecated. Use "go_run" instead.' local package=$1 # If no `@version` is provided, default to adding `@latest` if [[ "$package" != *@* ]]; then @@ -650,7 +646,7 @@ function go_update_deps() { else group "Upgrading to release ${RELEASE}" fi - FLOATING_DEPS+=( $(go_run knative.dev/test-infra/buoy@latest buoy float ${REPO_ROOT_DIR}/go.mod "${buoyArgs[@]}") ) + FLOATING_DEPS+=( $(go_run knative.dev/test-infra/buoy@latest float ${REPO_ROOT_DIR}/go.mod "${buoyArgs[@]}") ) if [[ ${#FLOATING_DEPS[@]} > 0 ]]; then echo "Floating deps to ${FLOATING_DEPS[@]}" go get -d ${FLOATING_DEPS[@]} diff --git a/vendor/modules.txt b/vendor/modules.txt index 5052bd9ae..36755c929 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -286,7 +286,7 @@ gopkg.in/go-playground/webhooks.v3/github gopkg.in/yaml.v2 # honnef.co/go/tools v0.0.1-2020.1.5 ## explicit -# knative.dev/hack v0.0.0-20220722185521-123a2783c4d8 +# knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1 ## explicit knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2