diff --git a/go.mod b/go.mod index f32836b23d..43234975cc 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( k8s.io/api v0.30.3 k8s.io/apimachinery v0.30.3 k8s.io/code-generator v0.30.3 - knative.dev/client/pkg v0.0.0 + knative.dev/client/pkg v0.0.0-00010101000000-000000000000 knative.dev/hack v0.0.0-20240814130635-06f7aff93954 knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c @@ -126,7 +126,7 @@ require ( k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 // indirect - knative.dev/eventing v0.42.1-0.20240820132224-5fc4c0fcd118 // indirect + knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect diff --git a/go.sum b/go.sum index 9fc1eec8fd..6e1989116c 100644 --- a/go.sum +++ b/go.sum @@ -838,8 +838,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 h1:jBfmxcR0H5Z9IzamelZtmmg9jfeOXfssllUVX5M4Xzs= knative.dev/client-pkg v0.0.0-20240808015000-22f598931483/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg= -knative.dev/eventing v0.42.1-0.20240820132224-5fc4c0fcd118 h1:DWuqESfz3MSaxrb7ZRhVpNS71f81hY1tyi0Q9DwDJDw= -knative.dev/eventing v0.42.1-0.20240820132224-5fc4c0fcd118/go.mod h1:eTJLSCpHchscm2VV/e10w3HcGIB7dOYdGAzeBIRmJ08= +knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea h1:j3bFBE797vD6IZJsECQ5lEENumLp817rkQxANrbKxHs= +knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea/go.mod h1:Clx8z37Nwg321H9+vGNxp5C6bVdo4l4XM5g6T5CgZVI= knative.dev/hack v0.0.0-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM= knative.dev/hack v0.0.0-20240814130635-06f7aff93954/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b h1:ws/Jeho6on84+5tfNKLAKriVVGIwivHbgPEtZjBfcs0= diff --git a/go.work.sum b/go.work.sum index ceffe76b7c..d4c5d82214 100644 --- a/go.work.sum +++ b/go.work.sum @@ -378,8 +378,8 @@ knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d h1:pj+XufdayIdxV/PUFpuIB1 knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d/go.mod h1:vxgDv5XOAYFa2LrreP8quBiyKB2HB2fqWG6nc6LmDR4= knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954 h1:0yjDplGHUnZ8NpcfgmH0thXSzG28VSM16hb3Vz171l8= knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954/go.mod h1:jRH/sx6mwwuMVhvJgnzSaoYA1N4qaIkJa+zxEGtVA5I= -knative.dev/reconciler-test v0.0.0-20240814180205-22954a20fd47 h1:56SJFVaVl05ae1rtKm145mhSDbDkbUy26nxnExobzSM= -knative.dev/reconciler-test v0.0.0-20240814180205-22954a20fd47/go.mod h1:GmL2taVxYoXADdFOl534FcW+rYDQP6LDjWj82Q5yQDI= +knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617 h1:UW3CH3wWocQiQKQYxf8gdDw9EEOgL31GU8yXY4w5lE8= +knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617/go.mod h1:GmL2taVxYoXADdFOl534FcW+rYDQP6LDjWj82Q5yQDI= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= diff --git a/hack/build.sh b/hack/build.sh index 3ba585fce6..909304897b 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -368,7 +368,6 @@ if has_flag --debug; then fi # Shared funcs from hack repo - # shellcheck disable=SC1090 source "$(go run knative.dev/hack/cmd/script library.sh)" diff --git a/hack/tools.go b/hack/tools.go index 2a4f4f706f..6002ea174f 100644 --- a/hack/tools.go +++ b/hack/tools.go @@ -18,7 +18,7 @@ package tools // This package imports things required by this repository, to force `go mod` to see them as dependencies import ( - _ "knative.dev/hack/cmd/script" + _ "knative.dev/hack/cmd/script" // Allow calling embedded scripts from hack _ "knative.dev/pkg/hack" _ "k8s.io/code-generator" diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index 79c1abcaa4..31e23ef9c2 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -22,12 +22,14 @@ set -o pipefail source "$(go run knative.dev/hack/cmd/script library.sh)" "${REPO_ROOT_DIR}"/hack/build.sh --codegen -if output="$(git status --porcelain)" && [ -z "$output" ]; then - subheader "${REPO_ROOT_DIR} is up to date." -else + +if ! git diff --exit-code --name-only > /dev/null; then error 'Modified files found:' - git status --porcelain - error 'Diff' - git diff - abort "${REPO_ROOT_DIR} is out of date. Please run ./hack/build.sh -c and commit." + git diff --name-only + error 'Difference:' + git --no-pager diff + abort "${MODULE_NAME} is out of date!" "" \ + "Please, run ./hack/build.sh -c and commit." fi + +header "${MODULE_NAME} is up to date." diff --git a/pkg/commands/broker/broker.go b/pkg/commands/broker/broker.go index 1d8f1ea9d6..c642f757df 100644 --- a/pkg/commands/broker/broker.go +++ b/pkg/commands/broker/broker.go @@ -5,7 +5,7 @@ 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 + 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, diff --git a/pkg/go.mod b/pkg/go.mod index 66bb5644b9..856c257dce 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -28,7 +28,7 @@ require ( k8s.io/client-go v0.30.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 - knative.dev/eventing v0.42.1-0.20240820132224-5fc4c0fcd118 + knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c knative.dev/serving v0.42.1-0.20240820122005-5f5f6d820b03 @@ -82,7 +82,7 @@ require ( github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/pkg/go.sum b/pkg/go.sum index d3fc36ded6..29ebc06ca1 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -292,8 +292,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 h1:P8UmIzZMYDR+NGImiFvErt6VWfIRPuGM+vyjiEdkmIw= github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= @@ -868,8 +868,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 h1:jBfmxcR0H5Z9IzamelZtmmg9jfeOXfssllUVX5M4Xzs= knative.dev/client-pkg v0.0.0-20240808015000-22f598931483/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg= -knative.dev/eventing v0.42.1-0.20240820132224-5fc4c0fcd118 h1:DWuqESfz3MSaxrb7ZRhVpNS71f81hY1tyi0Q9DwDJDw= -knative.dev/eventing v0.42.1-0.20240820132224-5fc4c0fcd118/go.mod h1:eTJLSCpHchscm2VV/e10w3HcGIB7dOYdGAzeBIRmJ08= +knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea h1:j3bFBE797vD6IZJsECQ5lEENumLp817rkQxANrbKxHs= +knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea/go.mod h1:Clx8z37Nwg321H9+vGNxp5C6bVdo4l4XM5g6T5CgZVI= knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b h1:ws/Jeho6on84+5tfNKLAKriVVGIwivHbgPEtZjBfcs0= knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b/go.mod h1:2eMQVGLBZ5Kj1C4kKPuPhO7BsUeF6fkmhZFDQPIP+88= knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c h1:2crXVk4FG0dSG6WHaIT+WKbUzn7qG2wn0AfYmvA22zs= diff --git a/test/upload-test-images.sh b/test/upload-test-images.sh index 7be1df1d11..05dc0669db 100755 --- a/test/upload-test-images.sh +++ b/test/upload-test-images.sh @@ -39,7 +39,7 @@ function upload_test_images() { # ko resolve is being used for the side-effect of publishing images, # so the resulting yaml produced is ignored. # We limit the number of concurrent builds (jobs) to avoid OOMs. - go run github.com/google/ko@v0.15.4 \ + ko \ resolve \ --jobs=4 \ "${platform[@]}" \