diff --git a/go.mod b/go.mod index 42dd2020f..67018a431 100644 --- a/go.mod +++ b/go.mod @@ -21,9 +21,9 @@ require ( k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 k8s.io/code-generator v0.29.2 - knative.dev/hack v0.0.0-20240222141347-5f0998e65262 - knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62 - knative.dev/pkg v0.0.0-20240227021706-97fb318ab987 + knative.dev/hack v0.0.0-20240302114326-e6dedc74dc47 + knative.dev/networking v0.0.0-20240301213829-48fd99cee22f + knative.dev/pkg v0.0.0-20240301013300-145b9017fff8 ) require ( diff --git a/go.sum b/go.sum index a9d8120dd..1f9c771e5 100644 --- a/go.sum +++ b/go.sum @@ -718,12 +718,12 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/hack v0.0.0-20240222141347-5f0998e65262 h1:QzYYQnuTjZAHamqbVLnaoxsa1bxfhpxM2AUhdfeL6qE= -knative.dev/hack v0.0.0-20240222141347-5f0998e65262/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62 h1:SkftWb1pXigIhCZJk3LI6gZLz+YqS2Qh5r4w+rI47fs= -knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62/go.mod h1:Llg1nQIqMqiMTmfKyebjCvkSjzRqqQ6Z23oyCMVla7c= -knative.dev/pkg v0.0.0-20240227021706-97fb318ab987 h1:zdXI4ZgLKD+3wdHNMRTTcTxDcjuPv+IuSDIbGKcOX4g= -knative.dev/pkg v0.0.0-20240227021706-97fb318ab987/go.mod h1:RcjeKl+Pv5Ufdvs8COdJEHJKutJh42yfIXILGOjy1ng= +knative.dev/hack v0.0.0-20240302114326-e6dedc74dc47 h1:ob3nmyZw8vJbvnHQdnDTG/5RDeUKBj5erjTdef/Mpew= +knative.dev/hack v0.0.0-20240302114326-e6dedc74dc47/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/networking v0.0.0-20240301213829-48fd99cee22f h1:4NtA408WaBmyCKCuSq3AD027/YvyjC6ltF4YNNHGj5U= +knative.dev/networking v0.0.0-20240301213829-48fd99cee22f/go.mod h1:Llg1nQIqMqiMTmfKyebjCvkSjzRqqQ6Z23oyCMVla7c= +knative.dev/pkg v0.0.0-20240301013300-145b9017fff8 h1:NnFumOSY3xsUMPInOcllg2GzxKeP+MU448wn7L66QpY= +knative.dev/pkg v0.0.0-20240301013300-145b9017fff8/go.mod h1:RcjeKl+Pv5Ufdvs8COdJEHJKutJh42yfIXILGOjy1ng= 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/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 0f3ef5979..ca67e6848 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -497,7 +497,7 @@ function report_go_test() { logfile="${logfile/.xml/.jsonl}" echo "Running go test with args: ${go_test_args[*]}" local gotest_retcode=0 - go_run gotest.tools/gotestsum@v1.10.1 \ + go_run gotest.tools/gotestsum@v1.11.0 \ --format "${GO_TEST_VERBOSITY:-testname}" \ --junitfile "${xml}" \ --junitfile-testsuite-name relative \ @@ -517,7 +517,7 @@ function report_go_test() { echo "Test log (ANSI) written to ${ansilog}" htmllog="${logfile/.jsonl/.html}" - go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.9.1 \ + go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.11.0 \ --preview < "$ansilog" > "$htmllog" echo "Test log (HTML) written to ${htmllog}" diff --git a/vendor/knative.dev/networking/test/e2e-common.sh b/vendor/knative.dev/networking/test/e2e-common.sh deleted file mode 100644 index 6f9dc6eae..000000000 --- a/vendor/knative.dev/networking/test/e2e-common.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2020 The Knative Authors -# -# 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. - -# This script includes common functions for testing setup and teardown. -source $(dirname $0)/../vendor/knative.dev/hack/e2e-tests.sh - -# Add function call to trap -# Parameters: $1 - Function to call -# $2...$n - Signals for trap -function add_trap() { - local cmd=$1 - shift - for trap_signal in $@; do - local current_trap="$(trap -p $trap_signal | cut -d\' -f2)" - local new_cmd="($cmd)" - [[ -n "${current_trap}" ]] && new_cmd="${current_trap};${new_cmd}" - trap -- "${new_cmd}" $trap_signal - done -} diff --git a/vendor/knative.dev/networking/test/e2e-tests.sh b/vendor/knative.dev/networking/test/e2e-tests.sh deleted file mode 100644 index e69cc268f..000000000 --- a/vendor/knative.dev/networking/test/e2e-tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Copyright 2020 The Knative Authors -# -# 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. - -source $(dirname $0)/e2e-common.sh - - -# Script entry point. -initialize $@ --skip-istio-addon - -success diff --git a/vendor/knative.dev/networking/test/presubmit-tests.sh b/vendor/knative.dev/networking/test/presubmit-tests.sh index 9fb0aba5b..b726c175a 100644 --- a/vendor/knative.dev/networking/test/presubmit-tests.sh +++ b/vendor/knative.dev/networking/test/presubmit-tests.sh @@ -23,8 +23,6 @@ source $(dirname $0)/../vendor/knative.dev/hack/presubmit-tests.sh -# TODO(mattmoor): integration tests - # We use the default build, unit and integration test runners. main "$@" diff --git a/vendor/modules.txt b/vendor/modules.txt index b09e40ddf..523f600ba 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1010,10 +1010,10 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20240222141347-5f0998e65262 +# knative.dev/hack v0.0.0-20240302114326-e6dedc74dc47 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20240227132105-cfb3abdd3c62 +# knative.dev/networking v0.0.0-20240301213829-48fd99cee22f ## explicit; go 1.21 knative.dev/networking/config knative.dev/networking/pkg @@ -1054,7 +1054,7 @@ knative.dev/networking/test/test_images/runtime/handlers knative.dev/networking/test/test_images/timeout knative.dev/networking/test/test_images/wsserver knative.dev/networking/test/types -# knative.dev/pkg v0.0.0-20240227021706-97fb318ab987 +# knative.dev/pkg v0.0.0-20240301013300-145b9017fff8 ## explicit; go 1.21 knative.dev/pkg/apis knative.dev/pkg/apis/duck