From 02ab9eca17eff36376b51a7f1cf661cf0ca60203 Mon Sep 17 00:00:00 2001 From: Stallman Wang Date: Mon, 3 May 2021 10:53:50 +0800 Subject: [PATCH 1/3] Update log.go --- log/log.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log/log.go b/log/log.go index 16e6578..d7cc899 100644 --- a/log/log.go +++ b/log/log.go @@ -17,7 +17,7 @@ import ( "strings" "time" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) type LogFormatter struct { From 72ff3800f2c9e04875b7b792e689a04a1388c61a Mon Sep 17 00:00:00 2001 From: Stallman Wang Date: Mon, 3 May 2021 11:09:37 +0800 Subject: [PATCH 2/3] fix google.golang.org/grpc/naming: module google.golang.org/grpc@latest found (v1.37.0), but does not contain package google.golang.org/grpc/naming ``` go: finding module for package google.golang.org/grpc/naming github.com/yunify/metad/backends/etcdv3 imports github.com/coreos/etcd/clientv3 tested by github.com/coreos/etcd/clientv3.test imports github.com/coreos/etcd/integration imports github.com/coreos/etcd/proxy/grpcproxy imports google.golang.org/grpc/naming: module google.golang.org/grpc@latest found (v1.37.0), but does not contain package google.golang.org/grpc/naming ``` --- build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build b/build index 98a51ae..220e099 100755 --- a/build +++ b/build @@ -11,6 +11,15 @@ gen_version echo "Building metad ..." mkdir -p bin + +go mod init + +# fix google.golang.org/grpc/naming: module google.golang.org/grpc@latest found (v1.37.0), but does not contain package google.golang.org/grpc/naming +# https://github.com/yunify/metad/issues/24 +go mod edit -replace google.golang.org/grpc@latest=google.golang.org/grpc@v1.26.0 + +go mod tidy + go build -o $OUTPUT . revert_version From a57aa32eb59e3f45934127ad2db04f7c6123e7d7 Mon Sep 17 00:00:00 2001 From: Stallman Wang Date: Mon, 3 May 2021 11:32:39 +0800 Subject: [PATCH 3/3] Update build --- build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build b/build index 220e099..21c0a62 100755 --- a/build +++ b/build @@ -16,8 +16,9 @@ go mod init # fix google.golang.org/grpc/naming: module google.golang.org/grpc@latest found (v1.37.0), but does not contain package google.golang.org/grpc/naming # https://github.com/yunify/metad/issues/24 -go mod edit -replace google.golang.org/grpc@latest=google.golang.org/grpc@v1.26.0 +go mod edit -replace google.golang.org/grpc@v1.37.0=google.golang.org/grpc@v1.3.0 +go mod vendor go mod tidy go build -o $OUTPUT .