diff options
| author |  Yong Tang <yong.tang.github@outlook.com>
| 2022-03-14 09:09:50 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-03-14 09:09:50 -0700 |
| commit | 54531d0a4403bd15b2c152f8a987e3d628a9b7cc (patch) | |
| tree | cb6adbfea086c2e2fd583c24e41836fffe2c488e | |
| parent | a7ae4bb8832c51d3ae605f61087a423a04e82bf8 (diff) | |
| download | coredns-54531d0a4403bd15b2c152f8a987e3d628a9b7cc.tar.gz coredns-54531d0a4403bd15b2c152f8a987e3d628a9b7cc.tar.zst coredns-54531d0a4403bd15b2c152f8a987e3d628a9b7cc.zip | |
Clean up dependency on github.com/golang/protobuf (#5222)
This PR cldean up remaining left over of github.com/golang/protobuf in coredns,
as github.com/golang/protobuf has been deprecated.
Note the github.com/golang/protobuf is now only indirectly
used by external libraries. Manually updating coredns' dependency to futher clean up has been tried.
However, it was not possible as external library usages of github.com/golang/protobuf are too interleaved.
This PR fixes 4939.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | plugin/dnstap/encoder.go | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -11,7 +11,6 @@ require ( github.com/coredns/caddy v1.1.1 github.com/dnstap/golang-dnstap v0.4.0 github.com/farsightsec/golang-framestream v0.3.0 - github.com/golang/protobuf v1.5.2 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 github.com/matttproud/golang_protobuf_extensions v1.0.1 @@ -66,6 +65,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.2.0 // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.7 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect diff --git a/plugin/dnstap/encoder.go b/plugin/dnstap/encoder.go index 09b1e2e6f..93d3e73d9 100644 --- a/plugin/dnstap/encoder.go +++ b/plugin/dnstap/encoder.go @@ -6,7 +6,7 @@ import ( tap "github.com/dnstap/golang-dnstap" fs "github.com/farsightsec/golang-framestream" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" ) // encoder wraps a golang-framestream.Encoder. |