From fd05bf146e737e45704e6cbf0856d33fd9fd4967 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Wed, 27 Apr 2022 10:12:52 -0400 Subject: [PATCH] upgrade to latest dependencies (#2500) bumping knative.dev/hack 6ffd841...5f47386: > 5f47386 Update community files (# 171) > 2a09b5c only use `install` for run_go_tool (# 169) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- vendor/knative.dev/hack/library.sh | 21 +++++++-------------- vendor/modules.txt | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index c3407972f..a05d9c219 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( k8s.io/code-generator v0.23.5 k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b k8s.io/klog/v2 v2.60.1-0.20220317184644-43cc75f9ae89 - knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c + knative.dev/hack v0.0.0-20220427014036-5f473869d377 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index a83b84c10..67ab8dbfa 100644 --- a/go.sum +++ b/go.sum @@ -1191,8 +1191,8 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c h1:aXsFXeky/GccNQxwf72CS4NR3EoqTqsCVNKQnblfwr0= -knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20220427014036-5f473869d377 h1:NMJG3LkOZ5Xut7TzbxtwaQAmT8ZBfDMxwCkoatZv8ms= +knative.dev/hack v0.0.0-20220427014036-5f473869d377/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= pgregory.net/rapid v0.3.3 h1:jCjBsY4ln4Atz78QoBWxUEvAHaFyNDQg9+WU62aCn1U= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 8f7b3997e..895800b31 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -544,26 +544,19 @@ function start_latest_eventing_sugar_controller() { } # Run a go tool, installing it first if necessary. -# Parameters: $1 - tool package/dir for go get/install. +# Parameters: $1 - tool package/dir for go install. # $2 - tool to run. # $3..$n - parameters passed to the tool. function run_go_tool() { + local package=$1 local tool=$2 local install_failed=0 + # If no `@version` is provided, default to adding `@latest` + if [[ "$package" != *@* ]]; then + package=$package@latest + fi if [[ -z "$(which ${tool})" ]]; then - local action=get - [[ $1 =~ ^[\./].* ]] && action=install - # Avoid running `go get` from root dir of the repository, as it can change go.sum and go.mod files. - # See discussions in https://github.com/golang/go/issues/27643. - if [[ ${action} == "get" && $(pwd) == "${REPO_ROOT_DIR}" ]]; then - local temp_dir="$(mktemp -d)" - # Swallow the output as we are returning the stdout in the end. - pushd "${temp_dir}" > /dev/null 2>&1 - GOFLAGS="" go ${action} "$1" || install_failed=1 - popd > /dev/null 2>&1 - else - GOFLAGS="" go ${action} "$1" || install_failed=1 - fi + GOFLAGS="" go install "$package" || install_failed=1 fi (( install_failed )) && return ${install_failed} shift 2 diff --git a/vendor/modules.txt b/vendor/modules.txt index 4c33001dc..2a79ee5e7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1080,7 +1080,7 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c +# knative.dev/hack v0.0.0-20220427014036-5f473869d377 ## explicit; go 1.14 knative.dev/hack # sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6