From 4f5312807b90fd7ff044acb7ac0ddbbc91473863 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Tue, 17 Aug 2021 08:53:22 -0500 Subject: [PATCH] Undo dep hacks to work around gRPC example module. This is essentially reverting 87c7e89b139a8024d8b00bfbd18e500cc25937e4. Signed-off-by: Matt Moyer --- go.mod | 4 ---- go.sum | 1 + hack/dependencyhacks/grpcexamples/go.mod | 3 --- hack/module.sh | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 hack/dependencyhacks/grpcexamples/go.mod diff --git a/go.mod b/go.mod index b5f20e9d..3fc7d215 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,3 @@ replace github.com/oleiade/reflections v1.0.0 => github.com/oleiade/reflections // We use the SHA of github.com/form3tech-oss/jwt-go@v3.2.2 to get around "used for two different module paths" // https://golang.org/issues/26904 replace github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/form3tech-oss/jwt-go v0.0.0-20200915135329-9162a5abdbc0 - -// Pin a gRPC module that's only used in some tests. -// This is required because sometime after v1.29.1, they moved this package into a separate module. -replace google.golang.org/grpc/examples => ./hack/dependencyhacks/grpcexamples/ diff --git a/go.sum b/go.sum index fe9d15bc..be450e2d 100644 --- a/go.sum +++ b/go.sum @@ -1793,6 +1793,7 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc/examples v0.0.0-20210304020650-930c79186c99/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/hack/dependencyhacks/grpcexamples/go.mod b/hack/dependencyhacks/grpcexamples/go.mod deleted file mode 100644 index 47491cc5..00000000 --- a/hack/dependencyhacks/grpcexamples/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module google.golang.org/grpc/examples - -go 1.14 diff --git a/hack/module.sh b/hack/module.sh index f7c2d0d2..12f53d6b 100755 --- a/hack/module.sh +++ b/hack/module.sh @@ -46,7 +46,7 @@ function with_modules() { env_vars="KUBE_CACHE_MUTATION_DETECTOR=${kube_cache_mutation_detector} KUBE_PANIC_WATCH_DECODE_ERROR=${kube_panic_watch_decode_error}" pushd "${ROOT}" >/dev/null - for mod_file in $(find . -maxdepth 4 -not -path "./generated/*" -not -path "./hack/*" -name go.mod | sort); do + for mod_file in $(find . -maxdepth 4 -not -path "./generated/*" -name go.mod | sort); do mod_dir="$(dirname "${mod_file}")" ( echo "=> "