diff --git a/.golangci.yml b/.golangci.yml index db69692ea9..ac8ab884d1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -120,6 +120,8 @@ linters-settings: desc: not allowed, use github.com/tikv/client-go/v2/txnkv - pkg: "github.com/gogo/protobuf" desc: "not allowed, gogo protobuf is deprecated" + - pkg: "github.com/golang/protobuf/proto" + desc: "not allowed, protobuf v1 is deprecated, use google.golang.org/protobuf/proto instead" forbidigo: forbid: - '^time\.Tick$' diff --git a/go.mod b/go.mod index 883a1429c0..6bf19d3cea 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/go-playground/validator/v10 v10.14.0 github.com/gofrs/flock v0.8.1 github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.4 + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/klauspost/compress v1.17.7 diff --git a/internal/proxy/util.go b/internal/proxy/util.go index 1471652521..fcc7418d6e 100644 --- a/internal/proxy/util.go +++ b/internal/proxy/util.go @@ -25,10 +25,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/metadata" + "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/commonpb" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" diff --git a/tests/integration/levelzero/delete_on_growing_test.go b/tests/integration/levelzero/delete_on_growing_test.go index 012db115a7..283288b68b 100644 --- a/tests/integration/levelzero/delete_on_growing_test.go +++ b/tests/integration/levelzero/delete_on_growing_test.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/golang/protobuf/proto" "go.uber.org/zap" + "google.golang.org/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/v2/milvuspb" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb"