diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml index 3055ba43c89..5e4f0b04753 100644 --- a/.github/workflows/check-generated.yml +++ b/.github/workflows/check-generated.yml @@ -26,8 +26,6 @@ jobs: run: | set -euo pipefail - readonly MOCKERY=2.12.3 # N.B. no leading "v" - curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf - make mockery 2>/dev/null if ! git diff --stat --exit-code ; then diff --git a/go.mod b/go.mod index 44d40528a63..f73dee98508 100644 --- a/go.mod +++ b/go.mod @@ -47,10 +47,12 @@ require ( github.com/pointlander/peg v1.0.1 github.com/prometheus/common v0.34.0 github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca - github.com/vektra/mockery/v2 v2.14.0 ) -require github.com/prometheus/client_model v0.2.0 +require ( + github.com/prometheus/client_model v0.2.0 + github.com/vektra/mockery/v2 v2.14.0 +) require ( 4d63.com/gochecknoglobals v0.1.0 // indirect @@ -119,7 +121,7 @@ require ( github.com/gofrs/flock v0.8.1 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/snappy v0.0.1 // indirect + github.com/golang/snappy v0.0.3 // indirect github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect diff --git a/go.sum b/go.sum index 7ea4c555933..09adf7346da 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,9 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= diff --git a/scripts/mockery_generate.sh b/scripts/mockery_generate.sh index 2d6f40e6389..2509e0cdbeb 100755 --- a/scripts/mockery_generate.sh +++ b/scripts/mockery_generate.sh @@ -1,15 +1,6 @@ #!/bin/sh # # Invoke Mockery v2 to update generated mocks for the given type. -# -# This script runs a locally-installed "mockery" if available, otherwise it -# runs the published Docker container. This legerdemain is so that the CI build -# and a local build can work off the same script. -# -if ! which mockery ; then - mockery() { - docker run --rm -v "$PWD":/w --workdir=/w vektra/mockery:v2.12.3 - } -fi -mockery --disable-version-string --case underscore --name "$@" +go run github.com/vektra/mockery/v2 --disable-version-string --case underscore --name "$*" +