Skip to content

Commit 0afef27

Browse files
fuqianggaofuqianggao
authored
Return Any message type instead of NotFound in csds-client util. (#29)
So that csds-client don't throw error with message type not linked. Signed-off-by: fuqianggao <[email protected]>
1 parent e9720e5 commit 0afef27

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

‎csds-client/client/util/util.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/awalterschulze/gographviz"
2020
"github.com/emirpasic/gods/sets/treeset"
2121
envoy_api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
22+
envoy_config_accesslog_v2 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2"
2223
envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
2324
envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
2425
envoy_config_filter_http_cors_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/cors/v2"
@@ -27,6 +28,7 @@ import (
2728
envoy_config_filter_network_http_connection_manager_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2"
2829
envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
2930
envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
31+
envoy_extensions_accesslog_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
3032
envoy_extensions_filters_http_cors_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cors/v3"
3133
envoy_extensions_filters_http_fault_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3"
3234
envoy_extensions_filters_http_router_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
@@ -37,6 +39,7 @@ import (
3739
"google.golang.org/grpc/credentials/oauth"
3840
"google.golang.org/protobuf/encoding/protojson"
3941
"google.golang.org/protobuf/proto"
42+
"google.golang.org/protobuf/types/known/anypb"
4043
"google.golang.org/protobuf/reflect/protoreflect"
4144
"google.golang.org/protobuf/reflect/protoregistry"
4245
)
@@ -114,8 +117,15 @@ func (r *TypeResolver) FindMessageByURL(url string) (protoreflect.MessageType, e
114117
case "type.googleapis.com/envoy.extensions.filters.http.cors.v3.Cors":
115118
cors := envoy_extensions_filters_http_cors_v3.Cors{}
116119
return cors.ProtoReflect().Type(), nil
120+
case "type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog":
121+
fileAccessLog := envoy_config_accesslog_v2.FileAccessLog{}
122+
return fileAccessLog.ProtoReflect().Type(), nil
123+
case "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog":
124+
fileAccessLog := envoy_extensions_accesslog_v3.FileAccessLog{}
125+
return fileAccessLog.ProtoReflect().Type(), nil
117126
default:
118-
return nil, protoregistry.NotFound
127+
dummy := anypb.Any{}
128+
return dummy.ProtoReflect().Type(), nil
119129
}
120130
}
121131

‎csds-client/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ require (
1414
github.com/golang/mock v1.4.4
1515
golang.org/x/sys v0.0.0-20200819171115-d785dc25833f // indirect
1616
google.golang.org/grpc v1.31.0
17-
google.golang.org/protobuf v1.25.0
17+
google.golang.org/protobuf v1.26.0
1818
gopkg.in/yaml.v2 v2.3.0 // indirect
1919
)

‎csds-client/go.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
9494
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
9595
github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
9696
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
97+
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
98+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
9799
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
98100
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
99101
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -105,6 +107,7 @@ github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
105107
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
106108
github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
107109
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
110+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
108111
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
109112
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
110113
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -395,6 +398,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
395398
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
396399
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
397400
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
401+
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
402+
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
403+
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
398404
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
399405
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
400406
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=

0 commit comments

Comments
 (0)