From 0d11bd2b4715eb1e88f8177d321ef35c55a8352f Mon Sep 17 00:00:00 2001 From: Zhonghu Xu Date: Wed, 31 Jul 2019 23:59:02 +0800 Subject: [PATCH] Envoy contol-plane API upgrade (#15949) * upgrade envoy api * related fix * update * update * update * update * update * update * fix * fix * fix * fix * fix * fix * fix --- go.mod | 2 +- go.sum | 2 + istioctl/pkg/auth/listener.go | 4 +- istioctl/pkg/util/configdump/bootstrap.go | 2 +- .../pkg/util/configdump/bootstrap_test.go | 2 +- istioctl/pkg/util/configdump/cluster.go | 2 +- istioctl/pkg/util/configdump/cluster_test.go | 4 +- istioctl/pkg/util/configdump/listener.go | 2 +- istioctl/pkg/util/configdump/listener_test.go | 4 +- istioctl/pkg/util/configdump/route.go | 2 +- istioctl/pkg/util/configdump/route_test.go | 4 +- .../dynamic_attribute_test.go | 4 +- .../dynamic_listener/dynamic_listener_test.go | 12 +- mixer/test/client/gateway/gateway_test.go | 12 +- .../client/pilotplugin/pilotplugin_test.go | 14 +- .../pilotplugin_mtls/pilotplugin_mtls_test.go | 18 +- .../pilotplugin_tcp/pilotplugin_tcp_test.go | 4 +- pilot/pkg/networking/core/v1alpha3/cluster.go | 32 +- .../networking/core/v1alpha3/cluster_test.go | 4 +- .../core/v1alpha3/envoyfilter/deprecated.go | 14 +- .../v1alpha3/envoyfilter/listener_patch.go | 28 +- .../envoyfilter/listener_patch_test.go | 58 +- .../core/v1alpha3/envoyfilter/rc_patch.go | 8 +- .../v1alpha3/envoyfilter/rc_patch_test.go | 12 +- pilot/pkg/networking/core/v1alpha3/gateway.go | 14 +- .../pkg/networking/core/v1alpha3/httproute.go | 32 +- .../pkg/networking/core/v1alpha3/listener.go | 34 +- .../core/v1alpha3/listener_builder.go | 22 +- .../networking/core/v1alpha3/listener_test.go | 2 +- .../loadbalancer/loadbalancer_test.go | 6 +- .../networking/core/v1alpha3/networkfilter.go | 40 +- .../core/v1alpha3/route/retry/retry.go | 2 +- .../networking/core/v1alpha3/route/route.go | 32 +- .../core/v1alpha3/route/route_test.go | 38 +- .../networking/plugin/authz/authorization.go | 4 +- pilot/pkg/networking/plugin/mixer/mixer.go | 22 +- pilot/pkg/networking/plugin/plugin.go | 4 +- pilot/pkg/networking/util/util.go | 38 +- pilot/pkg/networking/util/util_test.go | 20 +- pilot/pkg/proxy/envoy/v2/ads.go | 14 +- pilot/pkg/proxy/envoy/v2/cds.go | 2 +- pilot/pkg/proxy/envoy/v2/eds.go | 22 +- pilot/pkg/proxy/envoy/v2/eds_sh_test.go | 2 +- pilot/pkg/proxy/envoy/v2/eds_test.go | 4 +- pilot/pkg/proxy/envoy/v2/ep_filters.go | 24 +- pilot/pkg/proxy/envoy/v2/ep_filters_test.go | 16 +- pilot/pkg/proxy/envoy/v2/lds.go | 2 +- pilot/pkg/proxy/envoy/v2/lds_test.go | 2 +- pilot/pkg/proxy/envoy/v2/rds.go | 4 +- .../security/authn/v1alpha1/policy_applier.go | 2 +- .../authn/v1alpha1/policy_applier_test.go | 2 +- .../components/echo/docker/sidecar.go | 2 +- .../framework/components/echo/kube/sidecar.go | 2 +- security/pkg/nodeagent/sds/sdsservice.go | 2 +- security/pkg/nodeagent/sds/sdsservice_test.go | 4 +- security/pkg/testing/sdsc/sdsclient.go | 2 +- .../authn/permissive/permissive_test.go | 2 +- .../envoy/admin/v2alpha/certs.pb.go | 5 +- .../envoy/admin/v2alpha/certs.pb.validate.go | 102 +- .../envoy/admin/v2alpha/clusters.pb.go | 8 +- .../admin/v2alpha/clusters.pb.validate.go | 153 +- .../envoy/admin/v2alpha/config_dump.pb.go | 1345 ++++++++++++++--- .../admin/v2alpha/config_dump.pb.validate.go | 790 ++++++---- .../envoy/admin/v2alpha/listeners.pb.go | 6 +- .../admin/v2alpha/listeners.pb.validate.go | 34 +- .../envoy/admin/v2alpha/memory.pb.go | 3 +- .../envoy/admin/v2alpha/metrics.pb.go | 3 +- .../envoy/admin/v2alpha/mutex_stats.pb.go | 3 +- .../envoy/admin/v2alpha/server_info.pb.go | 5 +- .../admin/v2alpha/server_info.pb.validate.go | 102 +- .../envoy/admin/v2alpha/tap.pb.go | 8 +- .../envoy/admin/v2alpha/tap.pb.validate.go | 17 +- .../envoy/api/v2/auth/cert.pb.go | 8 +- .../envoy/api/v2/auth/cert.pb.validate.go | 493 +++--- .../go-control-plane/envoy/api/v2/cds.pb.go | 491 +++--- .../envoy/api/v2/cds.pb.validate.go | 604 +++----- .../api/v2/cluster/circuit_breaker.pb.go | 8 +- .../v2/cluster/circuit_breaker.pb.validate.go | 102 +- .../envoy/api/v2/cluster/filter.pb.go | 458 ++++++ .../api/v2/cluster/filter.pb.validate.go | 115 ++ .../api/v2/cluster/outlier_detection.pb.go | 5 +- .../cluster/outlier_detection.pb.validate.go | 102 +- .../envoy/api/v2/core/address.pb.go | 130 +- .../envoy/api/v2/core/address.pb.validate.go | 141 +- .../envoy/api/v2/core/base.pb.go | 944 ++++++++++-- .../envoy/api/v2/core/base.pb.validate.go | 324 ++-- .../envoy/api/v2/core/config_source.pb.go | 10 +- .../api/v2/core/config_source.pb.validate.go | 119 +- .../envoy/api/v2/core/grpc_service.pb.go | 5 +- .../api/v2/core/grpc_service.pb.validate.go | 323 ++-- .../envoy/api/v2/core/health_check.pb.go | 10 +- .../api/v2/core/health_check.pb.validate.go | 306 ++-- .../envoy/api/v2/core/http_uri.pb.go | 118 +- .../envoy/api/v2/core/protocol.pb.go | 7 +- .../envoy/api/v2/core/protocol.pb.validate.go | 68 +- .../envoy/api/v2/discovery.pb.go | 122 +- .../envoy/api/v2/discovery.pb.validate.go | 136 +- .../go-control-plane/envoy/api/v2/eds.pb.go | 109 +- .../envoy/api/v2/eds.pb.validate.go | 68 +- .../envoy/api/v2/endpoint/endpoint.pb.go | 94 +- .../api/v2/endpoint/endpoint.pb.validate.go | 119 +- .../envoy/api/v2/endpoint/load_report.pb.go | 8 +- .../v2/endpoint/load_report.pb.validate.go | 153 +- .../go-control-plane/envoy/api/v2/lds.pb.go | 172 ++- .../envoy/api/v2/lds.pb.validate.go | 226 +-- .../envoy/api/v2/listener/listener.pb.go | 133 +- .../api/v2/listener/listener.pb.validate.go | 221 +-- .../go-control-plane/envoy/api/v2/rds.pb.go | 142 +- .../envoy/api/v2/rds.pb.validate.go | 107 +- .../envoy/api/v2/route/route.pb.go | 518 +++---- .../envoy/api/v2/route/route.pb.validate.go | 1312 ++++++---------- .../go-control-plane/envoy/api/v2/srds.pb.go | 5 +- .../envoy/api/v2/srds.pb.validate.go | 34 +- .../envoy/config/accesslog/v2/als.pb.go | 8 +- .../config/accesslog/v2/als.pb.validate.go | 51 +- .../envoy/config/accesslog/v2/file.pb.go | 5 +- .../config/accesslog/v2/file.pb.validate.go | 17 +- .../envoy/config/bootstrap/v2/bootstrap.pb.go | 366 +++-- .../bootstrap/v2/bootstrap.pb.validate.go | 598 +++----- .../filter/accesslog/v2/accesslog.pb.go | 12 +- .../accesslog/v2/accesslog.pb.validate.go | 340 ++--- .../envoy/config/filter/fault/v2/fault.pb.go | 10 +- .../filter/fault/v2/fault.pb.validate.go | 85 +- .../config/filter/http/fault/v2/fault.pb.go | 409 ++++- .../filter/http/fault/v2/fault.pb.validate.go | 114 +- .../http/health_check/v2/health_check.pb.go | 12 +- .../v2/health_check.pb.validate.go | 51 +- .../http/jwt_authn/v2alpha/config.pb.go | 10 +- .../jwt_authn/v2alpha/config.pb.validate.go | 255 ++-- .../config/filter/http/rbac/v2/rbac.pb.go | 8 +- .../filter/http/rbac/v2/rbac.pb.validate.go | 51 +- .../v2/http_connection_manager.pb.go | 450 +++--- .../v2/http_connection_manager.pb.validate.go | 663 +++----- .../network/mongo_proxy/v2/mongo_proxy.pb.go | 8 +- .../mongo_proxy/v2/mongo_proxy.pb.validate.go | 17 +- .../mysql_proxy/v1alpha1/mysql_proxy.pb.go | 5 +- .../config/filter/network/rbac/v2/rbac.pb.go | 8 +- .../network/rbac/v2/rbac.pb.validate.go | 34 +- .../network/redis_proxy/v2/redis_proxy.pb.go | 249 +-- .../redis_proxy/v2/redis_proxy.pb.validate.go | 161 +- .../network/tcp_proxy/v2/tcp_proxy.pb.go | 12 +- .../tcp_proxy/v2/tcp_proxy.pb.validate.go | 170 +-- .../v2alpha/file_based_metadata.pb.go | 6 +- .../file_based_metadata.pb.validate.go | 17 +- .../config/metrics/v2/metrics_service.pb.go | 8 +- .../metrics/v2/metrics_service.pb.validate.go | 17 +- .../envoy/config/metrics/v2/stats.pb.go | 10 +- .../config/metrics/v2/stats.pb.validate.go | 153 +- .../config/overload/v2alpha/overload.pb.go | 5 +- .../overload/v2alpha/overload.pb.validate.go | 119 +- .../envoy/config/rbac/v2/rbac.pb.go | 12 +- .../envoy/config/rbac/v2/rbac.pb.validate.go | 323 ++-- .../envoy/config/trace/v2/trace.pb.go | 173 +-- .../config/trace/v2/trace.pb.validate.go | 121 +- .../envoy/data/tap/v2alpha/common.pb.go | 3 +- .../envoy/data/tap/v2alpha/http.pb.go | 6 +- .../data/tap/v2alpha/http.pb.validate.go | 187 +-- .../envoy/data/tap/v2alpha/transport.pb.go | 8 +- .../data/tap/v2alpha/transport.pb.validate.go | 204 +-- .../envoy/data/tap/v2alpha/wrapper.pb.go | 5 +- .../data/tap/v2alpha/wrapper.pb.validate.go | 68 +- .../envoy/service/discovery/v2/ads.pb.go | 8 +- .../envoy/service/discovery/v2/hds.pb.go | 10 +- .../service/discovery/v2/hds.pb.validate.go | 204 +-- .../envoy/service/discovery/v2/rtds.pb.go | 8 +- .../service/discovery/v2/rtds.pb.validate.go | 17 +- .../envoy/service/discovery/v2/sds.pb.go | 8 +- .../envoy/service/tap/v2alpha/common.pb.go | 142 +- .../service/tap/v2alpha/common.pb.validate.go | 323 ++-- .../envoy/service/tap/v2alpha/tap.pb.go | 10 +- .../service/tap/v2alpha/tap.pb.validate.go | 51 +- .../envoy/service/tap/v2alpha/tapds.pb.go | 8 +- .../service/tap/v2alpha/tapds.pb.validate.go | 17 +- .../envoy/type/http_status.pb.go | 5 +- .../envoy/type/matcher/metadata.pb.go | 5 +- .../type/matcher/metadata.pb.validate.go | 34 +- .../envoy/type/matcher/number.pb.go | 8 +- .../envoy/type/matcher/number.pb.validate.go | 17 +- .../envoy/type/matcher/string.pb.go | 5 +- .../envoy/type/matcher/string.pb.validate.go | 17 +- .../envoy/type/matcher/value.pb.go | 5 +- .../envoy/type/matcher/value.pb.validate.go | 85 +- .../go-control-plane/envoy/type/percent.pb.go | 5 +- .../go-control-plane/envoy/type/range.pb.go | 5 +- .../go-control-plane/pkg/server/server.go | 4 +- vendor/modules.txt | 16 +- 186 files changed, 9464 insertions(+), 9001 deletions(-) create mode 100644 vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go create mode 100644 vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.validate.go diff --git a/go.mod b/go.mod index 75090c2696c9..94b0b7be87f2 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect github.com/emicklei/go-restful v2.6.0+incompatible - github.com/envoyproxy/go-control-plane v0.8.2 + github.com/envoyproxy/go-control-plane v0.8.3 github.com/evanphx/json-patch v3.0.0+incompatible github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 // indirect diff --git a/go.sum b/go.sum index f9e947fa68b9..d4c07d38a280 100644 --- a/go.sum +++ b/go.sum @@ -123,6 +123,8 @@ github.com/emicklei/go-restful v2.6.0+incompatible h1:luAX89wpjId5gV+GJV11MFD56G github.com/emicklei/go-restful v2.6.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.8.2 h1:HsOE6hYsY5/UYEjZ/rNezsZUBiMxJdBNxgsDQZbxIaU= github.com/envoyproxy/go-control-plane v0.8.2/go.mod h1:EWRTAFN6uuDZIa6KOuUfrOMJ7ySgXZ44rVKiTWjKe34= +github.com/envoyproxy/go-control-plane v0.8.3 h1:Sqcub1O4SnINoXxNmqbNSeNcZ7O/mkk5jq2Ou6JF7HU= +github.com/envoyproxy/go-control-plane v0.8.3/go.mod h1:EWRTAFN6uuDZIa6KOuUfrOMJ7ySgXZ44rVKiTWjKe34= github.com/envoyproxy/protoc-gen-validate v0.0.0-20190405222122-d6164de49109 h1:FNgqGzbOm637YKRbYGKb9cqGo8i50++w/LWvMau7jrw= github.com/envoyproxy/protoc-gen-validate v0.0.0-20190405222122-d6164de49109/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v3.0.0+incompatible h1:l91aby7TzBXBdmF8heZqjskeH9f3g7ZOL8/sSe+vTlU= diff --git a/istioctl/pkg/auth/listener.go b/istioctl/pkg/auth/listener.go index aeee29942603..e8741b086ffe 100644 --- a/istioctl/pkg/auth/listener.go +++ b/istioctl/pkg/auth/listener.go @@ -60,7 +60,7 @@ type ParsedListener struct { filterChains []*filterChain } -func getFilterConfig(filter listener.Filter, out proto.Message) error { +func getFilterConfig(filter *listener.Filter, out proto.Message) error { switch c := filter.ConfigType.(type) { case *listener.Filter_Config: if err := util.StructToMessage(c.Config, out); err != nil { @@ -74,7 +74,7 @@ func getFilterConfig(filter listener.Filter, out proto.Message) error { return nil } -func getHTTPConnectionManager(filter listener.Filter) *hcm_filter.HttpConnectionManager { +func getHTTPConnectionManager(filter *listener.Filter) *hcm_filter.HttpConnectionManager { cm := &hcm_filter.HttpConnectionManager{} if err := getFilterConfig(filter, cm); err != nil { log.Errorf("failed to get HTTP connection manager config: %s", err) diff --git a/istioctl/pkg/util/configdump/bootstrap.go b/istioctl/pkg/util/configdump/bootstrap.go index 9cbd8ccbbbad..ba9cfec4cc5d 100644 --- a/istioctl/pkg/util/configdump/bootstrap.go +++ b/istioctl/pkg/util/configdump/bootstrap.go @@ -30,7 +30,7 @@ func (w *Wrapper) GetBootstrapConfigDump() (*adminapi.BootstrapConfigDump, error } bootstrapDumpAny := w.Configs[0] bootstrapDump := &adminapi.BootstrapConfigDump{} - err := proto.UnmarshalAny(&bootstrapDumpAny, bootstrapDump) + err := proto.UnmarshalAny(bootstrapDumpAny, bootstrapDump) if err != nil { return nil, err } diff --git a/istioctl/pkg/util/configdump/bootstrap_test.go b/istioctl/pkg/util/configdump/bootstrap_test.go index 92ab50287c62..ada47725624b 100644 --- a/istioctl/pkg/util/configdump/bootstrap_test.go +++ b/istioctl/pkg/util/configdump/bootstrap_test.go @@ -48,7 +48,7 @@ func TestWrapper_GetBootstrapConfigDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noBootstrap { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } if tt.noConfigs { w.Configs = nil diff --git a/istioctl/pkg/util/configdump/cluster.go b/istioctl/pkg/util/configdump/cluster.go index 2c85c3e09933..13a7cdaf64eb 100644 --- a/istioctl/pkg/util/configdump/cluster.go +++ b/istioctl/pkg/util/configdump/cluster.go @@ -50,7 +50,7 @@ func (w *Wrapper) GetClusterConfigDump() (*adminapi.ClustersConfigDump, error) { } clusterDumpAny := w.Configs[1] clusterDump := &adminapi.ClustersConfigDump{} - err := proto.UnmarshalAny(&clusterDumpAny, clusterDump) + err := proto.UnmarshalAny(clusterDumpAny, clusterDump) if err != nil { return nil, err } diff --git a/istioctl/pkg/util/configdump/cluster_test.go b/istioctl/pkg/util/configdump/cluster_test.go index e58ef1a80220..3c2fb2444e89 100644 --- a/istioctl/pkg/util/configdump/cluster_test.go +++ b/istioctl/pkg/util/configdump/cluster_test.go @@ -61,7 +61,7 @@ func TestWrapper_GetClusterConfigDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noCluster { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } if tt.noConfigs { w.Configs = nil @@ -120,7 +120,7 @@ func TestWrapper_GetDynamicClusterDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noCluster { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } got, err := w.GetDynamicClusterDump(tt.stripVersion) if (err != nil) != tt.wantErr { diff --git a/istioctl/pkg/util/configdump/listener.go b/istioctl/pkg/util/configdump/listener.go index 770380da76ed..8ed7537e77d4 100644 --- a/istioctl/pkg/util/configdump/listener.go +++ b/istioctl/pkg/util/configdump/listener.go @@ -50,7 +50,7 @@ func (w *Wrapper) GetListenerConfigDump() (*adminapi.ListenersConfigDump, error) } listenerDumpAny := w.Configs[2] listenerDump := &adminapi.ListenersConfigDump{} - err := proto.UnmarshalAny(&listenerDumpAny, listenerDump) + err := proto.UnmarshalAny(listenerDumpAny, listenerDump) if err != nil { return nil, err } diff --git a/istioctl/pkg/util/configdump/listener_test.go b/istioctl/pkg/util/configdump/listener_test.go index 73bd830dccdd..87bfbf023c2c 100644 --- a/istioctl/pkg/util/configdump/listener_test.go +++ b/istioctl/pkg/util/configdump/listener_test.go @@ -50,7 +50,7 @@ func TestWrapper_GetListenerConfigDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noListener { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } if tt.noConfigs { w.Configs = nil @@ -110,7 +110,7 @@ func TestWrapper_GetDynamicListenerDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noListener { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } got, err := w.GetDynamicListenerDump(tt.stripVersion) if (err != nil) != tt.wantErr { diff --git a/istioctl/pkg/util/configdump/route.go b/istioctl/pkg/util/configdump/route.go index 13fd206eeae0..f8efecfcc078 100644 --- a/istioctl/pkg/util/configdump/route.go +++ b/istioctl/pkg/util/configdump/route.go @@ -74,7 +74,7 @@ func (w *Wrapper) GetRouteConfigDump() (*adminapi.RoutesConfigDump, error) { var routeDumpAny proto.Any for _, conf := range w.Configs { if conf.TypeUrl == "type.googleapis.com/envoy.admin.v2alpha.RoutesConfigDump" { - routeDumpAny = conf + routeDumpAny = *conf } } if routeDumpAny.TypeUrl == "" { diff --git a/istioctl/pkg/util/configdump/route_test.go b/istioctl/pkg/util/configdump/route_test.go index 2d508d7c135e..a33d25400f8d 100644 --- a/istioctl/pkg/util/configdump/route_test.go +++ b/istioctl/pkg/util/configdump/route_test.go @@ -48,7 +48,7 @@ func TestWrapper_GetRouteConfigDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noRoute { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } if tt.noConfigs { w.Configs = nil @@ -105,7 +105,7 @@ func TestWrapper_GetDynamicRouteDump(t *testing.T) { t.Run(tt.name, func(t *testing.T) { w := setupWrapper(t) if tt.noRoute { - w.Configs = []proto.Any{} + w.Configs = []*proto.Any{} } got, err := w.GetDynamicRouteDump(tt.stripVersion) if (err != nil) != tt.wantErr { diff --git a/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go b/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go index 75042057624e..b6b1919b0d60 100644 --- a/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go +++ b/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go @@ -188,8 +188,8 @@ func TestDynamicAttribute(t *testing.T) { Endpoints: cache.Resources{Version: "1", Items: map[string]cache.Resource{ "backend": &v2.ClusterLoadAssignment{ ClusterName: "backend", - Endpoints: []endpoint.LocalityLbEndpoints{{ - LbEndpoints: []endpoint.LbEndpoint{{ + Endpoints: []*endpoint.LocalityLbEndpoints{{ + LbEndpoints: []*endpoint.LbEndpoint{{ Metadata: &core.Metadata{ FilterMetadata: map[string]*types.Struct{ "istio": { diff --git a/mixer/test/client/dynamic_listener/dynamic_listener_test.go b/mixer/test/client/dynamic_listener/dynamic_listener_test.go index 2647de9da92e..faa91a4e0aa0 100644 --- a/mixer/test/client/dynamic_listener/dynamic_listener_test.go +++ b/mixer/test/client/dynamic_listener/dynamic_listener_test.go @@ -140,11 +140,11 @@ func makeListener(s *env.TestSetup, key string) *v2.Listener { RouteSpecifier: &hcm.HttpConnectionManager_RouteConfig{ RouteConfig: &v2.RouteConfiguration{ Name: key, - VirtualHosts: []route.VirtualHost{{ + VirtualHosts: []*route.VirtualHost{{ Name: "backend", Domains: []string{"*"}, - Routes: []route.Route{{ - Match: route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, + Routes: []*route.Route{{ + Match: &route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, Action: &route.Route_Route{Route: &route.RouteAction{ ClusterSpecifier: &route.RouteAction_Cluster{Cluster: "backend"}, }}, @@ -166,11 +166,11 @@ func makeListener(s *env.TestSetup, key string) *v2.Listener { return &v2.Listener{ Name: strconv.Itoa(int(s.Ports().ServerProxyPort)), - Address: core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ + Address: &core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ Address: "127.0.0.1", PortSpecifier: &core.SocketAddress_PortValue{PortValue: uint32(s.Ports().ServerProxyPort)}}}}, - FilterChains: []listener.FilterChain{{ - Filters: []listener.Filter{{ + FilterChains: []*listener.FilterChain{{ + Filters: []*listener.Filter{{ Name: util.HTTPConnectionManager, ConfigType: &listener.Filter_Config{pbst}, }}, diff --git a/mixer/test/client/gateway/gateway_test.go b/mixer/test/client/gateway/gateway_test.go index 6be3a5c8af36..7ffa1bceda4f 100644 --- a/mixer/test/client/gateway/gateway_test.go +++ b/mixer/test/client/gateway/gateway_test.go @@ -287,11 +287,11 @@ var ( func makeRoute(cluster string) *v2.RouteConfiguration { return &v2.RouteConfiguration{ Name: cluster, - VirtualHosts: []route.VirtualHost{{ + VirtualHosts: []*route.VirtualHost{{ Name: cluster, Domains: []string{"*"}, - Routes: []route.Route{{ - Match: route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, + Routes: []*route.Route{{ + Match: &route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, Action: &route.Route_Route{Route: &route.RouteAction{ ClusterSpecifier: &route.RouteAction_Cluster{Cluster: cluster}, }}, @@ -303,14 +303,14 @@ func makeRoute(cluster string) *v2.RouteConfiguration { func makeListener(port uint16, route string) (*v2.Listener, *hcm.HttpConnectionManager) { return &v2.Listener{ Name: route, - Address: core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ + Address: &core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ Address: "127.0.0.1", PortSpecifier: &core.SocketAddress_PortValue{PortValue: uint32(port)}}}}, }, &hcm.HttpConnectionManager{ CodecType: hcm.AUTO, StatPrefix: route, RouteSpecifier: &hcm.HttpConnectionManager_Rds{ - Rds: &hcm.Rds{RouteConfigName: route, ConfigSource: core.ConfigSource{ + Rds: &hcm.Rds{RouteConfigName: route, ConfigSource: &core.ConfigSource{ ConfigSourceSpecifier: &core.ConfigSource_Ads{Ads: &core.AggregatedConfigSource{}}, }}, }, @@ -329,7 +329,7 @@ func makeSnapshot(s *env.TestSetup, t *testing.T) cache.Snapshot { t.Error(err) } clientManager.HttpFilters = append(clientMutable.FilterChains[0].HTTP, clientManager.HttpFilters...) - clientListener.FilterChains = []listener.FilterChain{{Filters: []listener.Filter{{ + clientListener.FilterChains = []*listener.FilterChain{{Filters: []*listener.Filter{{ Name: util.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{TypedConfig: pilotutil.MessageToAny(clientManager)}, }}}} diff --git a/mixer/test/client/pilotplugin/pilotplugin_test.go b/mixer/test/client/pilotplugin/pilotplugin_test.go index f675d5f9a305..01bb3bd7d718 100644 --- a/mixer/test/client/pilotplugin/pilotplugin_test.go +++ b/mixer/test/client/pilotplugin/pilotplugin_test.go @@ -364,11 +364,11 @@ var ( func makeRoute(cluster string) *v2.RouteConfiguration { return &v2.RouteConfiguration{ Name: cluster, - VirtualHosts: []route.VirtualHost{{ + VirtualHosts: []*route.VirtualHost{{ Name: cluster, Domains: []string{"*"}, - Routes: []route.Route{{ - Match: route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, + Routes: []*route.Route{{ + Match: &route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, Action: &route.Route_Route{Route: &route.RouteAction{ ClusterSpecifier: &route.RouteAction_Cluster{Cluster: cluster}, }}, @@ -380,14 +380,14 @@ func makeRoute(cluster string) *v2.RouteConfiguration { func makeListener(port uint16, route string) (*v2.Listener, *hcm.HttpConnectionManager) { return &v2.Listener{ Name: route, - Address: core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ + Address: &core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ Address: "127.0.0.1", PortSpecifier: &core.SocketAddress_PortValue{PortValue: uint32(port)}}}}, }, &hcm.HttpConnectionManager{ CodecType: hcm.AUTO, StatPrefix: route, RouteSpecifier: &hcm.HttpConnectionManager_Rds{ - Rds: &hcm.Rds{RouteConfigName: route, ConfigSource: core.ConfigSource{ + Rds: &hcm.Rds{RouteConfigName: route, ConfigSource: &core.ConfigSource{ ConfigSourceSpecifier: &core.ConfigSource_Ads{Ads: &core.AggregatedConfigSource{}}, }}, }, @@ -408,7 +408,7 @@ func makeSnapshot(s *env.TestSetup, t *testing.T) cache.Snapshot { t.Error(err) } serverManager.HttpFilters = append(serverMutable.FilterChains[0].HTTP, serverManager.HttpFilters...) - serverListener.FilterChains = []listener.FilterChain{{Filters: []listener.Filter{{ + serverListener.FilterChains = []*listener.FilterChain{{Filters: []*listener.Filter{{ Name: util.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{TypedConfig: pilotutil.MessageToAny(serverManager)}, }}}} @@ -418,7 +418,7 @@ func makeSnapshot(s *env.TestSetup, t *testing.T) cache.Snapshot { t.Error(err) } clientManager.HttpFilters = append(clientMutable.FilterChains[0].HTTP, clientManager.HttpFilters...) - clientListener.FilterChains = []listener.FilterChain{{Filters: []listener.Filter{{ + clientListener.FilterChains = []*listener.FilterChain{{Filters: []*listener.Filter{{ Name: util.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{TypedConfig: pilotutil.MessageToAny(clientManager)}, }}}} diff --git a/mixer/test/client/pilotplugin_mtls/pilotplugin_mtls_test.go b/mixer/test/client/pilotplugin_mtls/pilotplugin_mtls_test.go index b1cb81dd1654..87e75770bb0d 100644 --- a/mixer/test/client/pilotplugin_mtls/pilotplugin_mtls_test.go +++ b/mixer/test/client/pilotplugin_mtls/pilotplugin_mtls_test.go @@ -379,11 +379,11 @@ var ( func makeRoute(cluster string) *v2.RouteConfiguration { return &v2.RouteConfiguration{ Name: cluster, - VirtualHosts: []route.VirtualHost{{ + VirtualHosts: []*route.VirtualHost{{ Name: cluster, Domains: []string{"*"}, - Routes: []route.Route{{ - Match: route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, + Routes: []*route.Route{{ + Match: &route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}}, Action: &route.Route_Route{Route: &route.RouteAction{ ClusterSpecifier: &route.RouteAction_Cluster{Cluster: cluster}, }}, @@ -395,17 +395,17 @@ func makeRoute(cluster string) *v2.RouteConfiguration { func makeListener(port uint16, route string) (*v2.Listener, *hcm.HttpConnectionManager) { return &v2.Listener{ Name: route, - Address: core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ + Address: &core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ Address: "127.0.0.1", PortSpecifier: &core.SocketAddress_PortValue{PortValue: uint32(port)}}}}, - ListenerFilters: []listener.ListenerFilter{{ + ListenerFilters: []*listener.ListenerFilter{{ Name: "envoy.listener.tls_inspector", }}, }, &hcm.HttpConnectionManager{ CodecType: hcm.AUTO, StatPrefix: route, RouteSpecifier: &hcm.HttpConnectionManager_Rds{ - Rds: &hcm.Rds{RouteConfigName: route, ConfigSource: core.ConfigSource{ + Rds: &hcm.Rds{RouteConfigName: route, ConfigSource: &core.ConfigSource{ ConfigSourceSpecifier: &core.ConfigSource_Ads{Ads: &core.AggregatedConfigSource{}}, }}, }, @@ -426,8 +426,8 @@ func makeSnapshot(s *env.TestSetup, t *testing.T) cache.Snapshot { t.Error(err) } serverManager.HttpFilters = append(serverMutable.FilterChains[0].HTTP, serverManager.HttpFilters...) - serverListener.FilterChains = []listener.FilterChain{{ - Filters: []listener.Filter{{ + serverListener.FilterChains = []*listener.FilterChain{{ + Filters: []*listener.Filter{{ Name: util.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{TypedConfig: pilotutil.MessageToAny(serverManager)}, }}, @@ -453,7 +453,7 @@ func makeSnapshot(s *env.TestSetup, t *testing.T) cache.Snapshot { t.Error(err) } clientManager.HttpFilters = append(clientMutable.FilterChains[0].HTTP, clientManager.HttpFilters...) - clientListener.FilterChains = []listener.FilterChain{{Filters: []listener.Filter{{ + clientListener.FilterChains = []*listener.FilterChain{{Filters: []*listener.Filter{{ Name: util.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{TypedConfig: pilotutil.MessageToAny(clientManager)}, }}}} diff --git a/mixer/test/client/pilotplugin_tcp/pilotplugin_tcp_test.go b/mixer/test/client/pilotplugin_tcp/pilotplugin_tcp_test.go index e2f09e453afa..f94f5d7d6db2 100644 --- a/mixer/test/client/pilotplugin_tcp/pilotplugin_tcp_test.go +++ b/mixer/test/client/pilotplugin_tcp/pilotplugin_tcp_test.go @@ -226,10 +226,10 @@ var ( func makeListener(port uint16, cluster string) *v2.Listener { return &v2.Listener{ Name: cluster, - Address: core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ + Address: &core.Address{Address: &core.Address_SocketAddress{SocketAddress: &core.SocketAddress{ Address: "127.0.0.1", PortSpecifier: &core.SocketAddress_PortValue{PortValue: uint32(port)}}}}, - FilterChains: []listener.FilterChain{{Filters: []listener.Filter{{ + FilterChains: []*listener.FilterChain{{Filters: []*listener.Filter{{ Name: util.TCPProxy, ConfigType: &listener.Filter_TypedConfig{ TypedConfig: pilotutil.MessageToAny(&tcp_proxy.TcpProxy{ diff --git a/pilot/pkg/networking/core/v1alpha3/cluster.go b/pilot/pkg/networking/core/v1alpha3/cluster.go index 6804a9f76eff..8bd320370e68 100644 --- a/pilot/pkg/networking/core/v1alpha3/cluster.go +++ b/pilot/pkg/networking/core/v1alpha3/cluster.go @@ -346,7 +346,7 @@ func updateEds(cluster *apiv2.Cluster) { } func buildLocalityLbEndpoints(env *model.Environment, proxyNetworkView map[string]bool, service *model.Service, - port int, labels config.LabelsCollection) []endpoint.LocalityLbEndpoints { + port int, labels config.LabelsCollection) []*endpoint.LocalityLbEndpoints { if service.Resolution != model.DNSLB { return nil @@ -358,7 +358,7 @@ func buildLocalityLbEndpoints(env *model.Environment, proxyNetworkView map[strin return nil } - lbEndpoints := make(map[string][]endpoint.LbEndpoint) + lbEndpoints := make(map[string][]*endpoint.LbEndpoint) for _, instance := range instances { // Only send endpoints from the networks in the network view requested by the proxy. // The default network view assigned to the Proxy is the UnnamedNetwork (""), which matches @@ -368,10 +368,10 @@ func buildLocalityLbEndpoints(env *model.Environment, proxyNetworkView map[strin continue } host := util.BuildAddress(instance.Endpoint.Address, uint32(instance.Endpoint.Port)) - ep := endpoint.LbEndpoint{ + ep := &endpoint.LbEndpoint{ HostIdentifier: &endpoint.LbEndpoint_Endpoint{ Endpoint: &endpoint.Endpoint{ - Address: &host, + Address: host, }, }, LoadBalancingWeight: &types.UInt32Value{ @@ -385,14 +385,14 @@ func buildLocalityLbEndpoints(env *model.Environment, proxyNetworkView map[strin lbEndpoints[locality] = append(lbEndpoints[locality], ep) } - localityLbEndpoints := make([]endpoint.LocalityLbEndpoints, 0, len(lbEndpoints)) + localityLbEndpoints := make([]*endpoint.LocalityLbEndpoints, 0, len(lbEndpoints)) for locality, eps := range lbEndpoints { var weight uint32 for _, ep := range eps { weight += ep.LoadBalancingWeight.GetValue() } - localityLbEndpoints = append(localityLbEndpoints, endpoint.LocalityLbEndpoints{ + localityLbEndpoints = append(localityLbEndpoints, &endpoint.LocalityLbEndpoints{ Locality: util.ConvertLocality(locality), LbEndpoints: eps, LoadBalancingWeight: &types.UInt32Value{ @@ -404,18 +404,18 @@ func buildLocalityLbEndpoints(env *model.Environment, proxyNetworkView map[strin return util.LocalityLbWeightNormalize(localityLbEndpoints) } -func buildInboundLocalityLbEndpoints(bind string, port int) []endpoint.LocalityLbEndpoints { +func buildInboundLocalityLbEndpoints(bind string, port int) []*endpoint.LocalityLbEndpoints { address := util.BuildAddress(bind, uint32(port)) - lbEndpoint := endpoint.LbEndpoint{ + lbEndpoint := &endpoint.LbEndpoint{ HostIdentifier: &endpoint.LbEndpoint_Endpoint{ Endpoint: &endpoint.Endpoint{ - Address: &address, + Address: address, }, }, } - return []endpoint.LocalityLbEndpoints{ + return []*endpoint.LocalityLbEndpoints{ { - LbEndpoints: []endpoint.LbEndpoint{lbEndpoint}, + LbEndpoints: []*endpoint.LbEndpoint{lbEndpoint}, }, } } @@ -424,7 +424,7 @@ func generateInboundPassthroughClusters(env *model.Environment) []*apiv2.Cluster inboundPassthroughClusterIpv4 := buildDefaultPassthroughCluster(env) inboundPassthroughClusterIpv4.Name = util.InboundPassthroughClusterIpv4 inboundPassthroughClusterIpv4.UpstreamBindConfig = &core.BindConfig{ - SourceAddress: core.SocketAddress{ + SourceAddress: &core.SocketAddress{ Address: util.InboundPassthroughBindIpv4, PortSpecifier: &core.SocketAddress_PortValue{ PortValue: uint32(0), @@ -435,7 +435,7 @@ func generateInboundPassthroughClusters(env *model.Environment) []*apiv2.Cluster inboundPassthroughClusterIpv6 := buildDefaultPassthroughCluster(env) inboundPassthroughClusterIpv6.Name = util.InboundPassthroughClusterIpv6 inboundPassthroughClusterIpv6.UpstreamBindConfig = &core.BindConfig{ - SourceAddress: core.SocketAddress{ + SourceAddress: &core.SocketAddress{ Address: util.InboundPassthroughBindIpv6, PortSpecifier: &core.SocketAddress_PortValue{ PortValue: uint32(0), @@ -803,7 +803,7 @@ func applyConnectionPool(env *model.Environment, cluster *apiv2.Cluster, setting if idleTimeout != nil { idleTimeoutDuration := util.GogoDurationToDuration(idleTimeout) - cluster.CommonHttpProtocolOptions = &core.HttpProtocolOptions{IdleTimeout: &idleTimeoutDuration} + cluster.CommonHttpProtocolOptions = &core.HttpProtocolOptions{IdleTimeout: idleTimeoutDuration} } } @@ -1118,7 +1118,7 @@ func buildDefaultPassthroughCluster(env *model.Environment) *apiv2.Cluster { } func buildDefaultCluster(env *model.Environment, name string, discoveryType apiv2.Cluster_DiscoveryType, - localityLbEndpoints []endpoint.LocalityLbEndpoints, direction model.TrafficDirection, proxy *model.Proxy, port *model.Port) *apiv2.Cluster { + localityLbEndpoints []*endpoint.LocalityLbEndpoints, direction model.TrafficDirection, proxy *model.Proxy, port *model.Port) *apiv2.Cluster { cluster := &apiv2.Cluster{ Name: name, ClusterDiscoveryType: &apiv2.Cluster_Type{Type: discoveryType}, @@ -1127,7 +1127,7 @@ func buildDefaultCluster(env *model.Environment, name string, discoveryType apiv if discoveryType == apiv2.Cluster_STRICT_DNS { cluster.DnsLookupFamily = apiv2.Cluster_V4_ONLY dnsRate := util.GogoDurationToDuration(env.Mesh.DnsRefreshRate) - cluster.DnsRefreshRate = &dnsRate + cluster.DnsRefreshRate = dnsRate } if discoveryType == apiv2.Cluster_STATIC || discoveryType == apiv2.Cluster_STRICT_DNS { diff --git a/pilot/pkg/networking/core/v1alpha3/cluster_test.go b/pilot/pkg/networking/core/v1alpha3/cluster_test.go index 5dcf483dfa83..fb8e69cb6ac9 100644 --- a/pilot/pkg/networking/core/v1alpha3/cluster_test.go +++ b/pilot/pkg/networking/core/v1alpha3/cluster_test.go @@ -313,7 +313,7 @@ func TestBuildGatewayClustersWithRingHashLb(t *testing.T) { g.Expect(cluster.LbPolicy).To(Equal(apiv2.Cluster_RING_HASH)) g.Expect(cluster.GetRingHashLbConfig().GetMinimumRingSize().GetValue()).To(Equal(uint64(2))) g.Expect(cluster.Name).To(Equal("outbound|8080||*.example.org")) - g.Expect(cluster.ConnectTimeout).To(Equal(time.Duration(10000000001))) + g.Expect(cluster.ConnectTimeout.Nanoseconds()).To(Equal(int64(10000000001))) } func TestBuildGatewayClustersWithRingHashLbDefaultMinRingSize(t *testing.T) { @@ -346,7 +346,7 @@ func TestBuildGatewayClustersWithRingHashLbDefaultMinRingSize(t *testing.T) { g.Expect(cluster.LbPolicy).To(Equal(apiv2.Cluster_RING_HASH)) g.Expect(cluster.GetRingHashLbConfig().GetMinimumRingSize().GetValue()).To(Equal(uint64(1024))) g.Expect(cluster.Name).To(Equal("outbound|8080||*.example.org")) - g.Expect(cluster.ConnectTimeout).To(Equal(time.Duration(10000000001))) + g.Expect(cluster.ConnectTimeout.Nanoseconds()).To(Equal(int64(10000000001))) } func newTestEnvironment(serviceDiscovery model.ServiceDiscovery, mesh meshconfig.MeshConfig, configStore model.IstioConfigStore) *model.Environment { diff --git a/pilot/pkg/networking/core/v1alpha3/envoyfilter/deprecated.go b/pilot/pkg/networking/core/v1alpha3/envoyfilter/deprecated.go index 877e20bc1aac..dd6b2e545b0d 100644 --- a/pilot/pkg/networking/core/v1alpha3/envoyfilter/deprecated.go +++ b/pilot/pkg/networking/core/v1alpha3/envoyfilter/deprecated.go @@ -47,7 +47,7 @@ func DeprecatedInsertUserFilters(in *plugin.InputParams, listener *xdsapi.Listen return nil } - listenerIPAddress := getListenerIPAddress(&listener.Address) + listenerIPAddress := getListenerIPAddress(listener.Address) if listenerIPAddress == nil { log.Warnf("Failed to parse IP Address from plugin listener") } @@ -80,10 +80,10 @@ func DeprecatedInsertUserFilters(in *plugin.InputParams, listener *xdsapi.Listen // http listener, http filter case if f.FilterType == networking.EnvoyFilter_Filter_HTTP { // Insert into http connection manager - deprecatedInsertHTTPFilter(listener.Name, &listener.FilterChains[cnum], httpConnectionManagers[cnum], f, util.IsXDSMarshalingToAnyEnabled(in.Node)) + deprecatedInsertHTTPFilter(listener.Name, listener.FilterChains[cnum], httpConnectionManagers[cnum], f, util.IsXDSMarshalingToAnyEnabled(in.Node)) } else { // http listener, tcp filter - deprecatedInsertNetworkFilter(listener.Name, &listener.FilterChains[cnum], f) + deprecatedInsertNetworkFilter(listener.Name, listener.FilterChains[cnum], f) } } else { // The listener match logic does not take into account the listener protocol @@ -106,7 +106,7 @@ func DeprecatedInsertUserFilters(in *plugin.InputParams, listener *xdsapi.Listen f.FilterName) continue } - deprecatedInsertNetworkFilter(listener.Name, &listener.FilterChains[cnum], f) + deprecatedInsertNetworkFilter(listener.Name, listener.FilterChains[cnum], f) } } } @@ -256,7 +256,7 @@ func deprecatedInsertHTTPFilter(listenerName string, filterChain *xdslistener.Fi } else { filterStruct.ConfigType = &xdslistener.Filter_Config{Config: util.MessageToStruct(hcm)} } - filterChain.Filters[len(filterChain.Filters)-1] = filterStruct + filterChain.Filters[len(filterChain.Filters)-1] = &filterStruct log.Infof("EnvoyFilters: Rebuilt HTTP Connection Manager %s (from %d filters to %d filters)", listenerName, oldLen, len(hcm.HttpFilters)) } @@ -276,7 +276,7 @@ func deprecatedInsertNetworkFilter(listenerName string, filterChain *xdslistener oldLen := len(filterChain.Filters) switch position { case networking.EnvoyFilter_InsertPosition_FIRST, networking.EnvoyFilter_InsertPosition_BEFORE: - filterChain.Filters = append([]xdslistener.Filter{*filter}, filterChain.Filters...) + filterChain.Filters = append([]*xdslistener.Filter{filter}, filterChain.Filters...) if position == networking.EnvoyFilter_InsertPosition_BEFORE { // bubble the filter to the right position scanning from beginning for i := 1; i < len(filterChain.Filters); i++ { @@ -287,7 +287,7 @@ func deprecatedInsertNetworkFilter(listenerName string, filterChain *xdslistener } } case networking.EnvoyFilter_InsertPosition_LAST, networking.EnvoyFilter_InsertPosition_AFTER: - filterChain.Filters = append(filterChain.Filters, *filter) + filterChain.Filters = append(filterChain.Filters, filter) if position == networking.EnvoyFilter_InsertPosition_AFTER { // bubble the filter to the right position scanning from end for i := len(filterChain.Filters) - 2; i >= 0; i-- { diff --git a/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch.go b/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch.go index f9205e0cf921..d05cdb1e75e4 100644 --- a/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch.go +++ b/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch.go @@ -103,7 +103,7 @@ func doFilterChainListOperation(proxy *model.Proxy, patchContext networking.Envo if fc.Filters == nil { continue } - doFilterChainOperation(proxy, patchContext, patches, listener, &listener.FilterChains[i], &filterChainsRemoved) + doFilterChainOperation(proxy, patchContext, patches, listener, listener.FilterChains[i], &filterChainsRemoved) } for _, cp := range patches[networking.EnvoyFilter_FILTER_CHAIN] { if cp.Operation == networking.EnvoyFilter_Patch_ADD { @@ -111,11 +111,11 @@ func doFilterChainListOperation(proxy *model.Proxy, patchContext networking.Envo !listenerMatch(listener, cp) { continue } - listener.FilterChains = append(listener.FilterChains, *cp.Value.(*xdslistener.FilterChain)) + listener.FilterChains = append(listener.FilterChains, cp.Value.(*xdslistener.FilterChain)) } } if filterChainsRemoved { - tempArray := make([]xdslistener.FilterChain, 0, len(listener.FilterChains)) + tempArray := make([]*xdslistener.FilterChain, 0, len(listener.FilterChains)) for _, fc := range listener.FilterChains { if fc.Filters != nil { tempArray = append(tempArray, fc) @@ -155,7 +155,7 @@ func doNetworkFilterListOperation(proxy *model.Proxy, patchContext networking.En if filter.Name == "" { continue } - doNetworkFilterOperation(proxy, patchContext, patches, listener, fc, &fc.Filters[i], &networkFiltersRemoved) + doNetworkFilterOperation(proxy, patchContext, patches, listener, fc, fc.Filters[i], &networkFiltersRemoved) } for _, cp := range patches[networking.EnvoyFilter_NETWORK_FILTER] { if !commonConditionMatch(proxy, patchContext, cp) || @@ -165,17 +165,17 @@ func doNetworkFilterListOperation(proxy *model.Proxy, patchContext networking.En } if cp.Operation == networking.EnvoyFilter_Patch_ADD { - fc.Filters = append(fc.Filters, *cp.Value.(*xdslistener.Filter)) + fc.Filters = append(fc.Filters, cp.Value.(*xdslistener.Filter)) } else if cp.Operation == networking.EnvoyFilter_Patch_INSERT_AFTER { // Insert after without a filter match is same as ADD in the end if !hasNetworkFilterMatch(cp) { - fc.Filters = append(fc.Filters, *cp.Value.(*xdslistener.Filter)) + fc.Filters = append(fc.Filters, cp.Value.(*xdslistener.Filter)) continue } // find the matching filter first insertPosition := -1 for i := 0; i < len(fc.Filters); i++ { - if networkFilterMatch(&fc.Filters[i], cp) { + if networkFilterMatch(fc.Filters[i], cp) { insertPosition = i + 1 break } @@ -185,21 +185,21 @@ func doNetworkFilterListOperation(proxy *model.Proxy, patchContext networking.En continue } - fc.Filters = append(fc.Filters, *cp.Value.(*xdslistener.Filter)) + fc.Filters = append(fc.Filters, cp.Value.(*xdslistener.Filter)) if insertPosition < len(fc.Filters)-1 { copy(fc.Filters[insertPosition+1:], fc.Filters[insertPosition:]) - fc.Filters[insertPosition] = *cp.Value.(*xdslistener.Filter) + fc.Filters[insertPosition] = cp.Value.(*xdslistener.Filter) } } else if cp.Operation == networking.EnvoyFilter_Patch_INSERT_BEFORE { // insert before without a filter match is same as insert in the beginning if !hasNetworkFilterMatch(cp) { - fc.Filters = append([]xdslistener.Filter{*cp.Value.(*xdslistener.Filter)}, fc.Filters...) + fc.Filters = append([]*xdslistener.Filter{cp.Value.(*xdslistener.Filter)}, fc.Filters...) continue } // find the matching filter first insertPosition := -1 for i := 0; i < len(fc.Filters); i++ { - if networkFilterMatch(&fc.Filters[i], cp) { + if networkFilterMatch(fc.Filters[i], cp) { insertPosition = i break } @@ -208,13 +208,13 @@ func doNetworkFilterListOperation(proxy *model.Proxy, patchContext networking.En if insertPosition == -1 { continue } - fc.Filters = append(fc.Filters, *cp.Value.(*xdslistener.Filter)) + fc.Filters = append(fc.Filters, cp.Value.(*xdslistener.Filter)) copy(fc.Filters[insertPosition+1:], fc.Filters[insertPosition:]) - fc.Filters[insertPosition] = *cp.Value.(*xdslistener.Filter) + fc.Filters[insertPosition] = cp.Value.(*xdslistener.Filter) } } if networkFiltersRemoved { - tempArray := make([]xdslistener.Filter, 0, len(fc.Filters)) + tempArray := make([]*xdslistener.Filter, 0, len(fc.Filters)) for _, filter := range fc.Filters { if filter.Name != "" { tempArray = append(tempArray, filter) diff --git a/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch_test.go b/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch_test.go index 28a69dc5ae78..2de522c2d15c 100644 --- a/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch_test.go +++ b/pilot/pkg/networking/core/v1alpha3/envoyfilter/listener_patch_test.go @@ -262,7 +262,7 @@ func TestApplyListenerPatches(t *testing.T) { sidecarOutboundIn := []*xdsapi.Listener{ { Name: "12345", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -271,9 +271,9 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - FilterChains: []listener.FilterChain{ + FilterChains: []*listener.FilterChain{ { - Filters: []listener.Filter{ + Filters: []*listener.Filter{ {Name: "filter1"}, {Name: "filter2"}, }, @@ -288,7 +288,7 @@ func TestApplyListenerPatches(t *testing.T) { sidecarOutboundOut := []*xdsapi.Listener{ { Name: "12345", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -297,9 +297,9 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - FilterChains: []listener.FilterChain{ + FilterChains: []*listener.FilterChain{ { - Filters: []listener.Filter{ + Filters: []*listener.Filter{ {Name: "filter0"}, {Name: "filter1"}, }, @@ -317,7 +317,7 @@ func TestApplyListenerPatches(t *testing.T) { sidecarInboundIn := []*xdsapi.Listener{ { Name: "12345", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -329,7 +329,7 @@ func TestApplyListenerPatches(t *testing.T) { }, { Name: "another-listener", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -338,15 +338,15 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - ListenerFilters: []listener.ListenerFilter{{Name: "envoy.tls_inspector"}}, - FilterChains: []listener.FilterChain{ + ListenerFilters: []*listener.ListenerFilter{{Name: "envoy.tls_inspector"}}, + FilterChains: []*listener.FilterChain{ { FilterChainMatch: &listener.FilterChainMatch{TransportProtocol: "tls"}, TlsContext: &auth.DownstreamTlsContext{}, - Filters: []listener.Filter{{Name: "network-filter"}}, + Filters: []*listener.Filter{{Name: "network-filter"}}, }, { - Filters: []listener.Filter{ + Filters: []*listener.Filter{ { Name: xdsutil.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{ @@ -367,7 +367,7 @@ func TestApplyListenerPatches(t *testing.T) { sidecarInboundOut := []*xdsapi.Listener{ { Name: "another-listener", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -376,10 +376,10 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - ListenerFilters: []listener.ListenerFilter{{Name: "envoy.tls_inspector"}}, - FilterChains: []listener.FilterChain{ + ListenerFilters: []*listener.ListenerFilter{{Name: "envoy.tls_inspector"}}, + FilterChains: []*listener.FilterChain{ { - Filters: []listener.Filter{ + Filters: []*listener.Filter{ { Name: xdsutil.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{ @@ -401,7 +401,7 @@ func TestApplyListenerPatches(t *testing.T) { gatewayIn := []*xdsapi.Listener{ { Name: "80", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -410,12 +410,12 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - FilterChains: []listener.FilterChain{ + FilterChains: []*listener.FilterChain{ { FilterChainMatch: &listener.FilterChainMatch{ ServerNames: []string{"match.com", "*.foo.com"}, }, - Filters: []listener.Filter{ + Filters: []*listener.Filter{ { Name: xdsutil.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{ @@ -433,7 +433,7 @@ func TestApplyListenerPatches(t *testing.T) { }, { Name: "another-listener", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -442,12 +442,12 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - FilterChains: []listener.FilterChain{ + FilterChains: []*listener.FilterChain{ { FilterChainMatch: &listener.FilterChainMatch{ ServerNames: []string{"nomatch.com", "*.foo.com"}, }, - Filters: []listener.Filter{{Name: "network-filter"}}, + Filters: []*listener.Filter{{Name: "network-filter"}}, }, }, }, @@ -456,7 +456,7 @@ func TestApplyListenerPatches(t *testing.T) { gatewayOut := []*xdsapi.Listener{ { Name: "80", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -465,13 +465,13 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - ListenerFilters: []listener.ListenerFilter{{Name: "foo"}}, - FilterChains: []listener.FilterChain{ + ListenerFilters: []*listener.ListenerFilter{{Name: "foo"}}, + FilterChains: []*listener.FilterChain{ { FilterChainMatch: &listener.FilterChainMatch{ ServerNames: []string{"match.com", "*.foo.com", "foo.com"}, }, - Filters: []listener.Filter{ + Filters: []*listener.Filter{ { Name: xdsutil.HTTPConnectionManager, ConfigType: &listener.Filter_TypedConfig{ @@ -490,7 +490,7 @@ func TestApplyListenerPatches(t *testing.T) { }, { Name: "another-listener", - Address: core.Address{ + Address: &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ PortSpecifier: &core.SocketAddress_PortValue{ @@ -499,12 +499,12 @@ func TestApplyListenerPatches(t *testing.T) { }, }, }, - FilterChains: []listener.FilterChain{ + FilterChains: []*listener.FilterChain{ { FilterChainMatch: &listener.FilterChainMatch{ ServerNames: []string{"nomatch.com", "*.foo.com"}, }, - Filters: []listener.Filter{{Name: "network-filter"}}, + Filters: []*listener.Filter{{Name: "network-filter"}}, }, }, }, diff --git a/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch.go b/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch.go index 2eb94ead490e..778251ddf869 100644 --- a/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch.go +++ b/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch.go @@ -61,13 +61,13 @@ func ApplyRouteConfigurationPatches(patchContext networking.EnvoyFilter_PatchCon // removed by another envoy filter continue } - if virtualHostMatch(&routeConfiguration.VirtualHosts[i], cp) { + if virtualHostMatch(routeConfiguration.VirtualHosts[i], cp) { if cp.Operation == networking.EnvoyFilter_Patch_REMOVE { // set name to empty. We remove virtual hosts with empty names later in this function routeConfiguration.VirtualHosts[i].Name = "" virtualHostsRemoved = true } else { - proto.Merge(&routeConfiguration.VirtualHosts[i], cp.Value) + proto.Merge(routeConfiguration.VirtualHosts[i], cp.Value) } } } @@ -81,12 +81,12 @@ func ApplyRouteConfigurationPatches(patchContext networking.EnvoyFilter_PatchCon if commonConditionMatch(proxy, patchContext, cp) && routeConfigurationMatch(patchContext, routeConfiguration, cp) { - routeConfiguration.VirtualHosts = append(routeConfiguration.VirtualHosts, *cp.Value.(*route.VirtualHost)) + routeConfiguration.VirtualHosts = append(routeConfiguration.VirtualHosts, proto.Clone(cp.Value).(*route.VirtualHost)) } } } if virtualHostsRemoved { - trimmedVirtualHosts := make([]route.VirtualHost, 0, len(routeConfiguration.VirtualHosts)) + trimmedVirtualHosts := make([]*route.VirtualHost, 0, len(routeConfiguration.VirtualHosts)) for _, virtualHost := range routeConfiguration.VirtualHosts { if virtualHost.Name == "" { continue diff --git a/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch_test.go b/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch_test.go index 65d0c9309dbc..64c6430e86a7 100644 --- a/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch_test.go +++ b/pilot/pkg/networking/core/v1alpha3/envoyfilter/rc_patch_test.go @@ -281,7 +281,7 @@ func TestApplyRouteConfigurationPatches(t *testing.T) { sidecarOutboundRC := &xdsapi.RouteConfiguration{ Name: "80", - VirtualHosts: []route.VirtualHost{ + VirtualHosts: []*route.VirtualHost{ { Name: "foo.com", Domains: []string{"domain"}, @@ -291,7 +291,7 @@ func TestApplyRouteConfigurationPatches(t *testing.T) { } patchedSidecarOutputRC := &xdsapi.RouteConfiguration{ Name: "80", - VirtualHosts: []route.VirtualHost{ + VirtualHosts: []*route.VirtualHost{ { Name: "foo.com", Domains: []string{"domain", "domain:80"}, @@ -305,7 +305,7 @@ func TestApplyRouteConfigurationPatches(t *testing.T) { } sidecarInboundRC := &xdsapi.RouteConfiguration{ Name: "inbound|http|80", - VirtualHosts: []route.VirtualHost{ + VirtualHosts: []*route.VirtualHost{ { Name: "vhost2", Domains: []string{"domain"}, @@ -314,7 +314,7 @@ func TestApplyRouteConfigurationPatches(t *testing.T) { } patchedSidecarInboundRC := &xdsapi.RouteConfiguration{ Name: "inbound|http|80", - VirtualHosts: []route.VirtualHost{ + VirtualHosts: []*route.VirtualHost{ { Name: "new-vhost", Domains: []string{"domain:80"}, @@ -324,7 +324,7 @@ func TestApplyRouteConfigurationPatches(t *testing.T) { gatewayRC := &xdsapi.RouteConfiguration{ Name: "80", - VirtualHosts: []route.VirtualHost{ + VirtualHosts: []*route.VirtualHost{ { Name: "vhost1", Domains: []string{"domain"}, @@ -337,7 +337,7 @@ func TestApplyRouteConfigurationPatches(t *testing.T) { } patchedGatewayRC := &xdsapi.RouteConfiguration{ Name: "80", - VirtualHosts: []route.VirtualHost{ + VirtualHosts: []*route.VirtualHost{ { Name: "gateway", Domains: []string{"gateway", "domain:80"}, diff --git a/pilot/pkg/networking/core/v1alpha3/gateway.go b/pilot/pkg/networking/core/v1alpha3/gateway.go index 23b1416a3d27..883be306e84c 100644 --- a/pilot/pkg/networking/core/v1alpha3/gateway.go +++ b/pilot/pkg/networking/core/v1alpha3/gateway.go @@ -275,15 +275,15 @@ func (configgen *ConfigGeneratorImpl) buildGatewayHTTPRouteConfig(env *model.Env } } - var virtualHosts []route.VirtualHost + var virtualHosts []*route.VirtualHost if len(vHostDedupMap) == 0 { log.Warnf("constructed http route config for port %d with no vhosts; Setting up a default 404 vhost", port) - virtualHosts = []route.VirtualHost{{ + virtualHosts = []*route.VirtualHost{{ Name: fmt.Sprintf("blackhole:%d", port), Domains: []string{"*"}, - Routes: []route.Route{ + Routes: []*route.Route{ { - Match: route.RouteMatch{ + Match: &route.RouteMatch{ PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}, }, Action: &route.Route_DirectResponse{ @@ -295,9 +295,9 @@ func (configgen *ConfigGeneratorImpl) buildGatewayHTTPRouteConfig(env *model.Env }, }} } else { - virtualHosts = make([]route.VirtualHost, 0, len(vHostDedupMap)) + virtualHosts = make([]*route.VirtualHost, 0, len(vHostDedupMap)) for _, v := range vHostDedupMap { - virtualHosts = append(virtualHosts, *v) + virtualHosts = append(virtualHosts, v) } } @@ -551,7 +551,7 @@ func (configgen *ConfigGeneratorImpl) createGatewayTCPFilterChainOpts( // It first obtains all virtual services bound to the set of Gateways for this workload, filters them by this // server's port and hostnames, and produces network filters for each destination from the filtered services. func buildGatewayNetworkFiltersFromTCPRoutes(node *model.Proxy, env *model.Environment, push *model.PushContext, server *networking.Server, - gatewaysForWorkload map[string]bool) []listener.Filter { + gatewaysForWorkload map[string]bool) []*listener.Filter { port := &model.Port{ Name: server.Port.Name, Port: int(server.Port.Number), diff --git a/pilot/pkg/networking/core/v1alpha3/httproute.go b/pilot/pkg/networking/core/v1alpha3/httproute.go index 237fce26cbd4..36bce2784b9e 100644 --- a/pilot/pkg/networking/core/v1alpha3/httproute.go +++ b/pilot/pkg/networking/core/v1alpha3/httproute.go @@ -73,15 +73,15 @@ func (configgen *ConfigGeneratorImpl) buildSidecarInboundHTTPRouteConfig(env *mo traceOperation := fmt.Sprintf("%s:%d/*", instance.Service.Hostname, instance.Endpoint.ServicePort.Port) defaultRoute := istio_route.BuildDefaultHTTPInboundRoute(clusterName, traceOperation) - inboundVHost := route.VirtualHost{ + inboundVHost := &route.VirtualHost{ Name: fmt.Sprintf("%s|http|%d", model.TrafficDirectionInbound, instance.Endpoint.ServicePort.Port), Domains: []string{"*"}, - Routes: []route.Route{*defaultRoute}, + Routes: []*route.Route{defaultRoute}, } r := &xdsapi.RouteConfiguration{ Name: clusterName, - VirtualHosts: []route.VirtualHost{inboundVHost}, + VirtualHosts: []*route.VirtualHost{inboundVHost}, ValidateClusters: proto.BoolFalse, } @@ -171,19 +171,19 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundHTTPRouteConfig(env *m // Get list of virtual services bound to the mesh gateway virtualHostWrappers := istio_route.BuildSidecarVirtualHostsFromConfigAndRegistry(node, push, nameToServiceMap, proxyLabels, virtualServices, listenerPort) - vHostPortMap := make(map[int][]route.VirtualHost) + vHostPortMap := make(map[int][]*route.VirtualHost) uniques := make(map[string]struct{}) for _, virtualHostWrapper := range virtualHostWrappers { // If none of the routes matched by source, skip this virtual host if len(virtualHostWrapper.Routes) == 0 { continue } - virtualHosts := make([]route.VirtualHost, 0, len(virtualHostWrapper.VirtualServiceHosts)+len(virtualHostWrapper.Services)) + virtualHosts := make([]*route.VirtualHost, 0, len(virtualHostWrapper.VirtualServiceHosts)+len(virtualHostWrapper.Services)) for _, host := range virtualHostWrapper.VirtualServiceHosts { name := fmt.Sprintf("%s:%d", host, virtualHostWrapper.Port) if _, found := uniques[name]; !found { uniques[name] = struct{}{} - virtualHosts = append(virtualHosts, route.VirtualHost{ + virtualHosts = append(virtualHosts, &route.VirtualHost{ Name: name, Domains: []string{host, fmt.Sprintf("%s:%d", host, virtualHostWrapper.Port)}, Routes: virtualHostWrapper.Routes, @@ -198,7 +198,7 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundHTTPRouteConfig(env *m name := fmt.Sprintf("%s:%d", svc.Hostname, virtualHostWrapper.Port) if _, found := uniques[name]; !found { uniques[name] = struct{}{} - virtualHosts = append(virtualHosts, route.VirtualHost{ + virtualHosts = append(virtualHosts, &route.VirtualHost{ Name: name, Domains: generateVirtualHostDomains(svc, virtualHostWrapper.Port, node), Routes: virtualHostWrapper.Routes, @@ -212,7 +212,7 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundHTTPRouteConfig(env *m vHostPortMap[virtualHostWrapper.Port] = append(vHostPortMap[virtualHostWrapper.Port], virtualHosts...) } - var virtualHosts []route.VirtualHost + var virtualHosts []*route.VirtualHost if listenerPort == 0 { virtualHosts = mergeAllVirtualHosts(vHostPortMap) } else { @@ -224,12 +224,12 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundHTTPRouteConfig(env *m if features.EnableFallthroughRoute.Get() { // This needs to be the last virtual host, as routes are evaluated in order. if isAllowAnyOutbound(node) { - virtualHosts = append(virtualHosts, route.VirtualHost{ + virtualHosts = append(virtualHosts, &route.VirtualHost{ Name: util.PassthroughRouteName, Domains: []string{"*"}, - Routes: []route.Route{ + Routes: []*route.Route{ { - Match: route.RouteMatch{ + Match: &route.RouteMatch{ PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}, }, Action: &route.Route_Route{ @@ -241,12 +241,12 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundHTTPRouteConfig(env *m }, }) } else { - virtualHosts = append(virtualHosts, route.VirtualHost{ + virtualHosts = append(virtualHosts, &route.VirtualHost{ Name: util.BlackHoleRouteName, Domains: []string{"*"}, - Routes: []route.Route{ + Routes: []*route.Route{ { - Match: route.RouteMatch{ + Match: &route.RouteMatch{ PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}, }, Action: &route.Route_DirectResponse{ @@ -347,8 +347,8 @@ func generateAltVirtualHosts(hostname string, port int, proxyDomain string) []st // mergeAllVirtualHosts across all ports. On routes for ports other than port 80, // virtual hosts without an explicit port suffix (IP:PORT) should not be added -func mergeAllVirtualHosts(vHostPortMap map[int][]route.VirtualHost) []route.VirtualHost { - var virtualHosts []route.VirtualHost +func mergeAllVirtualHosts(vHostPortMap map[int][]*route.VirtualHost) []*route.VirtualHost { + var virtualHosts []*route.VirtualHost for p, vhosts := range vHostPortMap { if p == 80 { virtualHosts = append(virtualHosts, vhosts...) diff --git a/pilot/pkg/networking/core/v1alpha3/listener.go b/pilot/pkg/networking/core/v1alpha3/listener.go index a704a402f0f8..fa7b49472682 100644 --- a/pilot/pkg/networking/core/v1alpha3/listener.go +++ b/pilot/pkg/networking/core/v1alpha3/listener.go @@ -449,7 +449,7 @@ func (configgen *ConfigGeneratorImpl) buildSidecarInboundListenerForPortOrUDS(no } for _, chain := range allChains { var httpOpts *httpListenerOpts - var tcpNetworkFilters []listener.Filter + var tcpNetworkFilters []*listener.Filter switch pluginParams.ListenerProtocol { case plugin.ListenerProtocolHTTP: @@ -1081,7 +1081,7 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundListenerForPortOrUDS(l } listenerOpts.filterChainOpts = append([]*filterChainOpts{{ destinationCIDRs: pluginParams.Node.IPAddresses, - networkFilters: []listener.Filter{blackhole}, + networkFilters: []*listener.Filter{&blackhole}, }}, listenerOpts.filterChainOpts...) } @@ -1119,7 +1119,7 @@ func (configgen *ConfigGeneratorImpl) buildSidecarOutboundListenerForPortOrUDS(l // For every new filter chain match being added, check if any previous match is same // if so, skip adding this filter chain with a warning // This is very unoptimized. - newFilterChains := make([]listener.FilterChain, 0, + newFilterChains := make([]*listener.FilterChain, 0, len(currentListenerEntry.listener.FilterChains)+len(mutable.Listener.FilterChains)) newFilterChains = append(newFilterChains, currentListenerEntry.listener.FilterChains...) @@ -1245,7 +1245,7 @@ func (configgen *ConfigGeneratorImpl) generateManagementListeners(node *model.Pr // non overlapping listeners only. for i := range mgmtListeners { m := mgmtListeners[i] - l := util.GetByAddress(listeners, m.Address) + l := util.GetByAddress(listeners, *m.Address) if l != nil { log.Warnf("Omitting listener for management address %s due to collision with service listener %s", m.Name, l.Name) @@ -1309,11 +1309,11 @@ func (configgen *ConfigGeneratorImpl) onVirtualOutboundListener(env *model.Envir } } if len(mutable.FilterChains) > 0 && len(mutable.FilterChains[0].TCP) > 0 { - filters := append([]listener.Filter{}, mutable.FilterChains[0].TCP...) + filters := append([]*listener.Filter{}, mutable.FilterChains[0].TCP...) filters = append(filters, fallbackFilter) // Replace the final filter chain with the new chain that has had plugins applied - initialFilterChain = append(initialFilterChain, listener.FilterChain{Filters: filters}) + initialFilterChain = append(initialFilterChain, &listener.FilterChain{Filters: filters}) ipTablesListener.FilterChains = initialFilterChain } return ipTablesListener @@ -1425,8 +1425,8 @@ type filterChainOpts struct { tlsContext *auth.DownstreamTlsContext httpOpts *httpListenerOpts match *listener.FilterChainMatch - listenerFilters []listener.ListenerFilter - networkFilters []listener.Filter + listenerFilters []*listener.ListenerFilter + networkFilters []*listener.Filter } // buildListenerOpts are the options required to build a Listener @@ -1490,7 +1490,7 @@ func buildHTTPConnectionManager(node *model.Proxy, env *model.Environment, httpO if httpOpts.rds != "" { rds := &http_conn.HttpConnectionManager_Rds{ Rds: &http_conn.Rds{ - ConfigSource: core.ConfigSource{ + ConfigSource: &core.ConfigSource{ ConfigSourceSpecifier: &core.ConfigSource_Ads{ Ads: &core.AggregatedConfigSource{}, }, @@ -1575,9 +1575,9 @@ func buildHTTPConnectionManager(node *model.Proxy, env *model.Environment, httpO // buildListener builds and initializes a Listener proto based on the provided opts. It does not set any filters. func buildListener(opts buildListenerOpts) *xdsapi.Listener { - filterChains := make([]listener.FilterChain, 0, len(opts.filterChainOpts)) + filterChains := make([]*listener.FilterChain, 0, len(opts.filterChainOpts)) listenerFiltersMap := make(map[string]bool) - var listenerFilters []listener.ListenerFilter + var listenerFilters []*listener.ListenerFilter // add a TLS inspector if we need to detect ServerName or ALPN needTLSInspector := false @@ -1590,7 +1590,7 @@ func buildListener(opts buildListenerOpts) *xdsapi.Listener { } if needTLSInspector { listenerFiltersMap[xdsutil.TlsInspector] = true - listenerFilters = append(listenerFilters, listener.ListenerFilter{Name: xdsutil.TlsInspector}) + listenerFilters = append(listenerFilters, &listener.ListenerFilter{Name: xdsutil.TlsInspector}) } for _, chain := range opts.filterChainOpts { @@ -1637,7 +1637,7 @@ func buildListener(opts buildListenerOpts) *xdsapi.Listener { if !needMatch && reflect.DeepEqual(*match, listener.FilterChainMatch{}) { match = nil } - filterChains = append(filterChains, listener.FilterChain{ + filterChains = append(filterChains, &listener.FilterChain{ FilterChainMatch: match, TlsContext: chain.tlsContext, }) @@ -1687,7 +1687,7 @@ func appendListenerFallthroughRoute(l *xdsapi.Listener, opts *buildListenerOpts, } } - tcpFilter := listener.Filter{ + tcpFilter := &listener.Filter{ Name: xdsutil.TCPProxy, } tcpProxy := &tcp_proxy.TcpProxy{ @@ -1701,9 +1701,9 @@ func appendListenerFallthroughRoute(l *xdsapi.Listener, opts *buildListenerOpts, } opts.filterChainOpts = append(opts.filterChainOpts, &filterChainOpts{ - networkFilters: []listener.Filter{tcpFilter}, + networkFilters: []*listener.Filter{tcpFilter}, }) - l.FilterChains = append(l.FilterChains, listener.FilterChain{FilterChainMatch: wildcardMatch}) + l.FilterChains = append(l.FilterChains, &listener.FilterChain{FilterChainMatch: wildcardMatch}) } } @@ -1750,7 +1750,7 @@ func buildCompleteFilterChain(pluginParams *plugin.InputParams, mutable *plugin. opt.httpOpts.statPrefix = mutable.Listener.Name httpConnectionManagers[i] = buildHTTPConnectionManager(pluginParams.Node, opts.env, opt.httpOpts, chain.HTTP) - filter := listener.Filter{ + filter := &listener.Filter{ Name: xdsutil.HTTPConnectionManager, } if util.IsXDSMarshalingToAnyEnabled(pluginParams.Node) { diff --git a/pilot/pkg/networking/core/v1alpha3/listener_builder.go b/pilot/pkg/networking/core/v1alpha3/listener_builder.go index b2e10b9feed3..dd968858b546 100644 --- a/pilot/pkg/networking/core/v1alpha3/listener_builder.go +++ b/pilot/pkg/networking/core/v1alpha3/listener_builder.go @@ -129,9 +129,9 @@ func (builder *ListenerBuilder) buildVirtualOutboundListener( tcpProxyFilter := newTCPProxyOutboundListenerFilter(env, node) - filterChains := []listener.FilterChain{ + filterChains := []*listener.FilterChain{ { - Filters: []listener.Filter{*tcpProxyFilter}, + Filters: []*listener.Filter{tcpProxyFilter}, }, } @@ -144,15 +144,15 @@ func (builder *ListenerBuilder) buildVirtualOutboundListener( for _, ip := range node.IPAddresses { cidrRanges = append(cidrRanges, util.ConvertAddressToCidr(ip)) } - blackhole := blackholeStructMarshalling + blackhole := &blackholeStructMarshalling if util.IsXDSMarshalingToAnyEnabled(node) { - blackhole = blackholeAnyMarshalling + blackhole = &blackholeAnyMarshalling } - filterChains = append([]listener.FilterChain{{ + filterChains = append([]*listener.FilterChain{{ FilterChainMatch: &listener.FilterChainMatch{ PrefixRanges: cidrRanges, }, - Filters: []listener.Filter{blackhole}, + Filters: []*listener.Filter{blackhole}, }}, filterChains...) } @@ -269,9 +269,9 @@ func newBlackholeFilter(enableAny bool) listener.Filter { return filter } -func newInboundPassthroughFilterChains(env *model.Environment, node *model.Proxy) []listener.FilterChain { +func newInboundPassthroughFilterChains(env *model.Environment, node *model.Proxy) []*listener.FilterChain { // ipv4 and ipv6 - filterChains := make([]listener.FilterChain, 0, 2) + filterChains := make([]*listener.FilterChain, 0, 2) for _, clusterName := range []string{util.InboundPassthroughClusterIpv4, util.InboundPassthroughClusterIpv6} { tcpProxy := &tcp_proxy.TcpProxy{ @@ -293,7 +293,7 @@ func newInboundPassthroughFilterChains(env *model.Environment, node *model.Proxy }, } setAccessLog(env, node, tcpProxy) - filter := listener.Filter{ + filter := &listener.Filter{ Name: xdsutil.TCPProxy, } @@ -302,9 +302,9 @@ func newInboundPassthroughFilterChains(env *model.Environment, node *model.Proxy } else { filter.ConfigType = &listener.Filter_Config{Config: util.MessageToStruct(tcpProxy)} } - filterChain := listener.FilterChain{ + filterChain := &listener.FilterChain{ FilterChainMatch: &filterChainMatch, - Filters: []listener.Filter{ + Filters: []*listener.Filter{ filter, }, } diff --git a/pilot/pkg/networking/core/v1alpha3/listener_test.go b/pilot/pkg/networking/core/v1alpha3/listener_test.go index 2a34845ab3e1..ed339fc5f7ad 100644 --- a/pilot/pkg/networking/core/v1alpha3/listener_test.go +++ b/pilot/pkg/networking/core/v1alpha3/listener_test.go @@ -768,7 +768,7 @@ func buildAllListeners(p plugin.Plugin, sidecarConfig *model.Config, services .. return configgen.buildSidecarListeners(&env, &proxy, env.PushContext, builder).getListeners() } -func getFilterConfig(filter listener.Filter, out proto.Message) error { +func getFilterConfig(filter *listener.Filter, out proto.Message) error { switch c := filter.ConfigType.(type) { case *listener.Filter_Config: if err := util.StructToMessage(c.Config, out); err != nil { diff --git a/pilot/pkg/networking/core/v1alpha3/loadbalancer/loadbalancer_test.go b/pilot/pkg/networking/core/v1alpha3/loadbalancer/loadbalancer_test.go index f20ad8c00049..4f9ce7f76335 100644 --- a/pilot/pkg/networking/core/v1alpha3/loadbalancer/loadbalancer_test.go +++ b/pilot/pkg/networking/core/v1alpha3/loadbalancer/loadbalancer_test.go @@ -281,7 +281,7 @@ func buildFakeCluster() *apiv2.Cluster { Name: "outbound|8080||test.example.org", LoadAssignment: &apiv2.ClusterLoadAssignment{ ClusterName: "outbound|8080||test.example.org", - Endpoints: []endpoint.LocalityLbEndpoints{ + Endpoints: []*endpoint.LocalityLbEndpoints{ { Locality: &envoycore.Locality{ Region: "region1", @@ -342,7 +342,7 @@ func buildSmallCluster() *apiv2.Cluster { Name: "outbound|8080||test.example.org", LoadAssignment: &apiv2.ClusterLoadAssignment{ ClusterName: "outbound|8080||test.example.org", - Endpoints: []endpoint.LocalityLbEndpoints{ + Endpoints: []*endpoint.LocalityLbEndpoints{ { Locality: &envoycore.Locality{ Region: "region1", @@ -374,7 +374,7 @@ func buildSmallClusterWithNilLocalities() *apiv2.Cluster { Name: "outbound|8080||test.example.org", LoadAssignment: &apiv2.ClusterLoadAssignment{ ClusterName: "outbound|8080||test.example.org", - Endpoints: []endpoint.LocalityLbEndpoints{ + Endpoints: []*endpoint.LocalityLbEndpoints{ { Locality: &envoycore.Locality{ Region: "region1", diff --git a/pilot/pkg/networking/core/v1alpha3/networkfilter.go b/pilot/pkg/networking/core/v1alpha3/networkfilter.go index 55ce951a9d03..7f43b9bd3937 100644 --- a/pilot/pkg/networking/core/v1alpha3/networkfilter.go +++ b/pilot/pkg/networking/core/v1alpha3/networkfilter.go @@ -43,7 +43,7 @@ const tcpEnvoyAccesslogName string = "tcp_envoy_accesslog" var redisOpTimeout = 5 * time.Second // buildInboundNetworkFilters generates a TCP proxy network filter on the inbound path -func buildInboundNetworkFilters(env *model.Environment, node *model.Proxy, instance *model.ServiceInstance) []listener.Filter { +func buildInboundNetworkFilters(env *model.Environment, node *model.Proxy, instance *model.ServiceInstance) []*listener.Filter { clusterName := model.BuildSubsetKey(model.TrafficDirectionInbound, instance.Endpoint.ServicePort.Name, instance.Service.Hostname, instance.Endpoint.ServicePort.Port) tcpProxy := &tcp_proxy.TcpProxy{ @@ -124,7 +124,7 @@ func setAccessLogAndBuildTCPFilter(env *model.Environment, node *model.Proxy, co // buildOutboundNetworkFiltersWithSingleDestination takes a single cluster name // and builds a stack of network filters. func buildOutboundNetworkFiltersWithSingleDestination(env *model.Environment, node *model.Proxy, - clusterName string, port *model.Port) []listener.Filter { + clusterName string, port *model.Port) []*listener.Filter { tcpProxy := &tcp_proxy.TcpProxy{ StatPrefix: clusterName, @@ -144,7 +144,7 @@ func buildOutboundNetworkFiltersWithSingleDestination(env *model.Environment, no // buildOutboundNetworkFiltersWithWeightedClusters takes a set of weighted // destination routes and builds a stack of network filters. func buildOutboundNetworkFiltersWithWeightedClusters(env *model.Environment, node *model.Proxy, routes []*networking.RouteDestination, - push *model.PushContext, port *model.Port, configMeta model.ConfigMeta) []listener.Filter { + push *model.PushContext, port *model.Port, configMeta model.ConfigMeta) []*listener.Filter { statPrefix := fmt.Sprintf("%s.%s", configMeta.Name, configMeta.Namespace) clusterSpecifier := &tcp_proxy.TcpProxy_WeightedClusters{ @@ -181,25 +181,25 @@ func buildOutboundNetworkFiltersWithWeightedClusters(env *model.Environment, nod // buildNetworkFiltersStack builds a slice of network filters based on // the protocol in use and the given TCP filter instance. -func buildNetworkFiltersStack(node *model.Proxy, port *model.Port, tcpFilter *listener.Filter, statPrefix string, clusterName string) []listener.Filter { - filterstack := make([]listener.Filter, 0) +func buildNetworkFiltersStack(node *model.Proxy, port *model.Port, tcpFilter *listener.Filter, statPrefix string, clusterName string) []*listener.Filter { + filterstack := make([]*listener.Filter, 0) switch port.Protocol { case protocol.Mongo: - filterstack = append(filterstack, buildMongoFilter(statPrefix, util.IsXDSMarshalingToAnyEnabled(node)), *tcpFilter) + filterstack = append(filterstack, buildMongoFilter(statPrefix, util.IsXDSMarshalingToAnyEnabled(node)), tcpFilter) case protocol.Redis: if util.IsProxyVersionGE11(node) && features.EnableRedisFilter.Get() { // redis filter has route config, it is a terminating filter, no need append tcp filter. filterstack = append(filterstack, buildRedisFilter(statPrefix, clusterName, util.IsXDSMarshalingToAnyEnabled(node))) } else { - filterstack = append(filterstack, *tcpFilter) + filterstack = append(filterstack, tcpFilter) } case protocol.MySQL: if util.IsProxyVersionGE11(node) && features.EnableMysqlFilter.Get() { filterstack = append(filterstack, buildMySQLFilter(statPrefix, util.IsXDSMarshalingToAnyEnabled(node))) } - filterstack = append(filterstack, *tcpFilter) + filterstack = append(filterstack, tcpFilter) default: - filterstack = append(filterstack, *tcpFilter) + filterstack = append(filterstack, tcpFilter) } return filterstack @@ -210,7 +210,7 @@ func buildNetworkFiltersStack(node *model.Proxy, port *model.Port, tcpFilter *li // filter). func buildOutboundNetworkFilters(env *model.Environment, node *model.Proxy, routes []*networking.RouteDestination, push *model.PushContext, - port *model.Port, configMeta model.ConfigMeta) []listener.Filter { + port *model.Port, configMeta model.ConfigMeta) []*listener.Filter { if !util.IsProxyVersionGE11(node) || len(routes) == 1 { service := node.SidecarScope.ServiceForHostname(config.Hostname(routes[0].Destination.Host), push.ServiceByHostnameAndNamespace) @@ -221,7 +221,7 @@ func buildOutboundNetworkFilters(env *model.Environment, node *model.Proxy, } // buildMongoFilter builds an outbound Envoy MongoProxy filter. -func buildMongoFilter(statPrefix string, isXDSMarshalingToAnyEnabled bool) listener.Filter { +func buildMongoFilter(statPrefix string, isXDSMarshalingToAnyEnabled bool) *listener.Filter { // TODO: add a watcher for /var/lib/istio/mongo/certs // if certs are found use, TLS or mTLS clusters for talking to MongoDB. // User is responsible for mounting those certs in the pod. @@ -230,7 +230,7 @@ func buildMongoFilter(statPrefix string, isXDSMarshalingToAnyEnabled bool) liste // TODO enable faults in mongo } - out := listener.Filter{ + out := &listener.Filter{ Name: xdsutil.MongoProxy, } if isXDSMarshalingToAnyEnabled { @@ -244,12 +244,12 @@ func buildMongoFilter(statPrefix string, isXDSMarshalingToAnyEnabled bool) liste // buildOutboundAutoPassthroughFilterStack builds a filter stack with sni_cluster and tcp_proxy // used by auto_passthrough gateway servers -func buildOutboundAutoPassthroughFilterStack(env *model.Environment, node *model.Proxy, port *model.Port) []listener.Filter { +func buildOutboundAutoPassthroughFilterStack(env *model.Environment, node *model.Proxy, port *model.Port) []*listener.Filter { // First build tcp_proxy with access logs // then add sni_cluster to the front tcpProxy := buildOutboundNetworkFiltersWithSingleDestination(env, node, util.BlackHoleCluster, port) - filterstack := make([]listener.Filter, 0) - filterstack = append(filterstack, listener.Filter{ + filterstack := make([]*listener.Filter, 0) + filterstack = append(filterstack, &listener.Filter{ Name: util.SniClusterFilter, }) filterstack = append(filterstack, tcpProxy...) @@ -260,19 +260,19 @@ func buildOutboundAutoPassthroughFilterStack(env *model.Environment, node *model // buildRedisFilter builds an outbound Envoy RedisProxy filter. // Currently, if multiple clusters are defined, one of them will be picked for // configuring the Redis proxy. -func buildRedisFilter(statPrefix, clusterName string, isXDSMarshalingToAnyEnabled bool) listener.Filter { +func buildRedisFilter(statPrefix, clusterName string, isXDSMarshalingToAnyEnabled bool) *listener.Filter { redisProxy := &redis_proxy.RedisProxy{ LatencyInMicros: true, // redis latency stats are captured in micro seconds which is typically the case. StatPrefix: statPrefix, // redis stats are prefixed with redis. by Envoy Settings: &redis_proxy.RedisProxy_ConnPoolSettings{ OpTimeout: &redisOpTimeout, // TODO: Make this user configurable }, - PrefixRoutes: redis_proxy.RedisProxy_PrefixRoutes{ + PrefixRoutes: &redis_proxy.RedisProxy_PrefixRoutes{ CatchAllCluster: clusterName, }, } - out := listener.Filter{ + out := &listener.Filter{ Name: xdsutil.RedisProxy, } if isXDSMarshalingToAnyEnabled { @@ -285,12 +285,12 @@ func buildRedisFilter(statPrefix, clusterName string, isXDSMarshalingToAnyEnable } // buildMySQLFilter builds an outbound Envoy MySQLProxy filter. -func buildMySQLFilter(statPrefix string, isXDSMarshalingToAnyEnabled bool) listener.Filter { +func buildMySQLFilter(statPrefix string, isXDSMarshalingToAnyEnabled bool) *listener.Filter { mySQLProxy := &mysql_proxy.MySQLProxy{ StatPrefix: statPrefix, // MySQL stats are prefixed with mysql. by Envoy. } - out := listener.Filter{ + out := &listener.Filter{ Name: xdsutil.MySQLProxy, } diff --git a/pilot/pkg/networking/core/v1alpha3/route/retry/retry.go b/pilot/pkg/networking/core/v1alpha3/route/retry/retry.go index b2cc32849d16..b9f911dfffdb 100644 --- a/pilot/pkg/networking/core/v1alpha3/route/retry/retry.go +++ b/pilot/pkg/networking/core/v1alpha3/route/retry/retry.go @@ -82,7 +82,7 @@ func ConvertPolicy(in *networking.HTTPRetry) *route.RetryPolicy { if in.PerTryTimeout != nil { d := util.GogoDurationToDuration(in.PerTryTimeout) - out.PerTryTimeout = &d + out.PerTryTimeout = d } return out } diff --git a/pilot/pkg/networking/core/v1alpha3/route/route.go b/pilot/pkg/networking/core/v1alpha3/route/route.go index 940cba9e612b..dc68c9e3e3ac 100644 --- a/pilot/pkg/networking/core/v1alpha3/route/route.go +++ b/pilot/pkg/networking/core/v1alpha3/route/route.go @@ -64,7 +64,7 @@ type VirtualHostWrapper struct { VirtualServiceHosts []string // Routes in the virtual host - Routes []route.Route + Routes []*route.Route } // BuildSidecarVirtualHostsFromConfigAndRegistry creates virtual hosts from @@ -110,7 +110,7 @@ func BuildSidecarVirtualHostsFromConfigAndRegistry( out = append(out, VirtualHostWrapper{ Port: port.Port, Services: []*model.Service{svc}, - Routes: []route.Route{*BuildDefaultHTTPOutboundRoute(cluster, traceOperation)}, + Routes: []*route.Route{BuildDefaultHTTPOutboundRoute(cluster, traceOperation)}, }) } } @@ -240,25 +240,25 @@ func BuildHTTPRoutesForVirtualService( serviceRegistry map[config.Hostname]*model.Service, listenPort int, proxyLabels config.LabelsCollection, - gatewayNames map[string]bool) ([]route.Route, error) { + gatewayNames map[string]bool) ([]*route.Route, error) { vs, ok := virtualService.Spec.(*networking.VirtualService) if !ok { // should never happen return nil, fmt.Errorf("in not a virtual service: %#v", virtualService) } - out := make([]route.Route, 0, len(vs.Http)) + out := make([]*route.Route, 0, len(vs.Http)) allroutes: for _, http := range vs.Http { if len(http.Match) == 0 { if r := translateRoute(push, node, http, nil, listenPort, virtualService, serviceRegistry, proxyLabels, gatewayNames); r != nil { - out = append(out, *r) + out = append(out, r) } break allroutes // we have a rule with catch all match prefix: /. Other rules are of no use } else { for _, match := range http.Match { if r := translateRoute(push, node, http, match, listenPort, virtualService, serviceRegistry, proxyLabels, gatewayNames); r != nil { - out = append(out, *r) + out = append(out, r) rType, _ := getEnvoyRouteTypeAndVal(r) if rType == envoyCatchAll { // We have a catch all route. No point building other routes, with match conditions @@ -363,8 +363,8 @@ func translateRoute(push *model.PushContext, node *model.Proxy, in *networking.H if in.Timeout != nil { d := util.GogoDurationToDuration(in.Timeout) // timeout - action.Timeout = &d - action.MaxGrpcTimeout = &d + action.Timeout = d + action.MaxGrpcTimeout = d } else { // if no timeout is specified, disable timeouts. This is easier // to reason about than assuming some defaults. @@ -527,8 +527,8 @@ func translateAppendHeaders(headers map[string]string, appendFlag bool) []*core. } // translateRouteMatch translates match condition -func translateRouteMatch(in *networking.HTTPMatchRequest) route.RouteMatch { - out := route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}} +func translateRouteMatch(in *networking.HTTPMatchRequest) *route.RouteMatch { + out := &route.RouteMatch{PathSpecifier: &route.RouteMatch_Prefix{Prefix: "/"}} if in == nil { return out } @@ -742,7 +742,7 @@ func translateFault(in *networking.HTTPFaultInjection) *xdshttpfault.HTTPFault { case *networking.HTTPFaultInjection_Delay_FixedDelay: delayDuration := util.GogoDurationToDuration(d.FixedDelay) out.Delay.FaultDelaySecifier = &xdsfault.FaultDelay_FixedDelay{ - FixedDelay: &delayDuration, + FixedDelay: delayDuration, } default: log.Warnf("Exponential faults are not yet supported") @@ -910,12 +910,12 @@ func getEnvoyRouteTypeAndVal(r *route.Route) (envoyRouteType, string) { // the relative order of other routes in the concatenated route. // Assumes that the virtual services that generated first and second are ordered by // time. -func CombineVHostRoutes(first []route.Route, second []route.Route) []route.Route { - allroutes := make([]route.Route, 0, len(first)+len(second)) - catchAllRoutes := make([]route.Route, 0) +func CombineVHostRoutes(first []*route.Route, second []*route.Route) []*route.Route { + allroutes := make([]*route.Route, 0, len(first)+len(second)) + catchAllRoutes := make([]*route.Route, 0) for _, f := range first { - rType, _ := getEnvoyRouteTypeAndVal(&f) + rType, _ := getEnvoyRouteTypeAndVal(f) switch rType { case envoyCatchAll: catchAllRoutes = append(catchAllRoutes, f) @@ -925,7 +925,7 @@ func CombineVHostRoutes(first []route.Route, second []route.Route) []route.Route } for _, s := range second { - rType, _ := getEnvoyRouteTypeAndVal(&s) + rType, _ := getEnvoyRouteTypeAndVal(s) switch rType { case envoyCatchAll: catchAllRoutes = append(catchAllRoutes, s) diff --git a/pilot/pkg/networking/core/v1alpha3/route/route_test.go b/pilot/pkg/networking/core/v1alpha3/route/route_test.go index 3c9d7763a8de..cb39b3efdad9 100644 --- a/pilot/pkg/networking/core/v1alpha3/route/route_test.go +++ b/pilot/pkg/networking/core/v1alpha3/route/route_test.go @@ -496,17 +496,17 @@ var networkingSubsetWithPortLevelSettings = &networking.Subset{ } func TestCombineVHostRoutes(t *testing.T) { - first := []envoyroute.Route{ - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path1"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix1"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex1"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/"}}}, + first := []*envoyroute.Route{ + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path1"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix1"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex1"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/"}}}, } - second := []envoyroute.Route{ - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path12"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix12"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex12"}}}, - {Match: envoyroute.RouteMatch{ + second := []*envoyroute.Route{ + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path12"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix12"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex12"}}}, + {Match: &envoyroute.RouteMatch{ PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: "*"}, Headers: []*envoyroute.HeaderMatcher{ { @@ -518,14 +518,14 @@ func TestCombineVHostRoutes(t *testing.T) { }}, } - want := []envoyroute.Route{ - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path1"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix1"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex1"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path12"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix12"}}}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex12"}}}, - {Match: envoyroute.RouteMatch{ + want := []*envoyroute.Route{ + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path1"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix1"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex1"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Path{Path: "/path12"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/prefix12"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: ".*?regex12"}}}, + {Match: &envoyroute.RouteMatch{ PathSpecifier: &envoyroute.RouteMatch_Regex{Regex: "*"}, Headers: []*envoyroute.HeaderMatcher{ { @@ -535,7 +535,7 @@ func TestCombineVHostRoutes(t *testing.T) { }, }, }}, - {Match: envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/"}}}, + {Match: &envoyroute.RouteMatch{PathSpecifier: &envoyroute.RouteMatch_Prefix{Prefix: "/"}}}, } got := route.CombineVHostRoutes(first, second) diff --git a/pilot/pkg/networking/plugin/authz/authorization.go b/pilot/pkg/networking/plugin/authz/authorization.go index faec0868e513..14a53ecec81b 100644 --- a/pilot/pkg/networking/plugin/authz/authorization.go +++ b/pilot/pkg/networking/plugin/authz/authorization.go @@ -99,13 +99,13 @@ func buildFilter(in *plugin.InputParams, mutable *plugin.MutableObjects) { mutable.FilterChains[cnum].HTTP = append(mutable.FilterChains[cnum].HTTP, httpFilter) } else { rbacLog.Infof("added TCP filter to gateway filter chain %d", cnum) - mutable.FilterChains[cnum].TCP = append(mutable.FilterChains[cnum].TCP, *tcpFilter) + mutable.FilterChains[cnum].TCP = append(mutable.FilterChains[cnum].TCP, tcpFilter) } } } else { for cnum := range mutable.FilterChains { rbacLog.Infof("added TCP filter to filter chain %d", cnum) - mutable.FilterChains[cnum].TCP = append(mutable.FilterChains[cnum].TCP, *tcpFilter) + mutable.FilterChains[cnum].TCP = append(mutable.FilterChains[cnum].TCP, tcpFilter) } } case plugin.ListenerProtocolHTTP: diff --git a/pilot/pkg/networking/plugin/mixer/mixer.go b/pilot/pkg/networking/plugin/mixer/mixer.go index 4110b187bc9d..3440d01f3cc7 100644 --- a/pilot/pkg/networking/plugin/mixer/mixer.go +++ b/pilot/pkg/networking/plugin/mixer/mixer.go @@ -23,7 +23,7 @@ import ( xdsapi "github.com/envoyproxy/go-control-plane/envoy/api/v2" "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - e "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" + "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener" "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" http_conn "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2" @@ -207,12 +207,12 @@ func (mixerplugin) OnOutboundCluster(in *plugin.InputParams, cluster *xdsapi.Clu addr := util.BuildAddress(in.Service.Address, uint32(in.Port.Port)) cluster.LoadAssignment = &xdsapi.ClusterLoadAssignment{ ClusterName: cluster.Name, - Endpoints: []e.LocalityLbEndpoints{ + Endpoints: []*endpoint.LocalityLbEndpoints{ { - LbEndpoints: []e.LbEndpoint{ + LbEndpoints: []*endpoint.LbEndpoint{ { - HostIdentifier: &e.LbEndpoint_Endpoint{ - Endpoint: &e.Endpoint{Address: &addr}, + HostIdentifier: &endpoint.LbEndpoint_Endpoint{ + Endpoint: &endpoint.Endpoint{Address: addr}, }, }, }, @@ -399,7 +399,7 @@ func buildInboundHTTPFilter(mesh *meshconfig.MeshConfig, attrs attributes, node return out } -func addFilterConfigToRoute(in *plugin.InputParams, httpRoute route.Route, attrs attributes, isXDSMarshalingToAnyEnabled bool) { +func addFilterConfigToRoute(in *plugin.InputParams, httpRoute *route.Route, attrs attributes, isXDSMarshalingToAnyEnabled bool) { if isXDSMarshalingToAnyEnabled { httpRoute.TypedPerFilterConfig = addTypedServiceConfig(httpRoute.TypedPerFilterConfig, &mccpb.ServiceConfig{ DisableCheckCalls: disablePolicyChecks(outbound, in.Env.Mesh, in.Node), @@ -415,7 +415,7 @@ func addFilterConfigToRoute(in *plugin.InputParams, httpRoute route.Route, attrs } } -func modifyOutboundRouteConfig(push *model.PushContext, in *plugin.InputParams, virtualHostname string, httpRoute route.Route) route.Route { +func modifyOutboundRouteConfig(push *model.PushContext, in *plugin.InputParams, virtualHostname string, httpRoute *route.Route) *route.Route { isXDSMarshalingToAnyEnabled := util.IsXDSMarshalingToAnyEnabled(in.Node) // default config, to be overridden by per-weighted cluster @@ -507,7 +507,7 @@ func buildInboundRouteConfig(in *plugin.InputParams, instance *model.ServiceInst return out } -func buildOutboundTCPFilter(mesh *meshconfig.MeshConfig, attrsIn attributes, node *model.Proxy, destination *model.Service) listener.Filter { +func buildOutboundTCPFilter(mesh *meshconfig.MeshConfig, attrsIn attributes, node *model.Proxy, destination *model.Service) *listener.Filter { attrs := attrsCopy(attrsIn) if destination != nil { attrs = addDestinationServiceAttributes(attrs, destination) @@ -518,7 +518,7 @@ func buildOutboundTCPFilter(mesh *meshconfig.MeshConfig, attrsIn attributes, nod MixerAttributes: &mpb.Attributes{Attributes: attrs}, Transport: buildTransport(mesh, node), } - out := listener.Filter{ + out := &listener.Filter{ Name: mixer, } @@ -531,13 +531,13 @@ func buildOutboundTCPFilter(mesh *meshconfig.MeshConfig, attrsIn attributes, nod return out } -func buildInboundTCPFilter(mesh *meshconfig.MeshConfig, attrs attributes, node *model.Proxy) listener.Filter { +func buildInboundTCPFilter(mesh *meshconfig.MeshConfig, attrs attributes, node *model.Proxy) *listener.Filter { cfg := &mccpb.TcpClientConfig{ DisableCheckCalls: disablePolicyChecks(inbound, mesh, node), MixerAttributes: &mpb.Attributes{Attributes: attrs}, Transport: buildTransport(mesh, node), } - out := listener.Filter{ + out := &listener.Filter{ Name: mixer, } diff --git a/pilot/pkg/networking/plugin/plugin.go b/pilot/pkg/networking/plugin/plugin.go index 93300764d485..3af7f62e6893 100644 --- a/pilot/pkg/networking/plugin/plugin.go +++ b/pilot/pkg/networking/plugin/plugin.go @@ -105,14 +105,14 @@ type FilterChain struct { TLSContext *auth.DownstreamTlsContext // ListenerFilters are the filters needed for the whole listener, not particular to this // filter chain. - ListenerFilters []listener.ListenerFilter + ListenerFilters []*listener.ListenerFilter // ListenerProtocol indicates whether this filter chain is for HTTP or TCP // Note that HTTP filter chains can also have network filters ListenerProtocol ListenerProtocol // HTTP is the set of HTTP filters for this filter chain HTTP []*http_conn.HttpFilter // TCP is the set of network (TCP) filters for this filter chain. - TCP []listener.Filter + TCP []*listener.Filter } // MutableObjects is a set of objects passed to On*Listener callbacks. Fields may be nil or empty. diff --git a/pilot/pkg/networking/util/util.go b/pilot/pkg/networking/util/util.go index 5884784d007c..90b0c139c3eb 100644 --- a/pilot/pkg/networking/util/util.go +++ b/pilot/pkg/networking/util/util.go @@ -116,9 +116,9 @@ func ConvertAddressToCidr(addr string) *core.CidrRange { } // BuildAddress returns a SocketAddress with the given ip and port or uds. -func BuildAddress(bind string, port uint32) core.Address { +func BuildAddress(bind string, port uint32) *core.Address { if len(bind) > 0 && strings.HasPrefix(bind, model.UnixAddressPrefix) { - return core.Address{ + return &core.Address{ Address: &core.Address_Pipe{ Pipe: &core.Pipe{ Path: bind, @@ -127,7 +127,7 @@ func BuildAddress(bind string, port uint32) core.Address { } } - return core.Address{ + return &core.Address{ Address: &core.Address_SocketAddress{ SocketAddress: &core.SocketAddress{ Address: bind, @@ -140,19 +140,19 @@ func BuildAddress(bind string, port uint32) core.Address { } // GetNetworkEndpointAddress returns an Envoy v2 API `Address` that represents this NetworkEndpoint -func GetNetworkEndpointAddress(n *model.NetworkEndpoint) core.Address { +func GetNetworkEndpointAddress(n *model.NetworkEndpoint) *core.Address { switch n.Family { case model.AddressFamilyTCP: return BuildAddress(n.Address, uint32(n.Port)) case model.AddressFamilyUnix: - return core.Address{Address: &core.Address_Pipe{Pipe: &core.Pipe{Path: n.Address}}} + return &core.Address{Address: &core.Address_Pipe{Pipe: &core.Pipe{Path: n.Address}}} default: panic(fmt.Sprintf("unhandled Family %v", n.Family)) } } // lbWeightNormalize set LbEndpoints within a locality with a valid LoadBalancingWeight. -func lbWeightNormalize(endpoints []endpoint.LbEndpoint) []endpoint.LbEndpoint { +func lbWeightNormalize(endpoints []*endpoint.LbEndpoint) []*endpoint.LbEndpoint { var totalLbEndpointsNum uint32 var needNormalize bool @@ -166,7 +166,7 @@ func lbWeightNormalize(endpoints []endpoint.LbEndpoint) []endpoint.LbEndpoint { return endpoints } - out := make([]endpoint.LbEndpoint, len(endpoints)) + out := make([]*endpoint.LbEndpoint, len(endpoints)) for i, ep := range endpoints { weight := float64(ep.GetLoadBalancingWeight().GetValue()*maxLoadBalancingWeight) / float64(totalLbEndpointsNum) ep.LoadBalancingWeight = &types.UInt32Value{ @@ -179,7 +179,7 @@ func lbWeightNormalize(endpoints []endpoint.LbEndpoint) []endpoint.LbEndpoint { } // LocalityLbWeightNormalize set LocalityLbEndpoints within a cluster with a valid LoadBalancingWeight. -func LocalityLbWeightNormalize(endpoints []endpoint.LocalityLbEndpoints) []endpoint.LocalityLbEndpoints { +func LocalityLbWeightNormalize(endpoints []*endpoint.LocalityLbEndpoints) []*endpoint.LocalityLbEndpoints { var totalLbEndpointsNum uint32 var needNormalize bool @@ -194,7 +194,7 @@ func LocalityLbWeightNormalize(endpoints []endpoint.LocalityLbEndpoints) []endpo return endpoints } - out := make([]endpoint.LocalityLbEndpoints, len(endpoints)) + out := make([]*endpoint.LocalityLbEndpoints, len(endpoints)) for i, localityLbEndpoint := range endpoints { weight := float64(localityLbEndpoint.GetLoadBalancingWeight().GetValue()*maxLoadBalancingWeight) / float64(totalLbEndpointsNum) localityLbEndpoint.LoadBalancingWeight = &types.UInt32Value{ @@ -238,24 +238,24 @@ func MessageToStruct(msg proto.Message) *types.Struct { } // GogoDurationToDuration converts from gogo proto duration to time.duration -func GogoDurationToDuration(d *types.Duration) time.Duration { +func GogoDurationToDuration(d *types.Duration) *time.Duration { if d == nil { - return 0 + return nil } dur, err := types.DurationFromProto(d) if err != nil { // TODO(mostrowski): add error handling instead. log.Warnf("error converting duration %#v, using 0: %v", d, err) - return 0 + return nil } - return dur + return &dur } // SortVirtualHosts sorts a slice of virtual hosts by name. // // Envoy computes a hash of RDS to see if things have changed - hash is affected by order of elements in the filter. Therefore // we sort virtual hosts by name before handing them back so the ordering is stable across HTTP Route Configs. -func SortVirtualHosts(hosts []route.VirtualHost) { +func SortVirtualHosts(hosts []*route.VirtualHost) { sort.SliceStable(hosts, func(i, j int) bool { return hosts[i].Name < hosts[j].Name }) @@ -384,16 +384,16 @@ func CloneClusterLoadAssignment(original *xdsapi.ClusterLoadAssignment) xdsapi.C } // return a shallow copy LocalityLbEndpoints -func cloneLocalityLbEndpoints(endpoints []endpoint.LocalityLbEndpoints) []endpoint.LocalityLbEndpoints { - out := make([]endpoint.LocalityLbEndpoints, 0, len(endpoints)) +func cloneLocalityLbEndpoints(endpoints []*endpoint.LocalityLbEndpoints) []*endpoint.LocalityLbEndpoints { + out := make([]*endpoint.LocalityLbEndpoints, 0, len(endpoints)) for _, ep := range endpoints { - clone := ep + clone := *ep if ep.LoadBalancingWeight != nil { clone.LoadBalancingWeight = &types.UInt32Value{ Value: ep.GetLoadBalancingWeight().GetValue(), } } - out = append(out, clone) + out = append(out, &clone) } return out } @@ -418,7 +418,7 @@ func BuildConfigInfoMetadata(config model.ConfigMeta) *core.Metadata { } // IsHTTPFilterChain returns true if the filter chain contains a HTTP connection manager filter -func IsHTTPFilterChain(filterChain listener.FilterChain) bool { +func IsHTTPFilterChain(filterChain *listener.FilterChain) bool { for _, f := range filterChain.Filters { if f.Name == xdsutil.HTTPConnectionManager { return true diff --git a/pilot/pkg/networking/util/util_test.go b/pilot/pkg/networking/util/util_test.go index a2eba196a810..0c627f732989 100644 --- a/pilot/pkg/networking/util/util_test.go +++ b/pilot/pkg/networking/util/util_test.go @@ -500,14 +500,14 @@ func buildFakeCluster() *v2.Cluster { Name: "outbound|8080||test.example.org", LoadAssignment: &v2.ClusterLoadAssignment{ ClusterName: "outbound|8080||test.example.org", - Endpoints: []endpoint.LocalityLbEndpoints{ + Endpoints: []*endpoint.LocalityLbEndpoints{ { Locality: &core.Locality{ Region: "region1", Zone: "zone1", SubZone: "subzone1", }, - LbEndpoints: []endpoint.LbEndpoint{}, + LbEndpoints: []*endpoint.LbEndpoint{}, LoadBalancingWeight: &types.UInt32Value{ Value: 1, }, @@ -519,7 +519,7 @@ func buildFakeCluster() *v2.Cluster { Zone: "zone1", SubZone: "subzone2", }, - LbEndpoints: []endpoint.LbEndpoint{}, + LbEndpoints: []*endpoint.LbEndpoint{}, LoadBalancingWeight: &types.UInt32Value{ Value: 1, }, @@ -531,16 +531,16 @@ func buildFakeCluster() *v2.Cluster { } func TestIsHTTPFilterChain(t *testing.T) { - httpFilterChain := listener.FilterChain{ - Filters: []listener.Filter{ + httpFilterChain := &listener.FilterChain{ + Filters: []*listener.Filter{ { Name: xdsutil.HTTPConnectionManager, }, }, } - tcpFilterChain := listener.FilterChain{ - Filters: []listener.Filter{ + tcpFilterChain := &listener.FilterChain{ + Filters: []*listener.Filter{ { Name: xdsutil.TCPProxy, }, @@ -568,7 +568,7 @@ func BenchmarkGetByAddress(b *testing.B) { listener80, listener81, listenerip, - }, listenerip.Address) + }, *listenerip.Address) } } @@ -576,7 +576,7 @@ func TestGetByAddress(t *testing.T) { tests := []struct { name string listeners []*v2.Listener - address core.Address + address *core.Address expected *v2.Listener }{ { @@ -607,7 +607,7 @@ func TestGetByAddress(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got := GetByAddress(tt.listeners, tt.address) + got := GetByAddress(tt.listeners, *tt.address) if got != tt.expected { t.Errorf("Got %v, expected %v", got, tt.expected) } diff --git a/pilot/pkg/proxy/envoy/v2/ads.go b/pilot/pkg/proxy/envoy/v2/ads.go index 10c75428b130..4f76ff60433c 100644 --- a/pilot/pkg/proxy/envoy/v2/ads.go +++ b/pilot/pkg/proxy/envoy/v2/ads.go @@ -120,11 +120,11 @@ type XdsConnection struct { // configDump converts the connection internal state into an Envoy Admin API config dump proto // It is used in debugging to create a consistent object for comparison between Envoy and Pilot outputs func (s *DiscoveryServer) configDump(conn *XdsConnection) (*adminapi.ConfigDump, error) { - dynamicActiveClusters := []adminapi.ClustersConfigDump_DynamicCluster{} + dynamicActiveClusters := []*adminapi.ClustersConfigDump_DynamicCluster{} clusters := s.generateRawClusters(conn.modelNode, s.globalPushContext()) for _, cs := range clusters { - dynamicActiveClusters = append(dynamicActiveClusters, adminapi.ClustersConfigDump_DynamicCluster{Cluster: cs}) + dynamicActiveClusters = append(dynamicActiveClusters, &adminapi.ClustersConfigDump_DynamicCluster{Cluster: cs}) } clustersAny, err := types.MarshalAny(&adminapi.ClustersConfigDump{ VersionInfo: versionInfo(), @@ -134,10 +134,10 @@ func (s *DiscoveryServer) configDump(conn *XdsConnection) (*adminapi.ConfigDump, return nil, err } - dynamicActiveListeners := []adminapi.ListenersConfigDump_DynamicListener{} + dynamicActiveListeners := []*adminapi.ListenersConfigDump_DynamicListener{} listeners := s.generateRawListeners(conn, s.globalPushContext()) for _, cs := range listeners { - dynamicActiveListeners = append(dynamicActiveListeners, adminapi.ListenersConfigDump_DynamicListener{Listener: cs}) + dynamicActiveListeners = append(dynamicActiveListeners, &adminapi.ListenersConfigDump_DynamicListener{Listener: cs}) } listenersAny, err := types.MarshalAny(&adminapi.ListenersConfigDump{ VersionInfo: versionInfo(), @@ -150,9 +150,9 @@ func (s *DiscoveryServer) configDump(conn *XdsConnection) (*adminapi.ConfigDump, routes := s.generateRawRoutes(conn, s.globalPushContext()) routeConfigAny, _ := types.MarshalAny(&adminapi.RoutesConfigDump{}) if len(routes) > 0 { - dynamicRouteConfig := []adminapi.RoutesConfigDump_DynamicRouteConfig{} + dynamicRouteConfig := []*adminapi.RoutesConfigDump_DynamicRouteConfig{} for _, rs := range routes { - dynamicRouteConfig = append(dynamicRouteConfig, adminapi.RoutesConfigDump_DynamicRouteConfig{RouteConfig: rs}) + dynamicRouteConfig = append(dynamicRouteConfig, &adminapi.RoutesConfigDump_DynamicRouteConfig{RouteConfig: rs}) } routeConfigAny, err = types.MarshalAny(&adminapi.RoutesConfigDump{DynamicRouteConfigs: dynamicRouteConfig}) if err != nil { @@ -163,7 +163,7 @@ func (s *DiscoveryServer) configDump(conn *XdsConnection) (*adminapi.ConfigDump, bootstrapAny, _ := types.MarshalAny(&adminapi.BootstrapConfigDump{}) // The config dump must have all configs with order specified in // https://www.envoyproxy.io/docs/envoy/latest/api-v2/admin/v2alpha/config_dump.proto - configDump := &adminapi.ConfigDump{Configs: []types.Any{*bootstrapAny, *clustersAny, *listenersAny, *routeConfigAny}} + configDump := &adminapi.ConfigDump{Configs: []*types.Any{bootstrapAny, clustersAny, listenersAny, routeConfigAny}} return configDump, nil } diff --git a/pilot/pkg/proxy/envoy/v2/cds.go b/pilot/pkg/proxy/envoy/v2/cds.go index a1cbc8ab7a94..4340965dc3ba 100644 --- a/pilot/pkg/proxy/envoy/v2/cds.go +++ b/pilot/pkg/proxy/envoy/v2/cds.go @@ -39,7 +39,7 @@ func (conn *XdsConnection) clusters(response []*xdsapi.Cluster) *xdsapi.Discover for _, c := range response { cc, _ := types.MarshalAny(c) - out.Resources = append(out.Resources, *cc) + out.Resources = append(out.Resources, cc) } return out diff --git a/pilot/pkg/proxy/envoy/v2/eds.go b/pilot/pkg/proxy/envoy/v2/eds.go index 9a8e66ecbbb1..c60cbfc4025d 100644 --- a/pilot/pkg/proxy/envoy/v2/eds.go +++ b/pilot/pkg/proxy/envoy/v2/eds.go @@ -152,7 +152,7 @@ func networkEndpointToEnvoyEndpoint(e *model.NetworkEndpoint) (*endpoint.LbEndpo }, HostIdentifier: &endpoint.LbEndpoint_Endpoint{ Endpoint: &endpoint.Endpoint{ - Address: &addr, + Address: addr, }, }, } @@ -333,7 +333,7 @@ func (s *DiscoveryServer) updateServiceShards(push *model.PushContext) error { // the endpoints for the cluster. func (s *DiscoveryServer) updateCluster(push *model.PushContext, clusterName string, edsCluster *EdsCluster) error { // TODO: should we lock this as well ? Once we move to event-based it may not matter. - var locEps []endpoint.LocalityLbEndpoints + var locEps []*endpoint.LocalityLbEndpoints direction, subsetName, hostname, port := model.ParseSubsetKey(clusterName) if direction == model.TrafficDirectionInbound || @@ -584,7 +584,7 @@ func (s *DiscoveryServer) edsUpdate(shard, serviceName string, namespace string, // Envoy v2 Endpoints are constructed from Pilot's older data structure involving // model.ServiceInstance objects. Envoy expects the endpoints grouped by zone, so // a map is created - in new data structures this should be part of the model. -func localityLbEndpointsFromInstances(instances []*model.ServiceInstance) []endpoint.LocalityLbEndpoints { +func localityLbEndpointsFromInstances(instances []*model.ServiceInstance) []*endpoint.LocalityLbEndpoints { localityEpMap := make(map[string]*endpoint.LocalityLbEndpoints) for _, instance := range instances { lbEp, err := networkEndpointToEnvoyEndpoint(&instance.Endpoint) @@ -601,11 +601,11 @@ func localityLbEndpointsFromInstances(instances []*model.ServiceInstance) []endp } localityEpMap[locality] = locLbEps } - locLbEps.LbEndpoints = append(locLbEps.LbEndpoints, *lbEp) + locLbEps.LbEndpoints = append(locLbEps.LbEndpoints, lbEp) } - out := make([]endpoint.LocalityLbEndpoints, 0, len(localityEpMap)) + out := make([]*endpoint.LocalityLbEndpoints, 0, len(localityEpMap)) for _, locLbEps := range localityEpMap { - out = append(out, *locLbEps) + out = append(out, locLbEps) } return out } @@ -893,7 +893,7 @@ func endpointDiscoveryResponse(loadAssignments []*xdsapi.ClusterLoadAssignment, } for _, loadAssignment := range loadAssignments { resource, _ := types.MarshalAny(loadAssignment) - out.Resources = append(out.Resources, *resource) + out.Resources = append(out.Resources, resource) } return out @@ -905,7 +905,7 @@ func buildLocalityLbEndpointsFromShards( svcPort *model.Port, labels config.LabelsCollection, clusterName string, - push *model.PushContext) []endpoint.LocalityLbEndpoints { + push *model.PushContext) []*endpoint.LocalityLbEndpoints { localityEpMap := make(map[string]*endpoint.LocalityLbEndpoints) shards.mutex.Lock() @@ -931,13 +931,13 @@ func buildLocalityLbEndpointsFromShards( if ep.EnvoyEndpoint == nil { ep.EnvoyEndpoint = buildEnvoyLbEndpoint(ep.UID, ep.Family, ep.Address, ep.EndpointPort, ep.Network, ep.LbWeight) } - locLbEps.LbEndpoints = append(locLbEps.LbEndpoints, *ep.EnvoyEndpoint) + locLbEps.LbEndpoints = append(locLbEps.LbEndpoints, ep.EnvoyEndpoint) } } shards.mutex.Unlock() - locEps := make([]endpoint.LocalityLbEndpoints, 0, len(localityEpMap)) + locEps := make([]*endpoint.LocalityLbEndpoints, 0, len(localityEpMap)) for _, locLbEps := range localityEpMap { var weight uint32 for _, ep := range locLbEps.LbEndpoints { @@ -946,7 +946,7 @@ func buildLocalityLbEndpointsFromShards( locLbEps.LoadBalancingWeight = &types.UInt32Value{ Value: weight, } - locEps = append(locEps, *locLbEps) + locEps = append(locEps, locLbEps) } // Normalize LoadBalancingWeight in range [1, 128] locEps = LoadBalancingWeightNormalize(locEps) diff --git a/pilot/pkg/proxy/envoy/v2/eds_sh_test.go b/pilot/pkg/proxy/envoy/v2/eds_sh_test.go index 4a6a7b2c166c..bc8f43126ace 100644 --- a/pilot/pkg/proxy/envoy/v2/eds_sh_test.go +++ b/pilot/pkg/proxy/envoy/v2/eds_sh_test.go @@ -195,7 +195,7 @@ func verifySplitHorizonResponse(t *testing.T, network string, sidecarID string, var match *endpoint.LbEndpoint for _, ep := range lbEndpoints { if ep.GetEndpoint().Address.GetSocketAddress().Address == addr { - match = &ep + match = ep break } } diff --git a/pilot/pkg/proxy/envoy/v2/eds_test.go b/pilot/pkg/proxy/envoy/v2/eds_test.go index 9a9714e8a934..1867e96fdcc4 100644 --- a/pilot/pkg/proxy/envoy/v2/eds_test.go +++ b/pilot/pkg/proxy/envoy/v2/eds_test.go @@ -265,7 +265,7 @@ func testOverlappingPorts(server *bootstrap.Server, adsc *adsc.ADSC, t *testing. testEndpoints("10.0.0.53", "outbound|53||overlapping.cluster.local", adsc, t) } -func verifyNoLocalityPriorities(eps []endpoint.LocalityLbEndpoints, t *testing.T) { +func verifyNoLocalityPriorities(eps []*endpoint.LocalityLbEndpoints, t *testing.T) { for _, ep := range eps { if ep.GetPriority() != 0 { t.Errorf("expected no locality priorities to apply, got priority %v.", ep.GetPriority()) @@ -273,7 +273,7 @@ func verifyNoLocalityPriorities(eps []endpoint.LocalityLbEndpoints, t *testing.T } } -func verifyLocalityPriorities(proxyLocality string, eps []endpoint.LocalityLbEndpoints, t *testing.T) { +func verifyLocalityPriorities(proxyLocality string, eps []*endpoint.LocalityLbEndpoints, t *testing.T) { items := strings.SplitN(proxyLocality, "/", 3) region, zone, subzone := items[0], items[1], items[2] for _, ep := range eps { diff --git a/pilot/pkg/proxy/envoy/v2/ep_filters.go b/pilot/pkg/proxy/envoy/v2/ep_filters.go index 4ec43d1e805a..3a4aa94cd916 100644 --- a/pilot/pkg/proxy/envoy/v2/ep_filters.go +++ b/pilot/pkg/proxy/envoy/v2/ep_filters.go @@ -27,13 +27,13 @@ import ( ) // EndpointsFilterFunc is a function that filters data from the ClusterLoadAssignment and returns updated one -type EndpointsFilterFunc func(endpoints []endpoint.LocalityLbEndpoints, conn *XdsConnection, env *model.Environment) []endpoint.LocalityLbEndpoints +type EndpointsFilterFunc func(endpoints []endpoint.LocalityLbEndpoints, conn *XdsConnection, env *model.Environment) []*endpoint.LocalityLbEndpoints // EndpointsByNetworkFilter is a network filter function to support Split Horizon EDS - filter the endpoints based on the network // of the connected sidecar. The filter will filter out all endpoints which are not present within the // sidecar network and add a gateway endpoint to remote networks that have endpoints (if gateway exists). // Information for the mesh networks is provided as a MeshNetwork config map. -func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *XdsConnection, env *model.Environment) []endpoint.LocalityLbEndpoints { +func EndpointsByNetworkFilter(endpoints []*endpoint.LocalityLbEndpoints, conn *XdsConnection, env *model.Environment) []*endpoint.LocalityLbEndpoints { // If the sidecar does not specify a network, ignore Split Horizon EDS and return all network, found := conn.modelNode.Metadata[model.NodeMetadataNetwork] if !found { @@ -58,7 +58,7 @@ func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *Xd // A new array of endpoints to be returned that will have both local and // remote gateways (if any) - filtered := make([]endpoint.LocalityLbEndpoints, 0) + filtered := make([]*endpoint.LocalityLbEndpoints, 0) // Go through all cluster endpoints and add those with the same network as the sidecar // to the result. Also count the number of endpoints per each remote network while @@ -67,7 +67,7 @@ func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *Xd // Weight (number of endpoints) for the EDS cluster for each remote networks remoteEps := map[string]uint32{} - lbEndpoints := make([]endpoint.LbEndpoint, 0) + lbEndpoints := make([]*endpoint.LbEndpoint, 0) for _, lbEp := range ep.LbEndpoints { epNetwork := istioMetadata(lbEp, "network") if epNetwork == network { @@ -100,7 +100,7 @@ func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *Xd } registryName := getNetworkRegistry(networkConf) - gwEps := make([]endpoint.LbEndpoint, 0) + gwEps := make([]*endpoint.LbEndpoint, 0) // There may be multiples gateways for the network. Add an LbEndpoint for // each one of them for _, gw := range gws { @@ -112,14 +112,14 @@ func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *Xd gwEp := &endpoint.LbEndpoint{ HostIdentifier: &endpoint.LbEndpoint_Endpoint{ Endpoint: &endpoint.Endpoint{ - Address: &epAddr, + Address: epAddr, }, }, LoadBalancingWeight: &types.UInt32Value{ Value: w, }, } - gwEps = append(gwEps, *gwEp) + gwEps = append(gwEps, gwEp) } } } @@ -135,8 +135,8 @@ func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *Xd // Found local endpoint(s) so add to the result a new one LocalityLbEndpoints // that holds only the local endpoints - newEp := createLocalityLbEndpoints(&ep, lbEndpoints) - filtered = append(filtered, *newEp) + newEp := createLocalityLbEndpoints(ep, lbEndpoints) + filtered = append(filtered, newEp) } return filtered @@ -149,7 +149,7 @@ func EndpointsByNetworkFilter(endpoints []endpoint.LocalityLbEndpoints, conn *Xd // Checks whether there is an istio metadata string value for the provided key // within the endpoint metadata. If exists, it will return the value. -func istioMetadata(ep endpoint.LbEndpoint, key string) string { +func istioMetadata(ep *endpoint.LbEndpoint, key string) string { if ep.Metadata != nil && ep.Metadata.FilterMetadata["istio"] != nil && ep.Metadata.FilterMetadata["istio"].Fields != nil && @@ -159,7 +159,7 @@ func istioMetadata(ep endpoint.LbEndpoint, key string) string { return "" } -func createLocalityLbEndpoints(base *endpoint.LocalityLbEndpoints, lbEndpoints []endpoint.LbEndpoint) *endpoint.LocalityLbEndpoints { +func createLocalityLbEndpoints(base *endpoint.LocalityLbEndpoints, lbEndpoints []*endpoint.LbEndpoint) *endpoint.LocalityLbEndpoints { var weight *types.UInt32Value if len(lbEndpoints) == 0 { weight = nil @@ -179,7 +179,7 @@ func createLocalityLbEndpoints(base *endpoint.LocalityLbEndpoints, lbEndpoints [ } // LoadBalancingWeightNormalize set LoadBalancingWeight with a valid value. -func LoadBalancingWeightNormalize(endpoints []endpoint.LocalityLbEndpoints) []endpoint.LocalityLbEndpoints { +func LoadBalancingWeightNormalize(endpoints []*endpoint.LocalityLbEndpoints) []*endpoint.LocalityLbEndpoints { return util.LocalityLbWeightNormalize(endpoints) } diff --git a/pilot/pkg/proxy/envoy/v2/ep_filters_test.go b/pilot/pkg/proxy/envoy/v2/ep_filters_test.go index a2cce4ccba5b..79a18d365afe 100644 --- a/pilot/pkg/proxy/envoy/v2/ep_filters_test.go +++ b/pilot/pkg/proxy/envoy/v2/ep_filters_test.go @@ -59,7 +59,7 @@ func TestEndpointsByNetworkFilter(t *testing.T) { // networks and examines the returned filtered endpoints tests := []struct { name string - endpoints []endpoint.LocalityLbEndpoints + endpoints []*endpoint.LocalityLbEndpoints conn *XdsConnection env *model.Environment want []LocLbEpInfo @@ -230,7 +230,7 @@ func TestEndpointsByNetworkFilter_RegistryServiceName(t *testing.T) { // networks and examines the returned filtered endpoints tests := []struct { name string - endpoints []endpoint.LocalityLbEndpoints + endpoints []*endpoint.LocalityLbEndpoints conn *XdsConnection env *model.Environment want []LocLbEpInfo @@ -416,9 +416,9 @@ func environment() *model.Environment { // testEndpoints creates endpoints to be handed to the filter. It creates // 2 endpoints on network1, 1 endpoint on network2 and 1 endpoint on network4. -func testEndpoints() []endpoint.LocalityLbEndpoints { +func testEndpoints() []*endpoint.LocalityLbEndpoints { lbEndpoints := createLbEndpoints( - []LbEpInfo{ + []*LbEpInfo{ {network: "network1", address: "10.0.0.1"}, {network: "network1", address: "10.0.0.2"}, {network: "network2", address: "20.0.0.1"}, @@ -426,7 +426,7 @@ func testEndpoints() []endpoint.LocalityLbEndpoints { }, ) - return []endpoint.LocalityLbEndpoints{ + return []*endpoint.LocalityLbEndpoints{ { LbEndpoints: lbEndpoints, LoadBalancingWeight: &types.UInt32Value{ @@ -436,8 +436,8 @@ func testEndpoints() []endpoint.LocalityLbEndpoints { } } -func createLbEndpoints(lbEpsInfo []LbEpInfo) []endpoint.LbEndpoint { - lbEndpoints := make([]endpoint.LbEndpoint, len(lbEpsInfo)) +func createLbEndpoints(lbEpsInfo []*LbEpInfo) []*endpoint.LbEndpoint { + lbEndpoints := make([]*endpoint.LbEndpoint, len(lbEpsInfo)) for j, lbEpInfo := range lbEpsInfo { lbEp := endpoint.LbEndpoint{ HostIdentifier: &endpoint.LbEndpoint_Endpoint{ @@ -470,7 +470,7 @@ func createLbEndpoints(lbEpsInfo []LbEpInfo) []endpoint.LbEndpoint { }, }, } - lbEndpoints[j] = lbEp + lbEndpoints[j] = &lbEp } return lbEndpoints diff --git a/pilot/pkg/proxy/envoy/v2/lds.go b/pilot/pkg/proxy/envoy/v2/lds.go index d493f7ca93d5..8e6a525d4da9 100644 --- a/pilot/pkg/proxy/envoy/v2/lds.go +++ b/pilot/pkg/proxy/envoy/v2/lds.go @@ -75,7 +75,7 @@ func ldsDiscoveryResponse(ls []*xdsapi.Listener, version string) *xdsapi.Discove continue } lr, _ := types.MarshalAny(ll) - resp.Resources = append(resp.Resources, *lr) + resp.Resources = append(resp.Resources, lr) } return resp diff --git a/pilot/pkg/proxy/envoy/v2/lds_test.go b/pilot/pkg/proxy/envoy/v2/lds_test.go index ab7a99016452..8b5ba73dd29f 100644 --- a/pilot/pkg/proxy/envoy/v2/lds_test.go +++ b/pilot/pkg/proxy/envoy/v2/lds_test.go @@ -548,7 +548,7 @@ func expectLuaFilter(t *testing.T, l *xdsapi.Listener, expected bool) { var chain *xdsapi_listener.FilterChain for _, fc := range l.FilterChains { if len(fc.Filters) == 1 && fc.Filters[0].Name == "envoy.http_connection_manager" { - chain = &fc + chain = fc } } if chain == nil { diff --git a/pilot/pkg/proxy/envoy/v2/rds.go b/pilot/pkg/proxy/envoy/v2/rds.go index 2d7988a0951c..f968a48f11fc 100644 --- a/pilot/pkg/proxy/envoy/v2/rds.go +++ b/pilot/pkg/proxy/envoy/v2/rds.go @@ -64,7 +64,7 @@ func (s *DiscoveryServer) generateRawRoutes(con *XdsConnection, push *model.Push // Explicitly send an empty route configuration r = &xdsapi.RouteConfiguration{ Name: routeName, - VirtualHosts: []route.VirtualHost{}, + VirtualHosts: []*route.VirtualHost{}, ValidateClusters: proto.BoolFalse, } } @@ -91,7 +91,7 @@ func routeDiscoveryResponse(rs []*xdsapi.RouteConfiguration, version string) *xd } for _, rc := range rs { rr, _ := types.MarshalAny(rc) - resp.Resources = append(resp.Resources, *rr) + resp.Resources = append(resp.Resources, rr) } return resp diff --git a/pilot/pkg/security/authn/v1alpha1/policy_applier.go b/pilot/pkg/security/authn/v1alpha1/policy_applier.go index 6c75a2e7a978..38a742c509a3 100644 --- a/pilot/pkg/security/authn/v1alpha1/policy_applier.go +++ b/pilot/pkg/security/authn/v1alpha1/policy_applier.go @@ -386,7 +386,7 @@ func (a v1alpha1PolicyApplier) InboundFilterChain(sdsUdsPath string, sdsUseTrust { FilterChainMatch: alpnIstioMatch, TLSContext: tls, - ListenerFilters: []ldsv2.ListenerFilter{ + ListenerFilters: []*ldsv2.ListenerFilter{ { Name: xdsutil.TlsInspector, ConfigType: &ldsv2.ListenerFilter_Config{Config: &types.Struct{}}, diff --git a/pilot/pkg/security/authn/v1alpha1/policy_applier_test.go b/pilot/pkg/security/authn/v1alpha1/policy_applier_test.go index 64305d3d5bfd..27a1be5f5840 100644 --- a/pilot/pkg/security/authn/v1alpha1/policy_applier_test.go +++ b/pilot/pkg/security/authn/v1alpha1/policy_applier_test.go @@ -716,7 +716,7 @@ func TestOnInboundFilterChains(t *testing.T) { FilterChainMatch: &listener.FilterChainMatch{ ApplicationProtocols: []string{"istio"}, }, - ListenerFilters: []listener.ListenerFilter{ + ListenerFilters: []*listener.ListenerFilter{ { Name: "envoy.listener.tls_inspector", ConfigType: &listener.ListenerFilter_Config{&types.Struct{}}, diff --git a/pkg/test/framework/components/echo/docker/sidecar.go b/pkg/test/framework/components/echo/docker/sidecar.go index cc8692929147..c9547ea86247 100644 --- a/pkg/test/framework/components/echo/docker/sidecar.go +++ b/pkg/test/framework/components/echo/docker/sidecar.go @@ -53,7 +53,7 @@ func newSidecar(container *docker.Container) (*sidecar, error) { for _, c := range cfg.Configs { if c.TypeUrl == "type.googleapis.com/envoy.admin.v2alpha.BootstrapConfigDump" { cd := envoyAdmin.BootstrapConfigDump{} - if err := types.UnmarshalAny(&c, &cd); err != nil { + if err := types.UnmarshalAny(c, &cd); err != nil { return false, err } diff --git a/pkg/test/framework/components/echo/kube/sidecar.go b/pkg/test/framework/components/echo/kube/sidecar.go index 70123efab8a6..f6b2d7605537 100644 --- a/pkg/test/framework/components/echo/kube/sidecar.go +++ b/pkg/test/framework/components/echo/kube/sidecar.go @@ -59,7 +59,7 @@ func newSidecar(pod kubeCore.Pod, accessor *kube.Accessor) (*sidecar, error) { for _, c := range cfg.Configs { if c.TypeUrl == "type.googleapis.com/envoy.admin.v2alpha.BootstrapConfigDump" { cd := envoyAdmin.BootstrapConfigDump{} - if err := types.UnmarshalAny(&c, &cd); err != nil { + if err := types.UnmarshalAny(c, &cd); err != nil { return false, err } diff --git a/security/pkg/nodeagent/sds/sdsservice.go b/security/pkg/nodeagent/sds/sdsservice.go index f968851e213e..3fcba175fff5 100644 --- a/security/pkg/nodeagent/sds/sdsservice.go +++ b/security/pkg/nodeagent/sds/sdsservice.go @@ -608,7 +608,7 @@ func sdsDiscoveryResponse(s *model.SecretItem, conID, resourceName string) (*xds sdsServiceLog.Errorf("%s failed to mashal secret for proxy: %v", conIDresourceNamePrefix, err) return nil, err } - resp.Resources = append(resp.Resources, *ms) + resp.Resources = append(resp.Resources, ms) return resp, nil } diff --git a/security/pkg/nodeagent/sds/sdsservice_test.go b/security/pkg/nodeagent/sds/sdsservice_test.go index 83e449e9ec94..c82b00b1d8e9 100644 --- a/security/pkg/nodeagent/sds/sdsservice_test.go +++ b/security/pkg/nodeagent/sds/sdsservice_test.go @@ -496,7 +496,7 @@ func TestStreamSecretsMultiplePush(t *testing.T) { func verifySDSSResponse(t *testing.T, resp *api.DiscoveryResponse, expectedPrivateKey []byte, expectedCertChain []byte) { var pb authapi.Secret - if err := types.UnmarshalAny(&resp.Resources[0], &pb); err != nil { + if err := types.UnmarshalAny(resp.Resources[0], &pb); err != nil { t.Fatalf("UnmarshalAny SDS response failed: %v", err) } @@ -524,7 +524,7 @@ func verifySDSSResponse(t *testing.T, resp *api.DiscoveryResponse, expectedPriva func verifySDSSResponseForRootCert(t *testing.T, resp *api.DiscoveryResponse, expectedRootCert []byte) { var pb authapi.Secret - if err := types.UnmarshalAny(&resp.Resources[0], &pb); err != nil { + if err := types.UnmarshalAny(resp.Resources[0], &pb); err != nil { t.Fatalf("UnmarshalAny SDS response failed: %v", err) } diff --git a/security/pkg/testing/sdsc/sdsclient.go b/security/pkg/testing/sdsc/sdsclient.go index 59d822a54cc0..39a0391d480d 100644 --- a/security/pkg/testing/sdsc/sdsclient.go +++ b/security/pkg/testing/sdsc/sdsclient.go @@ -151,7 +151,7 @@ func ValidateResponse(response *xdsapi.DiscoveryResponse) error { return fmt.Errorf("unexpected resource size in the response, %v ", response.Resources) } var pb authapi.Secret - if err := types.UnmarshalAny(&response.Resources[0], &pb); err != nil { + if err := types.UnmarshalAny(response.Resources[0], &pb); err != nil { return fmt.Errorf("unmarshalAny SDS response failed: %v", err) } return nil diff --git a/tests/integration/security/authn/permissive/permissive_test.go b/tests/integration/security/authn/permissive/permissive_test.go index be87ce592d95..bc370c46e59b 100644 --- a/tests/integration/security/authn/permissive/permissive_test.go +++ b/tests/integration/security/authn/permissive/permissive_test.go @@ -115,7 +115,7 @@ spec: func(resp *xdsapi.DiscoveryResponse) (b bool, e error) { for _, r := range resp.Resources { foo := &xdsapi.Listener{} - err := types.UnmarshalAny(&r, foo) + err := types.UnmarshalAny(r, foo) result := verifyListener(foo, t) if err == nil && result { return true, nil diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.go index e335b43136c5..401ba0a39f27 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.go @@ -5,11 +5,10 @@ package envoy_admin_v2alpha import ( fmt "fmt" - io "io" - math "math" - proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.validate.go index 8e207737a08d..09397d1184b7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/certs.pb.validate.go @@ -44,17 +44,12 @@ func (m *Certificates) Validate() error { for idx, item := range m.GetCertificates() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificatesValidationError{ - field: fmt.Sprintf("Certificates[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificatesValidationError{ + field: fmt.Sprintf("Certificates[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -129,17 +124,12 @@ func (m *Certificate) Validate() error { for idx, item := range m.GetCaCert() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateValidationError{ - field: fmt.Sprintf("CaCert[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateValidationError{ + field: fmt.Sprintf("CaCert[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -149,17 +139,12 @@ func (m *Certificate) Validate() error { for idx, item := range m.GetCertChain() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateValidationError{ - field: fmt.Sprintf("CertChain[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateValidationError{ + field: fmt.Sprintf("CertChain[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -238,17 +223,12 @@ func (m *CertificateDetails) Validate() error { for idx, item := range m.GetSubjectAltNames() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateDetailsValidationError{ - field: fmt.Sprintf("SubjectAltNames[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateDetailsValidationError{ + field: fmt.Sprintf("SubjectAltNames[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -257,32 +237,22 @@ func (m *CertificateDetails) Validate() error { // no validation rules for DaysUntilExpiration - { - tmp := m.GetValidFrom() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateDetailsValidationError{ - field: "ValidFrom", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValidFrom()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateDetailsValidationError{ + field: "ValidFrom", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetExpirationTime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateDetailsValidationError{ - field: "ExpirationTime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetExpirationTime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateDetailsValidationError{ + field: "ExpirationTime", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go index 90d3890e0a04..1a6fb7af34f7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.go @@ -5,13 +5,11 @@ package envoy_admin_v2alpha import ( fmt "fmt" - io "io" - math "math" - - proto "github.com/gogo/protobuf/proto" - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _type "github.com/envoyproxy/go-control-plane/envoy/type" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go index ee4049bcf72b..28086ad1bfc7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/clusters.pb.validate.go @@ -47,17 +47,12 @@ func (m *Clusters) Validate() error { for idx, item := range m.GetClusterStatuses() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersValidationError{ - field: fmt.Sprintf("ClusterStatuses[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersValidationError{ + field: fmt.Sprintf("ClusterStatuses[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -133,17 +128,12 @@ func (m *ClusterStatus) Validate() error { // no validation rules for AddedViaApi - { - tmp := m.GetSuccessRateEjectionThreshold() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterStatusValidationError{ - field: "SuccessRateEjectionThreshold", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSuccessRateEjectionThreshold()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterStatusValidationError{ + field: "SuccessRateEjectionThreshold", + reason: "embedded message failed validation", + cause: err, } } } @@ -151,34 +141,24 @@ func (m *ClusterStatus) Validate() error { for idx, item := range m.GetHostStatuses() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterStatusValidationError{ - field: fmt.Sprintf("HostStatuses[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterStatusValidationError{ + field: fmt.Sprintf("HostStatuses[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetLocalOriginSuccessRateEjectionThreshold() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterStatusValidationError{ - field: "LocalOriginSuccessRateEjectionThreshold", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalOriginSuccessRateEjectionThreshold()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterStatusValidationError{ + field: "LocalOriginSuccessRateEjectionThreshold", + reason: "embedded message failed validation", + cause: err, } } } @@ -247,17 +227,12 @@ func (m *HostStatus) Validate() error { return nil } - { - tmp := m.GetAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HostStatusValidationError{ - field: "Address", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HostStatusValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, } } } @@ -265,49 +240,34 @@ func (m *HostStatus) Validate() error { for idx, item := range m.GetStats() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HostStatusValidationError{ - field: fmt.Sprintf("Stats[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetHealthStatus() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HostStatusValidationError{ - field: "HealthStatus", + field: fmt.Sprintf("Stats[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetSuccessRate() + } - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetHealthStatus()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HostStatusValidationError{ + field: "HealthStatus", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return HostStatusValidationError{ - field: "SuccessRate", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSuccessRate()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HostStatusValidationError{ + field: "SuccessRate", + reason: "embedded message failed validation", + cause: err, } } } @@ -318,17 +278,12 @@ func (m *HostStatus) Validate() error { // no validation rules for Priority - { - tmp := m.GetLocalOriginSuccessRate() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HostStatusValidationError{ - field: "LocalOriginSuccessRate", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalOriginSuccessRate()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HostStatusValidationError{ + field: "LocalOriginSuccessRate", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.go index a0b3c4a1e0d7..e9a026f07ed7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.go @@ -5,15 +5,14 @@ package envoy_admin_v2alpha import ( fmt "fmt" - io "io" - math "math" - + v21 "github.com/envoyproxy/go-control-plane/envoy/api/v2" + auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" + v2 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - v21 "github.com/envoyproxy/go-control-plane/envoy/api/v2" - v2 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -40,10 +39,10 @@ type ConfigDump struct { // * *clusters*: :ref:`ClustersConfigDump ` // * *listeners*: :ref:`ListenersConfigDump ` // * *routes*: :ref:`RoutesConfigDump ` - Configs []types.Any `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Configs []*types.Any `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ConfigDump) Reset() { *m = ConfigDump{} } @@ -79,7 +78,7 @@ func (m *ConfigDump) XXX_DiscardUnknown() { var xxx_messageInfo_ConfigDump proto.InternalMessageInfo -func (m *ConfigDump) GetConfigs() []types.Any { +func (m *ConfigDump) GetConfigs() []*types.Any { if m != nil { return m.Configs } @@ -91,7 +90,7 @@ func (m *ConfigDump) GetConfigs() []types.Any { // the static portions of an Envoy configuration by reusing the output as the bootstrap // configuration for another Envoy. type BootstrapConfigDump struct { - Bootstrap v2.Bootstrap `protobuf:"bytes,1,opt,name=bootstrap,proto3" json:"bootstrap"` + Bootstrap *v2.Bootstrap `protobuf:"bytes,1,opt,name=bootstrap,proto3" json:"bootstrap,omitempty"` // The timestamp when the BootstrapConfig was last updated. LastUpdated *types.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -132,11 +131,11 @@ func (m *BootstrapConfigDump) XXX_DiscardUnknown() { var xxx_messageInfo_BootstrapConfigDump proto.InternalMessageInfo -func (m *BootstrapConfigDump) GetBootstrap() v2.Bootstrap { +func (m *BootstrapConfigDump) GetBootstrap() *v2.Bootstrap { if m != nil { return m.Bootstrap } - return v2.Bootstrap{} + return nil } func (m *BootstrapConfigDump) GetLastUpdated() *types.Timestamp { @@ -155,23 +154,23 @@ type ListenersConfigDump struct { // will be "". VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The statically loaded listener configs. - StaticListeners []ListenersConfigDump_StaticListener `protobuf:"bytes,2,rep,name=static_listeners,json=staticListeners,proto3" json:"static_listeners"` + StaticListeners []*ListenersConfigDump_StaticListener `protobuf:"bytes,2,rep,name=static_listeners,json=staticListeners,proto3" json:"static_listeners,omitempty"` // The dynamically loaded active listeners. These are listeners that are available to service // data plane traffic. - DynamicActiveListeners []ListenersConfigDump_DynamicListener `protobuf:"bytes,3,rep,name=dynamic_active_listeners,json=dynamicActiveListeners,proto3" json:"dynamic_active_listeners"` + DynamicActiveListeners []*ListenersConfigDump_DynamicListener `protobuf:"bytes,3,rep,name=dynamic_active_listeners,json=dynamicActiveListeners,proto3" json:"dynamic_active_listeners,omitempty"` // The dynamically loaded warming listeners. These are listeners that are currently undergoing // warming in preparation to service data plane traffic. Note that if attempting to recreate an // Envoy configuration from a configuration dump, the warming listeners should generally be // discarded. - DynamicWarmingListeners []ListenersConfigDump_DynamicListener `protobuf:"bytes,4,rep,name=dynamic_warming_listeners,json=dynamicWarmingListeners,proto3" json:"dynamic_warming_listeners"` + DynamicWarmingListeners []*ListenersConfigDump_DynamicListener `protobuf:"bytes,4,rep,name=dynamic_warming_listeners,json=dynamicWarmingListeners,proto3" json:"dynamic_warming_listeners,omitempty"` // The dynamically loaded draining listeners. These are listeners that are currently undergoing // draining in preparation to stop servicing data plane traffic. Note that if attempting to // recreate an Envoy configuration from a configuration dump, the draining listeners should // generally be discarded. - DynamicDrainingListeners []ListenersConfigDump_DynamicListener `protobuf:"bytes,5,rep,name=dynamic_draining_listeners,json=dynamicDrainingListeners,proto3" json:"dynamic_draining_listeners"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DynamicDrainingListeners []*ListenersConfigDump_DynamicListener `protobuf:"bytes,5,rep,name=dynamic_draining_listeners,json=dynamicDrainingListeners,proto3" json:"dynamic_draining_listeners,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListenersConfigDump) Reset() { *m = ListenersConfigDump{} } @@ -214,35 +213,35 @@ func (m *ListenersConfigDump) GetVersionInfo() string { return "" } -func (m *ListenersConfigDump) GetStaticListeners() []ListenersConfigDump_StaticListener { +func (m *ListenersConfigDump) GetStaticListeners() []*ListenersConfigDump_StaticListener { if m != nil { return m.StaticListeners } return nil } -func (m *ListenersConfigDump) GetDynamicActiveListeners() []ListenersConfigDump_DynamicListener { +func (m *ListenersConfigDump) GetDynamicActiveListeners() []*ListenersConfigDump_DynamicListener { if m != nil { return m.DynamicActiveListeners } return nil } -func (m *ListenersConfigDump) GetDynamicWarmingListeners() []ListenersConfigDump_DynamicListener { +func (m *ListenersConfigDump) GetDynamicWarmingListeners() []*ListenersConfigDump_DynamicListener { if m != nil { return m.DynamicWarmingListeners } return nil } -func (m *ListenersConfigDump) GetDynamicDrainingListeners() []ListenersConfigDump_DynamicListener { +func (m *ListenersConfigDump) GetDynamicDrainingListeners() []*ListenersConfigDump_DynamicListener { if m != nil { return m.DynamicDrainingListeners } return nil } -// Describes a statically loaded cluster. +// Describes a statically loaded listener. type ListenersConfigDump_StaticListener struct { // The listener config. Listener *v21.Listener `protobuf:"bytes,1,opt,name=listener,proto3" json:"listener,omitempty"` @@ -379,18 +378,18 @@ type ClustersConfigDump struct { // will be "". VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The statically loaded cluster configs. - StaticClusters []ClustersConfigDump_StaticCluster `protobuf:"bytes,2,rep,name=static_clusters,json=staticClusters,proto3" json:"static_clusters"` + StaticClusters []*ClustersConfigDump_StaticCluster `protobuf:"bytes,2,rep,name=static_clusters,json=staticClusters,proto3" json:"static_clusters,omitempty"` // The dynamically loaded active clusters. These are clusters that are available to service // data plane traffic. - DynamicActiveClusters []ClustersConfigDump_DynamicCluster `protobuf:"bytes,3,rep,name=dynamic_active_clusters,json=dynamicActiveClusters,proto3" json:"dynamic_active_clusters"` + DynamicActiveClusters []*ClustersConfigDump_DynamicCluster `protobuf:"bytes,3,rep,name=dynamic_active_clusters,json=dynamicActiveClusters,proto3" json:"dynamic_active_clusters,omitempty"` // The dynamically loaded warming clusters. These are clusters that are currently undergoing // warming in preparation to service data plane traffic. Note that if attempting to recreate an // Envoy configuration from a configuration dump, the warming clusters should generally be // discarded. - DynamicWarmingClusters []ClustersConfigDump_DynamicCluster `protobuf:"bytes,4,rep,name=dynamic_warming_clusters,json=dynamicWarmingClusters,proto3" json:"dynamic_warming_clusters"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DynamicWarmingClusters []*ClustersConfigDump_DynamicCluster `protobuf:"bytes,4,rep,name=dynamic_warming_clusters,json=dynamicWarmingClusters,proto3" json:"dynamic_warming_clusters,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ClustersConfigDump) Reset() { *m = ClustersConfigDump{} } @@ -433,21 +432,21 @@ func (m *ClustersConfigDump) GetVersionInfo() string { return "" } -func (m *ClustersConfigDump) GetStaticClusters() []ClustersConfigDump_StaticCluster { +func (m *ClustersConfigDump) GetStaticClusters() []*ClustersConfigDump_StaticCluster { if m != nil { return m.StaticClusters } return nil } -func (m *ClustersConfigDump) GetDynamicActiveClusters() []ClustersConfigDump_DynamicCluster { +func (m *ClustersConfigDump) GetDynamicActiveClusters() []*ClustersConfigDump_DynamicCluster { if m != nil { return m.DynamicActiveClusters } return nil } -func (m *ClustersConfigDump) GetDynamicWarmingClusters() []ClustersConfigDump_DynamicCluster { +func (m *ClustersConfigDump) GetDynamicWarmingClusters() []*ClustersConfigDump_DynamicCluster { if m != nil { return m.DynamicWarmingClusters } @@ -589,12 +588,12 @@ func (m *ClustersConfigDump_DynamicCluster) GetLastUpdated() *types.Timestamp { // in RDS responses. type RoutesConfigDump struct { // The statically loaded route configs. - StaticRouteConfigs []RoutesConfigDump_StaticRouteConfig `protobuf:"bytes,2,rep,name=static_route_configs,json=staticRouteConfigs,proto3" json:"static_route_configs"` + StaticRouteConfigs []*RoutesConfigDump_StaticRouteConfig `protobuf:"bytes,2,rep,name=static_route_configs,json=staticRouteConfigs,proto3" json:"static_route_configs,omitempty"` // The dynamically loaded route configs. - DynamicRouteConfigs []RoutesConfigDump_DynamicRouteConfig `protobuf:"bytes,3,rep,name=dynamic_route_configs,json=dynamicRouteConfigs,proto3" json:"dynamic_route_configs"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DynamicRouteConfigs []*RoutesConfigDump_DynamicRouteConfig `protobuf:"bytes,3,rep,name=dynamic_route_configs,json=dynamicRouteConfigs,proto3" json:"dynamic_route_configs,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RoutesConfigDump) Reset() { *m = RoutesConfigDump{} } @@ -630,14 +629,14 @@ func (m *RoutesConfigDump) XXX_DiscardUnknown() { var xxx_messageInfo_RoutesConfigDump proto.InternalMessageInfo -func (m *RoutesConfigDump) GetStaticRouteConfigs() []RoutesConfigDump_StaticRouteConfig { +func (m *RoutesConfigDump) GetStaticRouteConfigs() []*RoutesConfigDump_StaticRouteConfig { if m != nil { return m.StaticRouteConfigs } return nil } -func (m *RoutesConfigDump) GetDynamicRouteConfigs() []RoutesConfigDump_DynamicRouteConfig { +func (m *RoutesConfigDump) GetDynamicRouteConfigs() []*RoutesConfigDump_DynamicRouteConfig { if m != nil { return m.DynamicRouteConfigs } @@ -775,12 +774,12 @@ func (m *RoutesConfigDump_DynamicRouteConfig) GetLastUpdated() *types.Timestamp // dynamically obtained scopes via the SRDS API. type ScopedRoutesConfigDump struct { // The statically loaded scoped route configs. - InlineScopedRouteConfigs []ScopedRoutesConfigDump_InlineScopedRouteConfigs `protobuf:"bytes,1,rep,name=inline_scoped_route_configs,json=inlineScopedRouteConfigs,proto3" json:"inline_scoped_route_configs"` + InlineScopedRouteConfigs []*ScopedRoutesConfigDump_InlineScopedRouteConfigs `protobuf:"bytes,1,rep,name=inline_scoped_route_configs,json=inlineScopedRouteConfigs,proto3" json:"inline_scoped_route_configs,omitempty"` // The dynamically loaded scoped route configs. - DynamicScopedRouteConfigs []ScopedRoutesConfigDump_DynamicScopedRouteConfigs `protobuf:"bytes,2,rep,name=dynamic_scoped_route_configs,json=dynamicScopedRouteConfigs,proto3" json:"dynamic_scoped_route_configs"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DynamicScopedRouteConfigs []*ScopedRoutesConfigDump_DynamicScopedRouteConfigs `protobuf:"bytes,2,rep,name=dynamic_scoped_route_configs,json=dynamicScopedRouteConfigs,proto3" json:"dynamic_scoped_route_configs,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ScopedRoutesConfigDump) Reset() { *m = ScopedRoutesConfigDump{} } @@ -816,14 +815,14 @@ func (m *ScopedRoutesConfigDump) XXX_DiscardUnknown() { var xxx_messageInfo_ScopedRoutesConfigDump proto.InternalMessageInfo -func (m *ScopedRoutesConfigDump) GetInlineScopedRouteConfigs() []ScopedRoutesConfigDump_InlineScopedRouteConfigs { +func (m *ScopedRoutesConfigDump) GetInlineScopedRouteConfigs() []*ScopedRoutesConfigDump_InlineScopedRouteConfigs { if m != nil { return m.InlineScopedRouteConfigs } return nil } -func (m *ScopedRoutesConfigDump) GetDynamicScopedRouteConfigs() []ScopedRoutesConfigDump_DynamicScopedRouteConfigs { +func (m *ScopedRoutesConfigDump) GetDynamicScopedRouteConfigs() []*ScopedRoutesConfigDump_DynamicScopedRouteConfigs { if m != nil { return m.DynamicScopedRouteConfigs } @@ -981,6 +980,222 @@ func (m *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetLastUpdated() *typ return nil } +// Envoys SDS implementation fills this message with all secrets fetched dynamically via SDS. +type SecretsConfigDump struct { + // The statically loaded secrets. + StaticSecrets []*SecretsConfigDump_StaticSecret `protobuf:"bytes,1,rep,name=static_secrets,json=staticSecrets,proto3" json:"static_secrets,omitempty"` + // The dynamically loaded active secrets. These are secrets that are available to service + // clusters or listeners. + DynamicActiveSecrets []*SecretsConfigDump_DynamicSecret `protobuf:"bytes,2,rep,name=dynamic_active_secrets,json=dynamicActiveSecrets,proto3" json:"dynamic_active_secrets,omitempty"` + // The dynamically loaded warming secrets. These are secrets that are currently undergoing + // warming in preparation to service clusters or listeners. + DynamicWarmingSecrets []*SecretsConfigDump_DynamicSecret `protobuf:"bytes,3,rep,name=dynamic_warming_secrets,json=dynamicWarmingSecrets,proto3" json:"dynamic_warming_secrets,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SecretsConfigDump) Reset() { *m = SecretsConfigDump{} } +func (m *SecretsConfigDump) String() string { return proto.CompactTextString(m) } +func (*SecretsConfigDump) ProtoMessage() {} +func (*SecretsConfigDump) Descriptor() ([]byte, []int) { + return fileDescriptor_bd4e190b1a64d2aa, []int{6} +} +func (m *SecretsConfigDump) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SecretsConfigDump) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SecretsConfigDump.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SecretsConfigDump) XXX_Merge(src proto.Message) { + xxx_messageInfo_SecretsConfigDump.Merge(m, src) +} +func (m *SecretsConfigDump) XXX_Size() int { + return m.Size() +} +func (m *SecretsConfigDump) XXX_DiscardUnknown() { + xxx_messageInfo_SecretsConfigDump.DiscardUnknown(m) +} + +var xxx_messageInfo_SecretsConfigDump proto.InternalMessageInfo + +func (m *SecretsConfigDump) GetStaticSecrets() []*SecretsConfigDump_StaticSecret { + if m != nil { + return m.StaticSecrets + } + return nil +} + +func (m *SecretsConfigDump) GetDynamicActiveSecrets() []*SecretsConfigDump_DynamicSecret { + if m != nil { + return m.DynamicActiveSecrets + } + return nil +} + +func (m *SecretsConfigDump) GetDynamicWarmingSecrets() []*SecretsConfigDump_DynamicSecret { + if m != nil { + return m.DynamicWarmingSecrets + } + return nil +} + +// DynamicSecret contains secret information fetched via SDS. +type SecretsConfigDump_DynamicSecret struct { + // The name assigned to the secret. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // This is the per-resource version information. + VersionInfo string `protobuf:"bytes,2,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` + // The timestamp when the secret was last updated. + LastUpdated *types.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + // The actual secret information. + // Security sensitive information is redacted (replaced with "[redacted]") for + // private keys and passwords in TLS certificates. + Secret *auth.Secret `protobuf:"bytes,4,opt,name=secret,proto3" json:"secret,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SecretsConfigDump_DynamicSecret) Reset() { *m = SecretsConfigDump_DynamicSecret{} } +func (m *SecretsConfigDump_DynamicSecret) String() string { return proto.CompactTextString(m) } +func (*SecretsConfigDump_DynamicSecret) ProtoMessage() {} +func (*SecretsConfigDump_DynamicSecret) Descriptor() ([]byte, []int) { + return fileDescriptor_bd4e190b1a64d2aa, []int{6, 0} +} +func (m *SecretsConfigDump_DynamicSecret) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SecretsConfigDump_DynamicSecret) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SecretsConfigDump_DynamicSecret.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SecretsConfigDump_DynamicSecret) XXX_Merge(src proto.Message) { + xxx_messageInfo_SecretsConfigDump_DynamicSecret.Merge(m, src) +} +func (m *SecretsConfigDump_DynamicSecret) XXX_Size() int { + return m.Size() +} +func (m *SecretsConfigDump_DynamicSecret) XXX_DiscardUnknown() { + xxx_messageInfo_SecretsConfigDump_DynamicSecret.DiscardUnknown(m) +} + +var xxx_messageInfo_SecretsConfigDump_DynamicSecret proto.InternalMessageInfo + +func (m *SecretsConfigDump_DynamicSecret) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *SecretsConfigDump_DynamicSecret) GetVersionInfo() string { + if m != nil { + return m.VersionInfo + } + return "" +} + +func (m *SecretsConfigDump_DynamicSecret) GetLastUpdated() *types.Timestamp { + if m != nil { + return m.LastUpdated + } + return nil +} + +func (m *SecretsConfigDump_DynamicSecret) GetSecret() *auth.Secret { + if m != nil { + return m.Secret + } + return nil +} + +// StaticSecret specifies statically loaded secret in bootstrap. +type SecretsConfigDump_StaticSecret struct { + // The name assigned to the secret. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // The timestamp when the secret was last updated. + LastUpdated *types.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + // The actual secret information. + // Security sensitive information is redacted (replaced with "[redacted]") for + // private keys and passwords in TLS certificates. + Secret *auth.Secret `protobuf:"bytes,3,opt,name=secret,proto3" json:"secret,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SecretsConfigDump_StaticSecret) Reset() { *m = SecretsConfigDump_StaticSecret{} } +func (m *SecretsConfigDump_StaticSecret) String() string { return proto.CompactTextString(m) } +func (*SecretsConfigDump_StaticSecret) ProtoMessage() {} +func (*SecretsConfigDump_StaticSecret) Descriptor() ([]byte, []int) { + return fileDescriptor_bd4e190b1a64d2aa, []int{6, 1} +} +func (m *SecretsConfigDump_StaticSecret) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SecretsConfigDump_StaticSecret) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SecretsConfigDump_StaticSecret.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SecretsConfigDump_StaticSecret) XXX_Merge(src proto.Message) { + xxx_messageInfo_SecretsConfigDump_StaticSecret.Merge(m, src) +} +func (m *SecretsConfigDump_StaticSecret) XXX_Size() int { + return m.Size() +} +func (m *SecretsConfigDump_StaticSecret) XXX_DiscardUnknown() { + xxx_messageInfo_SecretsConfigDump_StaticSecret.DiscardUnknown(m) +} + +var xxx_messageInfo_SecretsConfigDump_StaticSecret proto.InternalMessageInfo + +func (m *SecretsConfigDump_StaticSecret) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *SecretsConfigDump_StaticSecret) GetLastUpdated() *types.Timestamp { + if m != nil { + return m.LastUpdated + } + return nil +} + +func (m *SecretsConfigDump_StaticSecret) GetSecret() *auth.Secret { + if m != nil { + return m.Secret + } + return nil +} + func init() { proto.RegisterType((*ConfigDump)(nil), "envoy.admin.v2alpha.ConfigDump") proto.RegisterType((*BootstrapConfigDump)(nil), "envoy.admin.v2alpha.BootstrapConfigDump") @@ -996,6 +1211,9 @@ func init() { proto.RegisterType((*ScopedRoutesConfigDump)(nil), "envoy.admin.v2alpha.ScopedRoutesConfigDump") proto.RegisterType((*ScopedRoutesConfigDump_InlineScopedRouteConfigs)(nil), "envoy.admin.v2alpha.ScopedRoutesConfigDump.InlineScopedRouteConfigs") proto.RegisterType((*ScopedRoutesConfigDump_DynamicScopedRouteConfigs)(nil), "envoy.admin.v2alpha.ScopedRoutesConfigDump.DynamicScopedRouteConfigs") + proto.RegisterType((*SecretsConfigDump)(nil), "envoy.admin.v2alpha.SecretsConfigDump") + proto.RegisterType((*SecretsConfigDump_DynamicSecret)(nil), "envoy.admin.v2alpha.SecretsConfigDump.DynamicSecret") + proto.RegisterType((*SecretsConfigDump_StaticSecret)(nil), "envoy.admin.v2alpha.SecretsConfigDump.StaticSecret") } func init() { @@ -1003,63 +1221,70 @@ func init() { } var fileDescriptor_bd4e190b1a64d2aa = []byte{ - // 885 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x3b, 0x6f, 0x2b, 0x45, - 0x14, 0x66, 0x6c, 0x27, 0x21, 0xc7, 0x21, 0x09, 0x63, 0xc7, 0x71, 0x16, 0x94, 0x97, 0x00, 0x85, - 0x66, 0x57, 0x32, 0xcf, 0x86, 0x22, 0x8e, 0x91, 0x88, 0x44, 0x11, 0x39, 0x20, 0xe8, 0x56, 0x1b, - 0xef, 0xda, 0x19, 0xc9, 0x9e, 0x59, 0xed, 0xac, 0x4d, 0x8c, 0x90, 0x28, 0xa8, 0x90, 0xe8, 0xe9, - 0x68, 0x28, 0xe8, 0x69, 0xe9, 0x21, 0x1d, 0xf7, 0x17, 0x5c, 0x5d, 0xa5, 0xcd, 0x9f, 0xb8, 0xf2, - 0x3c, 0xd6, 0xfb, 0x72, 0x64, 0xc7, 0xee, 0xd6, 0xe7, 0x9c, 0xf9, 0xbe, 0xef, 0xcc, 0xf9, 0x8e, - 0x77, 0xe1, 0x7d, 0x8f, 0x8e, 0xd8, 0xd8, 0x72, 0xdc, 0x01, 0xa1, 0xd6, 0xa8, 0xe1, 0xf4, 0xfd, - 0x5b, 0xc7, 0xea, 0x30, 0xda, 0x25, 0x3d, 0xdb, 0x1d, 0x0e, 0x7c, 0xd3, 0x0f, 0x58, 0xc8, 0x70, - 0x45, 0x94, 0x99, 0xa2, 0xcc, 0x54, 0x65, 0x46, 0x4d, 0x9d, 0xf5, 0x89, 0x35, 0x6a, 0x58, 0x1d, - 0x97, 0xcb, 0xe2, 0x54, 0xbc, 0x3f, 0x23, 0x1e, 0x44, 0xf1, 0xfd, 0x44, 0x9c, 0x4f, 0x13, 0x1f, - 0xca, 0x84, 0x94, 0x63, 0xdd, 0x30, 0x16, 0xf2, 0x30, 0x70, 0xfc, 0x49, 0x55, 0xf4, 0x43, 0x95, - 0x1e, 0xf4, 0x18, 0xeb, 0xf5, 0x3d, 0x4b, 0xfc, 0xba, 0x19, 0x76, 0x2d, 0x87, 0x8e, 0x55, 0xea, - 0x28, 0x9d, 0x0a, 0xc9, 0xc0, 0xe3, 0xa1, 0xa3, 0x9b, 0x33, 0xaa, 0x3d, 0xd6, 0x63, 0xe2, 0xd1, - 0x9a, 0x3c, 0xc9, 0xe8, 0x69, 0x13, 0xe0, 0x42, 0x10, 0xb7, 0x86, 0x03, 0x1f, 0x7f, 0x0c, 0x1b, - 0x52, 0x06, 0xaf, 0xa3, 0xe3, 0xe2, 0x59, 0xb9, 0x51, 0x35, 0x25, 0xac, 0xa9, 0x61, 0xcd, 0x73, - 0x3a, 0x6e, 0x96, 0xee, 0x5f, 0x1e, 0xbd, 0xd1, 0xd6, 0xa5, 0xa7, 0x7f, 0x20, 0xa8, 0x34, 0xb5, - 0xd2, 0x18, 0xda, 0x57, 0xb0, 0x19, 0x35, 0x50, 0x47, 0xc7, 0xe8, 0xac, 0xdc, 0x78, 0xcf, 0x94, - 0x57, 0x2c, 0x8f, 0x9a, 0xd3, 0xfe, 0x46, 0x0d, 0x33, 0x82, 0x50, 0xf8, 0xd3, 0xc3, 0xf8, 0x0b, - 0xd8, 0xea, 0x3b, 0x3c, 0xb4, 0x87, 0xbe, 0xeb, 0x84, 0x9e, 0x5b, 0x2f, 0x08, 0x30, 0x23, 0x23, - 0xee, 0x1b, 0xdd, 0x73, 0xbb, 0x3c, 0xa9, 0xff, 0x56, 0x96, 0x9f, 0xfe, 0xbb, 0x0e, 0x95, 0xaf, - 0x09, 0x0f, 0x3d, 0xea, 0x05, 0x3c, 0x26, 0xf0, 0x04, 0xb6, 0x46, 0x5e, 0xc0, 0x09, 0xa3, 0x36, - 0xa1, 0x5d, 0x26, 0x34, 0x6e, 0xb6, 0xcb, 0x2a, 0x76, 0x49, 0xbb, 0x0c, 0xdf, 0xc2, 0x2e, 0x0f, - 0x9d, 0x90, 0x74, 0xec, 0xbe, 0x06, 0xa8, 0x17, 0xc4, 0xd5, 0x7c, 0x66, 0xe6, 0xb8, 0xc5, 0xcc, - 0xa1, 0x31, 0xaf, 0x05, 0x80, 0xce, 0xa8, 0xee, 0x76, 0x78, 0x22, 0xca, 0xf1, 0x1d, 0xd4, 0xdd, - 0x31, 0x75, 0x06, 0xa4, 0x63, 0x3b, 0x9d, 0x90, 0x8c, 0xbc, 0x18, 0x63, 0x51, 0x30, 0x7e, 0x3e, - 0x37, 0x63, 0x4b, 0x02, 0xa5, 0x28, 0x6b, 0x0a, 0xff, 0x5c, 0xc0, 0x4f, 0x99, 0x7f, 0x84, 0x03, - 0xcd, 0xfc, 0x83, 0x13, 0x0c, 0x08, 0xed, 0xc5, 0xa8, 0x4b, 0x2b, 0xa1, 0xde, 0x57, 0x04, 0xdf, - 0x49, 0xfc, 0x29, 0xf7, 0x4f, 0x60, 0x68, 0x6e, 0x37, 0x70, 0x08, 0x4d, 0x92, 0xaf, 0xad, 0x84, - 0x5c, 0xdf, 0x6b, 0x4b, 0x11, 0x44, 0x27, 0x8d, 0x5f, 0x10, 0x6c, 0x27, 0xa7, 0x83, 0x1b, 0xf0, - 0xa6, 0xe6, 0x57, 0x9e, 0xad, 0x69, 0x7a, 0x9f, 0x4c, 0x6c, 0xaa, 0x2b, 0xdb, 0x51, 0xdd, 0x92, - 0xf6, 0x34, 0xfe, 0x42, 0xb0, 0x93, 0x52, 0x3e, 0x8f, 0x35, 0xe3, 0x4a, 0x0b, 0xcf, 0x54, 0x5a, - 0x5c, 0x6c, 0x91, 0xfe, 0x5e, 0x03, 0x7c, 0xd1, 0x1f, 0xf2, 0x70, 0xe1, 0x3d, 0x72, 0x41, 0x19, - 0xde, 0xee, 0xa8, 0xf3, 0x6a, 0x8d, 0x3e, 0xc9, 0x1d, 0x6e, 0x96, 0x44, 0x6d, 0x91, 0x4a, 0xa8, - 0xc9, 0x6e, 0xf3, 0x78, 0x90, 0xe3, 0x10, 0xf6, 0x53, 0x3b, 0x14, 0xb1, 0xc9, 0x15, 0xfa, 0x74, - 0x5e, 0x36, 0x35, 0x8f, 0x24, 0xdd, 0x5e, 0x62, 0x81, 0x22, 0xd6, 0xd1, 0x74, 0x73, 0xf5, 0xfe, - 0x44, 0xb4, 0xa5, 0x15, 0xd0, 0xd6, 0x92, 0xcb, 0xa3, 0x8f, 0x19, 0x3f, 0xc3, 0x5b, 0x89, 0x4b, - 0xc1, 0x16, 0x6c, 0x28, 0x62, 0x65, 0xdd, 0xbd, 0xa4, 0x21, 0x54, 0x5d, 0x5b, 0x57, 0x2d, 0x6b, - 0xdc, 0x3f, 0x11, 0x6c, 0x27, 0x15, 0xcf, 0x63, 0x85, 0x98, 0xca, 0xc2, 0xb3, 0x54, 0x2e, 0x68, - 0xda, 0xff, 0x4b, 0xb0, 0xdb, 0x66, 0xc3, 0xd0, 0x8b, 0x5b, 0x96, 0x41, 0x55, 0xf9, 0x31, 0x98, - 0xa4, 0x6c, 0xfd, 0xda, 0x7b, 0xea, 0xbf, 0x3d, 0x0d, 0xa2, 0x2c, 0x29, 0xc2, 0x32, 0xaa, 0x06, - 0x86, 0x79, 0x3a, 0xc1, 0x71, 0x00, 0xda, 0x3d, 0x29, 0xc6, 0xa7, 0xfe, 0xdb, 0x33, 0x8c, 0xea, - 0xb6, 0xb3, 0x94, 0x15, 0x37, 0x93, 0xe1, 0xc6, 0xef, 0x08, 0xde, 0xce, 0x68, 0xc4, 0x17, 0xb0, - 0x15, 0x57, 0xa0, 0xac, 0x72, 0x9c, 0x1c, 0x42, 0xec, 0xc0, 0x30, 0x70, 0x42, 0xc2, 0x68, 0xbb, - 0x1c, 0xc4, 0x40, 0x96, 0x74, 0xce, 0x3f, 0x08, 0x70, 0xb6, 0x97, 0x79, 0xdc, 0x93, 0x56, 0x5f, - 0x58, 0x85, 0xfa, 0x05, 0x1d, 0xf5, 0xb8, 0x06, 0xb5, 0xeb, 0x0e, 0xf3, 0x3d, 0x37, 0xe3, 0xab, - 0x5f, 0x11, 0xbc, 0x43, 0x68, 0x9f, 0x50, 0xcf, 0xe6, 0xa2, 0x22, 0x35, 0x6d, 0xf9, 0x59, 0xd5, - 0xca, 0x9d, 0x76, 0x3e, 0xa4, 0x79, 0x29, 0xe0, 0x62, 0x49, 0x35, 0x5e, 0xfd, 0x76, 0x23, 0x33, - 0xf2, 0xf8, 0x37, 0x04, 0xef, 0x6a, 0xcf, 0xe5, 0x8a, 0x91, 0x66, 0xff, 0x72, 0x11, 0x31, 0x6a, - 0x68, 0x33, 0xd5, 0xe8, 0x2f, 0x89, 0x6c, 0x81, 0xf1, 0x1f, 0x82, 0xfa, 0xac, 0x5e, 0x30, 0x86, - 0x12, 0x75, 0x06, 0x9e, 0x9a, 0xb8, 0x78, 0xc6, 0xdf, 0x43, 0xf5, 0x09, 0xd9, 0x1f, 0x24, 0x47, - 0x9e, 0xc1, 0xd4, 0x83, 0xc7, 0x3c, 0xcb, 0xb6, 0xdc, 0xfc, 0x8d, 0x47, 0x04, 0x07, 0x33, 0x2f, - 0x22, 0xb7, 0x95, 0xb4, 0xb1, 0x0b, 0x59, 0x63, 0xcf, 0xea, 0xb6, 0xb8, 0xf2, 0x6e, 0x4b, 0x0b, - 0x75, 0xdb, 0x6c, 0xde, 0x3f, 0x1c, 0xa2, 0x17, 0x0f, 0x87, 0xe8, 0xd5, 0xc3, 0x21, 0x82, 0x13, - 0xc2, 0xa4, 0x14, 0x3f, 0x60, 0x77, 0xe3, 0x3c, 0xeb, 0x34, 0x77, 0xa6, 0x7e, 0xb9, 0x9a, 0x60, - 0x5f, 0xa1, 0x9b, 0x75, 0x41, 0xf2, 0xd1, 0xeb, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0xfb, 0x98, - 0x93, 0x89, 0x0d, 0x00, 0x00, + // 1006 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0xd6, 0x24, 0x69, 0x97, 0x7d, 0xe9, 0x8f, 0xdd, 0x69, 0x9a, 0xa6, 0x66, 0x55, 0xba, 0x15, + 0xa0, 0xe5, 0x62, 0x8b, 0x2c, 0xbf, 0x0e, 0x70, 0xd8, 0xb4, 0x1c, 0x56, 0xe2, 0xb0, 0x72, 0x41, + 0x20, 0x0e, 0x44, 0xae, 0xed, 0x66, 0x07, 0x39, 0x33, 0x96, 0x67, 0x12, 0xc8, 0x89, 0xc3, 0x4a, + 0xfc, 0x05, 0x48, 0x20, 0x71, 0x41, 0xe2, 0xc0, 0x8d, 0x33, 0x12, 0x47, 0x0e, 0x70, 0xe4, 0x3f, + 0x00, 0xf5, 0xca, 0x3f, 0x81, 0xe2, 0x99, 0x71, 0xc6, 0x3f, 0x52, 0x25, 0x75, 0x6f, 0xf1, 0x7b, + 0x6f, 0xbe, 0xef, 0x9b, 0x79, 0xdf, 0xf3, 0x38, 0xf0, 0x5a, 0x48, 0xa7, 0x6c, 0xe6, 0x78, 0xc1, + 0x98, 0x50, 0x67, 0xda, 0xf7, 0xa2, 0xf8, 0xb9, 0xe7, 0xf8, 0x8c, 0x5e, 0x92, 0xd1, 0x30, 0x98, + 0x8c, 0x63, 0x3b, 0x4e, 0x98, 0x60, 0x78, 0x2f, 0x2d, 0xb3, 0xd3, 0x32, 0x5b, 0x95, 0x59, 0x0f, + 0xd4, 0xda, 0x98, 0x38, 0xd3, 0xbe, 0xe3, 0x4d, 0xc4, 0x73, 0xc7, 0x0f, 0x13, 0x21, 0x97, 0x58, + 0xdd, 0x5c, 0xd6, 0x0f, 0x78, 0x65, 0x3c, 0x5a, 0x12, 0x4f, 0xb2, 0xf8, 0x41, 0x2e, 0xce, 0x17, + 0x89, 0x37, 0x64, 0x42, 0x8a, 0x75, 0x2e, 0x18, 0x13, 0x5c, 0x24, 0x5e, 0x3c, 0xaf, 0xca, 0x1e, + 0x54, 0xe9, 0xe1, 0x88, 0xb1, 0x51, 0x14, 0x3a, 0xe9, 0xd3, 0xc5, 0xe4, 0xd2, 0xf1, 0xe8, 0x4c, + 0xa5, 0x5e, 0x29, 0xa6, 0x04, 0x19, 0x87, 0x5c, 0x78, 0x7a, 0xeb, 0x56, 0x67, 0xc4, 0x46, 0x2c, + 0xfd, 0xe9, 0xcc, 0x7f, 0xc9, 0xe8, 0xc9, 0xfb, 0x00, 0xa7, 0x29, 0xf1, 0xd9, 0x64, 0x1c, 0x63, + 0x1b, 0xee, 0x48, 0x19, 0xbc, 0x87, 0x8e, 0x9b, 0x8f, 0xda, 0xfd, 0x8e, 0x2d, 0x61, 0x6d, 0x0d, + 0x6b, 0x3f, 0xa1, 0x33, 0x57, 0x17, 0x9d, 0xfc, 0x80, 0x60, 0x6f, 0xa0, 0x35, 0x1a, 0x38, 0x03, + 0xb8, 0x9b, 0x49, 0xef, 0xa1, 0x63, 0xf4, 0xa8, 0xdd, 0x7f, 0xd5, 0x96, 0x47, 0x2f, 0x97, 0xda, + 0x8b, 0x9d, 0x4d, 0xfb, 0x76, 0x06, 0xe1, 0x2e, 0x96, 0xe1, 0x0f, 0x60, 0x2b, 0xf2, 0xb8, 0x18, + 0x4e, 0xe2, 0xc0, 0x13, 0x61, 0xd0, 0x6b, 0xa4, 0x30, 0x56, 0x49, 0xd0, 0xc7, 0x7a, 0x9f, 0x6e, + 0x7b, 0x5e, 0xff, 0x89, 0x2c, 0x3f, 0xf9, 0x75, 0x13, 0xf6, 0x3e, 0x22, 0x5c, 0x84, 0x34, 0x4c, + 0xb8, 0x21, 0xed, 0x21, 0x6c, 0x4d, 0xc3, 0x84, 0x13, 0x46, 0x87, 0x84, 0x5e, 0xb2, 0x54, 0xdd, + 0x5d, 0xb7, 0xad, 0x62, 0x4f, 0xe9, 0x25, 0xc3, 0x17, 0x70, 0x8f, 0x0b, 0x4f, 0x10, 0x7f, 0x18, + 0x69, 0x80, 0x5e, 0x23, 0x3d, 0x8e, 0x77, 0xed, 0x0a, 0xff, 0xd8, 0x15, 0x34, 0xf6, 0x79, 0x0a, + 0xa0, 0x33, 0xee, 0x2e, 0xcf, 0x3d, 0x73, 0x9c, 0x40, 0x2f, 0x98, 0x51, 0x6f, 0x4c, 0xfc, 0xa1, + 0xe7, 0x0b, 0x32, 0x0d, 0x0d, 0xae, 0x66, 0xca, 0xf5, 0xde, 0xca, 0x5c, 0x67, 0x12, 0x28, 0x23, + 0xeb, 0x2a, 0xe4, 0x27, 0x29, 0xf0, 0x82, 0x53, 0xc0, 0xa1, 0xe6, 0xfc, 0xca, 0x4b, 0xc6, 0x84, + 0x8e, 0x0c, 0xd2, 0x56, 0x4d, 0xd2, 0x03, 0x05, 0xfd, 0xa9, 0x44, 0x5e, 0xb0, 0x4e, 0xc1, 0xd2, + 0xac, 0x41, 0xe2, 0x11, 0x9a, 0xa7, 0xdd, 0xa8, 0x49, 0xab, 0x4f, 0xf1, 0x4c, 0x41, 0x67, 0x6b, + 0xac, 0x17, 0x08, 0x76, 0xf2, 0x5d, 0xc0, 0x7d, 0x78, 0x49, 0x33, 0x2b, 0x57, 0x76, 0x35, 0x71, + 0x4c, 0xe6, 0x46, 0xcc, 0x60, 0xb3, 0xba, 0x9a, 0x36, 0xb4, 0x7e, 0x41, 0xb0, 0x5b, 0xd0, 0xbc, + 0x8a, 0x05, 0x4d, 0xa5, 0x8d, 0x1b, 0x2a, 0x6d, 0xae, 0x37, 0x30, 0x3f, 0x6d, 0x00, 0x3e, 0x8d, + 0x26, 0x5c, 0xac, 0x3d, 0x2f, 0x5f, 0x80, 0xb2, 0xf7, 0xd0, 0x57, 0xeb, 0xd5, 0xb8, 0xbc, 0x5d, + 0xd9, 0xd6, 0x32, 0x89, 0x9a, 0x16, 0x95, 0x70, 0x77, 0xb8, 0xf9, 0xc8, 0x31, 0x85, 0x83, 0xc2, + 0xac, 0x64, 0x3c, 0x72, 0x54, 0xde, 0x59, 0x95, 0x47, 0x75, 0x42, 0x13, 0xed, 0xe7, 0x06, 0x25, + 0xe3, 0x8b, 0x17, 0xb3, 0xa9, 0xe7, 0x24, 0x23, 0x6c, 0xd5, 0x22, 0xec, 0xe6, 0x87, 0x44, 0x2f, + 0xb0, 0xbe, 0x81, 0xed, 0xdc, 0x11, 0x60, 0x07, 0xee, 0x28, 0x4a, 0x65, 0xd4, 0xfd, 0x7c, 0xfb, + 0x35, 0xa0, 0xae, 0xaa, 0x6b, 0xd3, 0x9f, 0x11, 0xec, 0xe4, 0xb5, 0xae, 0xd2, 0x78, 0x43, 0x65, + 0xe3, 0x46, 0x2a, 0xd7, 0xb4, 0xe8, 0x1f, 0x2d, 0xb8, 0xe7, 0xb2, 0x89, 0x08, 0x4d, 0x83, 0x12, + 0xe8, 0x28, 0xf7, 0x25, 0xf3, 0xd4, 0x50, 0x5f, 0x60, 0xd7, 0xbd, 0xb1, 0x8b, 0x20, 0xca, 0x80, + 0x69, 0x58, 0x46, 0x5d, 0xcc, 0x8b, 0x21, 0x8e, 0x23, 0xd0, 0x8e, 0x29, 0x70, 0x5d, 0xf7, 0xc6, + 0x2e, 0x71, 0xa9, 0x73, 0x36, 0xc9, 0xf6, 0x82, 0x52, 0x8c, 0x5b, 0xdf, 0x23, 0xb8, 0x5f, 0xd2, + 0x85, 0x4f, 0x61, 0xcb, 0xe4, 0x56, 0xf6, 0x38, 0xce, 0x1f, 0xbc, 0xb1, 0x60, 0x92, 0x78, 0x82, + 0x30, 0xea, 0xb6, 0x13, 0x03, 0xa4, 0xa6, 0x5b, 0x7e, 0x47, 0x80, 0xcb, 0xbb, 0x58, 0xc5, 0x31, + 0x45, 0xf5, 0x8d, 0xdb, 0x50, 0xbf, 0xa6, 0x8b, 0xfe, 0xd9, 0x80, 0xee, 0xb9, 0xcf, 0xe2, 0x30, + 0x28, 0x79, 0xe9, 0x05, 0x82, 0x97, 0x09, 0x8d, 0x08, 0x0d, 0x87, 0x3c, 0xad, 0x28, 0xf4, 0x59, + 0x7e, 0x14, 0x9d, 0x55, 0xf6, 0xb9, 0x1a, 0xd2, 0x7e, 0x9a, 0xc2, 0x19, 0x49, 0xd5, 0x5e, 0xb7, + 0x47, 0x96, 0x64, 0xf0, 0xb7, 0x08, 0x1e, 0x68, 0x9f, 0x55, 0xca, 0x90, 0xd6, 0xfe, 0x70, 0x1d, + 0x19, 0xaa, 0x5d, 0x15, 0x3a, 0xf4, 0x37, 0x41, 0x39, 0x65, 0xfd, 0x89, 0xa0, 0xb7, 0x4c, 0x3f, + 0xc6, 0xd0, 0xa2, 0xde, 0x38, 0x54, 0x5d, 0x4e, 0x7f, 0xe3, 0xcf, 0xa0, 0x73, 0x8d, 0xe0, 0xd7, + 0xf3, 0x6d, 0x2e, 0x61, 0xea, 0x66, 0x63, 0x5e, 0x66, 0xab, 0xd7, 0x73, 0xeb, 0x3f, 0x04, 0x87, + 0x4b, 0x8f, 0xa0, 0x72, 0x2b, 0x45, 0x33, 0x37, 0xca, 0x66, 0x5e, 0xb6, 0xdb, 0xe6, 0xad, 0xef, + 0xb6, 0xb5, 0x9e, 0xc3, 0x7f, 0xdc, 0x80, 0xfb, 0xe7, 0xa1, 0x9f, 0x84, 0xc2, 0x34, 0xf7, 0xe7, + 0xa0, 0x2e, 0xd6, 0x21, 0x97, 0x39, 0x65, 0xe7, 0xc7, 0xd5, 0x3e, 0x2a, 0xae, 0x57, 0xef, 0x48, + 0x19, 0x77, 0xb7, 0xb9, 0xf1, 0xc4, 0xf1, 0x97, 0xd0, 0x2d, 0x5c, 0xd1, 0x9a, 0x43, 0xb6, 0xfe, + 0xad, 0x15, 0x39, 0x74, 0x8f, 0x24, 0x49, 0x27, 0x77, 0x3f, 0x6b, 0xae, 0x68, 0xf1, 0x39, 0xa0, + 0xaf, 0x67, 0x4d, 0xd6, 0xac, 0x41, 0xb6, 0x9f, 0xbf, 0x9b, 0x55, 0xb9, 0xf5, 0x1b, 0x82, 0xed, + 0x5c, 0xe1, 0x4d, 0xdd, 0x52, 0xcf, 0xc1, 0xf8, 0x4d, 0xd8, 0x94, 0xbb, 0x54, 0x66, 0x38, 0xcc, + 0xdb, 0x6b, 0xfe, 0xaf, 0x55, 0x6d, 0xd1, 0x55, 0x85, 0xd6, 0x77, 0x08, 0xb6, 0xcc, 0xa6, 0x55, + 0x2a, 0xaf, 0x77, 0x15, 0x18, 0xb2, 0x9a, 0x2b, 0xca, 0x1a, 0x0c, 0xfe, 0xba, 0x3a, 0x42, 0x7f, + 0x5f, 0x1d, 0xa1, 0x7f, 0xaf, 0x8e, 0x10, 0x3c, 0x24, 0x4c, 0x2e, 0x89, 0x13, 0xf6, 0xf5, 0xac, + 0xaa, 0x73, 0x83, 0xdd, 0x45, 0xcf, 0x9e, 0xcd, 0xe5, 0x3c, 0x43, 0x17, 0x9b, 0xa9, 0xae, 0xc7, + 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x8f, 0xb1, 0x73, 0xf7, 0x0f, 0x00, 0x00, } func (m *ConfigDump) Marshal() (dAtA []byte, err error) { @@ -1110,14 +1335,16 @@ func (m *BootstrapConfigDump) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintConfigDump(dAtA, i, uint64(m.Bootstrap.Size())) - n1, err := m.Bootstrap.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.Bootstrap != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(m.Bootstrap.Size())) + n1, err := m.Bootstrap.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n1 } - i += n1 if m.LastUpdated != nil { dAtA[i] = 0x12 i++ @@ -1730,89 +1957,248 @@ func (m *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) MarshalTo(dAtA []byte return i, nil } -func encodeVarintConfigDump(dAtA []byte, offset int, v uint64) int { - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ +func (m *SecretsConfigDump) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err } - dAtA[offset] = uint8(v) - return offset + 1 + return dAtA[:n], nil } -func (m *ConfigDump) Size() (n int) { - if m == nil { - return 0 - } + +func (m *SecretsConfigDump) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i var l int _ = l - if len(m.Configs) > 0 { - for _, e := range m.Configs { - l = e.Size() - n += 1 + l + sovConfigDump(uint64(l)) + if len(m.StaticSecrets) > 0 { + for _, msg := range m.StaticSecrets { + dAtA[i] = 0xa + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *BootstrapConfigDump) Size() (n int) { - if m == nil { - return 0 + if len(m.DynamicActiveSecrets) > 0 { + for _, msg := range m.DynamicActiveSecrets { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } } - var l int - _ = l - l = m.Bootstrap.Size() - n += 1 + l + sovConfigDump(uint64(l)) - if m.LastUpdated != nil { - l = m.LastUpdated.Size() - n += 1 + l + sovConfigDump(uint64(l)) + if len(m.DynamicWarmingSecrets) > 0 { + for _, msg := range m.DynamicWarmingSecrets { + dAtA[i] = 0x1a + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } } if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + i += copy(dAtA[i:], m.XXX_unrecognized) } - return n + return i, nil } -func (m *ListenersConfigDump) Size() (n int) { - if m == nil { - return 0 +func (m *SecretsConfigDump_DynamicSecret) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *SecretsConfigDump_DynamicSecret) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i var l int _ = l - l = len(m.VersionInfo) - if l > 0 { - n += 1 + l + sovConfigDump(uint64(l)) - } - if len(m.StaticListeners) > 0 { - for _, e := range m.StaticListeners { - l = e.Size() - n += 1 + l + sovConfigDump(uint64(l)) - } + if len(m.Name) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) } - if len(m.DynamicActiveListeners) > 0 { - for _, e := range m.DynamicActiveListeners { - l = e.Size() - n += 1 + l + sovConfigDump(uint64(l)) - } + if len(m.VersionInfo) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(len(m.VersionInfo))) + i += copy(dAtA[i:], m.VersionInfo) } - if len(m.DynamicWarmingListeners) > 0 { - for _, e := range m.DynamicWarmingListeners { - l = e.Size() - n += 1 + l + sovConfigDump(uint64(l)) + if m.LastUpdated != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(m.LastUpdated.Size())) + n17, err := m.LastUpdated.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } + i += n17 } - if len(m.DynamicDrainingListeners) > 0 { - for _, e := range m.DynamicDrainingListeners { - l = e.Size() - n += 1 + l + sovConfigDump(uint64(l)) + if m.Secret != nil { + dAtA[i] = 0x22 + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(m.Secret.Size())) + n18, err := m.Secret.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } + i += n18 } if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + i += copy(dAtA[i:], m.XXX_unrecognized) } - return n + return i, nil +} + +func (m *SecretsConfigDump_StaticSecret) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SecretsConfigDump_StaticSecret) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Name) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) + } + if m.LastUpdated != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(m.LastUpdated.Size())) + n19, err := m.LastUpdated.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n19 + } + if m.Secret != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintConfigDump(dAtA, i, uint64(m.Secret.Size())) + n20, err := m.Secret.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n20 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func encodeVarintConfigDump(dAtA []byte, offset int, v uint64) int { + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return offset + 1 +} +func (m *ConfigDump) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Configs) > 0 { + for _, e := range m.Configs { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *BootstrapConfigDump) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Bootstrap != nil { + l = m.Bootstrap.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.LastUpdated != nil { + l = m.LastUpdated.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *ListenersConfigDump) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.VersionInfo) + if l > 0 { + n += 1 + l + sovConfigDump(uint64(l)) + } + if len(m.StaticListeners) > 0 { + for _, e := range m.StaticListeners { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if len(m.DynamicActiveListeners) > 0 { + for _, e := range m.DynamicActiveListeners { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if len(m.DynamicWarmingListeners) > 0 { + for _, e := range m.DynamicWarmingListeners { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if len(m.DynamicDrainingListeners) > 0 { + for _, e := range m.DynamicDrainingListeners { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n } func (m *ListenersConfigDump_StaticListener) Size() (n int) { @@ -2085,6 +2471,88 @@ func (m *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) Size() (n int) { return n } +func (m *SecretsConfigDump) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.StaticSecrets) > 0 { + for _, e := range m.StaticSecrets { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if len(m.DynamicActiveSecrets) > 0 { + for _, e := range m.DynamicActiveSecrets { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if len(m.DynamicWarmingSecrets) > 0 { + for _, e := range m.DynamicWarmingSecrets { + l = e.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *SecretsConfigDump_DynamicSecret) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovConfigDump(uint64(l)) + } + l = len(m.VersionInfo) + if l > 0 { + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.LastUpdated != nil { + l = m.LastUpdated.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.Secret != nil { + l = m.Secret.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *SecretsConfigDump_StaticSecret) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.LastUpdated != nil { + l = m.LastUpdated.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.Secret != nil { + l = m.Secret.Size() + n += 1 + l + sovConfigDump(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func sovConfigDump(x uint64) (n int) { for { n++ @@ -2156,7 +2624,7 @@ func (m *ConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Configs = append(m.Configs, types.Any{}) + m.Configs = append(m.Configs, &types.Any{}) if err := m.Configs[len(m.Configs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2244,6 +2712,9 @@ func (m *BootstrapConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Bootstrap == nil { + m.Bootstrap = &v2.Bootstrap{} + } if err := m.Bootstrap.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2399,7 +2870,7 @@ func (m *ListenersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.StaticListeners = append(m.StaticListeners, ListenersConfigDump_StaticListener{}) + m.StaticListeners = append(m.StaticListeners, &ListenersConfigDump_StaticListener{}) if err := m.StaticListeners[len(m.StaticListeners)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2433,7 +2904,7 @@ func (m *ListenersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicActiveListeners = append(m.DynamicActiveListeners, ListenersConfigDump_DynamicListener{}) + m.DynamicActiveListeners = append(m.DynamicActiveListeners, &ListenersConfigDump_DynamicListener{}) if err := m.DynamicActiveListeners[len(m.DynamicActiveListeners)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2467,7 +2938,7 @@ func (m *ListenersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicWarmingListeners = append(m.DynamicWarmingListeners, ListenersConfigDump_DynamicListener{}) + m.DynamicWarmingListeners = append(m.DynamicWarmingListeners, &ListenersConfigDump_DynamicListener{}) if err := m.DynamicWarmingListeners[len(m.DynamicWarmingListeners)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2501,7 +2972,7 @@ func (m *ListenersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicDrainingListeners = append(m.DynamicDrainingListeners, ListenersConfigDump_DynamicListener{}) + m.DynamicDrainingListeners = append(m.DynamicDrainingListeners, &ListenersConfigDump_DynamicListener{}) if err := m.DynamicDrainingListeners[len(m.DynamicDrainingListeners)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2905,7 +3376,7 @@ func (m *ClustersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.StaticClusters = append(m.StaticClusters, ClustersConfigDump_StaticCluster{}) + m.StaticClusters = append(m.StaticClusters, &ClustersConfigDump_StaticCluster{}) if err := m.StaticClusters[len(m.StaticClusters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2939,7 +3410,7 @@ func (m *ClustersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicActiveClusters = append(m.DynamicActiveClusters, ClustersConfigDump_DynamicCluster{}) + m.DynamicActiveClusters = append(m.DynamicActiveClusters, &ClustersConfigDump_DynamicCluster{}) if err := m.DynamicActiveClusters[len(m.DynamicActiveClusters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2973,7 +3444,7 @@ func (m *ClustersConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicWarmingClusters = append(m.DynamicWarmingClusters, ClustersConfigDump_DynamicCluster{}) + m.DynamicWarmingClusters = append(m.DynamicWarmingClusters, &ClustersConfigDump_DynamicCluster{}) if err := m.DynamicWarmingClusters[len(m.DynamicWarmingClusters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3345,7 +3816,7 @@ func (m *RoutesConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.StaticRouteConfigs = append(m.StaticRouteConfigs, RoutesConfigDump_StaticRouteConfig{}) + m.StaticRouteConfigs = append(m.StaticRouteConfigs, &RoutesConfigDump_StaticRouteConfig{}) if err := m.StaticRouteConfigs[len(m.StaticRouteConfigs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3379,7 +3850,7 @@ func (m *RoutesConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicRouteConfigs = append(m.DynamicRouteConfigs, RoutesConfigDump_DynamicRouteConfig{}) + m.DynamicRouteConfigs = append(m.DynamicRouteConfigs, &RoutesConfigDump_DynamicRouteConfig{}) if err := m.DynamicRouteConfigs[len(m.DynamicRouteConfigs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3751,7 +4222,7 @@ func (m *ScopedRoutesConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.InlineScopedRouteConfigs = append(m.InlineScopedRouteConfigs, ScopedRoutesConfigDump_InlineScopedRouteConfigs{}) + m.InlineScopedRouteConfigs = append(m.InlineScopedRouteConfigs, &ScopedRoutesConfigDump_InlineScopedRouteConfigs{}) if err := m.InlineScopedRouteConfigs[len(m.InlineScopedRouteConfigs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3785,7 +4256,7 @@ func (m *ScopedRoutesConfigDump) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DynamicScopedRouteConfigs = append(m.DynamicScopedRouteConfigs, ScopedRoutesConfigDump_DynamicScopedRouteConfigs{}) + m.DynamicScopedRouteConfigs = append(m.DynamicScopedRouteConfigs, &ScopedRoutesConfigDump_DynamicScopedRouteConfigs{}) if err := m.DynamicScopedRouteConfigs[len(m.DynamicScopedRouteConfigs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4159,6 +4630,510 @@ func (m *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) Unmarshal(dAtA []byte } return nil } +func (m *SecretsConfigDump) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SecretsConfigDump: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SecretsConfigDump: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StaticSecrets", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.StaticSecrets = append(m.StaticSecrets, &SecretsConfigDump_StaticSecret{}) + if err := m.StaticSecrets[len(m.StaticSecrets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DynamicActiveSecrets", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DynamicActiveSecrets = append(m.DynamicActiveSecrets, &SecretsConfigDump_DynamicSecret{}) + if err := m.DynamicActiveSecrets[len(m.DynamicActiveSecrets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DynamicWarmingSecrets", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DynamicWarmingSecrets = append(m.DynamicWarmingSecrets, &SecretsConfigDump_DynamicSecret{}) + if err := m.DynamicWarmingSecrets[len(m.DynamicWarmingSecrets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfigDump(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfigDump + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfigDump + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SecretsConfigDump_DynamicSecret) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: DynamicSecret: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DynamicSecret: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VersionInfo", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VersionInfo = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastUpdated", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.LastUpdated == nil { + m.LastUpdated = &types.Timestamp{} + } + if err := m.LastUpdated.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Secret", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Secret == nil { + m.Secret = &auth.Secret{} + } + if err := m.Secret.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfigDump(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfigDump + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfigDump + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SecretsConfigDump_StaticSecret) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: StaticSecret: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: StaticSecret: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastUpdated", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.LastUpdated == nil { + m.LastUpdated = &types.Timestamp{} + } + if err := m.LastUpdated.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Secret", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigDump + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigDump + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfigDump + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Secret == nil { + m.Secret = &auth.Secret{} + } + if err := m.Secret.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfigDump(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfigDump + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfigDump + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipConfigDump(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go index 3ef9d8e9d5e7..4ff7fe67f956 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/config_dump.pb.validate.go @@ -43,17 +43,12 @@ func (m *ConfigDump) Validate() error { for idx, item := range m.GetConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ConfigDumpValidationError{ - field: fmt.Sprintf("Configs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ConfigDumpValidationError{ + field: fmt.Sprintf("Configs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -125,32 +120,22 @@ func (m *BootstrapConfigDump) Validate() error { return nil } - { - tmp := m.GetBootstrap() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapConfigDumpValidationError{ - field: "Bootstrap", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetBootstrap()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapConfigDumpValidationError{ + field: "Bootstrap", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapConfigDumpValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapConfigDumpValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -227,17 +212,12 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetStaticListeners() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersConfigDumpValidationError{ - field: fmt.Sprintf("StaticListeners[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDumpValidationError{ + field: fmt.Sprintf("StaticListeners[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -247,17 +227,12 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetDynamicActiveListeners() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersConfigDumpValidationError{ - field: fmt.Sprintf("DynamicActiveListeners[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDumpValidationError{ + field: fmt.Sprintf("DynamicActiveListeners[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -267,17 +242,12 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetDynamicWarmingListeners() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersConfigDumpValidationError{ - field: fmt.Sprintf("DynamicWarmingListeners[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDumpValidationError{ + field: fmt.Sprintf("DynamicWarmingListeners[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -287,17 +257,12 @@ func (m *ListenersConfigDump) Validate() error { for idx, item := range m.GetDynamicDrainingListeners() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersConfigDumpValidationError{ - field: fmt.Sprintf("DynamicDrainingListeners[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDumpValidationError{ + field: fmt.Sprintf("DynamicDrainingListeners[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -376,17 +341,12 @@ func (m *ClustersConfigDump) Validate() error { for idx, item := range m.GetStaticClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDumpValidationError{ - field: fmt.Sprintf("StaticClusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDumpValidationError{ + field: fmt.Sprintf("StaticClusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -396,17 +356,12 @@ func (m *ClustersConfigDump) Validate() error { for idx, item := range m.GetDynamicActiveClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDumpValidationError{ - field: fmt.Sprintf("DynamicActiveClusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDumpValidationError{ + field: fmt.Sprintf("DynamicActiveClusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -416,17 +371,12 @@ func (m *ClustersConfigDump) Validate() error { for idx, item := range m.GetDynamicWarmingClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDumpValidationError{ - field: fmt.Sprintf("DynamicWarmingClusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDumpValidationError{ + field: fmt.Sprintf("DynamicWarmingClusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -503,17 +453,12 @@ func (m *RoutesConfigDump) Validate() error { for idx, item := range m.GetStaticRouteConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RoutesConfigDumpValidationError{ - field: fmt.Sprintf("StaticRouteConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RoutesConfigDumpValidationError{ + field: fmt.Sprintf("StaticRouteConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -523,17 +468,12 @@ func (m *RoutesConfigDump) Validate() error { for idx, item := range m.GetDynamicRouteConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RoutesConfigDumpValidationError{ - field: fmt.Sprintf("DynamicRouteConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RoutesConfigDumpValidationError{ + field: fmt.Sprintf("DynamicRouteConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -608,17 +548,12 @@ func (m *ScopedRoutesConfigDump) Validate() error { for idx, item := range m.GetInlineScopedRouteConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesConfigDumpValidationError{ - field: fmt.Sprintf("InlineScopedRouteConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesConfigDumpValidationError{ + field: fmt.Sprintf("InlineScopedRouteConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -628,17 +563,12 @@ func (m *ScopedRoutesConfigDump) Validate() error { for idx, item := range m.GetDynamicScopedRouteConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesConfigDumpValidationError{ - field: fmt.Sprintf("DynamicScopedRouteConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesConfigDumpValidationError{ + field: fmt.Sprintf("DynamicScopedRouteConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -704,42 +634,144 @@ var _ interface { ErrorName() string } = ScopedRoutesConfigDumpValidationError{} -// Validate checks the field values on ListenersConfigDump_StaticListener with -// the rules defined in the proto definition for this message. If any rules -// are violated, an error is returned. -func (m *ListenersConfigDump_StaticListener) Validate() error { +// Validate checks the field values on SecretsConfigDump with the rules defined +// in the proto definition for this message. If any rules are violated, an +// error is returned. +func (m *SecretsConfigDump) Validate() error { if m == nil { return nil } - { - tmp := m.GetListener() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetStaticSecrets() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { - return ListenersConfigDump_StaticListenerValidationError{ - field: "Listener", + return SecretsConfigDumpValidationError{ + field: fmt.Sprintf("StaticSecrets[%v]", idx), reason: "embedded message failed validation", cause: err, } } } + } - { - tmp := m.GetLastUpdated() + for idx, item := range m.GetDynamicActiveSecrets() { + _, _ = idx, item - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretsConfigDumpValidationError{ + field: fmt.Sprintf("DynamicActiveSecrets[%v]", idx), + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + for idx, item := range m.GetDynamicWarmingSecrets() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { - return ListenersConfigDump_StaticListenerValidationError{ - field: "LastUpdated", + return SecretsConfigDumpValidationError{ + field: fmt.Sprintf("DynamicWarmingSecrets[%v]", idx), reason: "embedded message failed validation", cause: err, } } } + + } + + return nil +} + +// SecretsConfigDumpValidationError is the validation error returned by +// SecretsConfigDump.Validate if the designated constraints aren't met. +type SecretsConfigDumpValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e SecretsConfigDumpValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e SecretsConfigDumpValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e SecretsConfigDumpValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e SecretsConfigDumpValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e SecretsConfigDumpValidationError) ErrorName() string { + return "SecretsConfigDumpValidationError" +} + +// Error satisfies the builtin error interface +func (e SecretsConfigDumpValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sSecretsConfigDump.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = SecretsConfigDumpValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = SecretsConfigDumpValidationError{} + +// Validate checks the field values on ListenersConfigDump_StaticListener with +// the rules defined in the proto definition for this message. If any rules +// are violated, an error is returned. +func (m *ListenersConfigDump_StaticListener) Validate() error { + if m == nil { + return nil + } + + if v, ok := interface{}(m.GetListener()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDump_StaticListenerValidationError{ + field: "Listener", + reason: "embedded message failed validation", + cause: err, + } + } + } + + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDump_StaticListenerValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, + } + } } return nil @@ -812,32 +844,22 @@ func (m *ListenersConfigDump_DynamicListener) Validate() error { // no validation rules for VersionInfo - { - tmp := m.GetListener() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersConfigDump_DynamicListenerValidationError{ - field: "Listener", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetListener()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDump_DynamicListenerValidationError{ + field: "Listener", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersConfigDump_DynamicListenerValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersConfigDump_DynamicListenerValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -910,32 +932,22 @@ func (m *ClustersConfigDump_StaticCluster) Validate() error { return nil } - { - tmp := m.GetCluster() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDump_StaticClusterValidationError{ - field: "Cluster", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCluster()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDump_StaticClusterValidationError{ + field: "Cluster", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDump_StaticClusterValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDump_StaticClusterValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -1010,32 +1022,22 @@ func (m *ClustersConfigDump_DynamicCluster) Validate() error { // no validation rules for VersionInfo - { - tmp := m.GetCluster() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDump_DynamicClusterValidationError{ - field: "Cluster", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCluster()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDump_DynamicClusterValidationError{ + field: "Cluster", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClustersConfigDump_DynamicClusterValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClustersConfigDump_DynamicClusterValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -1108,32 +1110,22 @@ func (m *RoutesConfigDump_StaticRouteConfig) Validate() error { return nil } - { - tmp := m.GetRouteConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RoutesConfigDump_StaticRouteConfigValidationError{ - field: "RouteConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RoutesConfigDump_StaticRouteConfigValidationError{ + field: "RouteConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RoutesConfigDump_StaticRouteConfigValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RoutesConfigDump_StaticRouteConfigValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -1208,32 +1200,22 @@ func (m *RoutesConfigDump_DynamicRouteConfig) Validate() error { // no validation rules for VersionInfo - { - tmp := m.GetRouteConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RoutesConfigDump_DynamicRouteConfigValidationError{ - field: "RouteConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RoutesConfigDump_DynamicRouteConfigValidationError{ + field: "RouteConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RoutesConfigDump_DynamicRouteConfigValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RoutesConfigDump_DynamicRouteConfigValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -1312,34 +1294,24 @@ func (m *ScopedRoutesConfigDump_InlineScopedRouteConfigs) Validate() error { for idx, item := range m.GetScopedRouteConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesConfigDump_InlineScopedRouteConfigsValidationError{ - field: fmt.Sprintf("ScopedRouteConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesConfigDump_InlineScopedRouteConfigsValidationError{ + field: fmt.Sprintf("ScopedRouteConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesConfigDump_InlineScopedRouteConfigsValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesConfigDump_InlineScopedRouteConfigsValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -1423,34 +1395,24 @@ func (m *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) Validate() error { for idx, item := range m.GetScopedRouteConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesConfigDump_DynamicScopedRouteConfigsValidationError{ - field: fmt.Sprintf("ScopedRouteConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesConfigDump_DynamicScopedRouteConfigsValidationError{ + field: fmt.Sprintf("ScopedRouteConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetLastUpdated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesConfigDump_DynamicScopedRouteConfigsValidationError{ - field: "LastUpdated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesConfigDump_DynamicScopedRouteConfigsValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, } } } @@ -1519,3 +1481,185 @@ var _ interface { Cause() error ErrorName() string } = ScopedRoutesConfigDump_DynamicScopedRouteConfigsValidationError{} + +// Validate checks the field values on SecretsConfigDump_DynamicSecret with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *SecretsConfigDump_DynamicSecret) Validate() error { + if m == nil { + return nil + } + + // no validation rules for Name + + // no validation rules for VersionInfo + + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretsConfigDump_DynamicSecretValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, + } + } + } + + if v, ok := interface{}(m.GetSecret()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretsConfigDump_DynamicSecretValidationError{ + field: "Secret", + reason: "embedded message failed validation", + cause: err, + } + } + } + + return nil +} + +// SecretsConfigDump_DynamicSecretValidationError is the validation error +// returned by SecretsConfigDump_DynamicSecret.Validate if the designated +// constraints aren't met. +type SecretsConfigDump_DynamicSecretValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e SecretsConfigDump_DynamicSecretValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e SecretsConfigDump_DynamicSecretValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e SecretsConfigDump_DynamicSecretValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e SecretsConfigDump_DynamicSecretValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e SecretsConfigDump_DynamicSecretValidationError) ErrorName() string { + return "SecretsConfigDump_DynamicSecretValidationError" +} + +// Error satisfies the builtin error interface +func (e SecretsConfigDump_DynamicSecretValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sSecretsConfigDump_DynamicSecret.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = SecretsConfigDump_DynamicSecretValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = SecretsConfigDump_DynamicSecretValidationError{} + +// Validate checks the field values on SecretsConfigDump_StaticSecret with the +// rules defined in the proto definition for this message. If any rules are +// violated, an error is returned. +func (m *SecretsConfigDump_StaticSecret) Validate() error { + if m == nil { + return nil + } + + // no validation rules for Name + + if v, ok := interface{}(m.GetLastUpdated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretsConfigDump_StaticSecretValidationError{ + field: "LastUpdated", + reason: "embedded message failed validation", + cause: err, + } + } + } + + if v, ok := interface{}(m.GetSecret()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretsConfigDump_StaticSecretValidationError{ + field: "Secret", + reason: "embedded message failed validation", + cause: err, + } + } + } + + return nil +} + +// SecretsConfigDump_StaticSecretValidationError is the validation error +// returned by SecretsConfigDump_StaticSecret.Validate if the designated +// constraints aren't met. +type SecretsConfigDump_StaticSecretValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e SecretsConfigDump_StaticSecretValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e SecretsConfigDump_StaticSecretValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e SecretsConfigDump_StaticSecretValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e SecretsConfigDump_StaticSecretValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e SecretsConfigDump_StaticSecretValidationError) ErrorName() string { + return "SecretsConfigDump_StaticSecretValidationError" +} + +// Error satisfies the builtin error interface +func (e SecretsConfigDump_StaticSecretValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sSecretsConfigDump_StaticSecret.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = SecretsConfigDump_StaticSecretValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = SecretsConfigDump_StaticSecretValidationError{} diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.go index 7e71e53e53cd..efdedc09a87c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.go @@ -5,12 +5,10 @@ package envoy_admin_v2alpha import ( fmt "fmt" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.validate.go index 30a3bea9c332..8324b52c8b5e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/listeners.pb.validate.go @@ -43,17 +43,12 @@ func (m *Listeners) Validate() error { for idx, item := range m.GetListenerStatuses() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenersValidationError{ - field: fmt.Sprintf("ListenerStatuses[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenersValidationError{ + field: fmt.Sprintf("ListenerStatuses[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -127,17 +122,12 @@ func (m *ListenerStatus) Validate() error { // no validation rules for Name - { - tmp := m.GetLocalAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerStatusValidationError{ - field: "LocalAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerStatusValidationError{ + field: "LocalAddress", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/memory.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/memory.pb.go index ae63e7b990aa..5a7bc36b7730 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/memory.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/memory.pb.go @@ -5,10 +5,9 @@ package envoy_admin_v2alpha import ( fmt "fmt" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go index 5b5cb3228cc6..510d47831a7a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/metrics.pb.go @@ -5,10 +5,9 @@ package envoy_admin_v2alpha import ( fmt "fmt" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/mutex_stats.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/mutex_stats.pb.go index 2aac6958ee84..516b9d60ab17 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/mutex_stats.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/mutex_stats.pb.go @@ -5,10 +5,9 @@ package envoy_admin_v2alpha import ( fmt "fmt" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.go index 34e6b759aa03..a7fd1623503b 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.go @@ -5,11 +5,10 @@ package envoy_admin_v2alpha import ( fmt "fmt" - io "io" - math "math" - proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.validate.go index 53196b815f82..624cec4ce41f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/server_info.pb.validate.go @@ -44,47 +44,32 @@ func (m *ServerInfo) Validate() error { // no validation rules for State - { - tmp := m.GetUptimeCurrentEpoch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ServerInfoValidationError{ - field: "UptimeCurrentEpoch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUptimeCurrentEpoch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ServerInfoValidationError{ + field: "UptimeCurrentEpoch", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetUptimeAllEpochs() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ServerInfoValidationError{ - field: "UptimeAllEpochs", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUptimeAllEpochs()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ServerInfoValidationError{ + field: "UptimeAllEpochs", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCommandLineOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ServerInfoValidationError{ - field: "CommandLineOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommandLineOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ServerInfoValidationError{ + field: "CommandLineOptions", + reason: "embedded message failed validation", + cause: err, } } } @@ -184,47 +169,32 @@ func (m *CommandLineOptions) Validate() error { // no validation rules for ServiceZone - { - tmp := m.GetFileFlushInterval() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommandLineOptionsValidationError{ - field: "FileFlushInterval", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFileFlushInterval()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommandLineOptionsValidationError{ + field: "FileFlushInterval", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDrainTime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommandLineOptionsValidationError{ - field: "DrainTime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDrainTime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommandLineOptionsValidationError{ + field: "DrainTime", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetParentShutdownTime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommandLineOptionsValidationError{ - field: "ParentShutdownTime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetParentShutdownTime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommandLineOptionsValidationError{ + field: "ParentShutdownTime", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.go index 0c44acf66acd..d02d9f05d442 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.go @@ -5,13 +5,11 @@ package envoy_admin_v2alpha import ( fmt "fmt" - io "io" - math "math" - + v2alpha "github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" - - v2alpha "github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.validate.go index 8020034f7274..9ac0fcb9a43a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha/tap.pb.validate.go @@ -54,17 +54,12 @@ func (m *TapRequest) Validate() error { } } - { - tmp := m.GetTapConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TapRequestValidationError{ - field: "TapConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTapConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TapRequestValidationError{ + field: "TapConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go index bc9ea0745745..0f070269e711 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.go @@ -6,15 +6,13 @@ package auth import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go index f1d38c74e32c..5dc6fa54cc9c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/auth/cert.pb.validate.go @@ -120,62 +120,42 @@ func (m *TlsCertificate) Validate() error { return nil } - { - tmp := m.GetCertificateChain() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TlsCertificateValidationError{ - field: "CertificateChain", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCertificateChain()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TlsCertificateValidationError{ + field: "CertificateChain", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetPrivateKey() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TlsCertificateValidationError{ - field: "PrivateKey", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPrivateKey()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TlsCertificateValidationError{ + field: "PrivateKey", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetPassword() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TlsCertificateValidationError{ - field: "Password", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPassword()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TlsCertificateValidationError{ + field: "Password", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetOcspStaple() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TlsCertificateValidationError{ - field: "OcspStaple", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOcspStaple()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TlsCertificateValidationError{ + field: "OcspStaple", + reason: "embedded message failed validation", + cause: err, } } } @@ -183,17 +163,12 @@ func (m *TlsCertificate) Validate() error { for idx, item := range m.GetSignedCertificateTimestamp() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TlsCertificateValidationError{ - field: fmt.Sprintf("SignedCertificateTimestamp[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TlsCertificateValidationError{ + field: fmt.Sprintf("SignedCertificateTimestamp[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -275,17 +250,12 @@ func (m *TlsSessionTicketKeys) Validate() error { for idx, item := range m.GetKeys() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TlsSessionTicketKeysValidationError{ - field: fmt.Sprintf("Keys[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TlsSessionTicketKeysValidationError{ + field: fmt.Sprintf("Keys[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -359,17 +329,12 @@ func (m *CertificateValidationContext) Validate() error { return nil } - { - tmp := m.GetTrustedCa() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateValidationContextValidationError{ - field: "TrustedCa", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTrustedCa()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateValidationContextValidationError{ + field: "TrustedCa", + reason: "embedded message failed validation", + cause: err, } } } @@ -398,47 +363,32 @@ func (m *CertificateValidationContext) Validate() error { } - { - tmp := m.GetRequireOcspStaple() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateValidationContextValidationError{ - field: "RequireOcspStaple", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequireOcspStaple()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateValidationContextValidationError{ + field: "RequireOcspStaple", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRequireSignedCertificateTimestamp() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateValidationContextValidationError{ - field: "RequireSignedCertificateTimestamp", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequireSignedCertificateTimestamp()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateValidationContextValidationError{ + field: "RequireSignedCertificateTimestamp", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCrl() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CertificateValidationContextValidationError{ - field: "Crl", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCrl()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CertificateValidationContextValidationError{ + field: "Crl", + reason: "embedded message failed validation", + cause: err, } } } @@ -513,17 +463,12 @@ func (m *CommonTlsContext) Validate() error { return nil } - { - tmp := m.GetTlsParams() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContextValidationError{ - field: "TlsParams", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTlsParams()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContextValidationError{ + field: "TlsParams", + reason: "embedded message failed validation", + cause: err, } } } @@ -531,17 +476,12 @@ func (m *CommonTlsContext) Validate() error { for idx, item := range m.GetTlsCertificates() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContextValidationError{ - field: fmt.Sprintf("TlsCertificates[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContextValidationError{ + field: fmt.Sprintf("TlsCertificates[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -558,17 +498,12 @@ func (m *CommonTlsContext) Validate() error { for idx, item := range m.GetTlsCertificateSdsSecretConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContextValidationError{ - field: fmt.Sprintf("TlsCertificateSdsSecretConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContextValidationError{ + field: fmt.Sprintf("TlsCertificateSdsSecretConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -579,51 +514,36 @@ func (m *CommonTlsContext) Validate() error { case *CommonTlsContext_ValidationContext: - { - tmp := m.GetValidationContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContextValidationError{ - field: "ValidationContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValidationContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContextValidationError{ + field: "ValidationContext", + reason: "embedded message failed validation", + cause: err, } } } case *CommonTlsContext_ValidationContextSdsSecretConfig: - { - tmp := m.GetValidationContextSdsSecretConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContextValidationError{ - field: "ValidationContextSdsSecretConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValidationContextSdsSecretConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContextValidationError{ + field: "ValidationContextSdsSecretConfig", + reason: "embedded message failed validation", + cause: err, } } } case *CommonTlsContext_CombinedValidationContext: - { - tmp := m.GetCombinedValidationContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContextValidationError{ - field: "CombinedValidationContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCombinedValidationContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContextValidationError{ + field: "CombinedValidationContext", + reason: "embedded message failed validation", + cause: err, } } } @@ -695,17 +615,12 @@ func (m *UpstreamTlsContext) Validate() error { return nil } - { - tmp := m.GetCommonTlsContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamTlsContextValidationError{ - field: "CommonTlsContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommonTlsContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamTlsContextValidationError{ + field: "CommonTlsContext", + reason: "embedded message failed validation", + cause: err, } } } @@ -719,17 +634,12 @@ func (m *UpstreamTlsContext) Validate() error { // no validation rules for AllowRenegotiation - { - tmp := m.GetMaxSessionKeys() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamTlsContextValidationError{ - field: "MaxSessionKeys", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxSessionKeys()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamTlsContextValidationError{ + field: "MaxSessionKeys", + reason: "embedded message failed validation", + cause: err, } } } @@ -801,47 +711,32 @@ func (m *DownstreamTlsContext) Validate() error { return nil } - { - tmp := m.GetCommonTlsContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DownstreamTlsContextValidationError{ - field: "CommonTlsContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommonTlsContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DownstreamTlsContextValidationError{ + field: "CommonTlsContext", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRequireClientCertificate() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DownstreamTlsContextValidationError{ - field: "RequireClientCertificate", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequireClientCertificate()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DownstreamTlsContextValidationError{ + field: "RequireClientCertificate", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRequireSni() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DownstreamTlsContextValidationError{ - field: "RequireSni", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequireSni()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DownstreamTlsContextValidationError{ + field: "RequireSni", + reason: "embedded message failed validation", + cause: err, } } } @@ -850,34 +745,24 @@ func (m *DownstreamTlsContext) Validate() error { case *DownstreamTlsContext_SessionTicketKeys: - { - tmp := m.GetSessionTicketKeys() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DownstreamTlsContextValidationError{ - field: "SessionTicketKeys", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSessionTicketKeys()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DownstreamTlsContextValidationError{ + field: "SessionTicketKeys", + reason: "embedded message failed validation", + cause: err, } } } case *DownstreamTlsContext_SessionTicketKeysSdsSecretConfig: - { - tmp := m.GetSessionTicketKeysSdsSecretConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DownstreamTlsContextValidationError{ - field: "SessionTicketKeysSdsSecretConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSessionTicketKeysSdsSecretConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DownstreamTlsContextValidationError{ + field: "SessionTicketKeysSdsSecretConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -953,17 +838,12 @@ func (m *SdsSecretConfig) Validate() error { // no validation rules for Name - { - tmp := m.GetSdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SdsSecretConfigValidationError{ - field: "SdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SdsSecretConfigValidationError{ + field: "SdsConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -1038,51 +918,36 @@ func (m *Secret) Validate() error { case *Secret_TlsCertificate: - { - tmp := m.GetTlsCertificate() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SecretValidationError{ - field: "TlsCertificate", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTlsCertificate()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretValidationError{ + field: "TlsCertificate", + reason: "embedded message failed validation", + cause: err, } } } case *Secret_SessionTicketKeys: - { - tmp := m.GetSessionTicketKeys() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SecretValidationError{ - field: "SessionTicketKeys", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSessionTicketKeys()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretValidationError{ + field: "SessionTicketKeys", + reason: "embedded message failed validation", + cause: err, } } } case *Secret_ValidationContext: - { - tmp := m.GetValidationContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SecretValidationError{ - field: "ValidationContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValidationContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SecretValidationError{ + field: "ValidationContext", + reason: "embedded message failed validation", + cause: err, } } } @@ -1162,17 +1027,12 @@ func (m *CommonTlsContext_CombinedCertificateValidationContext) Validate() error } } - { - tmp := m.GetDefaultValidationContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContext_CombinedCertificateValidationContextValidationError{ - field: "DefaultValidationContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDefaultValidationContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContext_CombinedCertificateValidationContextValidationError{ + field: "DefaultValidationContext", + reason: "embedded message failed validation", + cause: err, } } } @@ -1184,17 +1044,12 @@ func (m *CommonTlsContext_CombinedCertificateValidationContext) Validate() error } } - { - tmp := m.GetValidationContextSdsSecretConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonTlsContext_CombinedCertificateValidationContextValidationError{ - field: "ValidationContextSdsSecretConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValidationContextSdsSecretConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonTlsContext_CombinedCertificateValidationContextValidationError{ + field: "ValidationContextSdsSecretConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go index ec19840dafb3..12dc312992fa 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.go @@ -7,10 +7,10 @@ import ( bytes "bytes" context "context" fmt "fmt" - io "io" - math "math" - time "time" - + auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" + cluster "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" @@ -19,11 +19,9 @@ import ( github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - - auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" - cluster "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster" - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -318,7 +316,7 @@ func (Cluster_RingHashLbConfig_HashFunction) EnumDescriptor() ([]byte, []int) { } // Configuration for a single upstream cluster. -// [#comment:next free field: 40] +// [#comment:next free field: 41] type Cluster struct { // Supplies the name of the cluster which must be unique across all clusters. // The cluster name is used when emitting @@ -338,7 +336,7 @@ type Cluster struct { // Configuration to use for EDS updates for the Cluster. EdsClusterConfig *Cluster_EdsClusterConfig `protobuf:"bytes,3,opt,name=eds_cluster_config,json=edsClusterConfig,proto3" json:"eds_cluster_config,omitempty"` // The timeout for new network connections to hosts in the cluster. - ConnectTimeout time.Duration `protobuf:"bytes,4,opt,name=connect_timeout,json=connectTimeout,proto3,stdduration" json:"connect_timeout"` + ConnectTimeout *time.Duration `protobuf:"bytes,4,opt,name=connect_timeout,json=connectTimeout,proto3,stdduration" json:"connect_timeout,omitempty"` // Soft limit on size of the cluster’s connections read and write buffers. If // unspecified, an implementation defined default is applied (1MiB). PerConnectionBufferLimitBytes *types.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` @@ -356,7 +354,7 @@ type Cluster struct { // **This field is deprecated**. Set the // :ref:`load_assignment` field instead. // - Hosts []*core.Address `protobuf:"bytes,7,rep,name=hosts,proto3" json:"hosts,omitempty"` // Deprecated: Do not use. + Hosts []*core.Address `protobuf:"bytes,7,rep,name=hosts,proto3" json:"hosts,omitempty"` // Setting this is required for specifying members of // :ref:`STATIC`, // :ref:`STRICT_DNS` @@ -515,10 +513,14 @@ type Cluster struct { // This only affects behavior for hosts that are being actively health checked. // If this flag is not set to true, Envoy will wait until the hosts fail active health // checking before removing it from the cluster. - DrainConnectionsOnHostRemoval bool `protobuf:"varint,32,opt,name=drain_connections_on_host_removal,json=drainConnectionsOnHostRemoval,proto3" json:"drain_connections_on_host_removal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DrainConnectionsOnHostRemoval bool `protobuf:"varint,32,opt,name=drain_connections_on_host_removal,json=drainConnectionsOnHostRemoval,proto3" json:"drain_connections_on_host_removal,omitempty"` + // An optional list of network filters that make up the filter chain for + // outgoing connections made by the cluster. Order matters as the filters are + // processed sequentially as connection events happen. + Filters []*cluster.Filter `protobuf:"bytes,40,rep,name=filters,proto3" json:"filters,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Cluster) Reset() { *m = Cluster{} } @@ -633,11 +635,11 @@ func (m *Cluster) GetEdsClusterConfig() *Cluster_EdsClusterConfig { return nil } -func (m *Cluster) GetConnectTimeout() time.Duration { +func (m *Cluster) GetConnectTimeout() *time.Duration { if m != nil { return m.ConnectTimeout } - return 0 + return nil } func (m *Cluster) GetPerConnectionBufferLimitBytes() *types.UInt32Value { @@ -654,7 +656,6 @@ func (m *Cluster) GetLbPolicy() Cluster_LbPolicy { return Cluster_ROUND_ROBIN } -// Deprecated: Do not use. func (m *Cluster) GetHosts() []*core.Address { if m != nil { return m.Hosts @@ -858,6 +859,13 @@ func (m *Cluster) GetDrainConnectionsOnHostRemoval() bool { return false } +func (m *Cluster) GetFilters() []*cluster.Filter { + if m != nil { + return m.Filters + } + return nil +} + // XXX_OneofFuncs is for the internal use of the proto package. func (*Cluster) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { return _Cluster_OneofMarshaler, _Cluster_OneofUnmarshaler, _Cluster_OneofSizer, []interface{}{ @@ -1480,6 +1488,7 @@ func (m *Cluster_OriginalDstLbConfig) GetUseHttpHeader() bool { type Cluster_CommonLbConfig struct { // Configures the :ref:`healthy panic threshold `. // If not specified, the default is 50%. + // To disable panic mode, set to 0%. // // .. note:: // The specified percent will be truncated to the nearest 1%. @@ -1913,179 +1922,180 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/cds.proto", fileDescriptor_e73f50fbb1daa302) } var fileDescriptor_e73f50fbb1daa302 = []byte{ - // 2738 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x5d, 0x6f, 0x1b, 0xc7, - 0xd5, 0xd6, 0x52, 0xb2, 0x2d, 0x8d, 0x44, 0x72, 0x35, 0x92, 0xed, 0x35, 0x65, 0xcb, 0x32, 0x63, - 0x27, 0x7a, 0x8d, 0xf7, 0xa5, 0xde, 0xca, 0xf9, 0x42, 0xda, 0x24, 0xe0, 0x97, 0x2c, 0x39, 0x14, - 0xa9, 0x0e, 0x49, 0x3b, 0x69, 0x10, 0x4c, 0x86, 0xbb, 0x43, 0x71, 0xa1, 0xe5, 0x2e, 0xb3, 0x33, - 0x2b, 0x9b, 0xbe, 0x28, 0xdc, 0x5c, 0xb5, 0xd7, 0xbd, 0x69, 0x81, 0xfe, 0x80, 0xa2, 0x40, 0xfe, - 0x40, 0xaf, 0x8a, 0x5e, 0xa5, 0x77, 0x05, 0x7a, 0xd3, 0xab, 0xb4, 0x30, 0x7a, 0xd3, 0x7f, 0x51, - 0xcc, 0xc7, 0xd2, 0xfc, 0x58, 0x49, 0x4e, 0xd0, 0x2b, 0x71, 0xce, 0x79, 0xce, 0x73, 0x66, 0xcf, - 0x9c, 0x39, 0x73, 0x66, 0x04, 0xae, 0x51, 0xff, 0x34, 0x18, 0xee, 0x90, 0x81, 0xbb, 0x73, 0xba, - 0xbb, 0x63, 0x3b, 0xac, 0x30, 0x08, 0x03, 0x1e, 0xc0, 0x15, 0x29, 0x2f, 0x90, 0x81, 0x5b, 0x38, - 0xdd, 0xcd, 0xdd, 0x9e, 0x44, 0x05, 0x21, 0xdd, 0x21, 0x8e, 0x13, 0x52, 0xa6, 0xe1, 0xb9, 0x9b, - 0x13, 0x00, 0x12, 0xf1, 0xde, 0x8e, 0x4d, 0x43, 0x9e, 0xa8, 0x95, 0xe6, 0x1d, 0xc2, 0xa8, 0xd6, - 0xde, 0x9b, 0xd5, 0xda, 0x81, 0xdf, 0x75, 0x8f, 0x31, 0x0b, 0xa2, 0xd0, 0xa6, 0x89, 0x24, 0x8e, - 0xcb, 0xec, 0xe0, 0x94, 0x86, 0x43, 0xad, 0xbd, 0x3b, 0x4b, 0xd2, 0xa3, 0xc4, 0xe3, 0x3d, 0x6c, - 0xf7, 0xa8, 0x7d, 0xa2, 0x51, 0x5b, 0xb3, 0x28, 0xa9, 0xb0, 0x03, 0x4f, 0x23, 0xee, 0x4f, 0x22, - 0xbc, 0x88, 0x71, 0x1a, 0xee, 0xd8, 0x6e, 0x68, 0x47, 0x2e, 0xc7, 0x9d, 0x90, 0x92, 0x13, 0x1a, - 0x6a, 0xec, 0xff, 0x26, 0x62, 0x83, 0x88, 0x7b, 0x2e, 0x0d, 0xb1, 0x43, 0x39, 0xb5, 0xb9, 0x1b, - 0xf8, 0x1a, 0x3d, 0x19, 0x69, 0x1a, 0x47, 0x3a, 0x67, 0x29, 0x39, 0x1f, 0x0e, 0xe8, 0xce, 0x80, - 0x86, 0x36, 0xf5, 0x47, 0x61, 0x3b, 0x0e, 0x82, 0x63, 0x8f, 0x4a, 0x13, 0xe2, 0xfb, 0x01, 0x27, - 0x82, 0x2e, 0xb6, 0xbb, 0xa1, 0xb5, 0x72, 0xd4, 0x89, 0xba, 0x3b, 0xc4, 0x8f, 0x83, 0xb1, 0x39, - 0xad, 0x72, 0xa2, 0x90, 0x8c, 0x4d, 0xe5, 0xe6, 0xb4, 0x9e, 0xf1, 0x30, 0xb2, 0xf9, 0x59, 0xd6, - 0x4f, 0x43, 0x32, 0x18, 0xd0, 0x30, 0x76, 0x7c, 0xfd, 0x94, 0x78, 0xae, 0x43, 0x38, 0xdd, 0x89, - 0x7f, 0x68, 0xc5, 0xfa, 0x71, 0x70, 0x1c, 0xc8, 0x9f, 0x3b, 0xe2, 0x97, 0x92, 0xe6, 0xbf, 0x29, - 0x80, 0x2b, 0x65, 0x15, 0x1b, 0x78, 0x0b, 0x2c, 0xf8, 0xa4, 0x4f, 0x2d, 0x63, 0xcb, 0xd8, 0x5e, - 0x2a, 0x2d, 0xfd, 0xf1, 0xdf, 0x7f, 0x9a, 0x5f, 0x08, 0x53, 0x5b, 0x06, 0x92, 0x62, 0x98, 0x07, - 0x69, 0xe2, 0x71, 0xcc, 0x38, 0xe1, 0x58, 0xe2, 0x6e, 0x0a, 0x1c, 0x5a, 0x26, 0x1e, 0x6f, 0x72, - 0xc2, 0xeb, 0x02, 0x53, 0x05, 0x0b, 0x22, 0x54, 0x56, 0x6a, 0xcb, 0xd8, 0xce, 0xec, 0xbe, 0x51, - 0x18, 0xcf, 0xd3, 0x82, 0xf6, 0x53, 0xa8, 0xc4, 0xd9, 0xd1, 0x1a, 0x0e, 0x68, 0x09, 0x08, 0x3f, - 0x97, 0xbe, 0x36, 0x52, 0xa6, 0xb1, 0x3f, 0x87, 0xa4, 0x39, 0xac, 0x81, 0x15, 0xbd, 0x60, 0x58, - 0xd2, 0xbd, 0xb9, 0x65, 0x6c, 0x2f, 0xef, 0xbe, 0x95, 0x4c, 0x57, 0x8e, 0x18, 0x0f, 0xfa, 0x7a, - 0x24, 0x28, 0xf7, 0xe7, 0xd0, 0xb2, 0xfd, 0x6a, 0x08, 0x5b, 0x00, 0x52, 0x87, 0xe1, 0x98, 0x51, - 0xa5, 0xaf, 0x35, 0x2f, 0x39, 0xdf, 0x4c, 0xe6, 0xac, 0x3a, 0x4c, 0xff, 0x2c, 0x4b, 0x34, 0x32, - 0xe9, 0x94, 0x04, 0x3e, 0x06, 0x59, 0x3b, 0xf0, 0x7d, 0x6a, 0x73, 0xcc, 0xdd, 0x3e, 0x0d, 0x22, - 0x6e, 0x2d, 0x48, 0xca, 0x1b, 0x05, 0xb5, 0x44, 0x85, 0x78, 0x89, 0x0a, 0x15, 0xbd, 0xc0, 0x25, - 0xf8, 0xed, 0x77, 0xb7, 0xe7, 0x7e, 0xf3, 0x8f, 0xdb, 0x86, 0xfc, 0xe6, 0x3f, 0x18, 0xa9, 0xfb, - 0x73, 0x28, 0xa3, 0x59, 0x5a, 0x8a, 0x04, 0x76, 0xc1, 0x9d, 0x81, 0x9a, 0xa5, 0xaf, 0x32, 0x14, - 0x77, 0xa2, 0x6e, 0x97, 0x86, 0xd8, 0x73, 0xfb, 0x22, 0xc9, 0x87, 0x9c, 0x32, 0xeb, 0x92, 0xf4, - 0x74, 0x73, 0xc6, 0x53, 0xfb, 0xc0, 0xe7, 0x0f, 0x76, 0x1f, 0x13, 0x2f, 0xa2, 0xe8, 0xd6, 0x40, - 0xce, 0x55, 0xb3, 0x94, 0x24, 0x49, 0x4d, 0x70, 0x94, 0x04, 0x05, 0x7c, 0x08, 0x96, 0xbc, 0x0e, - 0x1e, 0x04, 0x9e, 0x6b, 0x0f, 0xad, 0xcb, 0x72, 0xbd, 0x36, 0x93, 0x83, 0x51, 0xeb, 0x1c, 0x49, - 0xd4, 0xf8, 0x52, 0xa1, 0x45, 0x4f, 0x4b, 0xe1, 0xdb, 0xe0, 0x52, 0x2f, 0x60, 0x9c, 0x59, 0x57, - 0xb6, 0xe6, 0xb7, 0x97, 0x77, 0x73, 0x93, 0x24, 0x62, 0x1b, 0x17, 0x8a, 0xaa, 0x1c, 0x95, 0x52, - 0x96, 0x81, 0x14, 0x18, 0xd6, 0x40, 0xd6, 0x0b, 0x88, 0x83, 0x09, 0x63, 0xee, 0xb1, 0xdf, 0xa7, - 0x3e, 0xb7, 0xee, 0xc8, 0x8f, 0x4a, 0x4e, 0x9a, 0x5a, 0x40, 0x9c, 0xe2, 0x08, 0x8a, 0x32, 0xde, - 0xc4, 0x18, 0x96, 0x41, 0x7a, 0xbc, 0xa0, 0x30, 0x6b, 0x51, 0xce, 0x65, 0x33, 0x61, 0x2e, 0xfb, - 0x12, 0x57, 0x16, 0x30, 0xb4, 0xd2, 0x7b, 0x35, 0x60, 0xf0, 0x73, 0xb0, 0xd1, 0x27, 0xcf, 0x70, - 0x48, 0xbf, 0x8a, 0x28, 0xe3, 0x0c, 0x4f, 0x2e, 0x83, 0xb5, 0xf4, 0x1a, 0x31, 0xb7, 0xfa, 0xe4, - 0x19, 0xd2, 0xf6, 0x47, 0xe3, 0xe1, 0x87, 0x47, 0xc0, 0x9c, 0xaa, 0x53, 0xcc, 0x02, 0x92, 0xf1, - 0xde, 0xd4, 0x24, 0xe3, 0xb4, 0x56, 0xe8, 0x92, 0x06, 0xa3, 0xac, 0x3d, 0x29, 0x80, 0x7b, 0x60, - 0x99, 0x7b, 0x4c, 0xcc, 0x90, 0xd3, 0x67, 0xdc, 0x5a, 0x4e, 0x22, 0x13, 0xb5, 0xbe, 0xd0, 0x1e, - 0x30, 0x1e, 0x52, 0xd2, 0x6f, 0x79, 0xac, 0xac, 0xc0, 0x08, 0xf0, 0xd1, 0x6f, 0x78, 0x0c, 0x6e, - 0xda, 0x41, 0xbf, 0x1f, 0xf8, 0xb8, 0xc7, 0xf9, 0x00, 0xc7, 0x25, 0x17, 0x07, 0x03, 0x59, 0xd0, - 0xac, 0x5b, 0x49, 0x1b, 0x45, 0x85, 0x92, 0xf3, 0xc1, 0x91, 0x86, 0x37, 0x14, 0x1a, 0xdd, 0x50, - 0x5c, 0x09, 0x2a, 0xf8, 0x39, 0xb8, 0x9a, 0xec, 0x21, 0x9d, 0xb4, 0xbd, 0x47, 0x1e, 0x7e, 0x34, - 0xed, 0x62, 0xad, 0x97, 0x40, 0xfe, 0x05, 0xb8, 0x26, 0xc4, 0xbb, 0xb3, 0xec, 0x99, 0x73, 0xd9, - 0x77, 0xa7, 0xd9, 0xd7, 0x7b, 0x09, 0x52, 0xf8, 0x15, 0xc8, 0xd1, 0x67, 0x9c, 0xfa, 0x4c, 0x6c, - 0xc8, 0x19, 0x17, 0x6f, 0xc8, 0x6c, 0x7b, 0x70, 0x46, 0x2d, 0x89, 0xed, 0xa6, 0x38, 0xab, 0x3e, - 0x0f, 0x87, 0xc8, 0xa2, 0x67, 0xa8, 0xe1, 0x2f, 0x0c, 0xb0, 0x25, 0xaa, 0x9f, 0x83, 0xcf, 0xf1, - 0x7c, 0x57, 0x7a, 0x7e, 0x3f, 0xd9, 0xb3, 0xa8, 0x7e, 0xce, 0xf9, 0xee, 0x6f, 0xf1, 0xf3, 0x30, - 0xb0, 0x09, 0x4c, 0xc7, 0x67, 0x38, 0xa4, 0xdd, 0x90, 0xb2, 0x1e, 0x0e, 0x09, 0xa7, 0x96, 0x79, - 0x51, 0x95, 0xcb, 0x4c, 0x57, 0x38, 0xc7, 0x67, 0x48, 0x31, 0x20, 0xc2, 0x29, 0x7c, 0x13, 0x64, - 0x43, 0xca, 0x06, 0xa2, 0x72, 0x0a, 0x72, 0xce, 0x3d, 0xeb, 0xad, 0x2d, 0x63, 0x7b, 0x11, 0xa5, - 0xb5, 0xb8, 0xe2, 0xb3, 0x16, 0xf7, 0xe0, 0x17, 0x60, 0x55, 0xe8, 0xbd, 0x20, 0x38, 0x89, 0x06, - 0xb8, 0x4b, 0xfa, 0xae, 0x37, 0xb4, 0x56, 0x65, 0xa5, 0xba, 0x77, 0xc6, 0xc9, 0xe2, 0xb3, 0x9a, - 0x44, 0xef, 0x49, 0xf0, 0x44, 0xc1, 0xca, 0x3a, 0x93, 0x4a, 0xf8, 0x31, 0x48, 0xab, 0x6f, 0x63, - 0x81, 0x77, 0x2a, 0xb6, 0x23, 0xbc, 0xa8, 0x7e, 0xa1, 0x15, 0xf9, 0x25, 0x1a, 0x0f, 0x9b, 0x60, - 0x75, 0xa6, 0x9d, 0xb0, 0xd6, 0x12, 0x77, 0x8b, 0x9e, 0x5f, 0x43, 0xc1, 0x2b, 0x31, 0x1a, 0x99, - 0xc1, 0x94, 0x04, 0xb6, 0x80, 0x69, 0x7b, 0x94, 0xf8, 0xd1, 0x00, 0xbb, 0x3e, 0xa7, 0xe1, 0x29, - 0xf1, 0xac, 0xf5, 0xef, 0x1b, 0xf1, 0xac, 0xa6, 0x38, 0xd0, 0x0c, 0xb0, 0x01, 0xd6, 0x23, 0x5d, - 0x05, 0x70, 0xc7, 0xf5, 0x9d, 0xf8, 0x10, 0xbc, 0x2a, 0x99, 0x6f, 0x25, 0x7c, 0x72, 0xc9, 0xf5, - 0x1d, 0x7d, 0xf6, 0xc1, 0xd8, 0xf4, 0x95, 0x0c, 0xd6, 0x81, 0xe9, 0x75, 0x30, 0x8b, 0x3a, 0x8c, - 0xf2, 0x98, 0xec, 0x9a, 0x24, 0xbb, 0x7b, 0xd6, 0x21, 0xd2, 0x94, 0x60, 0xcd, 0x99, 0xf1, 0x26, - 0xc6, 0xf0, 0x09, 0x58, 0x0b, 0x5d, 0xff, 0x18, 0xf7, 0x08, 0xeb, 0x61, 0xaf, 0x13, 0x53, 0x5e, - 0x3f, 0xef, 0x90, 0x46, 0xae, 0x7f, 0xbc, 0x4f, 0x58, 0xaf, 0xd6, 0x51, 0x24, 0xfb, 0x06, 0x32, - 0xc3, 0x29, 0x19, 0xfc, 0x12, 0x5c, 0x0b, 0x42, 0xf7, 0xd8, 0xf5, 0x89, 0x87, 0x1d, 0xc6, 0xc7, - 0xb8, 0xf3, 0x92, 0xfb, 0x7f, 0x92, 0xb9, 0x1b, 0xda, 0xa6, 0xc2, 0xf8, 0x18, 0xfd, 0x5a, 0x30, - 0x2b, 0x86, 0x36, 0xb8, 0xee, 0x51, 0xc2, 0x78, 0x7c, 0x70, 0x8c, 0xb9, 0xb8, 0x27, 0x5d, 0xdc, - 0x3f, 0x23, 0x22, 0xc2, 0x48, 0x1f, 0x16, 0x63, 0x3e, 0xd6, 0xbd, 0x04, 0xb9, 0x88, 0xb7, 0x2e, - 0xd2, 0xaf, 0xd8, 0x37, 0xce, 0x8b, 0x77, 0x59, 0xa2, 0x63, 0x7b, 0xd1, 0x65, 0x8c, 0x8f, 0xe1, - 0x21, 0x30, 0x79, 0x48, 0x7c, 0x36, 0x08, 0x42, 0x8e, 0x59, 0x60, 0x9f, 0x50, 0x6e, 0x59, 0x92, - 0x2f, 0x9f, 0x90, 0x0c, 0xad, 0x18, 0xda, 0x94, 0x48, 0x94, 0xe5, 0x93, 0x02, 0xf8, 0x1e, 0x58, - 0xec, 0x53, 0x4e, 0x1c, 0xc2, 0x89, 0x75, 0x43, 0xd2, 0x6c, 0x24, 0xd0, 0x1c, 0x6a, 0x08, 0x1a, - 0x81, 0xe1, 0x17, 0x00, 0x8e, 0x6a, 0x1a, 0xa3, 0x9e, 0xde, 0x44, 0x39, 0xb9, 0xc9, 0x0b, 0x67, - 0x7c, 0x99, 0xfa, 0x1b, 0x97, 0xaa, 0x66, 0x6c, 0x85, 0x56, 0x07, 0xd3, 0x22, 0x78, 0x0c, 0x36, - 0x46, 0x79, 0x3f, 0xd6, 0x51, 0xc5, 0xd5, 0x73, 0x33, 0xe9, 0x68, 0x88, 0x8f, 0xcb, 0x57, 0x87, - 0xf7, 0xe8, 0x6c, 0x8b, 0xce, 0x52, 0xc1, 0x36, 0xd8, 0xb6, 0xbd, 0x80, 0xd1, 0x31, 0x2f, 0x0c, - 0x8b, 0x23, 0x35, 0x60, 0x1c, 0xeb, 0xd6, 0xa4, 0x4b, 0x5c, 0x2f, 0x0a, 0xa9, 0x75, 0x5b, 0x16, - 0xbb, 0x37, 0x24, 0xfe, 0x15, 0x13, 0x6b, 0xf8, 0xfb, 0x01, 0xe3, 0xaa, 0x3d, 0xd9, 0x53, 0x50, - 0xb8, 0x0f, 0xee, 0x38, 0x21, 0x71, 0xfd, 0x44, 0xda, 0x90, 0xf6, 0x03, 0x51, 0x1e, 0xb6, 0x24, - 0xdf, 0x2d, 0x09, 0x9c, 0xe1, 0x43, 0x0a, 0x94, 0x3b, 0x01, 0xab, 0x33, 0x8d, 0xf2, 0x45, 0x1d, - 0xff, 0x7b, 0x60, 0x45, 0x1d, 0x40, 0x3a, 0xe1, 0x52, 0x32, 0x5c, 0xeb, 0x33, 0x75, 0xa8, 0xe8, - 0x0f, 0xd1, 0xb2, 0x44, 0xaa, 0xec, 0xca, 0x45, 0xc0, 0x9c, 0xee, 0xa0, 0xe1, 0x47, 0x00, 0xc8, - 0x2e, 0x5c, 0x51, 0x19, 0x92, 0xea, 0x76, 0x42, 0x92, 0x28, 0x78, 0x53, 0x5e, 0x2e, 0xd1, 0x92, - 0x68, 0xbb, 0x95, 0xfd, 0x1d, 0xb0, 0xc2, 0x68, 0x78, 0xea, 0xda, 0x54, 0xdd, 0x3e, 0x52, 0xea, - 0xf6, 0xa1, 0x65, 0xe2, 0xf6, 0x91, 0x73, 0xc0, 0xad, 0x73, 0x4f, 0x3b, 0x68, 0x82, 0xf9, 0x13, - 0x3a, 0x54, 0x9f, 0x8b, 0xc4, 0x4f, 0xf8, 0x7f, 0xe0, 0xd2, 0xa9, 0xe8, 0xdc, 0xf4, 0xb7, 0x5d, - 0x9f, 0xf9, 0xb6, 0xa6, 0xbc, 0x7c, 0x21, 0x85, 0xfa, 0x20, 0xf5, 0xbe, 0x91, 0xeb, 0x82, 0xfc, - 0xc5, 0x07, 0x6b, 0x82, 0xab, 0xfb, 0x93, 0xae, 0x92, 0xc3, 0x38, 0xe6, 0xe7, 0xcf, 0x97, 0x41, - 0x66, 0xb2, 0x6a, 0xc2, 0x01, 0xc8, 0x76, 0x89, 0xe7, 0x75, 0x88, 0x7d, 0x12, 0x77, 0xee, 0x86, - 0xdc, 0x2a, 0x3f, 0x7e, 0x9d, 0xa2, 0x3b, 0x1a, 0xee, 0x69, 0x8e, 0x84, 0xb6, 0x3e, 0xd3, 0x9d, - 0xd0, 0xc1, 0x8f, 0x40, 0xc6, 0xa1, 0x5d, 0x12, 0x89, 0x8b, 0x9f, 0xb4, 0xbd, 0x28, 0x50, 0x69, - 0x0d, 0x57, 0x9e, 0xe0, 0x97, 0xc0, 0xd4, 0x87, 0x84, 0xda, 0xdd, 0x41, 0xc8, 0xac, 0x79, 0x79, - 0xce, 0xbe, 0xf3, 0xbd, 0xa6, 0xdc, 0xd4, 0xd6, 0x28, 0xcb, 0x26, 0xc6, 0x0c, 0xee, 0x82, 0xab, - 0x5e, 0x60, 0x13, 0xcf, 0xe5, 0x43, 0xfc, 0x94, 0xba, 0xc7, 0x3d, 0x8e, 0xc9, 0x53, 0x12, 0x52, - 0x79, 0x1b, 0x5b, 0x44, 0x6b, 0xb1, 0xf2, 0x89, 0xd4, 0x15, 0x85, 0x4a, 0xd8, 0x30, 0x9b, 0x78, - 0x14, 0x4f, 0x59, 0xca, 0x7b, 0xd5, 0x22, 0x5a, 0x93, 0xca, 0xda, 0x84, 0x21, 0xbc, 0x0b, 0x32, - 0x03, 0xe2, 0xbb, 0x36, 0xee, 0x07, 0x0e, 0xc5, 0xc4, 0x57, 0x97, 0xa6, 0x45, 0xb4, 0x22, 0xa5, - 0x87, 0x81, 0x43, 0x8b, 0xfe, 0x10, 0x6e, 0x82, 0x65, 0xcf, 0x65, 0x1c, 0x13, 0x26, 0x21, 0x57, - 0x24, 0x64, 0x49, 0x88, 0x8a, 0xac, 0xe8, 0x0f, 0x73, 0xbf, 0x4b, 0x01, 0x73, 0xfa, 0x9b, 0x20, - 0x04, 0x0b, 0x27, 0x74, 0xc8, 0x2c, 0x63, 0x6b, 0x7e, 0x7b, 0x09, 0xc9, 0xdf, 0xf0, 0x57, 0xc6, - 0xec, 0x5a, 0xab, 0x5b, 0x75, 0xeb, 0x07, 0x05, 0x6e, 0x46, 0xf0, 0xfa, 0x49, 0x90, 0xef, 0x81, - 0xcd, 0xf3, 0xad, 0x61, 0x16, 0x2c, 0xd7, 0x1b, 0x2d, 0x5c, 0xa9, 0xee, 0x1d, 0xd4, 0xab, 0x15, - 0x73, 0x4e, 0x09, 0xf0, 0x5e, 0xb1, 0x56, 0x2b, 0x15, 0xcb, 0x9f, 0x98, 0x06, 0x34, 0xc1, 0x4a, - 0xb1, 0xfe, 0x19, 0xae, 0xd6, 0x2b, 0x47, 0x8d, 0x83, 0x7a, 0xcb, 0x4c, 0x41, 0x08, 0x32, 0x95, - 0xea, 0x5e, 0xb1, 0x5d, 0x6b, 0xe1, 0x66, 0xbb, 0xd4, 0xac, 0xb6, 0xcc, 0xf9, 0x7c, 0x03, 0x5c, - 0x4b, 0x4e, 0xd2, 0x69, 0xc2, 0xb9, 0x19, 0x42, 0x23, 0x81, 0x30, 0x95, 0xeb, 0x80, 0xf5, 0xa4, - 0x73, 0x16, 0x3e, 0x02, 0x2b, 0x76, 0x2f, 0x10, 0xc5, 0xc4, 0x0e, 0x22, 0x9f, 0xeb, 0x7a, 0x74, - 0xee, 0xe5, 0x4e, 0xd7, 0xc7, 0xfb, 0xa9, 0xed, 0x14, 0x5a, 0x56, 0xc6, 0x65, 0x61, 0x9b, 0xfb, - 0x2e, 0x05, 0xcc, 0xe9, 0x5e, 0x04, 0x3e, 0x06, 0xab, 0x7d, 0xd7, 0x77, 0xfb, 0x51, 0x1f, 0xcb, - 0xc6, 0x86, 0xb9, 0xcf, 0xe9, 0xb9, 0x5e, 0xde, 0x7d, 0x5b, 0x79, 0x59, 0x11, 0x5e, 0xae, 0xec, - 0x5e, 0xb2, 0x5e, 0xbc, 0x78, 0xb1, 0x80, 0xb2, 0x9a, 0x44, 0xf0, 0x37, 0xdd, 0xe7, 0x14, 0x3a, - 0x20, 0x2d, 0x7b, 0xa4, 0x6e, 0xe4, 0xab, 0xb3, 0x72, 0x5e, 0x26, 0xc5, 0x83, 0xd7, 0x6b, 0x91, - 0x0a, 0x62, 0xb0, 0xa7, 0x4d, 0x27, 0xd6, 0x7c, 0xa5, 0x37, 0xa6, 0x91, 0xb3, 0x27, 0xcf, 0xa6, - 0x66, 0xbf, 0xf0, 0x03, 0x66, 0xaf, 0x48, 0xe2, 0xd9, 0xe7, 0x0b, 0x60, 0x65, 0x7c, 0x06, 0x70, - 0x19, 0x5c, 0xf9, 0xf4, 0x53, 0xbc, 0x5f, 0x6c, 0xee, 0x9b, 0x73, 0x70, 0x15, 0xa4, 0x0f, 0xdb, - 0xe8, 0xb0, 0x8d, 0xa4, 0x00, 0xef, 0x9a, 0xc6, 0xa3, 0x85, 0xc5, 0x94, 0x39, 0x9f, 0xfb, 0x10, - 0xac, 0x25, 0xf4, 0x63, 0xe2, 0x1e, 0x11, 0x31, 0xaa, 0x6e, 0xad, 0x3d, 0x4a, 0x1c, 0x1a, 0xca, - 0x00, 0x2f, 0xa2, 0x74, 0xc4, 0xa8, 0xb8, 0xdb, 0xed, 0x4b, 0x61, 0xee, 0x9b, 0x4b, 0x20, 0x33, - 0xd9, 0x0e, 0xc1, 0x4f, 0xc0, 0x75, 0x75, 0x28, 0x0f, 0xb1, 0xda, 0xd4, 0xbc, 0x27, 0xae, 0x27, - 0x81, 0xe7, 0xe8, 0x35, 0x5a, 0xd3, 0xf1, 0x14, 0xa7, 0x5a, 0xe1, 0x48, 0x3d, 0xfc, 0xa1, 0xab, - 0xda, 0xe6, 0x48, 0x98, 0xb4, 0x62, 0x0b, 0xe8, 0x82, 0xf5, 0xe7, 0x81, 0x4f, 0x55, 0xd9, 0x19, - 0xeb, 0xcf, 0x54, 0xa5, 0x7c, 0xf7, 0x75, 0xfa, 0xb3, 0xc2, 0xcf, 0x02, 0x9f, 0xca, 0xda, 0x34, - 0xea, 0x04, 0xe7, 0xd0, 0xea, 0xf3, 0x69, 0x21, 0xfc, 0x39, 0xd8, 0x98, 0x2a, 0x59, 0xd4, 0x19, - 0xf3, 0xa8, 0xde, 0xb4, 0x3e, 0x7c, 0x2d, 0x8f, 0x93, 0xe5, 0x8d, 0x3a, 0x63, 0x8e, 0x2d, 0xef, - 0x0c, 0x1d, 0x3c, 0x00, 0x6b, 0xd1, 0xc0, 0x21, 0x9c, 0xe2, 0x3e, 0x0d, 0x8f, 0x29, 0x7e, 0xea, - 0xfa, 0x4e, 0xf0, 0xf4, 0xc2, 0x87, 0x2f, 0xb4, 0xaa, 0xac, 0x0e, 0x85, 0xd1, 0x13, 0x69, 0x03, - 0xcb, 0xe0, 0xb6, 0x7b, 0xec, 0x07, 0x21, 0xc5, 0x3e, 0x7d, 0x2a, 0x1b, 0x1a, 0x86, 0x23, 0x9f, - 0xbb, 0x1e, 0xee, 0xba, 0xa1, 0x68, 0x9a, 0x6c, 0x5d, 0x8d, 0x73, 0x0a, 0x56, 0xa7, 0x4f, 0x45, - 0x3f, 0xc3, 0xda, 0x02, 0xb3, 0x27, 0x20, 0xfb, 0x76, 0xee, 0xb7, 0x06, 0x58, 0x9d, 0x09, 0x1d, - 0xfc, 0x09, 0xc8, 0x86, 0x41, 0xc4, 0x45, 0xe2, 0x52, 0x9f, 0x74, 0x3c, 0x7a, 0xee, 0xaa, 0x66, - 0x34, 0xb6, 0xaa, 0xa0, 0x70, 0x0f, 0x98, 0x7d, 0xd1, 0x71, 0xe9, 0xe7, 0x42, 0x99, 0xfa, 0xa9, - 0x8b, 0x53, 0x1f, 0x65, 0xfa, 0xae, 0xaf, 0x63, 0x2d, 0x72, 0x3d, 0x97, 0x03, 0xd6, 0x59, 0x31, - 0x2e, 0x6d, 0x80, 0x1b, 0xa3, 0x75, 0x8c, 0x9f, 0xd3, 0x07, 0xd4, 0x76, 0xbb, 0x2e, 0x0d, 0xf3, - 0x4f, 0x40, 0x7a, 0xe2, 0x89, 0x14, 0x02, 0x70, 0xb9, 0xd9, 0x2a, 0xb6, 0x0e, 0xca, 0xe6, 0x1c, - 0xcc, 0x00, 0xd0, 0x6c, 0xa1, 0x83, 0x72, 0x0b, 0x57, 0xea, 0x4d, 0xd3, 0x10, 0x75, 0xb1, 0xd6, - 0x78, 0x78, 0x50, 0x2e, 0xd6, 0xa4, 0x20, 0x05, 0xaf, 0x80, 0xf9, 0x6a, 0xa5, 0x69, 0xce, 0x8b, - 0x02, 0xd9, 0x40, 0x07, 0x0f, 0x0f, 0xea, 0x42, 0xd5, 0x6c, 0x99, 0x0b, 0xf9, 0x17, 0x06, 0x58, - 0x8c, 0x1f, 0xf3, 0x84, 0x21, 0x6a, 0xb4, 0xeb, 0x15, 0x8c, 0x1a, 0xa5, 0x83, 0xba, 0xda, 0x7e, - 0xb5, 0x6a, 0xb1, 0xd9, 0xc2, 0xa8, 0xfa, 0xd3, 0x76, 0xb5, 0x29, 0x2a, 0x6a, 0x1a, 0x2c, 0xa1, - 0x83, 0xfa, 0x43, 0xb5, 0x41, 0x53, 0x62, 0x1e, 0xa8, 0x58, 0xaf, 0x34, 0x0e, 0xcd, 0x79, 0xb8, - 0x06, 0xb2, 0xe3, 0xec, 0xb8, 0x56, 0x32, 0x17, 0x04, 0xe0, 0xb0, 0xf8, 0xb0, 0x56, 0x7d, 0x6c, - 0x5e, 0x82, 0xeb, 0xc0, 0x2c, 0xd7, 0xda, 0xcd, 0x56, 0x15, 0xe1, 0x23, 0xd4, 0x78, 0x7c, 0x50, - 0xa9, 0x56, 0xcc, 0xcb, 0xf9, 0x77, 0x40, 0x76, 0xea, 0x92, 0x0e, 0x17, 0xc1, 0x42, 0xb1, 0xdd, - 0x6a, 0x98, 0x73, 0xa2, 0x1a, 0x3c, 0x7e, 0x1b, 0x37, 0xea, 0xb5, 0xcf, 0x4c, 0x43, 0x0e, 0xde, - 0x55, 0x83, 0x54, 0xbe, 0x05, 0xac, 0xb3, 0xda, 0x7e, 0xb8, 0x01, 0xae, 0xb7, 0x9b, 0x55, 0x5c, - 0x6e, 0xd4, 0xf7, 0x0e, 0x1e, 0xb6, 0x51, 0xb5, 0x22, 0xfc, 0xb5, 0x1a, 0xe5, 0x46, 0xcd, 0x9c, - 0x8b, 0x95, 0x95, 0xc6, 0x93, 0x7a, 0xb3, 0x85, 0xaa, 0xc5, 0xc3, 0x57, 0x4a, 0xa3, 0x64, 0x81, - 0x6b, 0xf1, 0x2a, 0x8f, 0xfe, 0x63, 0x21, 0x1f, 0x9c, 0x4b, 0xcb, 0xf2, 0x71, 0x54, 0xad, 0xcc, - 0xa3, 0x85, 0xc5, 0x15, 0x33, 0xfd, 0x68, 0x61, 0x31, 0x6b, 0x9a, 0xf9, 0x27, 0x00, 0xb6, 0x67, - 0x6f, 0xc3, 0x45, 0x90, 0x51, 0xff, 0x0d, 0xc1, 0xfa, 0x1f, 0x2f, 0x3a, 0xdf, 0xce, 0x7b, 0x4b, - 0x48, 0x2b, 0x0b, 0x3d, 0xcc, 0x13, 0x70, 0xe3, 0xcc, 0x8b, 0x07, 0xac, 0x80, 0x34, 0xb7, 0x07, - 0xf8, 0x84, 0xd2, 0x01, 0xf1, 0xdc, 0x53, 0x7a, 0x4e, 0xfb, 0xdc, 0xb2, 0x07, 0x9f, 0xc4, 0x30, - 0xb4, 0xc2, 0xc7, 0x46, 0xbb, 0x7f, 0x49, 0x81, 0xeb, 0x3a, 0x8a, 0xa3, 0xfc, 0x6a, 0xaa, 0xf6, - 0x19, 0x3e, 0x01, 0x99, 0xa6, 0x72, 0xae, 0x00, 0x0c, 0x4e, 0xbd, 0x9d, 0x8e, 0x2c, 0xf4, 0x49, - 0x9a, 0xbb, 0x7d, 0xa6, 0x9e, 0x0d, 0x02, 0x9f, 0xd1, 0xfc, 0xdc, 0xb6, 0xf1, 0xff, 0x06, 0xfc, - 0x12, 0xa4, 0x2b, 0xd4, 0xe3, 0x64, 0xc4, 0x3b, 0xf5, 0xbe, 0x2b, 0x95, 0x33, 0xe4, 0x77, 0xcf, - 0x07, 0x4d, 0x78, 0x60, 0x20, 0xbd, 0x47, 0xb9, 0xdd, 0xfb, 0xef, 0xcd, 0xfc, 0xce, 0xd7, 0x7f, - 0xfb, 0xd7, 0xaf, 0x53, 0x1b, 0xf9, 0x6b, 0x13, 0xff, 0xcb, 0xfa, 0x40, 0xe7, 0x0a, 0xfb, 0xc0, - 0xb8, 0x5f, 0xfa, 0xf8, 0xf7, 0x2f, 0x37, 0x8d, 0x6f, 0x5f, 0x6e, 0x1a, 0x7f, 0x7d, 0xb9, 0x69, - 0xfc, 0xfd, 0xe5, 0xa6, 0xf1, 0xcf, 0x97, 0x9b, 0x06, 0xc8, 0xb9, 0x81, 0xe2, 0x1e, 0x84, 0xc1, - 0xb3, 0xe1, 0x84, 0x9b, 0xd2, 0x62, 0xd9, 0x61, 0x32, 0x79, 0x8f, 0x8c, 0x5f, 0x1a, 0x46, 0xe7, - 0xb2, 0xac, 0x21, 0x0f, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xd2, 0xa2, 0x9b, 0xe3, 0x1b, - 0x00, 0x00, + // 2755 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4b, 0x73, 0x1b, 0xc7, + 0xb5, 0xe6, 0x80, 0x94, 0x44, 0x36, 0x09, 0x60, 0xd8, 0xa4, 0xa4, 0x11, 0x28, 0x51, 0x14, 0x2c, + 0xd9, 0xbc, 0xaa, 0x7b, 0x41, 0x5f, 0xca, 0x96, 0x5d, 0xbe, 0xd7, 0x76, 0xe1, 0x45, 0x91, 0x32, + 0x08, 0x30, 0x0d, 0x40, 0xb2, 0xe3, 0x72, 0xb5, 0x1b, 0x33, 0x0d, 0x62, 0x8a, 0x83, 0x19, 0x78, + 0xba, 0x87, 0x12, 0xb4, 0x48, 0x29, 0x5e, 0x25, 0xeb, 0x6c, 0x92, 0xaa, 0xfc, 0x80, 0x54, 0xaa, + 0xf2, 0x07, 0xb2, 0x4a, 0x65, 0x95, 0xec, 0x52, 0x95, 0x4d, 0x36, 0x79, 0x94, 0x2a, 0x9b, 0xfc, + 0x8b, 0x54, 0x3f, 0x06, 0xc4, 0x63, 0x48, 0xc9, 0xae, 0xac, 0x88, 0x3e, 0xe7, 0x3b, 0xdf, 0xe9, + 0xe9, 0x3e, 0x7d, 0xfa, 0x9c, 0x26, 0xb8, 0x46, 0xfd, 0xd3, 0x60, 0xb8, 0x43, 0x06, 0xee, 0xce, + 0xe9, 0xee, 0x8e, 0xed, 0xb0, 0xc2, 0x20, 0x0c, 0x78, 0x00, 0x57, 0xa4, 0xbc, 0x40, 0x06, 0x6e, + 0xe1, 0x74, 0x37, 0x77, 0x7b, 0x12, 0x15, 0x84, 0x74, 0x87, 0x38, 0x4e, 0x48, 0x99, 0x86, 0xe7, + 0x6e, 0x4e, 0x00, 0x48, 0xc4, 0x7b, 0x3b, 0x36, 0x0d, 0x79, 0xa2, 0x56, 0x9a, 0x77, 0x08, 0xa3, + 0x5a, 0x7b, 0x6f, 0x56, 0x6b, 0x07, 0x7e, 0xd7, 0x3d, 0xc6, 0x2c, 0x88, 0x42, 0x9b, 0x26, 0x92, + 0x38, 0x2e, 0xb3, 0x83, 0x53, 0x1a, 0x0e, 0xb5, 0xf6, 0xee, 0x2c, 0x49, 0x8f, 0x12, 0x8f, 0xf7, + 0xb0, 0xdd, 0xa3, 0xf6, 0x89, 0x46, 0x6d, 0xcd, 0xa2, 0xa4, 0xc2, 0x0e, 0x3c, 0x8d, 0xb8, 0x3f, + 0x89, 0xf0, 0x22, 0xc6, 0x69, 0xb8, 0x63, 0xbb, 0xa1, 0x1d, 0xb9, 0x1c, 0x77, 0x42, 0x4a, 0x4e, + 0x68, 0xa8, 0xb1, 0x77, 0x12, 0xb1, 0x5d, 0xd7, 0xe3, 0x23, 0xc8, 0x7f, 0x27, 0x42, 0x82, 0x88, + 0x7b, 0x2e, 0x0d, 0xb1, 0x43, 0x39, 0xb5, 0xb9, 0x1b, 0xf8, 0x1a, 0x3d, 0xb9, 0x19, 0x34, 0xde, + 0x8c, 0x9c, 0xa5, 0xe4, 0x7c, 0x38, 0xa0, 0x3b, 0x03, 0x1a, 0xda, 0xd4, 0x1f, 0xad, 0xec, 0x71, + 0x10, 0x1c, 0x7b, 0x54, 0x9a, 0x10, 0xdf, 0x0f, 0x38, 0x11, 0x74, 0xb1, 0xdd, 0x0d, 0xad, 0x95, + 0xa3, 0x4e, 0xd4, 0xdd, 0x21, 0x7e, 0xbc, 0x5e, 0x9b, 0xd3, 0x2a, 0x27, 0x0a, 0xc9, 0xd8, 0x54, + 0x6e, 0x4e, 0xeb, 0x19, 0x0f, 0x23, 0x9b, 0x9f, 0x67, 0xfd, 0x2c, 0x24, 0x83, 0x01, 0x0d, 0x63, + 0xc7, 0xd7, 0x4f, 0x89, 0xe7, 0x3a, 0x84, 0xd3, 0x9d, 0xf8, 0x87, 0x56, 0xac, 0x1f, 0x07, 0xc7, + 0x81, 0xfc, 0xb9, 0x23, 0x7e, 0x29, 0x69, 0xfe, 0xaf, 0x05, 0x70, 0xa5, 0xac, 0xd6, 0x06, 0xde, + 0x02, 0x0b, 0x3e, 0xe9, 0x53, 0xcb, 0xd8, 0x32, 0xb6, 0x97, 0x4a, 0x4b, 0xbf, 0xfd, 0xd7, 0xef, + 0xe6, 0x17, 0xc2, 0xd4, 0x96, 0x81, 0xa4, 0x18, 0xe6, 0x41, 0x9a, 0x78, 0x1c, 0x33, 0x4e, 0x38, + 0x96, 0xb8, 0x9b, 0x02, 0x87, 0x96, 0x89, 0xc7, 0x9b, 0x9c, 0xf0, 0xba, 0xc0, 0x54, 0xc1, 0x82, + 0x58, 0x2a, 0x2b, 0xb5, 0x65, 0x6c, 0x67, 0x76, 0xdf, 0x2a, 0x8c, 0x87, 0x72, 0x41, 0xfb, 0x29, + 0x54, 0xe2, 0x00, 0x6a, 0x0d, 0x07, 0xb4, 0x04, 0x84, 0x9f, 0x4b, 0xdf, 0x1a, 0x29, 0xd3, 0xd8, + 0x9f, 0x43, 0xd2, 0x1c, 0xd6, 0xc0, 0x8a, 0xde, 0x30, 0x2c, 0xe9, 0xde, 0xde, 0x32, 0xb6, 0x97, + 0x77, 0xdf, 0x49, 0xa6, 0x2b, 0x47, 0x8c, 0x07, 0x7d, 0x3d, 0x12, 0x94, 0xfb, 0x73, 0x68, 0xd9, + 0x3e, 0x1b, 0xc2, 0x16, 0x80, 0xd4, 0x61, 0x38, 0x66, 0x54, 0x11, 0x6e, 0xcd, 0x4b, 0xce, 0xb7, + 0x93, 0x39, 0xab, 0x0e, 0xd3, 0x3f, 0xcb, 0x12, 0x8d, 0x4c, 0x3a, 0x25, 0x81, 0x08, 0x64, 0xed, + 0xc0, 0xf7, 0xa9, 0xcd, 0x31, 0x77, 0xfb, 0x34, 0x88, 0xb8, 0xb5, 0x20, 0x29, 0x6f, 0x14, 0xd4, + 0x16, 0x15, 0xe2, 0x2d, 0x2a, 0x54, 0xf4, 0x06, 0x97, 0x32, 0x3f, 0xff, 0xfb, 0x6d, 0x43, 0x7e, + 0xef, 0xaf, 0x8d, 0xd4, 0xfd, 0x39, 0x94, 0xd1, 0x0c, 0x2d, 0x45, 0x00, 0xbb, 0xe0, 0xce, 0x40, + 0xcd, 0xd0, 0x57, 0xd1, 0x89, 0x3b, 0x51, 0xb7, 0x4b, 0x43, 0xec, 0xb9, 0x7d, 0x71, 0x06, 0x86, + 0x9c, 0x32, 0xeb, 0x92, 0xf4, 0x72, 0x73, 0xc6, 0x4b, 0xfb, 0xc0, 0xe7, 0x0f, 0x76, 0x9f, 0x10, + 0x2f, 0xa2, 0xe8, 0xd6, 0x40, 0xce, 0x53, 0xb3, 0x94, 0x24, 0x49, 0x4d, 0x70, 0x94, 0x04, 0x05, + 0x7c, 0x04, 0x96, 0xbc, 0x0e, 0x1e, 0x04, 0x9e, 0x6b, 0x0f, 0xad, 0xcb, 0x72, 0xaf, 0x36, 0x93, + 0x17, 0xa2, 0xd6, 0x39, 0x92, 0xa8, 0xf1, 0x6d, 0x42, 0x8b, 0x9e, 0x96, 0xc2, 0x77, 0xc1, 0xa5, + 0x5e, 0xc0, 0x38, 0xb3, 0xae, 0x6c, 0xcd, 0x6f, 0x2f, 0xef, 0xe6, 0x26, 0x49, 0xc4, 0x29, 0x2f, + 0x14, 0x55, 0xb6, 0x42, 0x0a, 0x08, 0x6b, 0x20, 0xeb, 0x05, 0xc4, 0xc1, 0x84, 0x31, 0xf7, 0xd8, + 0xef, 0x53, 0x9f, 0x5b, 0x77, 0xe4, 0x07, 0x25, 0x07, 0x4b, 0x2d, 0x20, 0x4e, 0x71, 0x04, 0x45, + 0x19, 0x6f, 0x62, 0x0c, 0xcb, 0x20, 0x3d, 0x9e, 0x6b, 0x98, 0xb5, 0x28, 0xe7, 0xb1, 0x99, 0x30, + 0x8f, 0x7d, 0x89, 0x2b, 0x0b, 0x18, 0x5a, 0xe9, 0x9d, 0x0d, 0x18, 0xfc, 0x12, 0x6c, 0xf4, 0xc9, + 0x73, 0x1c, 0xd2, 0x6f, 0x22, 0xca, 0x38, 0xc3, 0x93, 0x5b, 0x60, 0x2d, 0xbd, 0xc1, 0x7a, 0x5b, + 0x7d, 0xf2, 0x1c, 0x69, 0xfb, 0xa3, 0xf1, 0xa5, 0x87, 0x47, 0xc0, 0x9c, 0x4a, 0x61, 0xcc, 0x02, + 0x92, 0xf1, 0xde, 0xd4, 0x24, 0xe3, 0x70, 0x56, 0xe8, 0x92, 0x06, 0xa3, 0xac, 0x3d, 0x29, 0x80, + 0x7b, 0x60, 0x99, 0x7b, 0x4c, 0xcc, 0x90, 0xd3, 0xe7, 0xdc, 0x5a, 0x4e, 0x22, 0x13, 0xd7, 0x40, + 0xa1, 0x3d, 0x60, 0x3c, 0xa4, 0xa4, 0xdf, 0xf2, 0x58, 0x59, 0x81, 0x11, 0xe0, 0xa3, 0xdf, 0xf0, + 0x18, 0xdc, 0xb4, 0x83, 0x7e, 0x3f, 0xf0, 0x71, 0x8f, 0xf3, 0x01, 0x8e, 0xb3, 0x31, 0x0e, 0x06, + 0x32, 0x91, 0x59, 0xb7, 0x92, 0x0e, 0x88, 0x5a, 0x4a, 0xce, 0x07, 0x47, 0x1a, 0xde, 0x50, 0x68, + 0x74, 0x43, 0x71, 0x25, 0xa8, 0xe0, 0x97, 0xe0, 0x6a, 0xb2, 0x87, 0x74, 0xd2, 0xb1, 0x1e, 0x79, + 0xf8, 0xdf, 0x69, 0x17, 0x6b, 0xbd, 0x04, 0xf2, 0xaf, 0xc0, 0x35, 0x21, 0xde, 0x9d, 0x65, 0xcf, + 0x5c, 0xc8, 0xbe, 0x3b, 0xcd, 0xbe, 0xde, 0x4b, 0x90, 0xc2, 0x6f, 0x40, 0x8e, 0x3e, 0xe7, 0xd4, + 0x67, 0xe2, 0x30, 0xce, 0xb8, 0x78, 0x4b, 0x46, 0xdb, 0x83, 0x73, 0x72, 0x48, 0x6c, 0x37, 0xc5, + 0x59, 0xf5, 0x79, 0x38, 0x44, 0x16, 0x3d, 0x47, 0x0d, 0x7f, 0x6c, 0x80, 0x2d, 0x91, 0xf5, 0x1c, + 0x7c, 0x81, 0xe7, 0xbb, 0xd2, 0xf3, 0x87, 0xc9, 0x9e, 0x45, 0xd6, 0x73, 0x2e, 0x76, 0x7f, 0x8b, + 0x5f, 0x84, 0x81, 0x4d, 0x60, 0x3a, 0x3e, 0xc3, 0x21, 0xed, 0x86, 0x94, 0xf5, 0x70, 0x48, 0x38, + 0xb5, 0xcc, 0xef, 0x9c, 0xdd, 0x1c, 0x9f, 0x21, 0xc5, 0x80, 0x08, 0xa7, 0xf0, 0x6d, 0x90, 0x0d, + 0x29, 0x1b, 0x88, 0x8c, 0x29, 0xc8, 0x39, 0xf7, 0xac, 0x77, 0xb6, 0x8c, 0xed, 0x45, 0x94, 0xd6, + 0xe2, 0x8a, 0xcf, 0x5a, 0xdc, 0x83, 0x5f, 0x81, 0x55, 0xa1, 0xf7, 0x82, 0xe0, 0x24, 0x1a, 0xe0, + 0x2e, 0xe9, 0xbb, 0xde, 0xd0, 0x5a, 0x95, 0x59, 0xea, 0xde, 0x39, 0x37, 0x8a, 0xcf, 0x6a, 0x12, + 0xbd, 0x27, 0xc1, 0x13, 0xc9, 0x2a, 0xeb, 0x4c, 0x2a, 0xe1, 0xa7, 0x20, 0xad, 0xbe, 0x8d, 0x05, + 0xde, 0xa9, 0x38, 0x8e, 0xf0, 0xb5, 0xb9, 0x6b, 0x45, 0x7e, 0x89, 0xc6, 0xc3, 0x26, 0x58, 0x9d, + 0x29, 0x23, 0xac, 0xb5, 0xc4, 0xd3, 0xa2, 0xe7, 0xd7, 0x50, 0xf0, 0x4a, 0x8c, 0x46, 0x66, 0x30, + 0x25, 0x81, 0x2d, 0x60, 0xda, 0x1e, 0x25, 0x7e, 0x34, 0xc0, 0xae, 0xcf, 0x69, 0x78, 0x4a, 0x3c, + 0x6b, 0xfd, 0xbb, 0xae, 0x78, 0x56, 0x53, 0x1c, 0x68, 0x06, 0xd8, 0x00, 0xeb, 0x91, 0xce, 0x02, + 0xb8, 0xe3, 0xfa, 0x4e, 0x7c, 0xf9, 0x5d, 0x95, 0xcc, 0xb7, 0x12, 0x3e, 0xb9, 0xe4, 0xfa, 0x8e, + 0xbe, 0xf3, 0x60, 0x6c, 0x7a, 0x26, 0x83, 0x75, 0x60, 0x7a, 0x1d, 0xcc, 0xa2, 0x0e, 0xa3, 0x3c, + 0x26, 0xbb, 0x26, 0xc9, 0xee, 0x9e, 0x77, 0x81, 0x34, 0x25, 0x58, 0x73, 0x66, 0xbc, 0x89, 0x31, + 0x7c, 0x0a, 0xd6, 0x42, 0xd7, 0x3f, 0xc6, 0x3d, 0xc2, 0x7a, 0xd8, 0xeb, 0xc4, 0x94, 0xd7, 0x2f, + 0xba, 0x9c, 0x91, 0xeb, 0x1f, 0xef, 0x13, 0xd6, 0xab, 0x75, 0x14, 0xc9, 0xbe, 0x81, 0xcc, 0x70, + 0x4a, 0x06, 0xbf, 0x06, 0xd7, 0x82, 0xd0, 0x3d, 0x76, 0x7d, 0xe2, 0x61, 0x87, 0xf1, 0x31, 0xee, + 0xbc, 0xe4, 0xfe, 0xaf, 0x64, 0xee, 0x86, 0xb6, 0xa9, 0x30, 0x3e, 0x46, 0xbf, 0x16, 0xcc, 0x8a, + 0xa1, 0x0d, 0xae, 0x7b, 0x94, 0x30, 0x1e, 0x5f, 0x1c, 0x63, 0x2e, 0xee, 0x49, 0x17, 0xf7, 0xcf, + 0x59, 0x11, 0x61, 0xa4, 0x2f, 0x8b, 0x31, 0x1f, 0xeb, 0x5e, 0x82, 0x5c, 0xac, 0xb7, 0x4e, 0xd2, + 0x67, 0xec, 0x1b, 0x17, 0xad, 0x77, 0x59, 0xa2, 0x63, 0x7b, 0x51, 0x61, 0x8c, 0x8f, 0xe1, 0x21, + 0x30, 0x79, 0x48, 0x7c, 0x36, 0x08, 0x42, 0x8e, 0x59, 0x60, 0x9f, 0x50, 0x6e, 0x59, 0x92, 0x2f, + 0x9f, 0x10, 0x0c, 0xad, 0x18, 0xda, 0x94, 0x48, 0x94, 0xe5, 0x93, 0x02, 0xf8, 0x01, 0x58, 0xec, + 0x53, 0x4e, 0x1c, 0xc2, 0x89, 0x75, 0x43, 0xd2, 0x6c, 0x24, 0xd0, 0x1c, 0x6a, 0x08, 0x1a, 0x81, + 0xe1, 0x57, 0x00, 0x8e, 0x72, 0x1a, 0xa3, 0x9e, 0x3e, 0x44, 0x39, 0x79, 0xc8, 0x0b, 0xe7, 0x7c, + 0x99, 0xfa, 0x1b, 0xa7, 0xaa, 0x66, 0x6c, 0x85, 0x56, 0x07, 0xd3, 0x22, 0x78, 0x0c, 0x36, 0x46, + 0x71, 0x3f, 0x56, 0x4d, 0xc5, 0xd9, 0x73, 0x33, 0xe9, 0x6a, 0x88, 0xaf, 0xcb, 0xb3, 0xcb, 0x7b, + 0x74, 0xb7, 0x45, 0xe7, 0xa9, 0x60, 0x1b, 0x6c, 0xdb, 0x5e, 0xc0, 0xe8, 0x98, 0x17, 0x86, 0xc5, + 0x95, 0x1a, 0x30, 0x8e, 0x75, 0x69, 0xd2, 0x25, 0xae, 0x17, 0x85, 0xd4, 0xba, 0x2d, 0x93, 0xdd, + 0x5b, 0x12, 0x7f, 0xc6, 0xc4, 0x1a, 0xfe, 0x7e, 0xc0, 0xb8, 0x2a, 0x4f, 0xf6, 0x14, 0x14, 0xee, + 0x83, 0x3b, 0x4e, 0x48, 0x5c, 0x3f, 0x91, 0x36, 0xa4, 0xfd, 0x40, 0xa4, 0x87, 0x2d, 0xc9, 0x77, + 0x4b, 0x02, 0x67, 0xf8, 0x90, 0x02, 0xc1, 0x87, 0xe0, 0x8a, 0x6a, 0x8b, 0x98, 0xb5, 0x2d, 0xf3, + 0xdc, 0xcd, 0xe4, 0x14, 0xb5, 0x27, 0x41, 0x28, 0x06, 0xe7, 0x4e, 0xc0, 0xea, 0x4c, 0x61, 0xfd, + 0xba, 0x0e, 0xe1, 0x03, 0xb0, 0xa2, 0x2e, 0x2e, 0x1d, 0xa8, 0x29, 0xb9, 0xcc, 0xeb, 0x33, 0xf9, + 0xab, 0xe8, 0x0f, 0xd1, 0xb2, 0x44, 0xaa, 0xa8, 0xcc, 0x45, 0xc0, 0x9c, 0xae, 0xb8, 0xe1, 0x27, + 0x00, 0xc8, 0xaa, 0x5d, 0x51, 0x19, 0x92, 0xea, 0x76, 0x42, 0x70, 0x29, 0x78, 0x53, 0xf6, 0xab, + 0x68, 0x49, 0x94, 0xe9, 0xca, 0xfe, 0x0e, 0x58, 0x61, 0x34, 0x3c, 0x75, 0x6d, 0xaa, 0xba, 0x95, + 0x94, 0xea, 0x56, 0xb4, 0x4c, 0x74, 0x2b, 0x39, 0x07, 0xdc, 0xba, 0xf0, 0x96, 0x84, 0x26, 0x98, + 0x3f, 0xa1, 0x43, 0xf5, 0xb9, 0x48, 0xfc, 0x84, 0xff, 0x03, 0x2e, 0x9d, 0x8a, 0x8a, 0x4f, 0x7f, + 0xdb, 0xf5, 0x99, 0x6f, 0x6b, 0xca, 0x66, 0x0d, 0x29, 0xd4, 0x47, 0xa9, 0x0f, 0x8d, 0x5c, 0x17, + 0xe4, 0x5f, 0x7f, 0x21, 0x27, 0xb8, 0xba, 0x3f, 0xe9, 0x2a, 0x79, 0x19, 0xc7, 0xfc, 0xfc, 0xfe, + 0x32, 0xc8, 0x4c, 0x66, 0x5b, 0x38, 0x00, 0xd9, 0x2e, 0xf1, 0xbc, 0x0e, 0xb1, 0x4f, 0xe2, 0x6a, + 0xdf, 0x90, 0x47, 0xec, 0xff, 0xde, 0x24, 0x59, 0x8f, 0x86, 0x7b, 0x9a, 0x23, 0xa1, 0x15, 0xc8, + 0x74, 0x27, 0x74, 0xf0, 0x13, 0x90, 0x71, 0x68, 0x97, 0x44, 0xa2, 0x51, 0x94, 0xb6, 0xaf, 0x5b, + 0xa8, 0xb4, 0x86, 0x2b, 0x4f, 0xf0, 0x6b, 0x60, 0xea, 0xcb, 0x45, 0x65, 0x85, 0x20, 0x64, 0xd6, + 0xbc, 0x8c, 0xdb, 0xf7, 0xbf, 0xd3, 0x94, 0x9b, 0xda, 0x1a, 0x65, 0xd9, 0xc4, 0x98, 0xc1, 0x5d, + 0x70, 0xd5, 0x0b, 0x6c, 0xe2, 0xb9, 0x7c, 0x88, 0x9f, 0x51, 0xf7, 0xb8, 0xc7, 0x31, 0x79, 0x46, + 0x42, 0x2a, 0xbb, 0xb7, 0x45, 0xb4, 0x16, 0x2b, 0x9f, 0x4a, 0x5d, 0x51, 0xa8, 0x84, 0x0d, 0xb3, + 0x89, 0x47, 0xf1, 0x94, 0xa5, 0xec, 0xc5, 0x16, 0xd1, 0x9a, 0x54, 0xd6, 0x26, 0x0c, 0xe1, 0x5d, + 0x90, 0x19, 0x10, 0xdf, 0xb5, 0x71, 0x3f, 0x70, 0x28, 0x26, 0xbe, 0x6a, 0xb4, 0x16, 0xd1, 0x8a, + 0x94, 0x1e, 0x06, 0x0e, 0x2d, 0xfa, 0x43, 0xb8, 0x09, 0x96, 0x3d, 0x97, 0x71, 0x4c, 0x98, 0x84, + 0x5c, 0x91, 0x90, 0x25, 0x21, 0x2a, 0xb2, 0xa2, 0x3f, 0xcc, 0xfd, 0x32, 0x05, 0xcc, 0xe9, 0x6f, + 0x82, 0x10, 0x2c, 0x9c, 0xd0, 0x21, 0xb3, 0x8c, 0xad, 0xf9, 0xed, 0x25, 0x24, 0x7f, 0xc3, 0x9f, + 0x1a, 0xb3, 0x7b, 0xad, 0xba, 0xf0, 0xd6, 0xf7, 0x5a, 0xb8, 0x19, 0xc1, 0x9b, 0x07, 0x41, 0xbe, + 0x07, 0x36, 0x2f, 0xb6, 0x86, 0x59, 0xb0, 0x5c, 0x6f, 0xb4, 0x70, 0xa5, 0xba, 0x77, 0x50, 0xaf, + 0x56, 0xcc, 0x39, 0x25, 0xc0, 0x7b, 0xc5, 0x5a, 0xad, 0x54, 0x2c, 0x7f, 0x66, 0x1a, 0xd0, 0x04, + 0x2b, 0xc5, 0xfa, 0x17, 0xb8, 0x5a, 0xaf, 0x1c, 0x35, 0x0e, 0xea, 0x2d, 0x33, 0x05, 0x21, 0xc8, + 0x54, 0xaa, 0x7b, 0xc5, 0x76, 0xad, 0x85, 0x9b, 0xed, 0x52, 0xb3, 0xda, 0x32, 0xe7, 0xf3, 0x0d, + 0x70, 0x2d, 0x39, 0x48, 0xa7, 0x09, 0xe7, 0x66, 0x08, 0x8d, 0x04, 0xc2, 0x54, 0xae, 0x03, 0xd6, + 0x93, 0xee, 0x67, 0xf8, 0x18, 0xac, 0xd8, 0xbd, 0x40, 0x24, 0x13, 0x3b, 0x88, 0x7c, 0xae, 0xf3, + 0xd1, 0x85, 0x4d, 0xa1, 0xce, 0x8f, 0xf7, 0x53, 0xdb, 0x29, 0xb4, 0xac, 0x8c, 0xcb, 0xc2, 0x36, + 0xf7, 0xb7, 0x14, 0x30, 0xa7, 0x6b, 0x18, 0xf8, 0x04, 0xac, 0xf6, 0x5d, 0xdf, 0xed, 0x47, 0x7d, + 0x2c, 0x0b, 0x22, 0xe6, 0xbe, 0xa0, 0x17, 0x7a, 0x79, 0xf8, 0x9e, 0xf2, 0xb2, 0x22, 0xbc, 0x5c, + 0xd9, 0xbd, 0x64, 0xbd, 0x7c, 0xf9, 0x72, 0x01, 0x65, 0x35, 0x89, 0xe0, 0x6f, 0xba, 0x2f, 0x28, + 0x74, 0x40, 0x5a, 0xd6, 0x56, 0xdd, 0xc8, 0x57, 0x77, 0xec, 0xbc, 0x0c, 0x8a, 0x07, 0x6f, 0x56, + 0x5a, 0x15, 0xc4, 0x60, 0x4f, 0x9b, 0x4e, 0xec, 0xf9, 0x4a, 0x6f, 0x4c, 0x23, 0x67, 0x4f, 0x9e, + 0x4f, 0xcd, 0x7e, 0xe1, 0x7b, 0xcc, 0x5e, 0x91, 0xc4, 0xb3, 0xcf, 0x17, 0xc0, 0xca, 0xf8, 0x0c, + 0xe0, 0x32, 0xb8, 0xf2, 0xf9, 0xe7, 0x78, 0xbf, 0xd8, 0xdc, 0x37, 0xe7, 0xe0, 0x2a, 0x48, 0x1f, + 0xb6, 0xd1, 0x61, 0x1b, 0x49, 0x01, 0xde, 0x35, 0x8d, 0xc7, 0x0b, 0x8b, 0x29, 0x73, 0x3e, 0xf7, + 0x31, 0x58, 0x4b, 0xa8, 0xe3, 0x44, 0xff, 0x11, 0x31, 0xaa, 0xba, 0xdd, 0x1e, 0x25, 0x0e, 0x0d, + 0xe5, 0x02, 0x2f, 0xa2, 0x74, 0xc4, 0xa8, 0xe8, 0x09, 0xf7, 0xa5, 0x30, 0xf7, 0x9b, 0x4b, 0x20, + 0x33, 0x59, 0x46, 0xc1, 0xcf, 0xc0, 0x75, 0x75, 0x99, 0x0f, 0xb1, 0x3a, 0xd4, 0xbc, 0x27, 0xda, + 0x9a, 0xc0, 0x73, 0xf4, 0x1e, 0xad, 0xe9, 0xf5, 0x14, 0xb7, 0x5a, 0xe1, 0x48, 0x3d, 0x14, 0xa2, + 0xab, 0xda, 0xe6, 0x48, 0x98, 0xb4, 0x62, 0x0b, 0xe8, 0x82, 0xf5, 0x17, 0x81, 0x4f, 0x55, 0xda, + 0x19, 0xab, 0xeb, 0x54, 0xa6, 0x7c, 0xf8, 0x26, 0x75, 0x5d, 0xe1, 0x87, 0x81, 0x4f, 0x65, 0x6e, + 0x1a, 0x55, 0x90, 0x73, 0x68, 0xf5, 0xc5, 0xb4, 0x10, 0xfe, 0x08, 0x6c, 0x4c, 0xa5, 0x2c, 0xea, + 0x8c, 0x79, 0x54, 0x6f, 0x60, 0x1f, 0xbf, 0x91, 0xc7, 0xc9, 0xf4, 0x46, 0x9d, 0x31, 0xc7, 0x96, + 0x77, 0x8e, 0x0e, 0x1e, 0x80, 0xb5, 0x68, 0xe0, 0x10, 0x4e, 0x71, 0x9f, 0x86, 0xc7, 0x14, 0x3f, + 0x73, 0x7d, 0x27, 0x78, 0xf6, 0xda, 0x87, 0x32, 0xb4, 0xaa, 0xac, 0x0e, 0x85, 0xd1, 0x53, 0x69, + 0x03, 0xcb, 0xe0, 0xb6, 0x7b, 0xec, 0x07, 0x21, 0xc5, 0x3e, 0x7d, 0x26, 0x0b, 0x21, 0x86, 0x23, + 0x9f, 0xbb, 0x1e, 0xee, 0xba, 0xa1, 0x28, 0xb6, 0x6c, 0x9d, 0x8d, 0x73, 0x0a, 0x56, 0xa7, 0xcf, + 0x44, 0x1d, 0xc4, 0xda, 0x02, 0xb3, 0x27, 0x20, 0xfb, 0x76, 0xee, 0x17, 0x06, 0x58, 0x9d, 0x59, + 0x3a, 0xf8, 0xff, 0x20, 0x1b, 0x06, 0x11, 0x17, 0x81, 0x4b, 0x7d, 0xd2, 0xf1, 0xe8, 0x85, 0xbb, + 0x9a, 0xd1, 0xd8, 0xaa, 0x82, 0xc2, 0x3d, 0x60, 0xf6, 0x45, 0xa5, 0xa6, 0x9f, 0x17, 0x65, 0xe8, + 0xa7, 0x5e, 0x1f, 0xfa, 0x28, 0xd3, 0x77, 0x7d, 0xbd, 0xd6, 0x22, 0xd6, 0x73, 0x39, 0x60, 0x9d, + 0xb7, 0xc6, 0xa5, 0x0d, 0x70, 0x63, 0xb4, 0x8f, 0xf1, 0x0b, 0xfd, 0x80, 0xda, 0x6e, 0xd7, 0xa5, + 0x61, 0xfe, 0x29, 0x48, 0x4f, 0x3c, 0xa9, 0x42, 0x00, 0x2e, 0x37, 0x5b, 0xc5, 0xd6, 0x41, 0xd9, + 0x9c, 0x83, 0x19, 0x00, 0x9a, 0x2d, 0x74, 0x50, 0x6e, 0xe1, 0x4a, 0xbd, 0x69, 0x1a, 0x22, 0x2f, + 0xd6, 0x1a, 0x8f, 0x0e, 0xca, 0xc5, 0x9a, 0x14, 0xa4, 0xe0, 0x15, 0x30, 0x5f, 0xad, 0x34, 0xcd, + 0x79, 0x91, 0x20, 0x1b, 0xe8, 0xe0, 0xd1, 0x41, 0x5d, 0xa8, 0x9a, 0x2d, 0x73, 0x21, 0xff, 0xd2, + 0x00, 0x8b, 0xf1, 0x03, 0xa0, 0x30, 0x44, 0x8d, 0x76, 0xbd, 0x82, 0x51, 0xa3, 0x74, 0x50, 0x57, + 0xc7, 0xaf, 0x56, 0x2d, 0x36, 0x5b, 0x18, 0x55, 0x7f, 0xd0, 0xae, 0x36, 0x45, 0x46, 0x4d, 0x83, + 0x25, 0x74, 0x50, 0x7f, 0xa4, 0x0e, 0x68, 0x4a, 0xcc, 0x03, 0x15, 0xeb, 0x95, 0xc6, 0xa1, 0x39, + 0x0f, 0xd7, 0x40, 0x76, 0x9c, 0x1d, 0xd7, 0x4a, 0xe6, 0x82, 0x00, 0x1c, 0x16, 0x1f, 0xd5, 0xaa, + 0x4f, 0xcc, 0x4b, 0x70, 0x1d, 0x98, 0xe5, 0x5a, 0xbb, 0xd9, 0xaa, 0x22, 0x7c, 0x84, 0x1a, 0x4f, + 0x0e, 0x2a, 0xd5, 0x8a, 0x79, 0x39, 0xff, 0x3e, 0xc8, 0x4e, 0x35, 0xf7, 0x70, 0x11, 0x2c, 0x14, + 0xdb, 0xad, 0x86, 0x39, 0x27, 0xb2, 0xc1, 0x93, 0xf7, 0x70, 0xa3, 0x5e, 0xfb, 0xc2, 0x34, 0xe4, + 0xe0, 0xa1, 0x1a, 0xa4, 0xf2, 0x2d, 0x60, 0x9d, 0xd7, 0x2e, 0xc0, 0x0d, 0x70, 0xbd, 0xdd, 0xac, + 0xe2, 0x72, 0xa3, 0xbe, 0x77, 0xf0, 0xa8, 0x8d, 0xaa, 0x15, 0xe1, 0xaf, 0xd5, 0x28, 0x37, 0x6a, + 0xe6, 0x5c, 0xac, 0xac, 0x34, 0x9e, 0xd6, 0x9b, 0x2d, 0x54, 0x2d, 0x1e, 0x9e, 0x29, 0x8d, 0x92, + 0x05, 0xae, 0xc5, 0xbb, 0x3c, 0xfa, 0x27, 0x88, 0x7c, 0xa0, 0x2e, 0x2d, 0xcb, 0x07, 0x55, 0xb5, + 0x33, 0x8f, 0x17, 0x16, 0x57, 0xcc, 0xf4, 0xe3, 0x85, 0xc5, 0xac, 0x69, 0xe6, 0x9f, 0x02, 0xd8, + 0x9e, 0xed, 0xa2, 0x8b, 0x20, 0xa3, 0xfe, 0xc1, 0x82, 0xf5, 0xff, 0x72, 0x74, 0xbc, 0x5d, 0xf4, + 0x06, 0x91, 0x56, 0x16, 0x7a, 0x98, 0x27, 0xe0, 0xc6, 0xb9, 0x0d, 0x0b, 0xac, 0x80, 0x34, 0xb7, + 0x07, 0xf8, 0x84, 0xd2, 0x01, 0xf1, 0xdc, 0x53, 0x7a, 0x41, 0xf9, 0xdc, 0xb2, 0x07, 0x9f, 0xc5, + 0x30, 0xb4, 0xc2, 0xc7, 0x46, 0xbb, 0x7f, 0x4c, 0x81, 0xeb, 0x7a, 0x15, 0x47, 0xf1, 0xd5, 0x54, + 0xe5, 0x33, 0x7c, 0x0a, 0x32, 0x4d, 0xe5, 0x5c, 0x01, 0x18, 0x9c, 0x7a, 0x73, 0x1d, 0x59, 0xe8, + 0x9b, 0x34, 0x77, 0xfb, 0x5c, 0x3d, 0x1b, 0x04, 0x3e, 0xa3, 0xf9, 0xb9, 0x6d, 0xe3, 0x5d, 0x03, + 0x7e, 0x0d, 0xd2, 0x15, 0xea, 0x71, 0x32, 0xe2, 0x9d, 0x7a, 0x17, 0x96, 0xca, 0x19, 0xf2, 0xbb, + 0x17, 0x83, 0x26, 0x3c, 0x30, 0x90, 0xde, 0xa3, 0xdc, 0xee, 0xfd, 0xe7, 0x66, 0x7e, 0xe7, 0xdb, + 0x3f, 0xff, 0xf3, 0x67, 0xa9, 0x8d, 0xfc, 0xb5, 0x89, 0x7f, 0x8f, 0x7d, 0xa4, 0x63, 0x85, 0x7d, + 0x64, 0xdc, 0x2f, 0x7d, 0xfa, 0xab, 0x57, 0x9b, 0xc6, 0x1f, 0x5e, 0x6d, 0x1a, 0x7f, 0x7a, 0xb5, + 0x69, 0xfc, 0xe5, 0xd5, 0xa6, 0xf1, 0x8f, 0x57, 0x9b, 0x06, 0xc8, 0xb9, 0x81, 0xe2, 0x1e, 0x84, + 0xc1, 0xf3, 0xe1, 0x84, 0x9b, 0xd2, 0x62, 0xd9, 0x61, 0x32, 0x78, 0x8f, 0x8c, 0x9f, 0x18, 0x46, + 0xe7, 0xb2, 0xcc, 0x21, 0x0f, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xad, 0xcf, 0xb8, 0xad, 0x36, + 0x1c, 0x00, 0x00, } func (this *Cluster) Equal(that interface{}) bool { @@ -2125,7 +2135,13 @@ func (this *Cluster) Equal(that interface{}) bool { if !this.EdsClusterConfig.Equal(that1.EdsClusterConfig) { return false } - if this.ConnectTimeout != that1.ConnectTimeout { + if this.ConnectTimeout != nil && that1.ConnectTimeout != nil { + if *this.ConnectTimeout != *that1.ConnectTimeout { + return false + } + } else if this.ConnectTimeout != nil { + return false + } else if that1.ConnectTimeout != nil { return false } if !this.PerConnectionBufferLimitBytes.Equal(that1.PerConnectionBufferLimitBytes) { @@ -2258,6 +2274,14 @@ func (this *Cluster) Equal(that interface{}) bool { if this.DrainConnectionsOnHostRemoval != that1.DrainConnectionsOnHostRemoval { return false } + if len(this.Filters) != len(that1.Filters) { + return false + } + for i := range this.Filters { + if !this.Filters[i].Equal(that1.Filters[i]) { + return false + } + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -3055,14 +3079,16 @@ func (m *Cluster) MarshalTo(dAtA []byte) (int, error) { } i += n2 } - dAtA[i] = 0x22 - i++ - i = encodeVarintCds(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.ConnectTimeout))) - n3, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ConnectTimeout, dAtA[i:]) - if err != nil { - return 0, err + if m.ConnectTimeout != nil { + dAtA[i] = 0x22 + i++ + i = encodeVarintCds(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.ConnectTimeout))) + n3, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.ConnectTimeout, dAtA[i:]) + if err != nil { + return 0, err + } + i += n3 } - i += n3 if m.PerConnectionBufferLimitBytes != nil { dAtA[i] = 0x2a i++ @@ -3433,6 +3459,20 @@ func (m *Cluster) MarshalTo(dAtA []byte) (int, error) { } i++ } + if len(m.Filters) > 0 { + for _, msg := range m.Filters { + dAtA[i] = 0xc2 + i++ + dAtA[i] = 0x2 + i++ + i = encodeVarintCds(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -4057,8 +4097,10 @@ func (m *Cluster) Size() (n int) { l = m.EdsClusterConfig.Size() n += 1 + l + sovCds(uint64(l)) } - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.ConnectTimeout) - n += 1 + l + sovCds(uint64(l)) + if m.ConnectTimeout != nil { + l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.ConnectTimeout) + n += 1 + l + sovCds(uint64(l)) + } if m.PerConnectionBufferLimitBytes != nil { l = m.PerConnectionBufferLimitBytes.Size() n += 1 + l + sovCds(uint64(l)) @@ -4196,6 +4238,12 @@ func (m *Cluster) Size() (n int) { if m.RespectDnsTtl { n += 3 } + if len(m.Filters) > 0 { + for _, e := range m.Filters { + l = e.Size() + n += 2 + l + sovCds(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4684,7 +4732,10 @@ func (m *Cluster) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.ConnectTimeout, dAtA[iNdEx:postIndex]); err != nil { + if m.ConnectTimeout == nil { + m.ConnectTimeout = new(time.Duration) + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.ConnectTimeout, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5949,6 +6000,40 @@ func (m *Cluster) Unmarshal(dAtA []byte) error { } } m.RespectDnsTtl = bool(v != 0) + case 40: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Filters", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCds + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCds + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCds + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Filters = append(m.Filters, &cluster.Filter{}) + if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCds(dAtA[iNdEx:]) diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go index c9652b810dff..4e4baa394bec 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cds.pb.validate.go @@ -49,23 +49,18 @@ func (m *Cluster) Validate() error { // no validation rules for AltStatName - { - tmp := m.GetEdsClusterConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "EdsClusterConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEdsClusterConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "EdsClusterConfig", + reason: "embedded message failed validation", + cause: err, } } } - if true { - dur := m.GetConnectTimeout() + if d := m.GetConnectTimeout(); d != nil { + dur := *d gt := time.Duration(0*time.Second + 0*time.Nanosecond) @@ -78,17 +73,12 @@ func (m *Cluster) Validate() error { } - { - tmp := m.GetPerConnectionBufferLimitBytes() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "PerConnectionBufferLimitBytes", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "PerConnectionBufferLimitBytes", + reason: "embedded message failed validation", + cause: err, } } } @@ -103,144 +93,99 @@ func (m *Cluster) Validate() error { for idx, item := range m.GetHosts() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: fmt.Sprintf("Hosts[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetLoadAssignment() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ - field: "LoadAssignment", + field: fmt.Sprintf("Hosts[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - - for idx, item := range m.GetHealthChecks() { - _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: fmt.Sprintf("HealthChecks[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } + if v, ok := interface{}(m.GetLoadAssignment()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "LoadAssignment", + reason: "embedded message failed validation", + cause: err, } } - } - { - tmp := m.GetMaxRequestsPerConnection() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetHealthChecks() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ - field: "MaxRequestsPerConnection", + field: fmt.Sprintf("HealthChecks[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - - { - tmp := m.GetCircuitBreakers() - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "CircuitBreakers", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxRequestsPerConnection()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "MaxRequestsPerConnection", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetTlsContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "TlsContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCircuitBreakers()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "CircuitBreakers", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCommonHttpProtocolOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "CommonHttpProtocolOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTlsContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "TlsContext", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHttpProtocolOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "HttpProtocolOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommonHttpProtocolOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "CommonHttpProtocolOptions", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHttp2ProtocolOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetHttpProtocolOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "HttpProtocolOptions", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "Http2ProtocolOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "Http2ProtocolOptions", + reason: "embedded message failed validation", + cause: err, } } } @@ -275,34 +220,24 @@ func (m *Cluster) Validate() error { for idx, item := range m.GetDnsResolvers() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: fmt.Sprintf("DnsResolvers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: fmt.Sprintf("DnsResolvers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetOutlierDetection() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "OutlierDetection", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOutlierDetection()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "OutlierDetection", + reason: "embedded message failed validation", + cause: err, } } } @@ -321,101 +256,86 @@ func (m *Cluster) Validate() error { } - { - tmp := m.GetUpstreamBindConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "UpstreamBindConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUpstreamBindConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "UpstreamBindConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLbSubsetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "LbSubsetConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLbSubsetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "LbSubsetConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCommonLbConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "CommonLbConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommonLbConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "CommonLbConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetTransportSocket() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "TransportSocket", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTransportSocket()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "TransportSocket", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMetadata() + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, + } + } + } - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + // no validation rules for ProtocolSelection - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUpstreamConnectionOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "UpstreamConnectionOptions", + reason: "embedded message failed validation", + cause: err, } } } - // no validation rules for ProtocolSelection + // no validation rules for CloseConnectionsOnHostHealthFailure - { - tmp := m.GetUpstreamConnectionOptions() + // no validation rules for DrainConnectionsOnHostRemoval - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetFilters() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ClusterValidationError{ - field: "UpstreamConnectionOptions", + field: fmt.Sprintf("Filters[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - - // no validation rules for CloseConnectionsOnHostHealthFailure - // no validation rules for DrainConnectionsOnHostRemoval + } switch m.ClusterDiscoveryType.(type) { @@ -430,17 +350,12 @@ func (m *Cluster) Validate() error { case *Cluster_ClusterType: - { - tmp := m.GetClusterType() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "ClusterType", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetClusterType()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "ClusterType", + reason: "embedded message failed validation", + cause: err, } } } @@ -451,51 +366,36 @@ func (m *Cluster) Validate() error { case *Cluster_RingHashLbConfig_: - { - tmp := m.GetRingHashLbConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "RingHashLbConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRingHashLbConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "RingHashLbConfig", + reason: "embedded message failed validation", + cause: err, } } } case *Cluster_OriginalDstLbConfig_: - { - tmp := m.GetOriginalDstLbConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "OriginalDstLbConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOriginalDstLbConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "OriginalDstLbConfig", + reason: "embedded message failed validation", + cause: err, } } } case *Cluster_LeastRequestLbConfig_: - { - tmp := m.GetLeastRequestLbConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterValidationError{ - field: "LeastRequestLbConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLeastRequestLbConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterValidationError{ + field: "LeastRequestLbConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -567,17 +467,12 @@ func (m *UpstreamBindConfig) Validate() error { return nil } - { - tmp := m.GetSourceAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamBindConfigValidationError{ - field: "SourceAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSourceAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamBindConfigValidationError{ + field: "SourceAddress", + reason: "embedded message failed validation", + cause: err, } } } @@ -649,17 +544,12 @@ func (m *UpstreamConnectionOptions) Validate() error { return nil } - { - tmp := m.GetTcpKeepalive() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamConnectionOptionsValidationError{ - field: "TcpKeepalive", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTcpKeepalive()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamConnectionOptionsValidationError{ + field: "TcpKeepalive", + reason: "embedded message failed validation", + cause: err, } } } @@ -738,17 +628,12 @@ func (m *Cluster_CustomClusterType) Validate() error { } } - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CustomClusterTypeValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CustomClusterTypeValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -820,17 +705,12 @@ func (m *Cluster_EdsClusterConfig) Validate() error { return nil } - { - tmp := m.GetEdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_EdsClusterConfigValidationError{ - field: "EdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_EdsClusterConfigValidationError{ + field: "EdsConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -911,17 +791,12 @@ func (m *Cluster_LbSubsetConfig) Validate() error { } } - { - tmp := m.GetDefaultSubset() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_LbSubsetConfigValidationError{ - field: "DefaultSubset", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDefaultSubset()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_LbSubsetConfigValidationError{ + field: "DefaultSubset", + reason: "embedded message failed validation", + cause: err, } } } @@ -929,17 +804,12 @@ func (m *Cluster_LbSubsetConfig) Validate() error { for idx, item := range m.GetSubsetSelectors() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_LbSubsetConfigValidationError{ - field: fmt.Sprintf("SubsetSelectors[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_LbSubsetConfigValidationError{ + field: fmt.Sprintf("SubsetSelectors[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1266,32 +1136,22 @@ func (m *Cluster_CommonLbConfig) Validate() error { return nil } - { - tmp := m.GetHealthyPanicThreshold() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CommonLbConfigValidationError{ - field: "HealthyPanicThreshold", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHealthyPanicThreshold()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CommonLbConfigValidationError{ + field: "HealthyPanicThreshold", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetUpdateMergeWindow() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CommonLbConfigValidationError{ - field: "UpdateMergeWindow", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUpdateMergeWindow()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CommonLbConfigValidationError{ + field: "UpdateMergeWindow", + reason: "embedded message failed validation", + cause: err, } } } @@ -1302,34 +1162,24 @@ func (m *Cluster_CommonLbConfig) Validate() error { case *Cluster_CommonLbConfig_ZoneAwareLbConfig_: - { - tmp := m.GetZoneAwareLbConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CommonLbConfigValidationError{ - field: "ZoneAwareLbConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetZoneAwareLbConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CommonLbConfigValidationError{ + field: "ZoneAwareLbConfig", + reason: "embedded message failed validation", + cause: err, } } } case *Cluster_CommonLbConfig_LocalityWeightedLbConfig_: - { - tmp := m.GetLocalityWeightedLbConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CommonLbConfigValidationError{ - field: "LocalityWeightedLbConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalityWeightedLbConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CommonLbConfigValidationError{ + field: "LocalityWeightedLbConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -1478,32 +1328,22 @@ func (m *Cluster_CommonLbConfig_ZoneAwareLbConfig) Validate() error { return nil } - { - tmp := m.GetRoutingEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CommonLbConfig_ZoneAwareLbConfigValidationError{ - field: "RoutingEnabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRoutingEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CommonLbConfig_ZoneAwareLbConfigValidationError{ + field: "RoutingEnabled", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMinClusterSize() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Cluster_CommonLbConfig_ZoneAwareLbConfigValidationError{ - field: "MinClusterSize", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMinClusterSize()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Cluster_CommonLbConfig_ZoneAwareLbConfigValidationError{ + field: "MinClusterSize", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go index 1e410ca3b508..d4dadf608a40 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go @@ -6,14 +6,12 @@ package cluster import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go index fed18c3fac71..0c52d6ca77ad 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.validate.go @@ -48,17 +48,12 @@ func (m *CircuitBreakers) Validate() error { for idx, item := range m.GetThresholds() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CircuitBreakersValidationError{ - field: fmt.Sprintf("Thresholds[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CircuitBreakersValidationError{ + field: fmt.Sprintf("Thresholds[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -132,79 +127,54 @@ func (m *CircuitBreakers_Thresholds) Validate() error { // no validation rules for Priority - { - tmp := m.GetMaxConnections() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CircuitBreakers_ThresholdsValidationError{ - field: "MaxConnections", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxConnections()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CircuitBreakers_ThresholdsValidationError{ + field: "MaxConnections", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMaxPendingRequests() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CircuitBreakers_ThresholdsValidationError{ - field: "MaxPendingRequests", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxPendingRequests()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CircuitBreakers_ThresholdsValidationError{ + field: "MaxPendingRequests", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMaxRequests() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CircuitBreakers_ThresholdsValidationError{ - field: "MaxRequests", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxRequests()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CircuitBreakers_ThresholdsValidationError{ + field: "MaxRequests", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMaxRetries() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CircuitBreakers_ThresholdsValidationError{ - field: "MaxRetries", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxRetries()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CircuitBreakers_ThresholdsValidationError{ + field: "MaxRetries", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for TrackRemaining - { - tmp := m.GetMaxConnectionPools() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CircuitBreakers_ThresholdsValidationError{ - field: "MaxConnectionPools", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxConnectionPools()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CircuitBreakers_ThresholdsValidationError{ + field: "MaxConnectionPools", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go new file mode 100644 index 000000000000..1c88ee1505cd --- /dev/null +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.go @@ -0,0 +1,458 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: envoy/api/v2/cluster/filter.proto + +package cluster + +import ( + bytes "bytes" + fmt "fmt" + _ "github.com/envoyproxy/protoc-gen-validate/validate" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + +// [#protodoc-title: Upstream filters] +// +// Upstream filters apply to the connections to the upstream cluster hosts. +type Filter struct { + // The name of the filter to instantiate. The name must match a + // :ref:`supported filter `. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // Filter specific configuration which depends on the filter being + // instantiated. See the supported filters for further documentation. + TypedConfig *types.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Filter) Reset() { *m = Filter{} } +func (m *Filter) String() string { return proto.CompactTextString(m) } +func (*Filter) ProtoMessage() {} +func (*Filter) Descriptor() ([]byte, []int) { + return fileDescriptor_8ce34c55b74b9243, []int{0} +} +func (m *Filter) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Filter.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_Filter.Merge(m, src) +} +func (m *Filter) XXX_Size() int { + return m.Size() +} +func (m *Filter) XXX_DiscardUnknown() { + xxx_messageInfo_Filter.DiscardUnknown(m) +} + +var xxx_messageInfo_Filter proto.InternalMessageInfo + +func (m *Filter) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Filter) GetTypedConfig() *types.Any { + if m != nil { + return m.TypedConfig + } + return nil +} + +func init() { + proto.RegisterType((*Filter)(nil), "envoy.api.v2.cluster.Filter") +} + +func init() { proto.RegisterFile("envoy/api/v2/cluster/filter.proto", fileDescriptor_8ce34c55b74b9243) } + +var fileDescriptor_8ce34c55b74b9243 = []byte{ + // 277 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x8f, 0x31, 0x4b, 0xc3, 0x40, + 0x18, 0x86, 0xb9, 0x58, 0x0a, 0x4d, 0x9c, 0x42, 0xd0, 0x5a, 0x34, 0xc4, 0x4e, 0x9d, 0xbe, 0x83, + 0x38, 0x38, 0x37, 0x45, 0x47, 0x29, 0x15, 0x5c, 0xf5, 0x9a, 0x5e, 0xc2, 0x41, 0xcc, 0x77, 0x5c, + 0x2f, 0xc1, 0xfc, 0x23, 0xf1, 0x27, 0x38, 0x39, 0x3a, 0xfa, 0x13, 0x24, 0x9b, 0xfe, 0x0a, 0xe9, + 0x97, 0x74, 0x11, 0xdd, 0x5e, 0xbe, 0xf7, 0xb9, 0xe3, 0x79, 0xdd, 0x73, 0x59, 0xd6, 0xd8, 0x70, + 0xa1, 0x15, 0xaf, 0x63, 0x9e, 0x16, 0xd5, 0xd6, 0x4a, 0xc3, 0x33, 0x55, 0x58, 0x69, 0x40, 0x1b, + 0xb4, 0xe8, 0x07, 0x84, 0x80, 0xd0, 0x0a, 0xea, 0x18, 0x7a, 0x64, 0x72, 0x92, 0x23, 0xe6, 0x85, + 0xe4, 0xc4, 0xac, 0xab, 0x8c, 0x8b, 0xb2, 0xe9, 0x1e, 0x4c, 0x4e, 0x7f, 0x57, 0x5b, 0x6b, 0xaa, + 0xd4, 0xf6, 0xed, 0x71, 0x2d, 0x0a, 0xb5, 0x11, 0x56, 0xf2, 0x7d, 0xe8, 0x8b, 0x20, 0xc7, 0x1c, + 0x29, 0xf2, 0x5d, 0xea, 0xae, 0xd3, 0x07, 0x77, 0x78, 0x4d, 0x36, 0xfe, 0x99, 0x3b, 0x28, 0xc5, + 0xa3, 0x1c, 0xb3, 0x88, 0xcd, 0x46, 0xc9, 0xe8, 0xf5, 0xeb, 0xed, 0x60, 0x60, 0x9c, 0x88, 0xad, + 0xe8, 0xec, 0x5f, 0xba, 0x87, 0xb6, 0xd1, 0x72, 0x73, 0x9f, 0x62, 0x99, 0xa9, 0x7c, 0xec, 0x44, + 0x6c, 0xe6, 0xc5, 0x01, 0x74, 0x32, 0xb0, 0x97, 0x81, 0x79, 0xd9, 0xac, 0x3c, 0x22, 0x17, 0x04, + 0x26, 0xd5, 0x73, 0x1b, 0xb2, 0xf7, 0x36, 0x64, 0x1f, 0x6d, 0xc8, 0x3e, 0xdb, 0x90, 0xb9, 0x53, + 0x85, 0x40, 0xa3, 0xb5, 0xc1, 0xa7, 0x06, 0xfe, 0xda, 0x9f, 0x78, 0x9d, 0xd5, 0x72, 0xf7, 0xed, + 0x92, 0xbd, 0x38, 0x47, 0x57, 0x44, 0xcd, 0xb5, 0x82, 0xbb, 0x18, 0x16, 0x1d, 0x75, 0x73, 0xfb, + 0xfd, 0x5f, 0xb1, 0x1e, 0x92, 0xd1, 0xc5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x8d, 0xab, + 0x9b, 0x82, 0x01, 0x00, 0x00, +} + +func (this *Filter) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*Filter) + if !ok { + that2, ok := that.(Filter) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Name != that1.Name { + return false + } + if !this.TypedConfig.Equal(that1.TypedConfig) { + return false + } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } + return true +} +func (m *Filter) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Filter) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Name) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintFilter(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) + } + if m.TypedConfig != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintFilter(dAtA, i, uint64(m.TypedConfig.Size())) + n1, err := m.TypedConfig.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n1 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func encodeVarintFilter(dAtA []byte, offset int, v uint64) int { + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return offset + 1 +} +func (m *Filter) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Name) + if l > 0 { + n += 1 + l + sovFilter(uint64(l)) + } + if m.TypedConfig != nil { + l = m.TypedConfig.Size() + n += 1 + l + sovFilter(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovFilter(x uint64) (n int) { + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n +} +func sozFilter(x uint64) (n int) { + return sovFilter(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Filter) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFilter + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Filter: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Filter: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFilter + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFilter + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFilter + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TypedConfig", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFilter + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthFilter + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthFilter + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.TypedConfig == nil { + m.TypedConfig = &types.Any{} + } + if err := m.TypedConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipFilter(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthFilter + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthFilter + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipFilter(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFilter + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFilter + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + return iNdEx, nil + case 1: + iNdEx += 8 + return iNdEx, nil + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFilter + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthFilter + } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthFilter + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFilter + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipFilter(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthFilter + } + } + return iNdEx, nil + case 4: + return iNdEx, nil + case 5: + iNdEx += 4 + return iNdEx, nil + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + } + panic("unreachable") +} + +var ( + ErrInvalidLengthFilter = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowFilter = fmt.Errorf("proto: integer overflow") +) diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.validate.go new file mode 100644 index 000000000000..7ffd1da8df3e --- /dev/null +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/filter.pb.validate.go @@ -0,0 +1,115 @@ +// Code generated by protoc-gen-validate. DO NOT EDIT. +// source: envoy/api/v2/cluster/filter.proto + +package cluster + +import ( + "bytes" + "errors" + "fmt" + "net" + "net/mail" + "net/url" + "regexp" + "strings" + "time" + "unicode/utf8" + + "github.com/gogo/protobuf/types" +) + +// ensure the imports are used +var ( + _ = bytes.MinRead + _ = errors.New("") + _ = fmt.Print + _ = utf8.UTFMax + _ = (*regexp.Regexp)(nil) + _ = (*strings.Reader)(nil) + _ = net.IPv4len + _ = time.Duration(0) + _ = (*url.URL)(nil) + _ = (*mail.Address)(nil) + _ = types.DynamicAny{} +) + +// Validate checks the field values on Filter with the rules defined in the +// proto definition for this message. If any rules are violated, an error is returned. +func (m *Filter) Validate() error { + if m == nil { + return nil + } + + if len(m.GetName()) < 1 { + return FilterValidationError{ + field: "Name", + reason: "value length must be at least 1 bytes", + } + } + + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, + } + } + } + + return nil +} + +// FilterValidationError is the validation error returned by Filter.Validate if +// the designated constraints aren't met. +type FilterValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e FilterValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e FilterValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e FilterValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e FilterValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e FilterValidationError) ErrorName() string { return "FilterValidationError" } + +// Error satisfies the builtin error interface +func (e FilterValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sFilter.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = FilterValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = FilterValidationError{} diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go index e5c989001ddb..b26c14a8980b 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.go @@ -6,13 +6,12 @@ package cluster import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go index 6f2bdbd4b393..65cee88371f2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/outlier_detection.pb.validate.go @@ -41,17 +41,12 @@ func (m *OutlierDetection) Validate() error { return nil } - { - tmp := m.GetConsecutive_5Xx() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutlierDetectionValidationError{ - field: "Consecutive_5Xx", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConsecutive_5Xx()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutlierDetectionValidationError{ + field: "Consecutive_5Xx", + reason: "embedded message failed validation", + cause: err, } } } @@ -131,62 +126,42 @@ func (m *OutlierDetection) Validate() error { } - { - tmp := m.GetSuccessRateMinimumHosts() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutlierDetectionValidationError{ - field: "SuccessRateMinimumHosts", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSuccessRateMinimumHosts()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutlierDetectionValidationError{ + field: "SuccessRateMinimumHosts", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetSuccessRateRequestVolume() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutlierDetectionValidationError{ - field: "SuccessRateRequestVolume", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSuccessRateRequestVolume()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutlierDetectionValidationError{ + field: "SuccessRateRequestVolume", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetSuccessRateStdevFactor() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutlierDetectionValidationError{ - field: "SuccessRateStdevFactor", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSuccessRateStdevFactor()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutlierDetectionValidationError{ + field: "SuccessRateStdevFactor", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetConsecutiveGatewayFailure() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutlierDetectionValidationError{ - field: "ConsecutiveGatewayFailure", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConsecutiveGatewayFailure()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutlierDetectionValidationError{ + field: "ConsecutiveGatewayFailure", + reason: "embedded message failed validation", + cause: err, } } } @@ -204,17 +179,12 @@ func (m *OutlierDetection) Validate() error { // no validation rules for SplitExternalLocalOriginErrors - { - tmp := m.GetConsecutiveLocalOriginFailure() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutlierDetectionValidationError{ - field: "ConsecutiveLocalOriginFailure", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConsecutiveLocalOriginFailure()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutlierDetectionValidationError{ + field: "ConsecutiveLocalOriginFailure", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go index 4699f0719650..a3d9e310d83a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.go @@ -6,13 +6,12 @@ package core import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -374,7 +373,7 @@ func (m *TcpKeepalive) GetKeepaliveInterval() *types.UInt32Value { type BindConfig struct { // The address to bind to when creating a socket. - SourceAddress SocketAddress `protobuf:"bytes,1,opt,name=source_address,json=sourceAddress,proto3" json:"source_address"` + SourceAddress *SocketAddress `protobuf:"bytes,1,opt,name=source_address,json=sourceAddress,proto3" json:"source_address,omitempty"` // Whether to set the *IP_FREEBIND* option when creating the socket. When this // flag is set to true, allows the :ref:`source_address // ` to be an IP address @@ -424,11 +423,11 @@ func (m *BindConfig) XXX_DiscardUnknown() { var xxx_messageInfo_BindConfig proto.InternalMessageInfo -func (m *BindConfig) GetSourceAddress() SocketAddress { +func (m *BindConfig) GetSourceAddress() *SocketAddress { if m != nil { return m.SourceAddress } - return SocketAddress{} + return nil } func (m *BindConfig) GetFreebind() *types.BoolValue { @@ -675,52 +674,52 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/core/address.proto", fileDescriptor_6906417f87bcce55) } var fileDescriptor_6906417f87bcce55 = []byte{ - // 710 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6f, 0xd3, 0x3e, - 0x18, 0xad, 0x9b, 0x6e, 0x6b, 0xbf, 0xae, 0xfd, 0x75, 0xd6, 0x4f, 0x5a, 0x54, 0x8d, 0xb6, 0xea, - 0x84, 0x54, 0x26, 0x48, 0x50, 0x87, 0xb8, 0x2f, 0x45, 0x6c, 0xd3, 0x10, 0x84, 0xb0, 0xc1, 0x31, - 0x4a, 0x5b, 0xb7, 0x58, 0x4b, 0x63, 0xcb, 0xc9, 0xc2, 0x76, 0x43, 0x1c, 0x10, 0xe2, 0xce, 0x5f, - 0xc0, 0x85, 0x3f, 0x01, 0x71, 0xda, 0x71, 0x47, 0xae, 0x5c, 0x10, 0xaa, 0xc4, 0x61, 0x7f, 0xc5, - 0x90, 0x9d, 0xa4, 0x13, 0x14, 0x34, 0xb8, 0xd9, 0xdf, 0xf7, 0xde, 0xf3, 0x7b, 0xf6, 0x67, 0x68, - 0x92, 0x20, 0x66, 0x27, 0xa6, 0xc7, 0xa9, 0x19, 0x77, 0xcd, 0x01, 0x13, 0xc4, 0xf4, 0x86, 0x43, - 0x41, 0xc2, 0xd0, 0xe0, 0x82, 0x45, 0x0c, 0xaf, 0x28, 0x80, 0xe1, 0x71, 0x6a, 0xc4, 0x5d, 0x43, - 0x02, 0xea, 0x6b, 0xf3, 0x9c, 0xbe, 0x17, 0x92, 0x84, 0x50, 0x6f, 0x8c, 0x19, 0x1b, 0xfb, 0xc4, - 0x54, 0xbb, 0xfe, 0xd1, 0xc8, 0x7c, 0x21, 0x3c, 0xce, 0x89, 0x48, 0x05, 0xeb, 0xab, 0xb1, 0xe7, - 0xd3, 0xa1, 0x17, 0x11, 0x33, 0x5b, 0xa4, 0x8d, 0xff, 0xc7, 0x6c, 0xcc, 0xd4, 0xd2, 0x94, 0xab, - 0xa4, 0xda, 0xbe, 0x0e, 0x05, 0x9b, 0x72, 0x82, 0xaf, 0x41, 0x81, 0x7b, 0xd1, 0x73, 0x1d, 0xb5, - 0x50, 0xa7, 0x64, 0x95, 0x3e, 0x9d, 0x9f, 0x6a, 0x05, 0x91, 0x6f, 0x21, 0x47, 0x95, 0xdb, 0x5f, - 0xf2, 0x50, 0x79, 0xc2, 0x06, 0x87, 0x24, 0xda, 0x4a, 0xec, 0xe3, 0xc7, 0x50, 0x54, 0x0a, 0x03, - 0xe6, 0x2b, 0x52, 0xb5, 0x7b, 0xc3, 0x98, 0xcb, 0x62, 0xfc, 0xc4, 0x31, 0xec, 0x94, 0x60, 0x81, - 0xd4, 0x5f, 0x78, 0x85, 0xf2, 0x35, 0xe4, 0xcc, 0x64, 0xf0, 0x3a, 0x2c, 0xa5, 0x97, 0xa3, 0xe7, - 0x7f, 0xb5, 0x91, 0x75, 0xf0, 0x4d, 0x00, 0xce, 0x44, 0xe4, 0xc6, 0x9e, 0x7f, 0x44, 0x74, 0xad, - 0x85, 0x3a, 0x15, 0xab, 0x2c, 0x71, 0x8b, 0x1b, 0x05, 0xfd, 0xe2, 0x42, 0xdb, 0xc9, 0x39, 0x25, - 0x09, 0x78, 0x2a, 0xfb, 0xb8, 0x09, 0x10, 0x78, 0x13, 0x32, 0x74, 0x65, 0x49, 0x2f, 0x48, 0x55, - 0x09, 0x50, 0x35, 0x9b, 0x89, 0x08, 0xaf, 0x43, 0x45, 0x90, 0x90, 0xf9, 0x31, 0x11, 0xae, 0xac, - 0xea, 0x0b, 0x12, 0xe3, 0x2c, 0x67, 0xc5, 0x87, 0xde, 0x44, 0xaa, 0x94, 0x29, 0x8f, 0xef, 0xb8, - 0x03, 0x36, 0xe1, 0x5e, 0xa4, 0x2f, 0xb6, 0x50, 0xa7, 0xe8, 0x80, 0x2c, 0xf5, 0x54, 0xa5, 0xdd, - 0x86, 0x62, 0x96, 0x0d, 0x2f, 0x81, 0xb6, 0xdf, 0xb3, 0x6b, 0x39, 0xb9, 0x38, 0xb8, 0x67, 0xd7, - 0x50, 0xbd, 0xf0, 0xe6, 0x7d, 0x23, 0x67, 0xad, 0x42, 0x55, 0x19, 0x0f, 0x39, 0x19, 0xd0, 0x11, - 0x25, 0x02, 0x2f, 0x7c, 0x3c, 0x3f, 0xd5, 0x50, 0xfb, 0x1c, 0xc1, 0xf2, 0xfe, 0x80, 0xef, 0x11, - 0xc2, 0x3d, 0x9f, 0xc6, 0x04, 0x6f, 0x43, 0xed, 0x30, 0xdb, 0xb8, 0x5c, 0xb0, 0x3e, 0x09, 0xd5, - 0x15, 0x97, 0xbb, 0x6b, 0x46, 0xf2, 0xfa, 0x46, 0xf6, 0xfa, 0xc6, 0xc1, 0x6e, 0x10, 0x6d, 0x76, - 0x55, 0x58, 0xe7, 0xbf, 0x19, 0xcb, 0x56, 0x24, 0xdc, 0x83, 0xea, 0xa5, 0x50, 0x44, 0x27, 0x44, - 0xdd, 0xeb, 0x55, 0x32, 0x95, 0x19, 0x67, 0x9f, 0x4e, 0x08, 0xde, 0x03, 0x7c, 0x29, 0x42, 0x83, - 0x88, 0x88, 0xd8, 0xf3, 0xd5, 0xc5, 0x5f, 0x25, 0xb4, 0x32, 0xe3, 0xed, 0xa6, 0xb4, 0xf6, 0x77, - 0x04, 0x60, 0xd1, 0x60, 0xd8, 0x63, 0xc1, 0x88, 0x8e, 0xf1, 0x33, 0xa8, 0x86, 0xec, 0x48, 0x0c, - 0x88, 0x9b, 0x3d, 0x7c, 0x92, 0xb3, 0x75, 0xd5, 0x28, 0x59, 0xd5, 0xb3, 0xaf, 0xcd, 0x9c, 0x9a, - 0xa2, 0xb7, 0x6a, 0x8a, 0x2a, 0x89, 0x4e, 0x36, 0x9d, 0x77, 0xa1, 0x38, 0x12, 0x84, 0xf4, 0x69, - 0x30, 0x4c, 0x33, 0xd7, 0xe7, 0xac, 0x5a, 0x8c, 0xf9, 0x89, 0xd1, 0x19, 0x16, 0xdf, 0x97, 0x86, - 0xe4, 0x39, 0x2e, 0xe3, 0x11, 0x65, 0x41, 0xa8, 0x6b, 0x2d, 0xad, 0x53, 0xee, 0x36, 0xff, 0x68, - 0xe8, 0x91, 0xc2, 0xc9, 0xf3, 0x2f, 0x77, 0x61, 0xfb, 0x1d, 0x82, 0xa5, 0xcc, 0xcb, 0xee, 0x4c, - 0xf3, 0x1f, 0x43, 0xee, 0xe4, 0x32, 0xd9, 0x4c, 0xea, 0x16, 0x14, 0x38, 0xe5, 0xd9, 0x33, 0xae, - 0xfe, 0x46, 0x40, 0x7e, 0xe6, 0x9d, 0x9c, 0xa3, 0x60, 0x56, 0x6d, 0xf6, 0xa1, 0xb2, 0x59, 0x7b, - 0x8d, 0xa0, 0xd4, 0xa3, 0x43, 0xe1, 0x78, 0xc1, 0x98, 0xe0, 0xdb, 0x50, 0x4d, 0xfb, 0x2e, 0x17, - 0x64, 0x44, 0x8f, 0xe7, 0xbf, 0x7f, 0x25, 0x05, 0xd8, 0xaa, 0x8f, 0xb7, 0x01, 0x12, 0xa4, 0xeb, - 0x93, 0xe0, 0x6f, 0xa6, 0x29, 0xfd, 0xea, 0x1b, 0x9a, 0xfe, 0x12, 0x39, 0xa5, 0x84, 0xfb, 0x80, - 0x04, 0xd6, 0xd6, 0x87, 0x69, 0x03, 0x9d, 0x4d, 0x1b, 0xe8, 0xf3, 0xb4, 0x81, 0xbe, 0x4d, 0x1b, - 0x08, 0x9a, 0x94, 0x25, 0x79, 0xb8, 0x60, 0xc7, 0x27, 0xf3, 0xd1, 0xac, 0xe5, 0xad, 0xcc, 0x0a, - 0x8b, 0x98, 0x8d, 0xfa, 0x8b, 0xea, 0xbc, 0xcd, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x44, 0xb7, - 0xc9, 0xd8, 0x64, 0x05, 0x00, 0x00, + // 705 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcf, 0x6f, 0xdb, 0x36, + 0x14, 0x36, 0x2d, 0x27, 0xb1, 0x9f, 0x63, 0xcf, 0x21, 0x06, 0x44, 0x30, 0x32, 0xdb, 0x70, 0x30, + 0xc0, 0x0b, 0x36, 0x69, 0x70, 0x86, 0xdd, 0x23, 0x0f, 0x4b, 0x82, 0x0c, 0xab, 0xaa, 0x24, 0xbd, + 0x0a, 0xb4, 0x4d, 0xbb, 0x44, 0x64, 0x91, 0xa0, 0x14, 0x35, 0xb9, 0x15, 0x3d, 0x14, 0x45, 0xef, + 0xfd, 0x0b, 0x7a, 0xe9, 0x9f, 0x50, 0xf4, 0x94, 0x63, 0x8f, 0xbd, 0xf6, 0xd6, 0xfa, 0x96, 0xbf, + 0x22, 0x05, 0x29, 0xc9, 0x41, 0xeb, 0x16, 0x69, 0x6f, 0xe4, 0x7b, 0xdf, 0xf7, 0xf1, 0x7b, 0x3f, + 0x08, 0x6d, 0x1a, 0x26, 0xfc, 0xd2, 0x26, 0x82, 0xd9, 0x49, 0xdf, 0x1e, 0x71, 0x49, 0x6d, 0x32, + 0x1e, 0x4b, 0x1a, 0x45, 0x96, 0x90, 0x3c, 0xe6, 0x78, 0x43, 0x03, 0x2c, 0x22, 0x98, 0x95, 0xf4, + 0x2d, 0x05, 0x68, 0x6e, 0x2d, 0x73, 0x86, 0x24, 0xa2, 0x29, 0xa1, 0xd9, 0x9a, 0x72, 0x3e, 0x0d, + 0xa8, 0xad, 0x6f, 0xc3, 0xf3, 0x89, 0xfd, 0x48, 0x12, 0x21, 0xa8, 0xcc, 0x04, 0x9b, 0x9b, 0x09, + 0x09, 0xd8, 0x98, 0xc4, 0xd4, 0xce, 0x0f, 0x59, 0xe2, 0xe7, 0x29, 0x9f, 0x72, 0x7d, 0xb4, 0xd5, + 0x29, 0x8d, 0x76, 0x7f, 0x85, 0x92, 0xcb, 0x04, 0xc5, 0xbf, 0x40, 0x49, 0x90, 0xf8, 0xa1, 0x89, + 0x3a, 0xa8, 0x57, 0x71, 0x2a, 0x6f, 0xae, 0xaf, 0x8c, 0x92, 0x2c, 0x76, 0x90, 0xa7, 0xc3, 0xdd, + 0xf7, 0x45, 0xa8, 0x1d, 0xf3, 0xd1, 0x19, 0x8d, 0xf7, 0x52, 0xfb, 0xf8, 0x3e, 0x94, 0xb5, 0xc2, + 0x88, 0x07, 0x9a, 0x54, 0xef, 0xff, 0x66, 0x2d, 0xd5, 0x62, 0x7d, 0xc6, 0xb1, 0xdc, 0x8c, 0xe0, + 0x80, 0xd2, 0x5f, 0x79, 0x82, 0x8a, 0x0d, 0xe4, 0x2d, 0x64, 0xf0, 0x36, 0xac, 0x65, 0xcd, 0x31, + 0x8b, 0x5f, 0xda, 0xc8, 0x33, 0xf8, 0x77, 0x00, 0xc1, 0x65, 0xec, 0x27, 0x24, 0x38, 0xa7, 0xa6, + 0xd1, 0x41, 0xbd, 0x9a, 0x53, 0x55, 0xb8, 0xd5, 0x9d, 0x92, 0x79, 0x73, 0x63, 0x1c, 0x14, 0xbc, + 0x8a, 0x02, 0x3c, 0x50, 0x79, 0xdc, 0x06, 0x08, 0xc9, 0x8c, 0x8e, 0x7d, 0x15, 0x32, 0x4b, 0x4a, + 0x55, 0x01, 0x74, 0xcc, 0xe5, 0x32, 0xc6, 0xdb, 0x50, 0x93, 0x34, 0xe2, 0x41, 0x42, 0xa5, 0xaf, + 0xa2, 0xe6, 0x8a, 0xc2, 0x78, 0xeb, 0x79, 0xf0, 0x7f, 0x32, 0x53, 0x2a, 0x55, 0x26, 0x92, 0xbf, + 0xfc, 0x11, 0x9f, 0x09, 0x12, 0x9b, 0xab, 0x1d, 0xd4, 0x2b, 0x7b, 0xa0, 0x42, 0x03, 0x1d, 0xe9, + 0x76, 0xa1, 0x9c, 0xd7, 0x86, 0xd7, 0xc0, 0x38, 0x19, 0xb8, 0x8d, 0x82, 0x3a, 0x9c, 0xfe, 0xe3, + 0x36, 0x50, 0xb3, 0xf4, 0xec, 0x65, 0xab, 0xe0, 0x6c, 0x42, 0x5d, 0x1b, 0x8f, 0x04, 0x1d, 0xb1, + 0x09, 0xa3, 0x12, 0xaf, 0xbc, 0xbe, 0xbe, 0x32, 0x50, 0xf7, 0x1a, 0xc1, 0xfa, 0xc9, 0x48, 0x1c, + 0x51, 0x2a, 0x48, 0xc0, 0x12, 0x8a, 0xf7, 0xa1, 0x71, 0x96, 0x5f, 0x7c, 0x21, 0xf9, 0x90, 0x46, + 0xba, 0xc5, 0xd5, 0xfe, 0x96, 0x95, 0x4e, 0xdf, 0xca, 0xa7, 0x6f, 0x9d, 0x1e, 0x86, 0xf1, 0x6e, + 0x5f, 0x17, 0xeb, 0xfd, 0xb4, 0x60, 0xb9, 0x9a, 0x84, 0x07, 0x50, 0xbf, 0x15, 0x8a, 0xd9, 0x8c, + 0xea, 0xbe, 0xde, 0x25, 0x53, 0x5b, 0x70, 0x4e, 0xd8, 0x8c, 0xe2, 0x23, 0xc0, 0xb7, 0x22, 0x2c, + 0x8c, 0xa9, 0x4c, 0x48, 0xa0, 0x1b, 0x7f, 0x97, 0xd0, 0xc6, 0x82, 0x77, 0x98, 0xd1, 0xba, 0x1f, + 0x11, 0x80, 0xc3, 0xc2, 0xf1, 0x80, 0x87, 0x13, 0x36, 0xc5, 0xc7, 0x50, 0x8f, 0xf8, 0xb9, 0x1c, + 0x51, 0x3f, 0x1f, 0x7c, 0x5a, 0x67, 0xe7, 0xae, 0x55, 0xca, 0x36, 0xe8, 0xb9, 0xde, 0xa0, 0x5a, + 0xaa, 0x91, 0x6f, 0xe6, 0xdf, 0x50, 0x9e, 0x48, 0x4a, 0x87, 0x2c, 0x1c, 0x67, 0xf5, 0x36, 0x97, + 0x6c, 0x3a, 0x9c, 0x07, 0xa9, 0xc9, 0x05, 0x16, 0xff, 0xab, 0xcc, 0xa8, 0x37, 0x7c, 0x2e, 0x62, + 0xc6, 0xc3, 0xc8, 0x34, 0x3a, 0x46, 0xaf, 0xda, 0x6f, 0x7f, 0xd3, 0xcc, 0x3d, 0x8d, 0x53, 0xef, + 0xdf, 0xde, 0xa2, 0xee, 0x0b, 0x04, 0x6b, 0xb9, 0x97, 0xc3, 0x85, 0xe6, 0x0f, 0x16, 0x78, 0x50, + 0xc8, 0x65, 0x73, 0xa9, 0x3f, 0xa0, 0x24, 0x98, 0xc8, 0x47, 0xb8, 0xf9, 0x15, 0x01, 0xf5, 0x91, + 0x0f, 0x0a, 0x9e, 0x86, 0x39, 0x8d, 0xc5, 0x67, 0xca, 0xf7, 0xec, 0x29, 0x82, 0xca, 0x80, 0x8d, + 0xa5, 0x47, 0xc2, 0x29, 0xc5, 0x7f, 0x42, 0x3d, 0xcb, 0xfb, 0x42, 0xd2, 0x09, 0xbb, 0x58, 0xfe, + 0xfa, 0xb5, 0x0c, 0xe0, 0xea, 0x3c, 0xde, 0x07, 0x48, 0x91, 0x7e, 0x40, 0xc3, 0xef, 0xd9, 0xa4, + 0x6c, 0x48, 0x3b, 0x86, 0xf9, 0x18, 0x79, 0x95, 0x94, 0xfb, 0x1f, 0x0d, 0x9d, 0xbd, 0x57, 0xf3, + 0x16, 0x7a, 0x3b, 0x6f, 0xa1, 0x77, 0xf3, 0x16, 0xfa, 0x30, 0x6f, 0x21, 0x68, 0x33, 0x9e, 0xd6, + 0x23, 0x24, 0xbf, 0xb8, 0x5c, 0x2e, 0xcd, 0x59, 0xdf, 0xcb, 0xad, 0xf0, 0x98, 0xbb, 0x68, 0xb8, + 0xaa, 0xdf, 0xdb, 0xfd, 0x14, 0x00, 0x00, 0xff, 0xff, 0x39, 0xae, 0xc4, 0x40, 0x60, 0x05, 0x00, + 0x00, } func (this *Pipe) Equal(that interface{}) bool { @@ -895,7 +894,7 @@ func (this *BindConfig) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.SourceAddress.Equal(&that1.SourceAddress) { + if !this.SourceAddress.Equal(that1.SourceAddress) { return false } if !this.Freebind.Equal(that1.Freebind) { @@ -1188,14 +1187,16 @@ func (m *BindConfig) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintAddress(dAtA, i, uint64(m.SourceAddress.Size())) - n5, err := m.SourceAddress.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.SourceAddress != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintAddress(dAtA, i, uint64(m.SourceAddress.Size())) + n5, err := m.SourceAddress.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n5 } - i += n5 if m.Freebind != nil { dAtA[i] = 0x12 i++ @@ -1420,8 +1421,10 @@ func (m *BindConfig) Size() (n int) { } var l int _ = l - l = m.SourceAddress.Size() - n += 1 + l + sovAddress(uint64(l)) + if m.SourceAddress != nil { + l = m.SourceAddress.Size() + n += 1 + l + sovAddress(uint64(l)) + } if m.Freebind != nil { l = m.Freebind.Size() n += 1 + l + sovAddress(uint64(l)) @@ -2025,6 +2028,9 @@ func (m *BindConfig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.SourceAddress == nil { + m.SourceAddress = &SocketAddress{} + } if err := m.SourceAddress.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go index f2d8c2786150..a2987b320b3e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/address.pb.validate.go @@ -217,47 +217,32 @@ func (m *TcpKeepalive) Validate() error { return nil } - { - tmp := m.GetKeepaliveProbes() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpKeepaliveValidationError{ - field: "KeepaliveProbes", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetKeepaliveProbes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpKeepaliveValidationError{ + field: "KeepaliveProbes", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetKeepaliveTime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpKeepaliveValidationError{ - field: "KeepaliveTime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetKeepaliveTime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpKeepaliveValidationError{ + field: "KeepaliveTime", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetKeepaliveInterval() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpKeepaliveValidationError{ - field: "KeepaliveInterval", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetKeepaliveInterval()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpKeepaliveValidationError{ + field: "KeepaliveInterval", + reason: "embedded message failed validation", + cause: err, } } } @@ -326,32 +311,29 @@ func (m *BindConfig) Validate() error { return nil } - { - tmp := m.GetSourceAddress() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { + if m.GetSourceAddress() == nil { + return BindConfigValidationError{ + field: "SourceAddress", + reason: "value is required", + } + } - if err := v.Validate(); err != nil { - return BindConfigValidationError{ - field: "SourceAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSourceAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BindConfigValidationError{ + field: "SourceAddress", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetFreebind() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BindConfigValidationError{ - field: "Freebind", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFreebind()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BindConfigValidationError{ + field: "Freebind", + reason: "embedded message failed validation", + cause: err, } } } @@ -359,17 +341,12 @@ func (m *BindConfig) Validate() error { for idx, item := range m.GetSocketOptions() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BindConfigValidationError{ - field: fmt.Sprintf("SocketOptions[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BindConfigValidationError{ + field: fmt.Sprintf("SocketOptions[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -444,34 +421,24 @@ func (m *Address) Validate() error { case *Address_SocketAddress: - { - tmp := m.GetSocketAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AddressValidationError{ - field: "SocketAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSocketAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AddressValidationError{ + field: "SocketAddress", + reason: "embedded message failed validation", + cause: err, } } } case *Address_Pipe: - { - tmp := m.GetPipe() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AddressValidationError{ - field: "Pipe", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPipe()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AddressValidationError{ + field: "Pipe", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go index 755a274a0c0a..42850b8e73d2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.go @@ -6,16 +6,14 @@ package core import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" - - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -139,7 +137,7 @@ func (x SocketOption_SocketState) String() string { } func (SocketOption_SocketState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a7738c0f9e1bfff4, []int{9, 0} + return fileDescriptor_a7738c0f9e1bfff4, []int{11, 0} } // Identifies location of where either Envoy runs or where upstream hosts run. @@ -763,6 +761,212 @@ func _DataSource_OneofSizer(msg proto.Message) (n int) { return n } +// The message specifies how to fetch data from remote and how to verify it. +type RemoteDataSource struct { + // The HTTP URI to fetch the remote data. + HttpUri *HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri,proto3" json:"http_uri,omitempty"` + // SHA256 string for verifying data. + Sha256 string `protobuf:"bytes,2,opt,name=sha256,proto3" json:"sha256,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *RemoteDataSource) Reset() { *m = RemoteDataSource{} } +func (m *RemoteDataSource) String() string { return proto.CompactTextString(m) } +func (*RemoteDataSource) ProtoMessage() {} +func (*RemoteDataSource) Descriptor() ([]byte, []int) { + return fileDescriptor_a7738c0f9e1bfff4, []int{8} +} +func (m *RemoteDataSource) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RemoteDataSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *RemoteDataSource) XXX_Merge(src proto.Message) { + xxx_messageInfo_RemoteDataSource.Merge(m, src) +} +func (m *RemoteDataSource) XXX_Size() int { + return m.Size() +} +func (m *RemoteDataSource) XXX_DiscardUnknown() { + xxx_messageInfo_RemoteDataSource.DiscardUnknown(m) +} + +var xxx_messageInfo_RemoteDataSource proto.InternalMessageInfo + +func (m *RemoteDataSource) GetHttpUri() *HttpUri { + if m != nil { + return m.HttpUri + } + return nil +} + +func (m *RemoteDataSource) GetSha256() string { + if m != nil { + return m.Sha256 + } + return "" +} + +// Async data source which support async data fetch. +type AsyncDataSource struct { + // Types that are valid to be assigned to Specifier: + // *AsyncDataSource_Local + // *AsyncDataSource_Remote + Specifier isAsyncDataSource_Specifier `protobuf_oneof:"specifier"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AsyncDataSource) Reset() { *m = AsyncDataSource{} } +func (m *AsyncDataSource) String() string { return proto.CompactTextString(m) } +func (*AsyncDataSource) ProtoMessage() {} +func (*AsyncDataSource) Descriptor() ([]byte, []int) { + return fileDescriptor_a7738c0f9e1bfff4, []int{9} +} +func (m *AsyncDataSource) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AsyncDataSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *AsyncDataSource) XXX_Merge(src proto.Message) { + xxx_messageInfo_AsyncDataSource.Merge(m, src) +} +func (m *AsyncDataSource) XXX_Size() int { + return m.Size() +} +func (m *AsyncDataSource) XXX_DiscardUnknown() { + xxx_messageInfo_AsyncDataSource.DiscardUnknown(m) +} + +var xxx_messageInfo_AsyncDataSource proto.InternalMessageInfo + +type isAsyncDataSource_Specifier interface { + isAsyncDataSource_Specifier() + Equal(interface{}) bool + MarshalTo([]byte) (int, error) + Size() int +} + +type AsyncDataSource_Local struct { + Local *DataSource `protobuf:"bytes,1,opt,name=local,proto3,oneof"` +} +type AsyncDataSource_Remote struct { + Remote *RemoteDataSource `protobuf:"bytes,2,opt,name=remote,proto3,oneof"` +} + +func (*AsyncDataSource_Local) isAsyncDataSource_Specifier() {} +func (*AsyncDataSource_Remote) isAsyncDataSource_Specifier() {} + +func (m *AsyncDataSource) GetSpecifier() isAsyncDataSource_Specifier { + if m != nil { + return m.Specifier + } + return nil +} + +func (m *AsyncDataSource) GetLocal() *DataSource { + if x, ok := m.GetSpecifier().(*AsyncDataSource_Local); ok { + return x.Local + } + return nil +} + +func (m *AsyncDataSource) GetRemote() *RemoteDataSource { + if x, ok := m.GetSpecifier().(*AsyncDataSource_Remote); ok { + return x.Remote + } + return nil +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*AsyncDataSource) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _AsyncDataSource_OneofMarshaler, _AsyncDataSource_OneofUnmarshaler, _AsyncDataSource_OneofSizer, []interface{}{ + (*AsyncDataSource_Local)(nil), + (*AsyncDataSource_Remote)(nil), + } +} + +func _AsyncDataSource_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*AsyncDataSource) + // specifier + switch x := m.Specifier.(type) { + case *AsyncDataSource_Local: + _ = b.EncodeVarint(1<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Local); err != nil { + return err + } + case *AsyncDataSource_Remote: + _ = b.EncodeVarint(2<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Remote); err != nil { + return err + } + case nil: + default: + return fmt.Errorf("AsyncDataSource.Specifier has unexpected type %T", x) + } + return nil +} + +func _AsyncDataSource_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*AsyncDataSource) + switch tag { + case 1: // specifier.local + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(DataSource) + err := b.DecodeMessage(msg) + m.Specifier = &AsyncDataSource_Local{msg} + return true, err + case 2: // specifier.remote + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RemoteDataSource) + err := b.DecodeMessage(msg) + m.Specifier = &AsyncDataSource_Remote{msg} + return true, err + default: + return false, nil + } +} + +func _AsyncDataSource_OneofSizer(msg proto.Message) (n int) { + m := msg.(*AsyncDataSource) + // specifier + switch x := m.Specifier.(type) { + case *AsyncDataSource_Local: + s := proto.Size(x.Local) + n += 1 // tag and wire + n += proto.SizeVarint(uint64(s)) + n += s + case *AsyncDataSource_Remote: + s := proto.Size(x.Remote) + n += 1 // tag and wire + n += proto.SizeVarint(uint64(s)) + n += s + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + // Configuration for transport socket in :ref:`listeners ` and // :ref:`clusters `. If the configuration is // empty, a default transport socket implementation and configuration will be @@ -787,7 +991,7 @@ func (m *TransportSocket) Reset() { *m = TransportSocket{} } func (m *TransportSocket) String() string { return proto.CompactTextString(m) } func (*TransportSocket) ProtoMessage() {} func (*TransportSocket) Descriptor() ([]byte, []int) { - return fileDescriptor_a7738c0f9e1bfff4, []int{8} + return fileDescriptor_a7738c0f9e1bfff4, []int{10} } func (m *TransportSocket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -957,7 +1161,7 @@ func (m *SocketOption) Reset() { *m = SocketOption{} } func (m *SocketOption) String() string { return proto.CompactTextString(m) } func (*SocketOption) ProtoMessage() {} func (*SocketOption) Descriptor() ([]byte, []int) { - return fileDescriptor_a7738c0f9e1bfff4, []int{9} + return fileDescriptor_a7738c0f9e1bfff4, []int{11} } func (m *SocketOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1129,7 +1333,7 @@ func (m *RuntimeFractionalPercent) Reset() { *m = RuntimeFractionalPerce func (m *RuntimeFractionalPercent) String() string { return proto.CompactTextString(m) } func (*RuntimeFractionalPercent) ProtoMessage() {} func (*RuntimeFractionalPercent) Descriptor() ([]byte, []int) { - return fileDescriptor_a7738c0f9e1bfff4, []int{10} + return fileDescriptor_a7738c0f9e1bfff4, []int{12} } func (m *RuntimeFractionalPercent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1183,7 +1387,7 @@ func (m *ControlPlane) Reset() { *m = ControlPlane{} } func (m *ControlPlane) String() string { return proto.CompactTextString(m) } func (*ControlPlane) ProtoMessage() {} func (*ControlPlane) Descriptor() ([]byte, []int) { - return fileDescriptor_a7738c0f9e1bfff4, []int{11} + return fileDescriptor_a7738c0f9e1bfff4, []int{13} } func (m *ControlPlane) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1228,6 +1432,8 @@ func init() { proto.RegisterType((*HeaderValueOption)(nil), "envoy.api.v2.core.HeaderValueOption") proto.RegisterType((*HeaderMap)(nil), "envoy.api.v2.core.HeaderMap") proto.RegisterType((*DataSource)(nil), "envoy.api.v2.core.DataSource") + proto.RegisterType((*RemoteDataSource)(nil), "envoy.api.v2.core.RemoteDataSource") + proto.RegisterType((*AsyncDataSource)(nil), "envoy.api.v2.core.AsyncDataSource") proto.RegisterType((*TransportSocket)(nil), "envoy.api.v2.core.TransportSocket") proto.RegisterType((*SocketOption)(nil), "envoy.api.v2.core.SocketOption") proto.RegisterType((*RuntimeFractionalPercent)(nil), "envoy.api.v2.core.RuntimeFractionalPercent") @@ -1237,80 +1443,87 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/core/base.proto", fileDescriptor_a7738c0f9e1bfff4) } var fileDescriptor_a7738c0f9e1bfff4 = []byte{ - // 1168 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xf8, 0x2b, 0xf6, 0xb3, 0x9d, 0x6c, 0xa7, 0x51, 0xeb, 0x86, 0xc6, 0x0d, 0xe6, 0x40, - 0x54, 0xc4, 0x1a, 0xdc, 0x03, 0x85, 0x5b, 0xd6, 0xde, 0xd4, 0x16, 0x89, 0xed, 0xae, 0x37, 0x05, - 0xf5, 0x62, 0xd6, 0xde, 0xb1, 0xbb, 0xea, 0x76, 0xc7, 0xcc, 0xce, 0x1a, 0xdc, 0x53, 0xc5, 0x09, - 0xd1, 0x03, 0x7f, 0x04, 0x17, 0x24, 0xc4, 0x1d, 0x71, 0xaa, 0xc4, 0x85, 0x1b, 0x1c, 0x39, 0xa2, - 0xdc, 0xfa, 0x5f, 0xa0, 0xf9, 0x70, 0xea, 0xc4, 0x11, 0xbd, 0xbd, 0xf9, 0xbd, 0xdf, 0x7b, 0xfb, - 0xbe, 0x17, 0x6e, 0x93, 0x68, 0x4e, 0x17, 0x75, 0x6f, 0x16, 0xd4, 0xe7, 0x8d, 0xfa, 0x98, 0x32, - 0x52, 0x1f, 0x79, 0x31, 0x31, 0x67, 0x8c, 0x72, 0x8a, 0xaf, 0x49, 0xad, 0xe9, 0xcd, 0x02, 0x73, - 0xde, 0x30, 0x85, 0x76, 0xf7, 0xd6, 0x94, 0xd2, 0x69, 0x48, 0xea, 0x92, 0x30, 0x4a, 0x26, 0x75, - 0x2f, 0x5a, 0x28, 0xf6, 0xee, 0xed, 0xcb, 0xaa, 0x98, 0xb3, 0x64, 0xcc, 0xb5, 0xb6, 0x7a, 0x59, - 0xfb, 0x0d, 0xf3, 0x66, 0x33, 0xc2, 0x62, 0xad, 0xbf, 0x39, 0xf7, 0xc2, 0xc0, 0xf7, 0x38, 0xa9, - 0x2f, 0x05, 0xad, 0xd8, 0x99, 0xd2, 0x29, 0x95, 0x62, 0x5d, 0x48, 0x1a, 0xad, 0xa8, 0xc0, 0xf9, - 0x62, 0x46, 0xea, 0x33, 0xc2, 0xc6, 0x24, 0xd2, 0x1f, 0xaa, 0x3d, 0x84, 0xfc, 0x31, 0x1d, 0x7b, - 0x61, 0xc0, 0x17, 0xf8, 0x06, 0xe4, 0x18, 0x99, 0x06, 0x34, 0xaa, 0xa0, 0x7d, 0x74, 0x50, 0x70, - 0xf4, 0x0b, 0x63, 0xc8, 0x3c, 0xa7, 0x11, 0xa9, 0xa4, 0x24, 0x2a, 0x65, 0x7c, 0x0b, 0xf2, 0x71, - 0x32, 0x1a, 0x4a, 0x3c, 0x2d, 0xf1, 0xcd, 0x38, 0x19, 0x3d, 0xa6, 0x11, 0xa9, 0xfd, 0x81, 0x20, - 0xd3, 0xa5, 0x3e, 0xc1, 0x5b, 0x90, 0x0a, 0x7c, 0xed, 0x2b, 0x15, 0xf8, 0xb8, 0x02, 0x9b, 0xe3, - 0x30, 0x89, 0x39, 0x61, 0xda, 0xd5, 0xf2, 0x89, 0xef, 0x41, 0xfe, 0x19, 0xe1, 0x9e, 0xef, 0x71, - 0x4f, 0x7a, 0x2b, 0x36, 0x6e, 0x9a, 0xaa, 0x02, 0xe6, 0xb2, 0x02, 0xe6, 0x40, 0xd6, 0xc7, 0x39, - 0x27, 0xe2, 0x4f, 0x20, 0x1f, 0xea, 0xd0, 0x2b, 0x19, 0x69, 0xf4, 0x8e, 0xb9, 0xd6, 0x02, 0x73, - 0x99, 0x9d, 0x73, 0x4e, 0xc6, 0xef, 0x41, 0x79, 0x94, 0x04, 0xa1, 0x3f, 0x9c, 0x13, 0x16, 0x8b, - 0x74, 0xb3, 0x32, 0x9a, 0x92, 0x04, 0x1f, 0x29, 0xac, 0xf6, 0x0a, 0x41, 0xfe, 0x64, 0xf9, 0xa9, - 0x2f, 0x61, 0x7b, 0x12, 0x84, 0x9c, 0xb0, 0xe1, 0x79, 0x98, 0x68, 0x3f, 0x7d, 0x50, 0x6c, 0xd4, - 0xaf, 0xf8, 0xe2, 0xd2, 0xca, 0x3c, 0x92, 0x26, 0xcb, 0xa7, 0x1d, 0x71, 0xb6, 0x70, 0xb6, 0x26, - 0x17, 0xc0, 0xdd, 0xc7, 0x70, 0xfd, 0x0a, 0x1a, 0x36, 0x20, 0xfd, 0x94, 0x2c, 0x74, 0xed, 0x84, - 0x88, 0x3f, 0x84, 0xec, 0xdc, 0x0b, 0x13, 0xd5, 0x85, 0xff, 0xa9, 0x8f, 0x62, 0x7d, 0x96, 0xba, - 0x8f, 0x6a, 0x5f, 0x41, 0xd9, 0x49, 0x22, 0x1e, 0x3c, 0x23, 0xa7, 0x9d, 0x88, 0xdf, 0x6b, 0x88, - 0xc4, 0x7d, 0x32, 0xf1, 0x92, 0x90, 0x0f, 0xdf, 0xf8, 0x2a, 0x3b, 0x25, 0x0d, 0x3e, 0x12, 0x18, - 0xbe, 0x0b, 0x45, 0xa6, 0xac, 0x86, 0x22, 0x04, 0xd9, 0x5c, 0xab, 0xf0, 0xfb, 0xeb, 0x57, 0xe9, - 0x0c, 0x4b, 0xed, 0x23, 0x07, 0xb4, 0xf6, 0x73, 0xb2, 0xa8, 0x3d, 0x84, 0x62, 0x9b, 0x78, 0x3e, - 0x61, 0xca, 0xf4, 0xce, 0x4a, 0xd4, 0x56, 0x59, 0x98, 0xe4, 0x59, 0x6e, 0x1f, 0x1d, 0xbc, 0x78, - 0x81, 0x54, 0x12, 0xef, 0xae, 0x26, 0x51, 0xb0, 0x8a, 0x82, 0x92, 0x63, 0x19, 0x49, 0x50, 0x9a, - 0xda, 0x4b, 0x04, 0xd7, 0x56, 0x7c, 0xf6, 0x66, 0x5c, 0x8c, 0xa0, 0x05, 0xb9, 0x27, 0x12, 0x94, - 0xce, 0x8b, 0x8d, 0xea, 0x15, 0x75, 0x5f, 0xb1, 0xb2, 0x40, 0x78, 0xce, 0xfe, 0x80, 0x52, 0x06, - 0x72, 0xb4, 0x25, 0x6e, 0x40, 0x4e, 0xec, 0x50, 0xe4, 0xeb, 0x12, 0xee, 0xae, 0x95, 0xd0, 0xa2, - 0x34, 0x94, 0xf6, 0x8e, 0x66, 0xd6, 0x6c, 0x28, 0x28, 0xb7, 0x27, 0xde, 0x0c, 0xdf, 0x87, 0x4d, - 0xe5, 0x2a, 0xd6, 0xdd, 0x7f, 0x4b, 0x14, 0xce, 0x92, 0x5e, 0xfb, 0x05, 0x01, 0xb4, 0x3c, 0xee, - 0x0d, 0x68, 0xc2, 0xc6, 0x04, 0xbf, 0x0f, 0xf9, 0x49, 0x10, 0x92, 0xc8, 0x7b, 0x46, 0x74, 0xb1, - 0xde, 0xd4, 0xb7, 0xbd, 0xe1, 0x9c, 0x2b, 0xb1, 0x09, 0xa5, 0x20, 0x0a, 0x83, 0x88, 0x0c, 0x47, - 0x0b, 0x4e, 0x62, 0x19, 0x78, 0x49, 0x93, 0x9f, 0xa7, 0x0c, 0x41, 0x2e, 0x2a, 0x82, 0x25, 0xf4, - 0xf8, 0x23, 0x28, 0x6b, 0x7e, 0xcc, 0x59, 0x10, 0x4d, 0xd7, 0xba, 0xd7, 0xde, 0x70, 0xb4, 0xc7, - 0x81, 0x24, 0x58, 0x18, 0x0a, 0xf1, 0x8c, 0x8c, 0x83, 0x49, 0x40, 0x18, 0xce, 0xfe, 0xf6, 0xfa, - 0x55, 0x1a, 0xd5, 0x7e, 0x45, 0xb0, 0xed, 0x32, 0x2f, 0x8a, 0x67, 0x94, 0xf1, 0x01, 0x1d, 0x3f, - 0x25, 0x1c, 0xef, 0x41, 0xe6, 0xca, 0x70, 0x1d, 0x09, 0xe3, 0x8f, 0x21, 0x37, 0xa6, 0xd1, 0x24, - 0x98, 0xbe, 0x65, 0x3c, 0xdb, 0x1b, 0x8e, 0x26, 0xe2, 0x4f, 0xa1, 0x24, 0xee, 0x91, 0x3f, 0xd4, - 0x86, 0x6a, 0xef, 0x77, 0xd6, 0x0c, 0x0f, 0xa3, 0x85, 0x48, 0x53, 0x72, 0x9b, 0x92, 0x6a, 0x95, - 0xa1, 0xa8, 0x8c, 0x86, 0x02, 0xad, 0xfd, 0x95, 0x82, 0x92, 0x0a, 0x53, 0x4f, 0xcb, 0x3e, 0x14, - 0x7d, 0x12, 0x8f, 0x59, 0x20, 0x9f, 0x7a, 0x8b, 0x56, 0x21, 0xbc, 0x03, 0xd9, 0x90, 0xcc, 0x49, - 0x28, 0xc3, 0x4d, 0x3b, 0xea, 0x21, 0x0e, 0x9d, 0x4c, 0x32, 0x2d, 0x41, 0x95, 0xd9, 0x1e, 0x14, - 0x82, 0x68, 0xb9, 0x2f, 0xe2, 0xcc, 0xa4, 0x45, 0x87, 0x82, 0x48, 0x6f, 0xcb, 0x1e, 0x14, 0x46, - 0xc9, 0x44, 0xab, 0xc5, 0x1d, 0x29, 0x09, 0xf5, 0x28, 0x99, 0x28, 0xf5, 0x17, 0x90, 0x8d, 0xb9, - 0xc7, 0x49, 0x45, 0xac, 0xc1, 0x56, 0xe3, 0x83, 0x2b, 0x06, 0x66, 0x35, 0x72, 0xfd, 0x18, 0x08, - 0x13, 0x6b, 0xe7, 0xcd, 0x0c, 0x4b, 0xe9, 0x3b, 0x39, 0xcd, 0xca, 0x5f, 0xed, 0x18, 0x8a, 0x2b, - 0x5c, 0x7c, 0x0d, 0xca, 0x03, 0xf7, 0xd0, 0xb5, 0x87, 0x7d, 0xc7, 0xb6, 0x3a, 0xdd, 0x96, 0xb1, - 0x81, 0xb7, 0xa1, 0xa8, 0x20, 0xab, 0x77, 0xda, 0x6d, 0x19, 0x08, 0x5f, 0x87, 0x6d, 0x05, 0x1c, - 0x77, 0x06, 0xae, 0xdd, 0xed, 0x74, 0x1f, 0x18, 0xa9, 0xdd, 0xcc, 0xf7, 0x3f, 0x55, 0x37, 0xac, - 0x2d, 0xbd, 0x97, 0xcb, 0x09, 0x78, 0x89, 0xa0, 0xa2, 0x4f, 0xc7, 0x11, 0xf3, 0xc6, 0x22, 0x34, - 0x2f, 0xec, 0xab, 0x1f, 0x07, 0xee, 0x5e, 0xbe, 0x22, 0x6a, 0x25, 0xf7, 0x74, 0x6e, 0xa2, 0x25, - 0xe6, 0x9a, 0xd5, 0x85, 0x8d, 0xbc, 0x78, 0x70, 0xee, 0x5c, 0x3c, 0x38, 0xea, 0xd7, 0xb0, 0x7a, - 0x65, 0x4c, 0x28, 0x35, 0x69, 0xc4, 0x19, 0x0d, 0xfb, 0xa1, 0x17, 0x11, 0x5c, 0x05, 0x08, 0x7c, - 0x12, 0x71, 0x39, 0xb4, 0xba, 0xbb, 0x2b, 0xc8, 0xdd, 0x03, 0xd8, 0x76, 0x68, 0xc2, 0x83, 0x68, - 0xda, 0x67, 0x01, 0x65, 0xe2, 0xe4, 0x17, 0x61, 0xb3, 0x65, 0x1f, 0x1d, 0x9e, 0x1e, 0xbb, 0xc6, - 0x06, 0xce, 0x43, 0xa6, 0xdd, 0x79, 0xd0, 0x36, 0xd0, 0xdd, 0x1f, 0x11, 0x94, 0x1d, 0xf2, 0x75, - 0x42, 0x62, 0x7e, 0x42, 0xf8, 0x13, 0xea, 0xe3, 0x1b, 0x80, 0x4f, 0x6c, 0xb7, 0xdd, 0x6b, 0x0d, - 0x4f, 0xbb, 0x83, 0xbe, 0xdd, 0xec, 0x1c, 0x75, 0x6c, 0x51, 0xcd, 0x4d, 0x48, 0x3f, 0xb0, 0x5d, - 0x03, 0x49, 0x63, 0xfb, 0xb0, 0x65, 0xa4, 0x84, 0xd4, 0xef, 0x0d, 0x5c, 0x23, 0x2d, 0x94, 0xfd, - 0x53, 0xd7, 0xc8, 0x60, 0x80, 0x5c, 0xcb, 0x3e, 0xb6, 0x5d, 0xdb, 0xc8, 0x8a, 0x4f, 0x36, 0x7b, - 0xdd, 0xae, 0xdd, 0x74, 0x8d, 0x9c, 0x78, 0xf4, 0xfa, 0x6e, 0xa7, 0xd7, 0x1d, 0x18, 0x9b, 0xb8, - 0x00, 0x59, 0xd7, 0x39, 0x6c, 0xda, 0x46, 0x5e, 0x88, 0xfd, 0x43, 0xb7, 0xd9, 0x36, 0x0a, 0xba, - 0x13, 0xed, 0x9f, 0xcf, 0xaa, 0xe8, 0xcf, 0xb3, 0x2a, 0xfa, 0xfb, 0xac, 0x8a, 0xfe, 0x39, 0xab, - 0xa2, 0x7f, 0xcf, 0xaa, 0x08, 0xee, 0x04, 0x54, 0x55, 0x77, 0xc6, 0xe8, 0xb7, 0x8b, 0xf5, 0x21, - 0xb2, 0x0a, 0x96, 0x17, 0x93, 0xbe, 0x58, 0x99, 0x3e, 0x7a, 0x9c, 0x11, 0xd0, 0x28, 0x27, 0x37, - 0xe8, 0xde, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x44, 0x71, 0x70, 0xb5, 0x08, 0x00, 0x00, + // 1270 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xcd, 0x6f, 0x1b, 0xc5, + 0x1b, 0xf6, 0xfa, 0xdb, 0xaf, 0xed, 0x64, 0x3b, 0xad, 0x5a, 0x37, 0xbf, 0xc6, 0x4d, 0xdd, 0xc3, + 0x2f, 0x2a, 0xc2, 0x06, 0x57, 0x85, 0x82, 0xc4, 0xc1, 0x6b, 0x6f, 0x6a, 0x8b, 0xc4, 0x76, 0xd7, + 0x9b, 0x0a, 0xf5, 0x62, 0xd6, 0xf6, 0xd8, 0x59, 0x75, 0xb3, 0xb3, 0xcc, 0xce, 0x9a, 0xba, 0xa7, + 0x8a, 0x13, 0xa2, 0x07, 0xfe, 0x00, 0x8e, 0x5c, 0x90, 0x10, 0x77, 0xc4, 0xa9, 0x12, 0x42, 0xe2, + 0xc8, 0x91, 0x23, 0xca, 0xad, 0xff, 0x05, 0x9a, 0x0f, 0xa7, 0x4e, 0x6c, 0xd1, 0xdb, 0xcc, 0xf3, + 0x3e, 0xcf, 0x3b, 0xef, 0xc7, 0xcc, 0x3b, 0x70, 0x0b, 0xfb, 0x73, 0xb2, 0xa8, 0x39, 0x81, 0x5b, + 0x9b, 0xd7, 0x6b, 0x63, 0x42, 0x71, 0x6d, 0xe4, 0x84, 0xb8, 0x1a, 0x50, 0xc2, 0x08, 0xba, 0x22, + 0xac, 0x55, 0x27, 0x70, 0xab, 0xf3, 0x7a, 0x95, 0x5b, 0x77, 0xf6, 0xd6, 0x05, 0x27, 0x8c, 0x05, + 0xc3, 0x88, 0xba, 0x52, 0xb4, 0x73, 0x73, 0x46, 0xc8, 0xcc, 0xc3, 0x35, 0xb1, 0x1b, 0x45, 0xd3, + 0x9a, 0xe3, 0x2f, 0x94, 0xe9, 0xd6, 0x65, 0x53, 0xc8, 0x68, 0x34, 0x66, 0xca, 0x5a, 0xbe, 0x6c, + 0xfd, 0x9a, 0x3a, 0x41, 0x80, 0x69, 0xa8, 0xec, 0x37, 0xe6, 0x8e, 0xe7, 0x4e, 0x1c, 0x86, 0x6b, + 0xcb, 0x85, 0x32, 0x5c, 0x9b, 0x91, 0x19, 0x11, 0xcb, 0x1a, 0x5f, 0x29, 0xb4, 0x24, 0x23, 0x65, + 0x8b, 0x00, 0xd7, 0x02, 0x4c, 0xc7, 0xd8, 0x57, 0x07, 0x55, 0x1e, 0x43, 0xf6, 0x90, 0x8c, 0x1d, + 0xcf, 0x65, 0x0b, 0x74, 0x1d, 0xd2, 0x14, 0xcf, 0x5c, 0xe2, 0x97, 0xb4, 0x3d, 0x6d, 0x3f, 0x67, + 0xa9, 0x1d, 0x42, 0x90, 0x7c, 0x41, 0x7c, 0x5c, 0x8a, 0x0b, 0x54, 0xac, 0xd1, 0x4d, 0xc8, 0x86, + 0xd1, 0x68, 0x28, 0xf0, 0x84, 0xc0, 0x33, 0x61, 0x34, 0x7a, 0x4a, 0x7c, 0x5c, 0xf9, 0x5d, 0x83, + 0x64, 0x97, 0x4c, 0x30, 0xda, 0x82, 0xb8, 0x3b, 0x51, 0xbe, 0xe2, 0xee, 0x04, 0x95, 0x20, 0x33, + 0xf6, 0xa2, 0x90, 0x61, 0xaa, 0x5c, 0x2d, 0xb7, 0xe8, 0x3e, 0x64, 0x4f, 0x31, 0x73, 0x26, 0x0e, + 0x73, 0x84, 0xb7, 0x7c, 0xfd, 0x46, 0x55, 0x56, 0xa0, 0xba, 0xac, 0x40, 0x75, 0x20, 0xea, 0x63, + 0x9d, 0x13, 0xd1, 0xc7, 0x90, 0xf5, 0x54, 0xe8, 0xa5, 0xa4, 0x10, 0xfd, 0xaf, 0xba, 0xd6, 0xa4, + 0xea, 0x32, 0x3b, 0xeb, 0x9c, 0x8c, 0xee, 0x42, 0x71, 0x14, 0xb9, 0xde, 0x64, 0x38, 0xc7, 0x34, + 0xe4, 0xe9, 0xa6, 0x44, 0x34, 0x05, 0x01, 0x3e, 0x91, 0x58, 0xe5, 0xb5, 0x06, 0xd9, 0xa3, 0xe5, + 0x51, 0x5f, 0xc0, 0xf6, 0xd4, 0xf5, 0x18, 0xa6, 0xc3, 0xf3, 0x30, 0xb5, 0xbd, 0xc4, 0x7e, 0xbe, + 0x5e, 0xdb, 0x70, 0xe2, 0x52, 0x55, 0x3d, 0x10, 0x92, 0xe5, 0xd6, 0xf4, 0x19, 0x5d, 0x58, 0x5b, + 0xd3, 0x0b, 0xe0, 0xce, 0x53, 0xb8, 0xba, 0x81, 0x86, 0x74, 0x48, 0x3c, 0xc3, 0x0b, 0x55, 0x3b, + 0xbe, 0x44, 0xef, 0x43, 0x6a, 0xee, 0x78, 0x91, 0xec, 0xc2, 0x7f, 0xd4, 0x47, 0xb2, 0x3e, 0x8d, + 0x3f, 0xd4, 0x2a, 0x5f, 0x42, 0xd1, 0x8a, 0x7c, 0xe6, 0x9e, 0xe2, 0xe3, 0x8e, 0xcf, 0xee, 0xd7, + 0x79, 0xe2, 0x13, 0x3c, 0x75, 0x22, 0x8f, 0x0d, 0xdf, 0xfa, 0x2a, 0x5a, 0x05, 0x05, 0x3e, 0xe1, + 0x18, 0xba, 0x07, 0x79, 0x2a, 0x55, 0x43, 0x1e, 0x82, 0x68, 0xae, 0x91, 0xfb, 0xed, 0xcd, 0xeb, + 0x44, 0x92, 0xc6, 0xf7, 0x34, 0x0b, 0x94, 0xf5, 0x73, 0xbc, 0xa8, 0x3c, 0x86, 0x7c, 0x1b, 0x3b, + 0x13, 0x4c, 0xa5, 0xf4, 0xf6, 0x4a, 0xd4, 0x46, 0x91, 0x4b, 0xb2, 0x34, 0xbd, 0xa7, 0xed, 0xbf, + 0x7c, 0xa9, 0xc9, 0x24, 0xee, 0xac, 0x26, 0x91, 0x33, 0xf2, 0x9c, 0x92, 0xa6, 0x49, 0x41, 0x90, + 0x96, 0xca, 0x2b, 0x0d, 0xae, 0xac, 0xf8, 0xec, 0x05, 0x8c, 0x5f, 0x41, 0x03, 0xd2, 0x27, 0x02, + 0x14, 0xce, 0xf3, 0xf5, 0xf2, 0x86, 0xba, 0xaf, 0xa8, 0x0c, 0xe0, 0x9e, 0x53, 0xdf, 0x69, 0x71, + 0x5d, 0xb3, 0x94, 0x12, 0xd5, 0x21, 0xcd, 0xdf, 0x90, 0x3f, 0x51, 0x25, 0xdc, 0x59, 0x2b, 0xa1, + 0x41, 0x88, 0x27, 0xf4, 0x96, 0x62, 0x56, 0x4c, 0xc8, 0x49, 0xb7, 0x47, 0x4e, 0x80, 0x1e, 0x42, + 0x46, 0xba, 0x0a, 0x55, 0xf7, 0xdf, 0x11, 0x85, 0xb5, 0xa4, 0x57, 0x7e, 0xd6, 0x00, 0x5a, 0x0e, + 0x73, 0x06, 0x24, 0xa2, 0x63, 0x8c, 0xfe, 0x0f, 0xd9, 0xa9, 0xeb, 0x61, 0xdf, 0x39, 0xc5, 0xaa, + 0x58, 0x6f, 0xeb, 0xdb, 0x8e, 0x59, 0xe7, 0x46, 0x54, 0x85, 0x82, 0xeb, 0x7b, 0xae, 0x8f, 0x87, + 0xa3, 0x05, 0xc3, 0xa1, 0x08, 0xbc, 0xa0, 0xc8, 0x2f, 0xe2, 0x3a, 0x27, 0xe7, 0x25, 0xc1, 0xe0, + 0x76, 0xf4, 0x01, 0x14, 0x15, 0x3f, 0x64, 0xd4, 0xf5, 0x67, 0x6b, 0xdd, 0x6b, 0xc7, 0x2c, 0xe5, + 0x71, 0x20, 0x08, 0x06, 0x82, 0x5c, 0x18, 0xe0, 0xb1, 0x3b, 0x75, 0x31, 0x45, 0xa9, 0x5f, 0xdf, + 0xbc, 0x4e, 0x68, 0x95, 0xe7, 0xa0, 0x5b, 0xf8, 0x94, 0x30, 0xbc, 0x12, 0x72, 0x03, 0xb2, 0xcb, + 0xd9, 0xa6, 0x5a, 0xb0, 0xb3, 0x29, 0x79, 0xc6, 0x82, 0x63, 0xea, 0x5e, 0x28, 0x7f, 0xe6, 0x44, + 0x82, 0xe8, 0x0e, 0xa4, 0xc3, 0x13, 0xa7, 0xfe, 0xe0, 0x23, 0xd5, 0xfd, 0x95, 0x3b, 0xa5, 0x0c, + 0x95, 0x1f, 0x34, 0xd8, 0x6e, 0x84, 0x0b, 0x7f, 0xbc, 0x72, 0xf2, 0x03, 0x48, 0x89, 0x97, 0xab, + 0x8e, 0xdd, 0xdd, 0x70, 0xec, 0x5b, 0x76, 0x3b, 0x66, 0x49, 0x36, 0xfa, 0x8c, 0x0f, 0x33, 0x9e, + 0x84, 0xea, 0xf6, 0xdd, 0x0d, 0xba, 0xcb, 0x59, 0xb6, 0x63, 0x96, 0x12, 0x6d, 0xac, 0xcb, 0x2f, + 0x1a, 0x6c, 0xdb, 0xd4, 0xf1, 0xc3, 0x80, 0x50, 0x36, 0x20, 0xe3, 0x67, 0x98, 0xa1, 0x5d, 0x48, + 0x6e, 0x6c, 0xa3, 0x25, 0x60, 0xf4, 0x21, 0xa4, 0xc7, 0xc4, 0x9f, 0xba, 0xb3, 0x77, 0x3c, 0x5b, + 0x7e, 0xb2, 0x24, 0xa2, 0x4f, 0xa0, 0xc0, 0xe7, 0xf4, 0x64, 0xa8, 0x84, 0x72, 0x1e, 0x5e, 0x5b, + 0x13, 0x36, 0xfc, 0x05, 0x6f, 0xbf, 0xe0, 0x36, 0x05, 0xd5, 0x28, 0x42, 0x5e, 0x8a, 0x86, 0x1c, + 0xad, 0xfc, 0x11, 0x87, 0x82, 0x0c, 0x53, 0xbd, 0xa2, 0x3d, 0xc8, 0x4f, 0x70, 0x38, 0xa6, 0xae, + 0xd8, 0xaa, 0xe9, 0xb2, 0x0a, 0xa1, 0x6b, 0x90, 0xf2, 0xf0, 0x1c, 0x7b, 0x22, 0xdc, 0x84, 0x25, + 0x37, 0xfc, 0x03, 0x10, 0x49, 0x26, 0x04, 0x28, 0x33, 0xdb, 0x85, 0x9c, 0xeb, 0x2f, 0xe7, 0x08, + 0x1f, 0xbf, 0x09, 0x7e, 0x73, 0x5d, 0x5f, 0x4d, 0x91, 0x5d, 0xc8, 0x8d, 0xa2, 0xa9, 0x32, 0xf3, + 0xf9, 0x5a, 0xe0, 0xe6, 0x51, 0x34, 0x95, 0xe6, 0x23, 0x48, 0x85, 0xcc, 0x61, 0xb8, 0xc4, 0xc7, + 0xc3, 0x56, 0xfd, 0xbd, 0x0d, 0xcd, 0x59, 0x8d, 0x5c, 0x6d, 0x06, 0x5c, 0xa2, 0x2e, 0xd7, 0x37, + 0xe2, 0x72, 0x49, 0x2f, 0x95, 0x43, 0xc8, 0xaf, 0x30, 0xd0, 0x15, 0x28, 0x0e, 0xec, 0x86, 0x6d, + 0x0e, 0xfb, 0x96, 0x69, 0x74, 0xba, 0x2d, 0x3d, 0x86, 0xb6, 0x21, 0x2f, 0x21, 0xa3, 0x77, 0xdc, + 0x6d, 0xe9, 0x1a, 0xba, 0x0a, 0xdb, 0x12, 0x38, 0xec, 0x0c, 0x6c, 0xb3, 0xdb, 0xe9, 0x3e, 0xd2, + 0xe3, 0x3b, 0xc9, 0x6f, 0x7f, 0x2c, 0xc7, 0x8c, 0x2d, 0x35, 0xa5, 0x96, 0x7d, 0x7f, 0xa5, 0x41, + 0x49, 0x0d, 0xd2, 0x03, 0xea, 0x8c, 0x79, 0x40, 0x8e, 0xd7, 0x97, 0xdf, 0x28, 0xea, 0x5e, 0x9e, + 0xa9, 0x17, 0xaf, 0x29, 0x6f, 0x44, 0x75, 0x4d, 0x75, 0xe1, 0x81, 0x5c, 0x1c, 0xbf, 0xb7, 0x2f, + 0x8e, 0x5f, 0xf9, 0x51, 0xae, 0xce, 0xdc, 0x2a, 0x14, 0x9a, 0xc4, 0x67, 0x94, 0x78, 0x7d, 0xcf, + 0xf1, 0x31, 0x2a, 0x03, 0xb8, 0x13, 0xec, 0x33, 0x71, 0x55, 0x55, 0x4f, 0x57, 0x90, 0x7b, 0xfb, + 0xb0, 0x6d, 0x91, 0x88, 0xb9, 0xfe, 0xac, 0x4f, 0x5d, 0x42, 0xf9, 0x07, 0x98, 0x87, 0x4c, 0xcb, + 0x3c, 0x68, 0x1c, 0x1f, 0xda, 0x7a, 0x0c, 0x65, 0x21, 0xd9, 0xee, 0x3c, 0x6a, 0xeb, 0xda, 0xbd, + 0xef, 0x35, 0x28, 0x5a, 0xf8, 0xab, 0x08, 0x87, 0xec, 0x08, 0xb3, 0x13, 0x32, 0x41, 0xd7, 0x01, + 0x1d, 0x99, 0x76, 0xbb, 0xd7, 0x1a, 0x1e, 0x77, 0x07, 0x7d, 0xb3, 0xd9, 0x39, 0xe8, 0x98, 0xbc, + 0x9a, 0x19, 0x48, 0x3c, 0x32, 0x6d, 0x5d, 0x13, 0x62, 0xb3, 0xd1, 0xd2, 0xe3, 0x7c, 0xd5, 0xef, + 0x0d, 0x6c, 0x3d, 0xc1, 0x8d, 0xfd, 0x63, 0x5b, 0x4f, 0x22, 0x80, 0x74, 0xcb, 0x3c, 0x34, 0x6d, + 0x53, 0x4f, 0xf1, 0x23, 0x9b, 0xbd, 0x6e, 0xd7, 0x6c, 0xda, 0x7a, 0x9a, 0x6f, 0x7a, 0x7d, 0xbb, + 0xd3, 0xeb, 0x0e, 0xf4, 0x0c, 0xca, 0x41, 0xca, 0xb6, 0x1a, 0x4d, 0x53, 0xcf, 0xf2, 0x65, 0xbf, + 0x61, 0x37, 0xdb, 0x7a, 0x4e, 0x75, 0xa2, 0xfd, 0xd3, 0x59, 0x59, 0xfb, 0xf3, 0xac, 0xac, 0xfd, + 0x75, 0x56, 0xd6, 0xfe, 0x3e, 0x2b, 0x6b, 0xff, 0x9c, 0x95, 0x35, 0xb8, 0xed, 0x12, 0x59, 0xdd, + 0x80, 0x92, 0xe7, 0x8b, 0xf5, 0xab, 0x63, 0xe4, 0x0c, 0x27, 0xc4, 0x7d, 0xfe, 0x50, 0xfa, 0xda, + 0xd3, 0x24, 0x87, 0x46, 0x69, 0xf1, 0x6e, 0xee, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x6c, + 0x50, 0xc9, 0xe5, 0x09, 0x00, 0x00, } func (this *Locality) Equal(that interface{}) bool { @@ -1644,6 +1857,117 @@ func (this *DataSource_InlineString) Equal(that interface{}) bool { } return true } +func (this *RemoteDataSource) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*RemoteDataSource) + if !ok { + that2, ok := that.(RemoteDataSource) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if !this.HttpUri.Equal(that1.HttpUri) { + return false + } + if this.Sha256 != that1.Sha256 { + return false + } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } + return true +} +func (this *AsyncDataSource) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*AsyncDataSource) + if !ok { + that2, ok := that.(AsyncDataSource) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if that1.Specifier == nil { + if this.Specifier != nil { + return false + } + } else if this.Specifier == nil { + return false + } else if !this.Specifier.Equal(that1.Specifier) { + return false + } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } + return true +} +func (this *AsyncDataSource_Local) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*AsyncDataSource_Local) + if !ok { + that2, ok := that.(AsyncDataSource_Local) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if !this.Local.Equal(that1.Local) { + return false + } + return true +} +func (this *AsyncDataSource_Remote) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*AsyncDataSource_Remote) + if !ok { + that2, ok := that.(AsyncDataSource_Remote) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if !this.Remote.Equal(that1.Remote) { + return false + } + return true +} func (this *TransportSocket) Equal(that interface{}) bool { if that == nil { return this == nil @@ -2223,7 +2547,7 @@ func (m *DataSource_InlineString) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], m.InlineString) return i, nil } -func (m *TransportSocket) Marshal() (dAtA []byte, err error) { +func (m *RemoteDataSource) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -2233,23 +2557,26 @@ func (m *TransportSocket) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransportSocket) MarshalTo(dAtA []byte) (int, error) { +func (m *RemoteDataSource) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int _ = l - if len(m.Name) > 0 { + if m.HttpUri != nil { dAtA[i] = 0xa i++ - i = encodeVarintBase(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } - if m.ConfigType != nil { - nn7, err := m.ConfigType.MarshalTo(dAtA[i:]) + i = encodeVarintBase(dAtA, i, uint64(m.HttpUri.Size())) + n7, err := m.HttpUri.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += nn7 + i += n7 + } + if len(m.Sha256) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintBase(dAtA, i, uint64(len(m.Sha256))) + i += copy(dAtA[i:], m.Sha256) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -2257,19 +2584,109 @@ func (m *TransportSocket) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *TransportSocket_Config) MarshalTo(dAtA []byte) (int, error) { - i := 0 - if m.Config != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintBase(dAtA, i, uint64(m.Config.Size())) - n8, err := m.Config.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n8 +func (m *AsyncDataSource) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err } - return i, nil + return dAtA[:n], nil +} + +func (m *AsyncDataSource) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Specifier != nil { + nn8, err := m.Specifier.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += nn8 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *AsyncDataSource_Local) MarshalTo(dAtA []byte) (int, error) { + i := 0 + if m.Local != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Local.Size())) + n9, err := m.Local.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n9 + } + return i, nil +} +func (m *AsyncDataSource_Remote) MarshalTo(dAtA []byte) (int, error) { + i := 0 + if m.Remote != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Remote.Size())) + n10, err := m.Remote.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n10 + } + return i, nil +} +func (m *TransportSocket) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TransportSocket) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Name) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintBase(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) + } + if m.ConfigType != nil { + nn11, err := m.ConfigType.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += nn11 + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + +func (m *TransportSocket_Config) MarshalTo(dAtA []byte) (int, error) { + i := 0 + if m.Config != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintBase(dAtA, i, uint64(m.Config.Size())) + n12, err := m.Config.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n12 + } + return i, nil } func (m *TransportSocket_TypedConfig) MarshalTo(dAtA []byte) (int, error) { i := 0 @@ -2277,11 +2694,11 @@ func (m *TransportSocket_TypedConfig) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintBase(dAtA, i, uint64(m.TypedConfig.Size())) - n9, err := m.TypedConfig.MarshalTo(dAtA[i:]) + n13, err := m.TypedConfig.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n9 + i += n13 } return i, nil } @@ -2317,11 +2734,11 @@ func (m *SocketOption) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintBase(dAtA, i, uint64(m.Name)) } if m.Value != nil { - nn10, err := m.Value.MarshalTo(dAtA[i:]) + nn14, err := m.Value.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += nn10 + i += nn14 } if m.State != 0 { dAtA[i] = 0x30 @@ -2370,11 +2787,11 @@ func (m *RuntimeFractionalPercent) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintBase(dAtA, i, uint64(m.DefaultValue.Size())) - n11, err := m.DefaultValue.MarshalTo(dAtA[i:]) + n15, err := m.DefaultValue.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n11 + i += n15 } if len(m.RuntimeKey) > 0 { dAtA[i] = 0x12 @@ -2629,6 +3046,65 @@ func (m *DataSource_InlineString) Size() (n int) { n += 1 + l + sovBase(uint64(l)) return n } +func (m *RemoteDataSource) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.HttpUri != nil { + l = m.HttpUri.Size() + n += 1 + l + sovBase(uint64(l)) + } + l = len(m.Sha256) + if l > 0 { + n += 1 + l + sovBase(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *AsyncDataSource) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Specifier != nil { + n += m.Specifier.Size() + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *AsyncDataSource_Local) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Local != nil { + l = m.Local.Size() + n += 1 + l + sovBase(uint64(l)) + } + return n +} +func (m *AsyncDataSource_Remote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Remote != nil { + l = m.Remote.Size() + n += 1 + l + sovBase(uint64(l)) + } + return n +} func (m *TransportSocket) Size() (n int) { if m == nil { return 0 @@ -3913,6 +4389,252 @@ func (m *DataSource) Unmarshal(dAtA []byte) error { } return nil } +func (m *RemoteDataSource) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBase + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RemoteDataSource: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RemoteDataSource: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HttpUri", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBase + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthBase + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthBase + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.HttpUri == nil { + m.HttpUri = &HttpUri{} + } + if err := m.HttpUri.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sha256", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBase + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthBase + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthBase + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sha256 = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipBase(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthBase + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthBase + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *AsyncDataSource) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBase + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: AsyncDataSource: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AsyncDataSource: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Local", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBase + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthBase + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthBase + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &DataSource{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Specifier = &AsyncDataSource_Local{v} + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Remote", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBase + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthBase + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthBase + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &RemoteDataSource{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Specifier = &AsyncDataSource_Remote{v} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipBase(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthBase + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthBase + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *TransportSocket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go index 3aac8b4bce28..a94baf985ca3 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/base.pb.validate.go @@ -114,32 +114,22 @@ func (m *Node) Validate() error { // no validation rules for Cluster - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return NodeValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return NodeValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLocality() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return NodeValidationError{ - field: "Locality", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return NodeValidationError{ + field: "Locality", + reason: "embedded message failed validation", + cause: err, } } } @@ -437,32 +427,22 @@ func (m *HeaderValueOption) Validate() error { } } - { - tmp := m.GetHeader() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HeaderValueOptionValidationError{ - field: "Header", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HeaderValueOptionValidationError{ + field: "Header", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetAppend() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HeaderValueOptionValidationError{ - field: "Append", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAppend()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HeaderValueOptionValidationError{ + field: "Append", + reason: "embedded message failed validation", + cause: err, } } } @@ -536,17 +516,12 @@ func (m *HeaderMap) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HeaderMapValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HeaderMapValidationError{ + field: fmt.Sprintf("Headers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -711,6 +686,194 @@ var _ interface { ErrorName() string } = DataSourceValidationError{} +// Validate checks the field values on RemoteDataSource with the rules defined +// in the proto definition for this message. If any rules are violated, an +// error is returned. +func (m *RemoteDataSource) Validate() error { + if m == nil { + return nil + } + + if m.GetHttpUri() == nil { + return RemoteDataSourceValidationError{ + field: "HttpUri", + reason: "value is required", + } + } + + if v, ok := interface{}(m.GetHttpUri()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RemoteDataSourceValidationError{ + field: "HttpUri", + reason: "embedded message failed validation", + cause: err, + } + } + } + + if len(m.GetSha256()) < 1 { + return RemoteDataSourceValidationError{ + field: "Sha256", + reason: "value length must be at least 1 bytes", + } + } + + return nil +} + +// RemoteDataSourceValidationError is the validation error returned by +// RemoteDataSource.Validate if the designated constraints aren't met. +type RemoteDataSourceValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e RemoteDataSourceValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e RemoteDataSourceValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e RemoteDataSourceValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e RemoteDataSourceValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e RemoteDataSourceValidationError) ErrorName() string { return "RemoteDataSourceValidationError" } + +// Error satisfies the builtin error interface +func (e RemoteDataSourceValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sRemoteDataSource.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = RemoteDataSourceValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = RemoteDataSourceValidationError{} + +// Validate checks the field values on AsyncDataSource with the rules defined +// in the proto definition for this message. If any rules are violated, an +// error is returned. +func (m *AsyncDataSource) Validate() error { + if m == nil { + return nil + } + + switch m.Specifier.(type) { + + case *AsyncDataSource_Local: + + if v, ok := interface{}(m.GetLocal()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AsyncDataSourceValidationError{ + field: "Local", + reason: "embedded message failed validation", + cause: err, + } + } + } + + case *AsyncDataSource_Remote: + + if v, ok := interface{}(m.GetRemote()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AsyncDataSourceValidationError{ + field: "Remote", + reason: "embedded message failed validation", + cause: err, + } + } + } + + default: + return AsyncDataSourceValidationError{ + field: "Specifier", + reason: "value is required", + } + + } + + return nil +} + +// AsyncDataSourceValidationError is the validation error returned by +// AsyncDataSource.Validate if the designated constraints aren't met. +type AsyncDataSourceValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e AsyncDataSourceValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e AsyncDataSourceValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e AsyncDataSourceValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e AsyncDataSourceValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e AsyncDataSourceValidationError) ErrorName() string { return "AsyncDataSourceValidationError" } + +// Error satisfies the builtin error interface +func (e AsyncDataSourceValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sAsyncDataSource.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = AsyncDataSourceValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = AsyncDataSourceValidationError{} + // Validate checks the field values on TransportSocket with the rules defined // in the proto definition for this message. If any rules are violated, an // error is returned. @@ -730,34 +893,24 @@ func (m *TransportSocket) Validate() error { case *TransportSocket_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TransportSocketValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TransportSocketValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *TransportSocket_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TransportSocketValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TransportSocketValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -930,17 +1083,12 @@ func (m *RuntimeFractionalPercent) Validate() error { } } - { - tmp := m.GetDefaultValue() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeFractionalPercentValidationError{ - field: "DefaultValue", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDefaultValue()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeFractionalPercentValidationError{ + field: "DefaultValue", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go index 569a0d99dd6f..da6841f1ed09 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.go @@ -6,15 +6,14 @@ package core import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - time "time" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -290,14 +289,13 @@ type ConfigSource struct { // *ConfigSource_ApiConfigSource // *ConfigSource_Ads ConfigSourceSpecifier isConfigSource_ConfigSourceSpecifier `protobuf_oneof:"config_source_specifier"` - // Optional initialization timeout. // When this timeout is specified, Envoy will wait no longer than the specified time for first // config response on this xDS subscription during the :ref:`initialization process // `. After reaching the timeout, Envoy will move to the next // initialization phase, even if the first config is not delivered yet. The timer is activated // when the xDS API subscription starts, and is disarmed on first config update or on error. 0 // means no timeout - Envoy will wait indefinitely for the first xDS config (unless another - // timeout applies). Default 0. + // timeout applies). The default is 15s. InitialFetchTimeout *types.Duration `protobuf:"bytes,4,opt,name=initial_fetch_timeout,json=initialFetchTimeout,proto3" json:"initial_fetch_timeout,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go index 30aca65c3521..83c35e25cc29 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/config_source.pb.validate.go @@ -51,34 +51,24 @@ func (m *ApiConfigSource) Validate() error { for idx, item := range m.GetGrpcServices() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ApiConfigSourceValidationError{ - field: fmt.Sprintf("GrpcServices[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ApiConfigSourceValidationError{ + field: fmt.Sprintf("GrpcServices[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetRefreshDelay() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ApiConfigSourceValidationError{ - field: "RefreshDelay", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRefreshDelay()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ApiConfigSourceValidationError{ + field: "RefreshDelay", + reason: "embedded message failed validation", + cause: err, } } } @@ -97,17 +87,12 @@ func (m *ApiConfigSource) Validate() error { } - { - tmp := m.GetRateLimitSettings() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ApiConfigSourceValidationError{ - field: "RateLimitSettings", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRateLimitSettings()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ApiConfigSourceValidationError{ + field: "RateLimitSettings", + reason: "embedded message failed validation", + cause: err, } } } @@ -244,17 +229,12 @@ func (m *RateLimitSettings) Validate() error { return nil } - { - tmp := m.GetMaxTokens() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimitSettingsValidationError{ - field: "MaxTokens", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxTokens()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimitSettingsValidationError{ + field: "MaxTokens", + reason: "embedded message failed validation", + cause: err, } } } @@ -337,17 +317,12 @@ func (m *ConfigSource) Validate() error { return nil } - { - tmp := m.GetInitialFetchTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ConfigSourceValidationError{ - field: "InitialFetchTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetInitialFetchTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ConfigSourceValidationError{ + field: "InitialFetchTimeout", + reason: "embedded message failed validation", + cause: err, } } } @@ -359,34 +334,24 @@ func (m *ConfigSource) Validate() error { case *ConfigSource_ApiConfigSource: - { - tmp := m.GetApiConfigSource() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ConfigSourceValidationError{ - field: "ApiConfigSource", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetApiConfigSource()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ConfigSourceValidationError{ + field: "ApiConfigSource", + reason: "embedded message failed validation", + cause: err, } } } case *ConfigSource_Ads: - { - tmp := m.GetAds() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ConfigSourceValidationError{ - field: "Ads", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAds()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ConfigSourceValidationError{ + field: "Ads", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go index 6abd162621bb..ad23aebac962 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.go @@ -6,13 +6,12 @@ package core import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go index 0cc81cb2db65..1d22887d1329 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/grpc_service.pb.validate.go @@ -41,17 +41,12 @@ func (m *GrpcService) Validate() error { return nil } - { - tmp := m.GetTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcServiceValidationError{ - field: "Timeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcServiceValidationError{ + field: "Timeout", + reason: "embedded message failed validation", + cause: err, } } } @@ -59,17 +54,12 @@ func (m *GrpcService) Validate() error { for idx, item := range m.GetInitialMetadata() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcServiceValidationError{ - field: fmt.Sprintf("InitialMetadata[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcServiceValidationError{ + field: fmt.Sprintf("InitialMetadata[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -80,34 +70,24 @@ func (m *GrpcService) Validate() error { case *GrpcService_EnvoyGrpc_: - { - tmp := m.GetEnvoyGrpc() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcServiceValidationError{ - field: "EnvoyGrpc", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEnvoyGrpc()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcServiceValidationError{ + field: "EnvoyGrpc", + reason: "embedded message failed validation", + cause: err, } } } case *GrpcService_GoogleGrpc_: - { - tmp := m.GetGoogleGrpc() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcServiceValidationError{ - field: "GoogleGrpc", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGoogleGrpc()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcServiceValidationError{ + field: "GoogleGrpc", + reason: "embedded message failed validation", + cause: err, } } } @@ -266,17 +246,12 @@ func (m *GrpcService_GoogleGrpc) Validate() error { } } - { - tmp := m.GetChannelCredentials() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpcValidationError{ - field: "ChannelCredentials", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetChannelCredentials()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpcValidationError{ + field: "ChannelCredentials", + reason: "embedded message failed validation", + cause: err, } } } @@ -284,17 +259,12 @@ func (m *GrpcService_GoogleGrpc) Validate() error { for idx, item := range m.GetCallCredentials() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpcValidationError{ - field: fmt.Sprintf("CallCredentials[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpcValidationError{ + field: fmt.Sprintf("CallCredentials[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -310,17 +280,12 @@ func (m *GrpcService_GoogleGrpc) Validate() error { // no validation rules for CredentialsFactoryName - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpcValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpcValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } @@ -392,47 +357,32 @@ func (m *GrpcService_GoogleGrpc_SslCredentials) Validate() error { return nil } - { - tmp := m.GetRootCerts() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_SslCredentialsValidationError{ - field: "RootCerts", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRootCerts()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_SslCredentialsValidationError{ + field: "RootCerts", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetPrivateKey() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_SslCredentialsValidationError{ - field: "PrivateKey", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPrivateKey()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_SslCredentialsValidationError{ + field: "PrivateKey", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCertChain() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_SslCredentialsValidationError{ - field: "CertChain", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCertChain()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_SslCredentialsValidationError{ + field: "CertChain", + reason: "embedded message failed validation", + cause: err, } } } @@ -578,51 +528,36 @@ func (m *GrpcService_GoogleGrpc_ChannelCredentials) Validate() error { case *GrpcService_GoogleGrpc_ChannelCredentials_SslCredentials: - { - tmp := m.GetSslCredentials() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ - field: "SslCredentials", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSslCredentials()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ + field: "SslCredentials", + reason: "embedded message failed validation", + cause: err, } } } case *GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault: - { - tmp := m.GetGoogleDefault() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ - field: "GoogleDefault", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGoogleDefault()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ + field: "GoogleDefault", + reason: "embedded message failed validation", + cause: err, } } } case *GrpcService_GoogleGrpc_ChannelCredentials_LocalCredentials: - { - tmp := m.GetLocalCredentials() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ - field: "LocalCredentials", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalCredentials()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_ChannelCredentialsValidationError{ + field: "LocalCredentials", + reason: "embedded message failed validation", + cause: err, } } } @@ -710,17 +645,12 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Validate() error { case *GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine: - { - tmp := m.GetGoogleComputeEngine() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_CallCredentialsValidationError{ - field: "GoogleComputeEngine", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGoogleComputeEngine()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_CallCredentialsValidationError{ + field: "GoogleComputeEngine", + reason: "embedded message failed validation", + cause: err, } } } @@ -730,51 +660,36 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Validate() error { case *GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJwtAccess: - { - tmp := m.GetServiceAccountJwtAccess() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_CallCredentialsValidationError{ - field: "ServiceAccountJwtAccess", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetServiceAccountJwtAccess()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_CallCredentialsValidationError{ + field: "ServiceAccountJwtAccess", + reason: "embedded message failed validation", + cause: err, } } } case *GrpcService_GoogleGrpc_CallCredentials_GoogleIam: - { - tmp := m.GetGoogleIam() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_CallCredentialsValidationError{ - field: "GoogleIam", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGoogleIam()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_CallCredentialsValidationError{ + field: "GoogleIam", + reason: "embedded message failed validation", + cause: err, } } } case *GrpcService_GoogleGrpc_CallCredentials_FromPlugin: - { - tmp := m.GetFromPlugin() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_CallCredentialsValidationError{ - field: "FromPlugin", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFromPlugin()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_CallCredentialsValidationError{ + field: "FromPlugin", + reason: "embedded message failed validation", + cause: err, } } } @@ -1026,34 +941,24 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) V case *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPluginValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPluginValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPluginValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPluginValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go index dbdde99a1d14..011bdd1f8789 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.go @@ -6,17 +6,15 @@ package core import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - time "time" - + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" - - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go index e1006edfb098..d0012113c0b8 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/health_check.pb.validate.go @@ -83,94 +83,64 @@ func (m *HealthCheck) Validate() error { } - { - tmp := m.GetInitialJitter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "InitialJitter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetInitialJitter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "InitialJitter", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetIntervalJitter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "IntervalJitter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetIntervalJitter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "IntervalJitter", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for IntervalJitterPercent - { - tmp := m.GetUnhealthyThreshold() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "UnhealthyThreshold", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUnhealthyThreshold()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "UnhealthyThreshold", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHealthyThreshold() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "HealthyThreshold", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHealthyThreshold()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "HealthyThreshold", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetAltPort() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "AltPort", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAltPort()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "AltPort", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetReuseConnection() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "ReuseConnection", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetReuseConnection()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "ReuseConnection", + reason: "embedded message failed validation", + cause: err, } } } @@ -267,68 +237,48 @@ func (m *HealthCheck) Validate() error { case *HealthCheck_HttpHealthCheck_: - { - tmp := m.GetHttpHealthCheck() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "HttpHealthCheck", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpHealthCheck()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "HttpHealthCheck", + reason: "embedded message failed validation", + cause: err, } } } case *HealthCheck_TcpHealthCheck_: - { - tmp := m.GetTcpHealthCheck() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "TcpHealthCheck", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTcpHealthCheck()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "TcpHealthCheck", + reason: "embedded message failed validation", + cause: err, } } } case *HealthCheck_GrpcHealthCheck_: - { - tmp := m.GetGrpcHealthCheck() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "GrpcHealthCheck", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcHealthCheck()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "GrpcHealthCheck", + reason: "embedded message failed validation", + cause: err, } } } case *HealthCheck_CustomHealthCheck_: - { - tmp := m.GetCustomHealthCheck() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "CustomHealthCheck", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCustomHealthCheck()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "CustomHealthCheck", + reason: "embedded message failed validation", + cause: err, } } } @@ -504,32 +454,22 @@ func (m *HealthCheck_HttpHealthCheck) Validate() error { } } - { - tmp := m.GetSend() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_HttpHealthCheckValidationError{ - field: "Send", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSend()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_HttpHealthCheckValidationError{ + field: "Send", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetReceive() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_HttpHealthCheckValidationError{ - field: "Receive", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetReceive()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_HttpHealthCheckValidationError{ + field: "Receive", + reason: "embedded message failed validation", + cause: err, } } } @@ -546,17 +486,12 @@ func (m *HealthCheck_HttpHealthCheck) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_HttpHealthCheckValidationError{ - field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_HttpHealthCheckValidationError{ + field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -568,17 +503,12 @@ func (m *HealthCheck_HttpHealthCheck) Validate() error { for idx, item := range m.GetExpectedStatuses() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_HttpHealthCheckValidationError{ - field: fmt.Sprintf("ExpectedStatuses[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_HttpHealthCheckValidationError{ + field: fmt.Sprintf("ExpectedStatuses[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -653,17 +583,12 @@ func (m *HealthCheck_TcpHealthCheck) Validate() error { return nil } - { - tmp := m.GetSend() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_TcpHealthCheckValidationError{ - field: "Send", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSend()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_TcpHealthCheckValidationError{ + field: "Send", + reason: "embedded message failed validation", + cause: err, } } } @@ -671,17 +596,12 @@ func (m *HealthCheck_TcpHealthCheck) Validate() error { for idx, item := range m.GetReceive() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_TcpHealthCheckValidationError{ - field: fmt.Sprintf("Receive[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_TcpHealthCheckValidationError{ + field: fmt.Sprintf("Receive[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -908,34 +828,24 @@ func (m *HealthCheck_CustomHealthCheck) Validate() error { case *HealthCheck_CustomHealthCheck_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_CustomHealthCheckValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_CustomHealthCheckValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *HealthCheck_CustomHealthCheck_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheck_CustomHealthCheckValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheck_CustomHealthCheckValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go index cca79f93d04c..b5b07b43df45 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/http_uri.pb.go @@ -4,16 +4,16 @@ package core import ( + bytes "bytes" fmt "fmt" - io "io" - math "math" - time "time" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -89,6 +89,7 @@ var xxx_messageInfo_HttpUri proto.InternalMessageInfo type isHttpUri_HttpUpstreamType interface { isHttpUri_HttpUpstreamType() + Equal(interface{}) bool MarshalTo([]byte) (int, error) Size() int } @@ -185,28 +186,97 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/core/http_uri.proto", fileDescriptor_1660b946db74c078) } var fileDescriptor_1660b946db74c078 = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xb1, 0x4a, 0x33, 0x41, - 0x10, 0xc7, 0x33, 0xb9, 0x2f, 0x5f, 0xcc, 0x6a, 0xe3, 0x22, 0x78, 0x26, 0x70, 0x39, 0x04, 0x21, - 0xd5, 0x2e, 0x9c, 0xb5, 0xcd, 0x61, 0x91, 0x46, 0x08, 0x01, 0xeb, 0xb0, 0x49, 0xd6, 0x73, 0x21, - 0xc9, 0x2c, 0x9b, 0xd9, 0xc3, 0xbc, 0x89, 0xcf, 0xe0, 0x13, 0xa8, 0x55, 0x4a, 0x4b, 0xdf, 0x40, - 0x49, 0x97, 0xb7, 0x90, 0xbb, 0xcb, 0x35, 0xda, 0xfd, 0x99, 0xf9, 0xed, 0xf0, 0xdb, 0x3f, 0x8b, - 0xf5, 0x2a, 0xc7, 0x8d, 0x54, 0xd6, 0xc8, 0x3c, 0x91, 0x33, 0x74, 0x5a, 0x3e, 0x12, 0xd9, 0x89, - 0x77, 0x46, 0x58, 0x87, 0x84, 0xfc, 0xb4, 0x24, 0x84, 0xb2, 0x46, 0xe4, 0x89, 0x28, 0x88, 0x6e, - 0x94, 0x21, 0x66, 0x0b, 0x2d, 0x4b, 0x60, 0xea, 0x1f, 0xe4, 0xdc, 0x3b, 0x45, 0x06, 0x57, 0xd5, - 0x93, 0xee, 0x59, 0x86, 0x19, 0x96, 0x51, 0x16, 0xe9, 0x30, 0x3d, 0xcf, 0xd5, 0xc2, 0xcc, 0x15, - 0x69, 0x59, 0x87, 0x6a, 0x71, 0xf9, 0x06, 0xac, 0x3d, 0x24, 0xb2, 0xf7, 0xce, 0xf0, 0x1e, 0x0b, - 0xbc, 0x33, 0x21, 0xc4, 0x30, 0xe8, 0xa4, 0x9d, 0xf7, 0xfd, 0x36, 0xf8, 0xe7, 0x9a, 0x31, 0x8c, - 0x8b, 0x29, 0xbf, 0x62, 0xed, 0xd9, 0xc2, 0xaf, 0x49, 0xbb, 0xb0, 0xf9, 0x0b, 0x18, 0x36, 0xc6, - 0xf5, 0x8e, 0xdf, 0xb1, 0x36, 0x99, 0xa5, 0x46, 0x4f, 0x61, 0x10, 0xc3, 0xe0, 0x38, 0xb9, 0x10, - 0x95, 0xb0, 0xa8, 0x85, 0xc5, 0xed, 0x41, 0x38, 0x0d, 0x9f, 0xbf, 0xfa, 0x50, 0x5c, 0x69, 0xbd, - 0x40, 0x33, 0x69, 0xd4, 0xe9, 0x08, 0xc6, 0xf5, 0x8d, 0xb4, 0xc7, 0x78, 0x55, 0x89, 0x5d, 0x93, - 0xd3, 0x6a, 0x39, 0xa1, 0x8d, 0xd5, 0xbc, 0xf5, 0xba, 0xdf, 0x06, 0x90, 0xde, 0x7c, 0xec, 0x22, - 0xf8, 0xdc, 0x45, 0xf0, 0xbd, 0x8b, 0x80, 0xf5, 0x0d, 0x8a, 0xb2, 0x2e, 0xeb, 0xf0, 0x69, 0x23, - 0xfe, 0x34, 0x97, 0x9e, 0x1c, 0xfe, 0x39, 0x2a, 0x44, 0x46, 0x30, 0xfd, 0x5f, 0x1a, 0x5d, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x3f, 0x9d, 0x68, 0x87, 0x01, 0x00, 0x00, + // 303 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x41, 0x4a, 0xc3, 0x40, + 0x14, 0x86, 0xfb, 0x1a, 0x6b, 0xed, 0xe8, 0xc6, 0x20, 0x18, 0x5b, 0x48, 0x83, 0x20, 0x74, 0x35, + 0x03, 0xf1, 0x04, 0x06, 0x17, 0xdd, 0x08, 0xa5, 0xe0, 0xba, 0x4c, 0xdb, 0x31, 0x0e, 0xb4, 0x7d, + 0xc3, 0xf4, 0x4d, 0xb0, 0x37, 0xf1, 0x08, 0xe2, 0x09, 0xd4, 0x55, 0x97, 0x2e, 0xbd, 0x81, 0x92, + 0x5d, 0x6f, 0x21, 0x49, 0x9a, 0x8d, 0xee, 0x7e, 0xde, 0xfb, 0xe6, 0xf1, 0xcd, 0xcf, 0x22, 0xb5, + 0xca, 0x70, 0x23, 0xa4, 0xd1, 0x22, 0x8b, 0xc5, 0x0c, 0xad, 0x12, 0x8f, 0x44, 0x66, 0xe2, 0xac, + 0xe6, 0xc6, 0x22, 0xa1, 0x7f, 0x5a, 0x12, 0x5c, 0x1a, 0xcd, 0xb3, 0x98, 0x17, 0x44, 0x37, 0x4c, + 0x11, 0xd3, 0x85, 0x12, 0x25, 0x30, 0x75, 0x0f, 0x62, 0xee, 0xac, 0x24, 0x8d, 0xab, 0xea, 0x49, + 0xf7, 0x2c, 0xc5, 0x14, 0xcb, 0x28, 0x8a, 0xb4, 0x9f, 0x9e, 0x67, 0x72, 0xa1, 0xe7, 0x92, 0x94, + 0xa8, 0x43, 0xb5, 0xb8, 0x7c, 0x07, 0xd6, 0x1e, 0x12, 0x99, 0x7b, 0xab, 0xfd, 0x1e, 0xf3, 0x9c, + 0xd5, 0x01, 0x44, 0x30, 0xe8, 0x24, 0x9d, 0x8f, 0xdd, 0xd6, 0x3b, 0xb0, 0xcd, 0x08, 0xc6, 0xc5, + 0xd4, 0xbf, 0x62, 0xed, 0xd9, 0xc2, 0xad, 0x49, 0xd9, 0xa0, 0xf9, 0x07, 0x18, 0x36, 0xc6, 0xf5, + 0xce, 0xbf, 0x63, 0x6d, 0xd2, 0x4b, 0x85, 0x8e, 0x02, 0x2f, 0x82, 0xc1, 0x71, 0x7c, 0xc1, 0x2b, + 0x61, 0x5e, 0x0b, 0xf3, 0xdb, 0xbd, 0x70, 0x12, 0x3c, 0x7f, 0xf7, 0xa1, 0xb8, 0xd2, 0x7a, 0x85, + 0x66, 0xdc, 0xa8, 0xd3, 0x11, 0x8c, 0xeb, 0x1b, 0x49, 0x8f, 0xf9, 0x55, 0x25, 0x66, 0x4d, 0x56, + 0xc9, 0xe5, 0x84, 0x36, 0x46, 0xf9, 0xad, 0xb7, 0xdd, 0xd6, 0x83, 0xe4, 0xe6, 0x25, 0x0f, 0xe1, + 0x33, 0x0f, 0xe1, 0x2b, 0x0f, 0xe1, 0x27, 0x0f, 0x81, 0xf5, 0x35, 0xf2, 0xb2, 0x32, 0x63, 0xf1, + 0x69, 0xc3, 0xff, 0xb5, 0x97, 0x9c, 0xec, 0xff, 0x3a, 0x2a, 0x64, 0x46, 0x30, 0x3d, 0x2c, 0xad, + 0xae, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x9b, 0xc8, 0x7c, 0x8b, 0x01, 0x00, 0x00, +} + +func (this *HttpUri) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*HttpUri) + if !ok { + that2, ok := that.(HttpUri) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Uri != that1.Uri { + return false + } + if that1.HttpUpstreamType == nil { + if this.HttpUpstreamType != nil { + return false + } + } else if this.HttpUpstreamType == nil { + return false + } else if !this.HttpUpstreamType.Equal(that1.HttpUpstreamType) { + return false + } + if this.Timeout != nil && that1.Timeout != nil { + if *this.Timeout != *that1.Timeout { + return false + } + } else if this.Timeout != nil { + return false + } else if that1.Timeout != nil { + return false + } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } + return true } +func (this *HttpUri_Cluster) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + that1, ok := that.(*HttpUri_Cluster) + if !ok { + that2, ok := that.(HttpUri_Cluster) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Cluster != that1.Cluster { + return false + } + return true +} func (m *HttpUri) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go index d72afb92aaec..b156fa35b617 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.go @@ -6,15 +6,14 @@ package core import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - time "time" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go index ea715ab84107..b6ab0580bead 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/core/protocol.pb.validate.go @@ -108,17 +108,12 @@ func (m *HttpProtocolOptions) Validate() error { return nil } - { - tmp := m.GetIdleTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpProtocolOptionsValidationError{ - field: "IdleTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetIdleTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpProtocolOptionsValidationError{ + field: "IdleTimeout", + reason: "embedded message failed validation", + cause: err, } } } @@ -190,17 +185,12 @@ func (m *Http1ProtocolOptions) Validate() error { return nil } - { - tmp := m.GetAllowAbsoluteUrl() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Http1ProtocolOptionsValidationError{ - field: "AllowAbsoluteUrl", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAllowAbsoluteUrl()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Http1ProtocolOptionsValidationError{ + field: "AllowAbsoluteUrl", + reason: "embedded message failed validation", + cause: err, } } } @@ -276,17 +266,12 @@ func (m *Http2ProtocolOptions) Validate() error { return nil } - { - tmp := m.GetHpackTableSize() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Http2ProtocolOptionsValidationError{ - field: "HpackTableSize", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHpackTableSize()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Http2ProtocolOptionsValidationError{ + field: "HpackTableSize", + reason: "embedded message failed validation", + cause: err, } } } @@ -395,17 +380,12 @@ func (m *GrpcProtocolOptions) Validate() error { return nil } - { - tmp := m.GetHttp2ProtocolOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return GrpcProtocolOptionsValidationError{ - field: "Http2ProtocolOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return GrpcProtocolOptionsValidationError{ + field: "Http2ProtocolOptions", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go index 2c8e4866331a..54323d5b4006 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.go @@ -6,16 +6,14 @@ package v2 import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" rpc "github.com/gogo/googleapis/google/rpc" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -44,10 +42,10 @@ type DiscoveryRequest struct { Node *core.Node `protobuf:"bytes,2,opt,name=node,proto3" json:"node,omitempty"` // List of resources to subscribe to, e.g. list of cluster names or a route // configuration name. If this is empty, all resources for the API are - // returned. LDS/CDS expect empty resource_names, since this is global - // discovery for the Envoy instance. The LDS and CDS responses will then imply - // a number of resources that need to be fetched via EDS/RDS, which will be - // explicitly enumerated in resource_names. + // returned. LDS/CDS may have empty resource_names, which will cause all + // resources for the Envoy instance to be returned. The LDS and CDS responses + // will then imply a number of resources that need to be fetched via EDS/RDS, + // which will be explicitly enumerated in resource_names. ResourceNames []string `protobuf:"bytes,3,rep,name=resource_names,json=resourceNames,proto3" json:"resource_names,omitempty"` // Type of the resource that is being requested, e.g. // "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment". This is implicit @@ -144,7 +142,7 @@ type DiscoveryResponse struct { // The version of the response data. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The response resources. These resources are typed and depend on the API being called. - Resources []types.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources"` + Resources []*types.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` // [#not-implemented-hide:] // Canary is used to support two Envoy command line flags: // @@ -216,7 +214,7 @@ func (m *DiscoveryResponse) GetVersionInfo() string { return "" } -func (m *DiscoveryResponse) GetResources() []types.Any { +func (m *DiscoveryResponse) GetResources() []*types.Any { if m != nil { return m.Resources } @@ -419,7 +417,7 @@ type DeltaDiscoveryResponse struct { SystemVersionInfo string `protobuf:"bytes,1,opt,name=system_version_info,json=systemVersionInfo,proto3" json:"system_version_info,omitempty"` // The response resources. These are typed resources, whose types must match // the type_url field. - Resources []Resource `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources"` + Resources []*Resource `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` // Type URL for resources. Identifies the xDS API when muxing over ADS. // Must be consistent with the type_url in the Any within 'resources' if 'resources' is non-empty. TypeUrl string `protobuf:"bytes,4,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"` @@ -470,7 +468,7 @@ func (m *DeltaDiscoveryResponse) GetSystemVersionInfo() string { return "" } -func (m *DeltaDiscoveryResponse) GetResources() []Resource { +func (m *DeltaDiscoveryResponse) GetResources() []*Resource { if m != nil { return m.Resources } @@ -583,51 +581,51 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/discovery.proto", fileDescriptor_2c7365e287e5c035) } var fileDescriptor_2c7365e287e5c035 = []byte{ - // 702 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6a, 0xdb, 0x40, - 0x10, 0xee, 0xda, 0x8e, 0x63, 0xaf, 0x9d, 0x90, 0x6c, 0x53, 0x47, 0x31, 0xc1, 0x71, 0x0d, 0x05, - 0x43, 0x40, 0x2a, 0x2e, 0x85, 0x10, 0x7a, 0x68, 0x53, 0xb7, 0x90, 0x1e, 0x42, 0x50, 0x48, 0x0e, - 0xbd, 0x88, 0xb5, 0x3c, 0x31, 0xa2, 0xca, 0xae, 0xba, 0x2b, 0x89, 0x0a, 0x7a, 0x2a, 0x7d, 0x98, - 0x3e, 0x4a, 0x8e, 0x3d, 0xf6, 0x54, 0x8a, 0x5f, 0x24, 0x45, 0xab, 0x95, 0x6d, 0x25, 0x26, 0xf8, - 0xb6, 0x33, 0xf3, 0xcd, 0xa7, 0xf9, 0xf9, 0x46, 0x78, 0x1f, 0x58, 0xcc, 0x13, 0x8b, 0x06, 0x9e, - 0x15, 0x0f, 0xac, 0xb1, 0x27, 0x5d, 0x1e, 0x83, 0x48, 0xcc, 0x40, 0xf0, 0x90, 0x93, 0xa6, 0x8a, - 0x9a, 0x34, 0xf0, 0xcc, 0x78, 0xd0, 0x2e, 0x62, 0x5d, 0x2e, 0xc0, 0x1a, 0x51, 0x09, 0x19, 0xb6, - 0xbd, 0x37, 0xe1, 0x7c, 0xe2, 0x83, 0xa5, 0xac, 0x51, 0x74, 0x6d, 0x51, 0xa6, 0x69, 0xda, 0xbb, - 0x3a, 0x24, 0x02, 0xd7, 0x92, 0x21, 0x0d, 0x23, 0xa9, 0x03, 0x3b, 0x13, 0x3e, 0xe1, 0xea, 0x69, - 0xa5, 0xaf, 0xcc, 0xdb, 0xfb, 0x51, 0xc2, 0x5b, 0xc3, 0xbc, 0x12, 0x1b, 0xbe, 0x46, 0x20, 0x43, - 0xf2, 0x1c, 0x37, 0x63, 0x10, 0xd2, 0xe3, 0xcc, 0xf1, 0xd8, 0x35, 0x37, 0x50, 0x17, 0xf5, 0xeb, - 0x76, 0x43, 0xfb, 0x4e, 0xd9, 0x35, 0x27, 0x87, 0xb8, 0xc2, 0xf8, 0x18, 0x8c, 0x52, 0x17, 0xf5, - 0x1b, 0x83, 0x5d, 0x73, 0xb1, 0x78, 0x33, 0x2d, 0xd7, 0x3c, 0xe3, 0x63, 0xb0, 0x15, 0x88, 0xbc, - 0xc0, 0x9b, 0x02, 0x24, 0x8f, 0x84, 0x0b, 0x0e, 0xa3, 0x37, 0x20, 0x8d, 0x72, 0xb7, 0xdc, 0xaf, - 0xdb, 0x1b, 0xb9, 0xf7, 0x2c, 0x75, 0x92, 0x3d, 0x5c, 0x0b, 0x93, 0x00, 0x9c, 0x48, 0xf8, 0x46, - 0x45, 0x7d, 0x72, 0x3d, 0xb5, 0x2f, 0x85, 0xaf, 0x19, 0x02, 0xce, 0x24, 0x38, 0x8c, 0x33, 0x17, - 0x8c, 0x35, 0x05, 0xd8, 0xc8, 0xbd, 0x67, 0xa9, 0x93, 0xbc, 0xc6, 0x4d, 0x10, 0x82, 0x0b, 0x67, - 0x0c, 0x21, 0xf5, 0x7c, 0xa3, 0xaa, 0xaa, 0x23, 0x66, 0x36, 0x13, 0x53, 0x04, 0xae, 0x79, 0xa1, - 0x66, 0x62, 0x37, 0x14, 0x6e, 0xa8, 0x60, 0xbd, 0x3b, 0x84, 0xb7, 0x17, 0x86, 0x90, 0x31, 0xae, - 0x32, 0x85, 0x23, 0x5c, 0xcf, 0x5b, 0x90, 0x46, 0xa9, 0x5b, 0xee, 0x37, 0x06, 0x3b, 0xf9, 0xc7, - 0xf2, 0xdd, 0x98, 0xef, 0x58, 0x72, 0x52, 0xb9, 0xfd, 0x7b, 0xf0, 0xc4, 0x9e, 0x83, 0x49, 0x0b, - 0x57, 0x5d, 0xca, 0xa8, 0x48, 0x8c, 0x72, 0x17, 0xf5, 0x6b, 0xb6, 0xb6, 0x1e, 0x9b, 0xc1, 0x0e, - 0x5e, 0x5b, 0x6c, 0x3d, 0x33, 0xc8, 0x10, 0x6f, 0xb8, 0x9c, 0x85, 0x82, 0xfb, 0x4e, 0xe0, 0x53, - 0x06, 0xba, 0xe7, 0x83, 0x25, 0x1b, 0x79, 0x9f, 0xe1, 0xce, 0x53, 0x98, 0xdd, 0x74, 0x17, 0xac, - 0xde, 0x5d, 0x19, 0x3f, 0x1b, 0x82, 0x1f, 0xd2, 0x07, 0x5a, 0xc8, 0x17, 0x8d, 0x56, 0x59, 0xf4, - 0x62, 0xf5, 0xa5, 0x62, 0xf5, 0x47, 0xd8, 0x28, 0x6a, 0xc0, 0x91, 0xd1, 0x48, 0xba, 0xc2, 0x1b, - 0x81, 0x56, 0x43, 0xab, 0xa0, 0x86, 0x8b, 0x3c, 0x4a, 0xde, 0xe0, 0xf6, 0xbd, 0xcc, 0x88, 0xcd, - 0x73, 0x2b, 0x2a, 0xd7, 0x28, 0xe4, 0x5e, 0xce, 0xe3, 0xe4, 0x3b, 0xde, 0xf3, 0x98, 0x17, 0x7a, - 0xd4, 0x77, 0x66, 0x2c, 0x7a, 0x85, 0xd2, 0x58, 0x53, 0x2b, 0x7b, 0x5b, 0x6c, 0x6a, 0xe9, 0x1c, - 0xcc, 0xd3, 0x8c, 0xc4, 0xd6, 0x1c, 0x57, 0x9a, 0xe2, 0x03, 0x0b, 0x45, 0x62, 0xef, 0x7a, 0xcb, - 0xa3, 0x4b, 0x74, 0x5b, 0x5d, 0x45, 0xb7, 0xeb, 0x2b, 0xe9, 0xb6, 0xfd, 0x09, 0xef, 0x3f, 0x56, - 0x16, 0xd9, 0xc2, 0xe5, 0x2f, 0x90, 0x68, 0xe1, 0xa6, 0xcf, 0x54, 0x43, 0x31, 0xf5, 0x23, 0xd0, - 0xdb, 0xc9, 0x8c, 0xe3, 0xd2, 0x11, 0xea, 0x4d, 0x11, 0x6e, 0xdd, 0xef, 0x5c, 0x1f, 0x82, 0x89, - 0x9f, 0xca, 0x44, 0x86, 0x70, 0xe3, 0x2c, 0xb9, 0x87, 0xed, 0x2c, 0x74, 0xb5, 0x70, 0x15, 0xc7, - 0x0f, 0xaf, 0xa2, 0x55, 0x1c, 0x71, 0x5e, 0xee, 0xc3, 0xbb, 0x78, 0x44, 0xff, 0x87, 0x78, 0x5b, - 0xc0, 0x0d, 0x8f, 0x61, 0xec, 0xcc, 0xe9, 0xab, 0x6a, 0xfd, 0x5b, 0x3a, 0x60, 0xcf, 0x78, 0x96, - 0x1e, 0x4b, 0xef, 0x27, 0xc2, 0xb5, 0x1c, 0x43, 0x08, 0xae, 0xa4, 0x72, 0x52, 0x07, 0x58, 0xb7, - 0xd5, 0x9b, 0x18, 0x78, 0x9d, 0xfa, 0x1e, 0x95, 0x20, 0xb5, 0xb0, 0x72, 0x33, 0x8d, 0xe8, 0xee, - 0x75, 0xe3, 0xb9, 0x49, 0x5e, 0xe2, 0x5a, 0x5e, 0x8f, 0xfe, 0x1d, 0x2e, 0xfd, 0x07, 0xd8, 0x33, - 0xd4, 0xc9, 0xc7, 0x5f, 0xd3, 0x0e, 0xba, 0x9d, 0x76, 0xd0, 0xef, 0x69, 0x07, 0xfd, 0x99, 0x76, - 0xd0, 0xbf, 0x69, 0x07, 0xe1, 0xb6, 0xc7, 0xb3, 0x29, 0x05, 0x82, 0x7f, 0x4b, 0x0a, 0x03, 0x3b, - 0xd9, 0x9c, 0x6d, 0xe5, 0x3c, 0xa5, 0x3c, 0x47, 0x9f, 0x4b, 0xf1, 0x60, 0x54, 0x55, 0xfc, 0xaf, - 0xfe, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf4, 0xcd, 0x22, 0x18, 0x59, 0x06, 0x00, 0x00, + // 698 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x41, 0x6b, 0xdb, 0x4c, + 0x10, 0x65, 0x6d, 0xc7, 0xb1, 0xd7, 0x4e, 0x48, 0xf6, 0xcb, 0xe7, 0x28, 0x26, 0xb8, 0xae, 0xa1, + 0x60, 0x08, 0x48, 0xc5, 0x6d, 0x21, 0x94, 0x1e, 0xda, 0xd4, 0x2d, 0xa4, 0x87, 0x10, 0x14, 0x92, + 0x43, 0x2f, 0x62, 0x2d, 0x4f, 0x8c, 0xa8, 0xb2, 0xab, 0xee, 0x4a, 0xa2, 0x82, 0x9e, 0x4a, 0x7f, + 0x4c, 0x7f, 0x4a, 0x8f, 0x3d, 0xf6, 0xd0, 0x43, 0xf1, 0xbf, 0xe8, 0xa9, 0x45, 0xab, 0x95, 0x6d, + 0x25, 0x22, 0xf8, 0xb6, 0xb3, 0xf3, 0xf6, 0x69, 0x66, 0xde, 0x1b, 0xe1, 0x43, 0x60, 0x31, 0x4f, + 0x2c, 0x1a, 0x78, 0x56, 0x3c, 0xb2, 0xa6, 0x9e, 0x74, 0x79, 0x0c, 0x22, 0x31, 0x03, 0xc1, 0x43, + 0x4e, 0xda, 0x2a, 0x6b, 0xd2, 0xc0, 0x33, 0xe3, 0x51, 0xb7, 0x88, 0x75, 0xb9, 0x00, 0x6b, 0x42, + 0x25, 0x64, 0xd8, 0xee, 0xc1, 0x8c, 0xf3, 0x99, 0x0f, 0x96, 0x8a, 0x26, 0xd1, 0xb5, 0x45, 0x99, + 0xa6, 0xe9, 0xee, 0xeb, 0x94, 0x08, 0x5c, 0x4b, 0x86, 0x34, 0x8c, 0xa4, 0x4e, 0xec, 0xcd, 0xf8, + 0x8c, 0xab, 0xa3, 0x95, 0x9e, 0xb2, 0xdb, 0xc1, 0x97, 0x0a, 0xde, 0x19, 0xe7, 0x95, 0xd8, 0xf0, + 0x31, 0x02, 0x19, 0x92, 0x87, 0xb8, 0x1d, 0x83, 0x90, 0x1e, 0x67, 0x8e, 0xc7, 0xae, 0xb9, 0x81, + 0xfa, 0x68, 0xd8, 0xb4, 0x5b, 0xfa, 0xee, 0x94, 0x5d, 0x73, 0x72, 0x84, 0x6b, 0x8c, 0x4f, 0xc1, + 0xa8, 0xf4, 0xd1, 0xb0, 0x35, 0xda, 0x37, 0x57, 0x8b, 0x37, 0xd3, 0x72, 0xcd, 0x33, 0x3e, 0x05, + 0x5b, 0x81, 0xc8, 0x23, 0xbc, 0x2d, 0x40, 0xf2, 0x48, 0xb8, 0xe0, 0x30, 0x7a, 0x03, 0xd2, 0xa8, + 0xf6, 0xab, 0xc3, 0xa6, 0xbd, 0x95, 0xdf, 0x9e, 0xa5, 0x97, 0xe4, 0x00, 0x37, 0xc2, 0x24, 0x00, + 0x27, 0x12, 0xbe, 0x51, 0x53, 0x9f, 0xdc, 0x4c, 0xe3, 0x4b, 0xe1, 0x6b, 0x86, 0x80, 0x33, 0x09, + 0x0e, 0xe3, 0xcc, 0x05, 0x63, 0x43, 0x01, 0xb6, 0xf2, 0xdb, 0xb3, 0xf4, 0x92, 0x3c, 0xc3, 0x6d, + 0x10, 0x82, 0x0b, 0x67, 0x0a, 0x21, 0xf5, 0x7c, 0xa3, 0xae, 0xaa, 0x23, 0x66, 0x36, 0x13, 0x53, + 0x04, 0xae, 0x79, 0xa1, 0x66, 0x62, 0xb7, 0x14, 0x6e, 0xac, 0x60, 0x83, 0x3f, 0x08, 0xef, 0xae, + 0x0c, 0x21, 0x63, 0x5c, 0x67, 0x0a, 0x23, 0xdc, 0xcc, 0x5b, 0x90, 0x46, 0xa5, 0x5f, 0x1d, 0xb6, + 0x46, 0x7b, 0xf9, 0xc7, 0x72, 0x6d, 0xcc, 0x57, 0x2c, 0xb1, 0x97, 0x30, 0xd2, 0xc1, 0x75, 0x97, + 0x32, 0x2a, 0x12, 0xa3, 0xda, 0x47, 0xc3, 0x86, 0xad, 0xa3, 0xfb, 0xba, 0xdf, 0xc3, 0x1b, 0xab, + 0x4d, 0x67, 0x01, 0x19, 0xe3, 0x2d, 0x97, 0xb3, 0x50, 0x70, 0xdf, 0x09, 0x7c, 0xca, 0x40, 0x77, + 0xfb, 0xa0, 0x44, 0x8b, 0xd7, 0x19, 0xee, 0x3c, 0x85, 0xd9, 0x6d, 0x77, 0x25, 0x1a, 0xfc, 0xad, + 0xe2, 0xff, 0xc7, 0xe0, 0x87, 0xf4, 0x8e, 0x0b, 0x72, 0x89, 0xd1, 0x3a, 0x12, 0xaf, 0x56, 0x5f, + 0x29, 0x56, 0x7f, 0x8c, 0x8d, 0xa2, 0xfa, 0x8e, 0x8c, 0x26, 0xd2, 0x15, 0xde, 0x04, 0xb4, 0x0f, + 0x3a, 0x05, 0x1f, 0x5c, 0xe4, 0x59, 0xf2, 0x02, 0x77, 0x6f, 0xbd, 0x8c, 0xd8, 0xf2, 0x6d, 0x4d, + 0xbd, 0x35, 0x0a, 0x6f, 0x2f, 0x97, 0x79, 0xf2, 0x19, 0x1f, 0x78, 0xcc, 0x0b, 0x3d, 0xea, 0x3b, + 0x0b, 0x16, 0x2d, 0x9e, 0x34, 0x36, 0x94, 0x58, 0x2f, 0x8b, 0x4d, 0x95, 0xce, 0xc1, 0x3c, 0xcd, + 0x48, 0x6c, 0xcd, 0x71, 0xa5, 0x29, 0xde, 0xb0, 0x50, 0x24, 0xf6, 0xbe, 0x57, 0x9e, 0x2d, 0x71, + 0x6c, 0x7d, 0x1d, 0xc7, 0x6e, 0xae, 0xe5, 0xd8, 0xee, 0x3b, 0x7c, 0x78, 0x5f, 0x59, 0x64, 0x07, + 0x57, 0x3f, 0x40, 0xa2, 0x2d, 0x9b, 0x1e, 0x53, 0x0f, 0xc5, 0xd4, 0x8f, 0x40, 0xab, 0x93, 0x05, + 0xcf, 0x2b, 0xc7, 0x68, 0xf0, 0x0b, 0xe1, 0xce, 0xed, 0xce, 0xf5, 0x0a, 0x98, 0xf8, 0x3f, 0x99, + 0xc8, 0x10, 0x6e, 0x9c, 0x92, 0x4d, 0xd8, 0xcd, 0x52, 0x57, 0x2b, 0xfb, 0xf0, 0xf4, 0xee, 0x3e, + 0x74, 0x8a, 0x23, 0xce, 0xcb, 0x5d, 0xdd, 0x88, 0x7b, 0x9c, 0x7f, 0x84, 0x77, 0x05, 0xdc, 0xf0, + 0x18, 0xa6, 0xce, 0x92, 0xb8, 0xae, 0x84, 0xdf, 0xd1, 0x09, 0x7b, 0xc1, 0x53, 0xba, 0x26, 0x83, + 0xaf, 0x08, 0x37, 0x72, 0x0c, 0x21, 0xb8, 0x96, 0x1a, 0x49, 0xad, 0x5e, 0xd3, 0x56, 0x67, 0x62, + 0xe0, 0x4d, 0xea, 0x7b, 0x54, 0x82, 0xd4, 0x96, 0xca, 0xc3, 0x34, 0xa3, 0xfb, 0xd6, 0x2d, 0xe7, + 0x21, 0x79, 0x8c, 0x1b, 0x79, 0x3d, 0xfa, 0x17, 0x58, 0xbe, 0xf7, 0x0b, 0xd4, 0xc9, 0xdb, 0x6f, + 0xf3, 0x1e, 0xfa, 0x3e, 0xef, 0xa1, 0x1f, 0xf3, 0x1e, 0xfa, 0x39, 0xef, 0xa1, 0xdf, 0xf3, 0x1e, + 0xc2, 0x5d, 0x8f, 0x67, 0xf3, 0x09, 0x04, 0xff, 0x94, 0x14, 0x46, 0x75, 0xb2, 0xbd, 0xd0, 0xe3, + 0x3c, 0xa5, 0x3c, 0x47, 0xef, 0x2b, 0xf1, 0x68, 0x52, 0x57, 0xfc, 0x4f, 0xfe, 0x05, 0x00, 0x00, + 0xff, 0xff, 0x85, 0x0a, 0x39, 0xfc, 0x4d, 0x06, 0x00, 0x00, } func (this *DiscoveryRequest) Equal(that interface{}) bool { @@ -703,7 +701,7 @@ func (this *DiscoveryResponse) Equal(that interface{}) bool { return false } for i := range this.Resources { - if !this.Resources[i].Equal(&that1.Resources[i]) { + if !this.Resources[i].Equal(that1.Resources[i]) { return false } } @@ -810,7 +808,7 @@ func (this *DeltaDiscoveryResponse) Equal(that interface{}) bool { return false } for i := range this.Resources { - if !this.Resources[i].Equal(&that1.Resources[i]) { + if !this.Resources[i].Equal(that1.Resources[i]) { return false } } @@ -1803,7 +1801,7 @@ func (m *DiscoveryResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Resources = append(m.Resources, types.Any{}) + m.Resources = append(m.Resources, &types.Any{}) if err := m.Resources[len(m.Resources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2424,7 +2422,7 @@ func (m *DeltaDiscoveryResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Resources = append(m.Resources, Resource{}) + m.Resources = append(m.Resources, &Resource{}) if err := m.Resources[len(m.Resources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go index 03d60171c21c..543468ee9b98 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/discovery.pb.validate.go @@ -43,17 +43,12 @@ func (m *DiscoveryRequest) Validate() error { // no validation rules for VersionInfo - { - tmp := m.GetNode() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DiscoveryRequestValidationError{ - field: "Node", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DiscoveryRequestValidationError{ + field: "Node", + reason: "embedded message failed validation", + cause: err, } } } @@ -62,17 +57,12 @@ func (m *DiscoveryRequest) Validate() error { // no validation rules for ResponseNonce - { - tmp := m.GetErrorDetail() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DiscoveryRequestValidationError{ - field: "ErrorDetail", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetErrorDetail()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DiscoveryRequestValidationError{ + field: "ErrorDetail", + reason: "embedded message failed validation", + cause: err, } } } @@ -147,17 +137,12 @@ func (m *DiscoveryResponse) Validate() error { for idx, item := range m.GetResources() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DiscoveryResponseValidationError{ - field: fmt.Sprintf("Resources[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DiscoveryResponseValidationError{ + field: fmt.Sprintf("Resources[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -170,17 +155,12 @@ func (m *DiscoveryResponse) Validate() error { // no validation rules for Nonce - { - tmp := m.GetControlPlane() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DiscoveryResponseValidationError{ - field: "ControlPlane", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetControlPlane()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DiscoveryResponseValidationError{ + field: "ControlPlane", + reason: "embedded message failed validation", + cause: err, } } } @@ -252,17 +232,12 @@ func (m *DeltaDiscoveryRequest) Validate() error { return nil } - { - tmp := m.GetNode() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DeltaDiscoveryRequestValidationError{ - field: "Node", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DeltaDiscoveryRequestValidationError{ + field: "Node", + reason: "embedded message failed validation", + cause: err, } } } @@ -273,17 +248,12 @@ func (m *DeltaDiscoveryRequest) Validate() error { // no validation rules for ResponseNonce - { - tmp := m.GetErrorDetail() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DeltaDiscoveryRequestValidationError{ - field: "ErrorDetail", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetErrorDetail()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DeltaDiscoveryRequestValidationError{ + field: "ErrorDetail", + reason: "embedded message failed validation", + cause: err, } } } @@ -360,17 +330,12 @@ func (m *DeltaDiscoveryResponse) Validate() error { for idx, item := range m.GetResources() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DeltaDiscoveryResponseValidationError{ - field: fmt.Sprintf("Resources[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DeltaDiscoveryResponseValidationError{ + field: fmt.Sprintf("Resources[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -451,17 +416,12 @@ func (m *Resource) Validate() error { // no validation rules for Version - { - tmp := m.GetResource() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ResourceValidationError{ - field: "Resource", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResource()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ResourceValidationError{ + field: "Resource", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go index 7e5deca2b731..47f45f5107dd 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.go @@ -7,9 +7,8 @@ import ( bytes "bytes" context "context" fmt "fmt" - io "io" - math "math" - + endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" @@ -17,9 +16,8 @@ import ( github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - - endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -49,7 +47,7 @@ type ClusterLoadAssignment struct { // `. ClusterName string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"` // List of endpoints to load balance to. - Endpoints []endpoint.LocalityLbEndpoints `protobuf:"bytes,2,rep,name=endpoints,proto3" json:"endpoints"` + Endpoints []*endpoint.LocalityLbEndpoints `protobuf:"bytes,2,rep,name=endpoints,proto3" json:"endpoints,omitempty"` // Map of named endpoints that can be referenced in LocalityLbEndpoints. NamedEndpoints map[string]*endpoint.Endpoint `protobuf:"bytes,5,rep,name=named_endpoints,json=namedEndpoints,proto3" json:"named_endpoints,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Load balancing policy settings. @@ -95,7 +93,7 @@ func (m *ClusterLoadAssignment) GetClusterName() string { return "" } -func (m *ClusterLoadAssignment) GetEndpoints() []endpoint.LocalityLbEndpoints { +func (m *ClusterLoadAssignment) GetEndpoints() []*endpoint.LocalityLbEndpoints { if m != nil { return m.Endpoints } @@ -278,53 +276,52 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/eds.proto", fileDescriptor_3c8760f38742c17f) } var fileDescriptor_3c8760f38742c17f = []byte{ - // 726 bytes of a gzipped FileDescriptorProto + // 719 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0xb3, 0x4e, 0x1a, 0xd2, 0x6d, 0x48, 0x2b, 0x53, 0xda, 0x60, 0x85, 0x34, 0x0a, 0x45, - 0xaa, 0x22, 0x64, 0xa3, 0x54, 0xa8, 0xa8, 0x17, 0xd4, 0x90, 0x46, 0x02, 0x55, 0x25, 0x72, 0x05, - 0x82, 0x0b, 0x61, 0x63, 0x6f, 0x8d, 0x85, 0xb3, 0x6b, 0xd6, 0x1b, 0x83, 0x0f, 0x5c, 0x38, 0x71, - 0xe7, 0x25, 0x50, 0x1f, 0x81, 0x13, 0xc7, 0x1e, 0x10, 0x42, 0xe2, 0xc2, 0x09, 0xa1, 0x88, 0x0b, - 0x6f, 0x81, 0xd6, 0x5f, 0xa9, 0x9b, 0x16, 0x71, 0xe0, 0x36, 0xde, 0x99, 0xf9, 0xcd, 0x78, 0xe6, - 0xbf, 0x0b, 0x57, 0x30, 0xf1, 0x69, 0xa0, 0x21, 0xd7, 0xd6, 0xfc, 0xb6, 0x86, 0x4d, 0x4f, 0x75, - 0x19, 0xe5, 0x54, 0x2e, 0x87, 0xe7, 0x2a, 0x72, 0x6d, 0xd5, 0x6f, 0x2b, 0xb5, 0x4c, 0x94, 0x69, - 0x7b, 0x06, 0xf5, 0x31, 0x0b, 0xa2, 0x58, 0x65, 0x3d, 0xcb, 0x20, 0xa6, 0x4b, 0x6d, 0xc2, 0x53, - 0x23, 0x8e, 0xaa, 0x46, 0x51, 0x3c, 0x70, 0xb1, 0xe6, 0x62, 0x66, 0xe0, 0xd4, 0x53, 0xb3, 0x28, - 0xb5, 0x1c, 0x1c, 0x02, 0x10, 0x21, 0x94, 0x23, 0x6e, 0x53, 0x12, 0x77, 0xa2, 0xac, 0xfa, 0xc8, - 0xb1, 0x4d, 0xc4, 0xb1, 0x96, 0x18, 0xb1, 0x63, 0xd9, 0xa2, 0x16, 0x0d, 0x4d, 0x4d, 0x58, 0xf1, - 0x69, 0x3d, 0x86, 0x85, 0x5f, 0xc3, 0xf1, 0xa1, 0xf6, 0x8a, 0x21, 0xd7, 0xc5, 0xcc, 0x3b, 0xcf, - 0x6f, 0x8e, 0x59, 0x58, 0x2f, 0xf2, 0x37, 0x3f, 0x17, 0xe1, 0xe5, 0xbb, 0xce, 0xd8, 0xe3, 0x98, - 0xed, 0x51, 0x64, 0xee, 0x78, 0x9e, 0x6d, 0x91, 0x11, 0x26, 0x5c, 0xbe, 0x01, 0xcb, 0x46, 0xe4, - 0x18, 0x10, 0x34, 0xc2, 0x55, 0xd0, 0x00, 0x1b, 0xf3, 0x9d, 0xf9, 0x8f, 0xbf, 0x3f, 0xe5, 0x0b, - 0x4c, 0x6a, 0x00, 0x7d, 0x21, 0x76, 0xef, 0xa3, 0x11, 0x96, 0xf7, 0xe1, 0x7c, 0x32, 0x00, 0xaf, - 0x2a, 0x35, 0xf2, 0x1b, 0x0b, 0xed, 0x96, 0x7a, 0x72, 0xa8, 0x6a, 0x3a, 0x9f, 0x3d, 0x6a, 0x20, - 0xc7, 0xe6, 0xc1, 0xde, 0x70, 0x37, 0xc9, 0xe8, 0x14, 0x8e, 0x7f, 0xac, 0xe5, 0xf4, 0x29, 0x42, - 0x7e, 0x06, 0x17, 0x45, 0x55, 0x73, 0x30, 0xa5, 0xce, 0x85, 0xd4, 0xad, 0x2c, 0xf5, 0xcc, 0xde, - 0x55, 0xd1, 0x92, 0x99, 0xd2, 0x77, 0x09, 0x67, 0x81, 0x5e, 0x21, 0x99, 0x43, 0xb9, 0x03, 0x8b, - 0x2e, 0x75, 0x6c, 0x23, 0xa8, 0x16, 0x1a, 0x60, 0xb6, 0xdd, 0xb3, 0xc1, 0xfd, 0x30, 0x43, 0x8f, - 0x33, 0x95, 0x21, 0xbc, 0x74, 0x46, 0x29, 0x79, 0x09, 0xe6, 0x5f, 0xe0, 0x20, 0x9a, 0x98, 0x2e, - 0x4c, 0xf9, 0x16, 0x9c, 0xf3, 0x91, 0x33, 0xc6, 0x55, 0x29, 0xac, 0xb5, 0x76, 0xce, 0x68, 0x12, - 0x8e, 0x1e, 0x45, 0x6f, 0x4b, 0xb7, 0x81, 0x72, 0x94, 0x87, 0xc5, 0xa8, 0xac, 0xfc, 0x14, 0x56, - 0x4c, 0x46, 0xdd, 0x81, 0x50, 0xa3, 0x43, 0x91, 0x99, 0x4c, 0x7a, 0xeb, 0xdf, 0x5b, 0x57, 0xbb, - 0x8c, 0xba, 0x0f, 0xe2, 0x7c, 0xfd, 0xa2, 0x79, 0xe2, 0x4b, 0x0c, 0x7d, 0x55, 0xa0, 0x5d, 0x46, - 0x7d, 0xdb, 0xb3, 0x29, 0xb1, 0x89, 0x35, 0x38, 0x44, 0x06, 0xa7, 0xac, 0x9a, 0x0f, 0xfb, 0xae, - 0xa9, 0x91, 0x9c, 0xd4, 0x44, 0x4e, 0xea, 0xc3, 0x7b, 0x84, 0x6f, 0xb6, 0x1f, 0x89, 0x6e, 0x63, - 0x6d, 0xb4, 0xa4, 0x46, 0x4e, 0x5f, 0x39, 0xcd, 0xe9, 0x85, 0x18, 0xf9, 0x09, 0x5c, 0x4e, 0x7e, - 0x76, 0xe0, 0x71, 0xe4, 0xe0, 0x01, 0x3a, 0xe4, 0x98, 0xc5, 0x2b, 0xb8, 0x32, 0x83, 0xef, 0xc6, - 0x6a, 0xed, 0x94, 0x05, 0xfb, 0xc2, 0x11, 0x28, 0xb4, 0xa4, 0x52, 0x4e, 0x97, 0x13, 0xc8, 0x81, - 0x60, 0xec, 0x08, 0x84, 0xf2, 0x06, 0x96, 0x4f, 0xfe, 0x9b, 0x7c, 0x1d, 0x96, 0x0c, 0xc4, 0xb1, - 0x45, 0x59, 0x30, 0xab, 0xdd, 0xd4, 0x25, 0xf7, 0xe0, 0x62, 0x38, 0xd3, 0xf8, 0x8e, 0x22, 0x2b, - 0xd9, 0xd1, 0xd5, 0x78, 0xa8, 0xe2, 0x06, 0xab, 0x3d, 0x86, 0x0c, 0xd1, 0x07, 0x72, 0xfa, 0x51, - 0x9c, 0x1e, 0x6e, 0xa2, 0x9f, 0x26, 0xdd, 0x2f, 0x94, 0xc0, 0x92, 0xd4, 0xfe, 0x22, 0xc1, 0x6a, - 0xb2, 0xc4, 0x6e, 0xf2, 0x6e, 0x1c, 0x60, 0xe6, 0xdb, 0x06, 0x96, 0x1f, 0xc3, 0xc5, 0x03, 0xce, - 0x30, 0x1a, 0x4d, 0x45, 0x58, 0xcf, 0x6e, 0x2e, 0x4d, 0xd1, 0xf1, 0xcb, 0x31, 0xf6, 0xb8, 0xb2, - 0x76, 0xae, 0xdf, 0x73, 0x29, 0xf1, 0x70, 0x33, 0xb7, 0x01, 0x6e, 0x02, 0x19, 0xc1, 0x4a, 0x17, - 0x3b, 0x1c, 0x4d, 0xc1, 0xd7, 0x4e, 0x25, 0x0a, 0xef, 0x0c, 0x7d, 0xfd, 0xef, 0x41, 0x99, 0x12, - 0x63, 0x58, 0xe9, 0x61, 0x6e, 0x3c, 0xff, 0x8f, 0xbd, 0x37, 0xdf, 0x7e, 0xfb, 0xf5, 0x5e, 0xaa, - 0x35, 0x57, 0x33, 0xaf, 0xec, 0x76, 0x7a, 0xe3, 0xb7, 0x41, 0xab, 0x73, 0xe7, 0xc3, 0xa4, 0x0e, - 0x8e, 0x27, 0x75, 0xf0, 0x75, 0x52, 0x07, 0xdf, 0x27, 0x75, 0xf0, 0x73, 0x52, 0x07, 0x50, 0xb1, - 0x69, 0x04, 0x77, 0x19, 0x7d, 0x1d, 0x64, 0xea, 0x74, 0x4a, 0xbb, 0xa6, 0xd7, 0x17, 0xfa, 0xe9, - 0x83, 0x77, 0x00, 0x0c, 0x8b, 0xa1, 0x96, 0x36, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xc3, - 0x41, 0x52, 0xfa, 0x05, 0x00, 0x00, + 0x10, 0xc7, 0xbb, 0x4e, 0x1a, 0xd2, 0x6d, 0x48, 0x2b, 0x53, 0xda, 0x60, 0x85, 0x34, 0x0a, 0x45, + 0xaa, 0x22, 0xe4, 0xa0, 0x54, 0xa8, 0xa8, 0x17, 0xd4, 0x90, 0x46, 0x80, 0x2a, 0x88, 0x5c, 0x81, + 0xe0, 0x42, 0xd8, 0xd8, 0x5b, 0x63, 0xe1, 0xec, 0x2e, 0xeb, 0x8d, 0xc1, 0x07, 0x2e, 0x9c, 0xb8, + 0xf3, 0x12, 0xa8, 0x8f, 0xc0, 0x89, 0x13, 0xe2, 0x84, 0x90, 0xb8, 0x70, 0x44, 0x11, 0x17, 0xde, + 0x02, 0xad, 0xbf, 0x52, 0x37, 0x2d, 0xe2, 0xc0, 0x6d, 0xbc, 0x33, 0xf3, 0x9b, 0xf1, 0xcc, 0x7f, + 0x17, 0xae, 0x62, 0xe2, 0xd3, 0xa0, 0x85, 0x98, 0xd3, 0xf2, 0xdb, 0x2d, 0x6c, 0x79, 0x3a, 0xe3, + 0x54, 0x50, 0xb5, 0x14, 0x9e, 0xeb, 0x88, 0x39, 0xba, 0xdf, 0xd6, 0xaa, 0x99, 0x28, 0xcb, 0xf1, + 0x4c, 0xea, 0x63, 0x1e, 0x44, 0xb1, 0xda, 0x46, 0x96, 0x41, 0x2c, 0x46, 0x1d, 0x22, 0x52, 0x23, + 0x8e, 0xaa, 0x44, 0x51, 0x22, 0x60, 0xb8, 0xc5, 0x30, 0x37, 0x71, 0xea, 0xa9, 0xda, 0x94, 0xda, + 0x2e, 0x0e, 0x01, 0x88, 0x10, 0x2a, 0x90, 0x70, 0x28, 0x89, 0x3b, 0xd1, 0xd6, 0x7c, 0xe4, 0x3a, + 0x16, 0x12, 0xb8, 0x95, 0x18, 0xb1, 0x63, 0xc5, 0xa6, 0x36, 0x0d, 0xcd, 0x96, 0xb4, 0xe2, 0xd3, + 0x5a, 0x0c, 0x0b, 0xbf, 0x86, 0xe3, 0xc3, 0xd6, 0x2b, 0x8e, 0x18, 0xc3, 0xdc, 0x3b, 0xcb, 0x6f, + 0x8d, 0x79, 0x58, 0x2f, 0xf2, 0x37, 0x3e, 0x17, 0xe0, 0xc5, 0xdb, 0xee, 0xd8, 0x13, 0x98, 0xef, + 0x53, 0x64, 0xed, 0x7a, 0x9e, 0x63, 0x93, 0x11, 0x26, 0x42, 0xbd, 0x06, 0x4b, 0x66, 0xe4, 0x18, + 0x10, 0x34, 0xc2, 0x15, 0x50, 0x07, 0x9b, 0x0b, 0x9d, 0x85, 0x8f, 0xbf, 0x3f, 0xe5, 0xf2, 0x5c, + 0xa9, 0x03, 0x63, 0x31, 0x76, 0xdf, 0x47, 0x23, 0xac, 0xde, 0x81, 0x0b, 0xc9, 0x00, 0xbc, 0x8a, + 0x52, 0xcf, 0x6d, 0x2e, 0xb6, 0x9b, 0xfa, 0xf1, 0xa1, 0xea, 0xe9, 0x7c, 0xf6, 0xa9, 0x89, 0x5c, + 0x47, 0x04, 0xfb, 0xc3, 0xbd, 0x24, 0xc3, 0x98, 0x26, 0xab, 0xcf, 0xe0, 0x92, 0xac, 0x67, 0x0d, + 0xa6, 0xbc, 0xf9, 0x90, 0xb7, 0x9d, 0xe5, 0x9d, 0xda, 0xb5, 0x2e, 0x9b, 0xb1, 0x52, 0xee, 0x1e, + 0x11, 0x3c, 0x30, 0xca, 0x24, 0x73, 0xa8, 0x76, 0x60, 0x81, 0x51, 0xd7, 0x31, 0x83, 0x4a, 0xbe, + 0x0e, 0x66, 0x1b, 0x3d, 0x1d, 0xdc, 0x0f, 0x33, 0x8c, 0x38, 0x53, 0x1b, 0xc2, 0x0b, 0xa7, 0x94, + 0x52, 0x97, 0x61, 0xee, 0x05, 0x0e, 0xa2, 0x59, 0x19, 0xd2, 0x54, 0x6f, 0xc0, 0x79, 0x1f, 0xb9, + 0x63, 0x5c, 0x51, 0xc2, 0x5a, 0xeb, 0x67, 0x0c, 0x25, 0xe1, 0x18, 0x51, 0xf4, 0x8e, 0x72, 0x13, + 0x68, 0x47, 0x39, 0x58, 0x88, 0xca, 0xaa, 0x4f, 0x61, 0xd9, 0xe2, 0x94, 0x0d, 0xa4, 0x0e, 0x5d, + 0x8a, 0xac, 0x64, 0xc6, 0xdb, 0xff, 0xde, 0xba, 0xde, 0xe5, 0x94, 0x3d, 0x88, 0xf3, 0x8d, 0xf3, + 0xd6, 0xb1, 0x2f, 0x39, 0xf4, 0x35, 0x89, 0x66, 0x9c, 0xfa, 0x8e, 0xe7, 0x50, 0xe2, 0x10, 0x7b, + 0x70, 0x88, 0x4c, 0x41, 0x79, 0x25, 0x17, 0xf6, 0x5d, 0xd5, 0x23, 0x21, 0xe9, 0x89, 0x90, 0xf4, + 0x87, 0x77, 0x89, 0xd8, 0x6a, 0x3f, 0x92, 0xdd, 0xc6, 0xaa, 0x68, 0x2a, 0xf5, 0x39, 0x63, 0xf5, + 0x24, 0xa7, 0x17, 0x62, 0xd4, 0x27, 0x70, 0x25, 0xf9, 0xd9, 0x81, 0x27, 0x90, 0x8b, 0x07, 0xe8, + 0x50, 0x60, 0x1e, 0xaf, 0xe0, 0xd2, 0x0c, 0xbe, 0x1b, 0xeb, 0xb4, 0x53, 0x92, 0xec, 0x73, 0x47, + 0x20, 0xdf, 0x54, 0x8a, 0x73, 0x86, 0x9a, 0x40, 0x0e, 0x24, 0x63, 0x57, 0x22, 0xb4, 0x37, 0xb0, + 0x74, 0xfc, 0xdf, 0xd4, 0xab, 0xb0, 0x68, 0x22, 0x81, 0x6d, 0xca, 0x83, 0x59, 0xd5, 0xa6, 0x2e, + 0xb5, 0x07, 0x97, 0xc2, 0x99, 0xc6, 0xb7, 0x13, 0xd9, 0xc9, 0x8e, 0x2e, 0xc7, 0x43, 0x95, 0x77, + 0x57, 0xef, 0x71, 0x64, 0xca, 0x3e, 0x90, 0xdb, 0x8f, 0xe2, 0x8c, 0x70, 0x13, 0xfd, 0x34, 0xe9, + 0x5e, 0xbe, 0x08, 0x96, 0x95, 0xf6, 0x57, 0x05, 0x56, 0x92, 0x25, 0x76, 0x93, 0x17, 0xe3, 0x00, + 0x73, 0xdf, 0x31, 0xb1, 0xfa, 0x18, 0x2e, 0x1d, 0x08, 0x8e, 0xd1, 0x68, 0x2a, 0xc2, 0x5a, 0x76, + 0x73, 0x69, 0x8a, 0x81, 0x5f, 0x8e, 0xb1, 0x27, 0xb4, 0xf5, 0x33, 0xfd, 0x1e, 0xa3, 0xc4, 0xc3, + 0x8d, 0xb9, 0x4d, 0x70, 0x1d, 0xa8, 0x08, 0x96, 0xbb, 0xd8, 0x15, 0x68, 0x0a, 0xbe, 0x72, 0x22, + 0x51, 0x7a, 0x67, 0xe8, 0x1b, 0x7f, 0x0f, 0xca, 0x94, 0x18, 0xc3, 0x72, 0x0f, 0x0b, 0xf3, 0xf9, + 0x7f, 0xec, 0xbd, 0xf1, 0xf6, 0xfb, 0xaf, 0xf7, 0x4a, 0xb5, 0xb1, 0x96, 0x79, 0x5f, 0x77, 0xd2, + 0x1b, 0xbf, 0x03, 0x9a, 0x9d, 0x5b, 0x1f, 0x26, 0x35, 0xf0, 0x65, 0x52, 0x03, 0xdf, 0x26, 0x35, + 0xf0, 0x63, 0x52, 0x03, 0x3f, 0x27, 0x35, 0x00, 0x35, 0x87, 0x46, 0x70, 0xc6, 0xe9, 0xeb, 0x20, + 0x53, 0xa7, 0x53, 0xdc, 0xb3, 0xbc, 0xbe, 0xd4, 0x4f, 0x1f, 0xbc, 0x03, 0x60, 0x58, 0x08, 0xb5, + 0xb4, 0xf5, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xa0, 0x20, 0xd0, 0xf4, 0x05, 0x00, 0x00, } func (this *ClusterLoadAssignment) Equal(that interface{}) bool { @@ -353,7 +350,7 @@ func (this *ClusterLoadAssignment) Equal(that interface{}) bool { return false } for i := range this.Endpoints { - if !this.Endpoints[i].Equal(&that1.Endpoints[i]) { + if !this.Endpoints[i].Equal(that1.Endpoints[i]) { return false } } @@ -1018,7 +1015,7 @@ func (m *ClusterLoadAssignment) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Endpoints = append(m.Endpoints, endpoint.LocalityLbEndpoints{}) + m.Endpoints = append(m.Endpoints, &endpoint.LocalityLbEndpoints{}) if err := m.Endpoints[len(m.Endpoints)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go index 0ce91d68e854..d44491a24e30 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/eds.pb.validate.go @@ -51,17 +51,12 @@ func (m *ClusterLoadAssignment) Validate() error { for idx, item := range m.GetEndpoints() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterLoadAssignmentValidationError{ - field: fmt.Sprintf("Endpoints[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterLoadAssignmentValidationError{ + field: fmt.Sprintf("Endpoints[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -70,17 +65,12 @@ func (m *ClusterLoadAssignment) Validate() error { // no validation rules for NamedEndpoints - { - tmp := m.GetPolicy() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterLoadAssignmentValidationError{ - field: "Policy", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPolicy()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterLoadAssignmentValidationError{ + field: "Policy", + reason: "embedded message failed validation", + cause: err, } } } @@ -155,17 +145,12 @@ func (m *ClusterLoadAssignment_Policy) Validate() error { for idx, item := range m.GetDropOverloads() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterLoadAssignment_PolicyValidationError{ - field: fmt.Sprintf("DropOverloads[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterLoadAssignment_PolicyValidationError{ + field: fmt.Sprintf("DropOverloads[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -279,17 +264,12 @@ func (m *ClusterLoadAssignment_Policy_DropOverload) Validate() error { } } - { - tmp := m.GetDropPercentage() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterLoadAssignment_Policy_DropOverloadValidationError{ - field: "DropPercentage", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDropPercentage()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterLoadAssignment_Policy_DropOverloadValidationError{ + field: "DropPercentage", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go index 53c0e282a9db..92a9ee4a9bf6 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.go @@ -6,15 +6,13 @@ package endpoint import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -356,7 +354,7 @@ type LocalityLbEndpoints struct { // Identifies location of where the upstream hosts run. Locality *core.Locality `protobuf:"bytes,1,opt,name=locality,proto3" json:"locality,omitempty"` // The group of endpoints belonging to the locality specified. - LbEndpoints []LbEndpoint `protobuf:"bytes,2,rep,name=lb_endpoints,json=lbEndpoints,proto3" json:"lb_endpoints"` + LbEndpoints []*LbEndpoint `protobuf:"bytes,2,rep,name=lb_endpoints,json=lbEndpoints,proto3" json:"lb_endpoints,omitempty"` // Optional: Per priority/region/zone/sub_zone weight; at least 1. The load // balancing weight for a locality is divided by the sum of the weights of all // localities at the same priority level to produce the effective percentage @@ -430,7 +428,7 @@ func (m *LocalityLbEndpoints) GetLocality() *core.Locality { return nil } -func (m *LocalityLbEndpoints) GetLbEndpoints() []LbEndpoint { +func (m *LocalityLbEndpoints) GetLbEndpoints() []*LbEndpoint { if m != nil { return m.LbEndpoints } @@ -470,45 +468,45 @@ func init() { } var fileDescriptor_a9d2a3e4ee06324f = []byte{ - // 603 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xad, 0xe3, 0xb4, 0x24, 0x9b, 0x06, 0x54, 0x97, 0x0a, 0x2b, 0x54, 0x69, 0x29, 0x05, 0x45, - 0x39, 0xac, 0x45, 0x8a, 0x84, 0x84, 0x84, 0x10, 0x2e, 0x48, 0x05, 0x15, 0x54, 0x2d, 0x02, 0x24, - 0x38, 0x58, 0x6b, 0x7b, 0x63, 0xaf, 0x70, 0xbc, 0x96, 0xbd, 0x49, 0xc9, 0x8d, 0xcf, 0xe1, 0x1b, - 0x38, 0x71, 0xec, 0x91, 0x3b, 0x12, 0x82, 0x88, 0x0b, 0x5f, 0x51, 0xb4, 0x6b, 0xaf, 0x93, 0x36, - 0xa9, 0x7a, 0xe0, 0x36, 0xde, 0x79, 0x6f, 0xe6, 0xbd, 0xe7, 0x01, 0xbb, 0x24, 0x1e, 0xb1, 0xb1, - 0x85, 0x13, 0x6a, 0x8d, 0x7a, 0x16, 0x89, 0xfd, 0x84, 0xd1, 0x98, 0x97, 0x05, 0x4c, 0x52, 0xc6, - 0x99, 0xb1, 0x21, 0x51, 0x10, 0x27, 0x14, 0x8e, 0x7a, 0x50, 0x35, 0x5b, 0x5b, 0x67, 0xc8, 0x1e, - 0x4b, 0x89, 0x85, 0x7d, 0x3f, 0x25, 0x59, 0x96, 0xf3, 0x5a, 0x9b, 0xf3, 0x00, 0x17, 0x67, 0xa4, - 0xe8, 0xee, 0xce, 0x77, 0x43, 0x82, 0x23, 0x1e, 0x3a, 0x5e, 0x48, 0xbc, 0x8f, 0x05, 0xaa, 0x1d, - 0x30, 0x16, 0x44, 0xc4, 0x92, 0x5f, 0xee, 0xb0, 0x6f, 0x1d, 0xa7, 0x38, 0x49, 0x48, 0xaa, 0x76, - 0xdc, 0x18, 0xe1, 0x88, 0xfa, 0x98, 0x13, 0x4b, 0x15, 0x45, 0xe3, 0x7a, 0xc0, 0x02, 0x26, 0x4b, - 0x4b, 0x54, 0xf9, 0xeb, 0xce, 0x1f, 0x0d, 0xd4, 0x9e, 0x15, 0x06, 0x8c, 0xfb, 0xe0, 0x4a, 0x21, - 0xd8, 0xd4, 0xb6, 0xb5, 0x4e, 0xa3, 0xd7, 0x82, 0x67, 0x9c, 0x0a, 0x4d, 0xf0, 0x49, 0x8e, 0x40, - 0x0a, 0x6a, 0x60, 0xb0, 0x3e, 0xab, 0xd3, 0xf1, 0x58, 0xdc, 0xa7, 0x81, 0x59, 0x91, 0x13, 0xee, - 0xc1, 0x85, 0x59, 0x41, 0xb5, 0x13, 0x1e, 0x48, 0xea, 0xbe, 0x60, 0xee, 0x4b, 0x22, 0x5a, 0x0b, - 0xcf, 0x3f, 0xb5, 0x1e, 0x83, 0xb5, 0x39, 0x9c, 0xd1, 0x05, 0x20, 0x61, 0x29, 0x77, 0x46, 0x38, - 0x1a, 0x12, 0x29, 0xb8, 0x69, 0x37, 0xbe, 0xfe, 0xfd, 0xa6, 0xaf, 0x74, 0xab, 0xe6, 0xe9, 0xa9, - 0x8e, 0xea, 0xa2, 0xfd, 0x56, 0x74, 0x77, 0x7e, 0x57, 0x00, 0x38, 0x74, 0x4b, 0xa3, 0x8f, 0x40, - 0x4d, 0x29, 0x29, 0x9c, 0x6e, 0x5d, 0xa2, 0xf3, 0x60, 0x09, 0x95, 0x14, 0xe3, 0x0e, 0x68, 0xaa, - 0xda, 0x89, 0xf1, 0x80, 0x98, 0xcb, 0xdb, 0x5a, 0xa7, 0x7e, 0xb0, 0x84, 0x56, 0xd5, 0xf3, 0x2b, - 0x3c, 0x20, 0xc6, 0x53, 0xd0, 0x2c, 0x82, 0xc9, 0x38, 0xe6, 0xc3, 0x4c, 0x46, 0x72, 0xf5, 0xfc, - 0x2a, 0x19, 0x6a, 0xee, 0xee, 0xb5, 0x84, 0xa1, 0xd5, 0x70, 0xe6, 0xcb, 0x78, 0x00, 0x6a, 0x03, - 0xc2, 0xb1, 0x8f, 0x39, 0x36, 0x75, 0xa9, 0xf5, 0xe6, 0x82, 0x01, 0x2f, 0x0b, 0x08, 0x2a, 0xc1, - 0xc6, 0x07, 0xb0, 0x11, 0x31, 0xec, 0x3b, 0x2e, 0x8e, 0x70, 0xec, 0xd1, 0x38, 0x70, 0x8e, 0x09, - 0x0d, 0x42, 0x6e, 0x56, 0xe5, 0x94, 0x4d, 0x98, 0x5f, 0x12, 0x54, 0x97, 0x04, 0xdf, 0x3c, 0x8f, - 0xf9, 0x5e, 0x4f, 0x06, 0x66, 0xd7, 0x45, 0x90, 0xd5, 0x6e, 0xa5, 0xa3, 0xa1, 0x75, 0x31, 0xc5, - 0x56, 0x43, 0xde, 0xc9, 0x19, 0xf6, 0x1a, 0xb8, 0x16, 0xb2, 0x8c, 0x3b, 0xd4, 0x27, 0x31, 0xa7, - 0x7d, 0x4a, 0xd2, 0x9d, 0x1f, 0x15, 0xb0, 0x7e, 0xc8, 0x3c, 0x1c, 0x51, 0x3e, 0x9e, 0x66, 0x2d, - 0x0d, 0x44, 0xc5, 0x73, 0x11, 0xf6, 0x22, 0x03, 0x8a, 0x89, 0x4a, 0xb0, 0xf1, 0x02, 0xac, 0x46, - 0xae, 0xa3, 0x22, 0x15, 0xf1, 0xe9, 0x9d, 0x46, 0xef, 0xd6, 0x05, 0x7f, 0x6a, 0xba, 0xd2, 0xae, - 0x9e, 0xfc, 0xdc, 0x5a, 0x42, 0x8d, 0x68, 0x46, 0xc4, 0x85, 0x61, 0xe8, 0xff, 0x1f, 0x86, 0x71, - 0x17, 0xd4, 0x92, 0x94, 0xb2, 0x54, 0x38, 0x5c, 0x96, 0x77, 0x08, 0x04, 0x63, 0xb9, 0xab, 0x9b, - 0x9f, 0x35, 0x54, 0xf6, 0x8c, 0x87, 0xa0, 0x9e, 0xa4, 0xec, 0x13, 0x1d, 0x08, 0xe0, 0xca, 0xe5, - 0x8b, 0xd1, 0x14, 0x6e, 0x1f, 0x7d, 0x99, 0xb4, 0xb5, 0x93, 0x49, 0x5b, 0xfb, 0x3e, 0x69, 0x6b, - 0xbf, 0x26, 0x6d, 0x0d, 0xdc, 0xa6, 0x2c, 0x8f, 0x42, 0x80, 0xc6, 0x8b, 0x53, 0xb1, 0x9b, 0x2a, - 0x82, 0x23, 0x31, 0xff, 0x48, 0x7b, 0x5f, 0x5e, 0xb1, 0xbb, 0x22, 0x57, 0xee, 0xfd, 0x0b, 0x00, - 0x00, 0xff, 0xff, 0x21, 0x66, 0xa0, 0x4a, 0xf4, 0x04, 0x00, 0x00, + // 597 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0x97, 0x66, 0x1b, 0xad, 0xbb, 0x82, 0x96, 0x31, 0x11, 0x95, 0xa9, 0x1b, 0x63, 0xa0, + 0xaa, 0x07, 0x47, 0x74, 0x48, 0x48, 0x48, 0x08, 0x91, 0x0d, 0xa9, 0x48, 0x03, 0x55, 0x46, 0x80, + 0x04, 0x87, 0xc8, 0x49, 0xdc, 0xc4, 0x22, 0x8d, 0xa3, 0xc4, 0xed, 0xe8, 0x8d, 0x8f, 0xc3, 0x67, + 0xe0, 0xc4, 0x91, 0x23, 0x17, 0xee, 0x50, 0x71, 0xe1, 0x53, 0x0c, 0xd9, 0x89, 0xd3, 0x6e, 0xed, + 0xb4, 0x03, 0xb7, 0x37, 0x7e, 0x9f, 0xf7, 0xcf, 0xf3, 0xcb, 0x0b, 0x0e, 0x48, 0x3c, 0x66, 0x13, + 0x0b, 0x27, 0xd4, 0x1a, 0x77, 0x2d, 0x12, 0xfb, 0x09, 0xa3, 0x31, 0x2f, 0x03, 0x98, 0xa4, 0x8c, + 0x33, 0x63, 0x5b, 0xaa, 0x20, 0x4e, 0x28, 0x1c, 0x77, 0xa1, 0x4a, 0x36, 0x77, 0xcf, 0x15, 0x7b, + 0x2c, 0x25, 0x16, 0xf6, 0xfd, 0x94, 0x64, 0x59, 0x5e, 0xd7, 0xdc, 0x59, 0x14, 0xb8, 0x38, 0x23, + 0x45, 0xf6, 0x60, 0x31, 0x1b, 0x12, 0x1c, 0xf1, 0xd0, 0xf1, 0x42, 0xe2, 0x7d, 0x2c, 0x54, 0xad, + 0x80, 0xb1, 0x20, 0x22, 0x96, 0xfc, 0x72, 0x47, 0x03, 0xeb, 0x34, 0xc5, 0x49, 0x42, 0x52, 0x35, + 0xe3, 0xd6, 0x18, 0x47, 0xd4, 0xc7, 0x9c, 0x58, 0x2a, 0x28, 0x12, 0x37, 0x03, 0x16, 0x30, 0x19, + 0x5a, 0x22, 0xca, 0x5f, 0xf7, 0xff, 0x68, 0xa0, 0xfa, 0xbc, 0x30, 0x60, 0x3c, 0x04, 0xd7, 0x8a, + 0x85, 0x4d, 0x6d, 0x4f, 0x6b, 0xd7, 0xbb, 0x4d, 0x78, 0xce, 0xa9, 0xd8, 0x09, 0x3e, 0xcb, 0x15, + 0x48, 0x49, 0x0d, 0x0c, 0xb6, 0xe6, 0xf7, 0x74, 0x3c, 0x16, 0x0f, 0x68, 0x60, 0x56, 0x64, 0x87, + 0x07, 0x70, 0x29, 0x2b, 0xa8, 0x66, 0xc2, 0x9e, 0x2c, 0x3d, 0x12, 0x95, 0x47, 0xb2, 0x10, 0x6d, + 0x86, 0x17, 0x9f, 0x9a, 0x4f, 0xc1, 0xe6, 0x82, 0xce, 0xe8, 0x00, 0x90, 0xb0, 0x94, 0x3b, 0x63, + 0x1c, 0x8d, 0x88, 0x5c, 0xb8, 0x61, 0xd7, 0xbf, 0xfe, 0xfd, 0xa6, 0xaf, 0x77, 0x56, 0xcd, 0xb3, + 0x33, 0x1d, 0xd5, 0x44, 0xfa, 0xad, 0xc8, 0xee, 0xff, 0xae, 0x00, 0x70, 0xe2, 0x96, 0x46, 0x9f, + 0x80, 0xaa, 0xda, 0xa4, 0x70, 0xba, 0x7b, 0xc5, 0x9e, 0xbd, 0x15, 0x54, 0x96, 0x18, 0xf7, 0x40, + 0x43, 0xc5, 0x4e, 0x8c, 0x87, 0xc4, 0x5c, 0xdb, 0xd3, 0xda, 0xb5, 0xde, 0x0a, 0xda, 0x50, 0xcf, + 0xaf, 0xf0, 0x90, 0x18, 0xc7, 0xa0, 0x51, 0x80, 0xc9, 0x38, 0xe6, 0xa3, 0x4c, 0x22, 0xb9, 0x7e, + 0x71, 0x94, 0x84, 0x9a, 0xbb, 0x7b, 0x2d, 0x65, 0x68, 0x23, 0x9c, 0xfb, 0x32, 0x1e, 0x81, 0xea, + 0x90, 0x70, 0xec, 0x63, 0x8e, 0x4d, 0x5d, 0xee, 0x7a, 0x7b, 0x49, 0x83, 0x97, 0x85, 0x04, 0x95, + 0x62, 0xe3, 0x03, 0xd8, 0x8e, 0x18, 0xf6, 0x1d, 0x17, 0x47, 0x38, 0xf6, 0x68, 0x1c, 0x38, 0xa7, + 0x84, 0x06, 0x21, 0x37, 0x57, 0x65, 0x97, 0x1d, 0x98, 0x5f, 0x12, 0x54, 0x97, 0x04, 0xdf, 0xbc, + 0x88, 0xf9, 0x61, 0x57, 0x02, 0xb3, 0x6b, 0x02, 0xe4, 0x6a, 0xa7, 0xd2, 0xd6, 0xd0, 0x96, 0xe8, + 0x62, 0xab, 0x26, 0xef, 0x64, 0x0f, 0x7b, 0x13, 0xdc, 0x08, 0x59, 0xc6, 0x1d, 0xea, 0x93, 0x98, + 0xd3, 0x01, 0x25, 0xe9, 0xfe, 0xcf, 0x0a, 0xd8, 0x3a, 0x61, 0x1e, 0x8e, 0x28, 0x9f, 0xcc, 0x58, + 0x4b, 0x03, 0x51, 0xf1, 0x5c, 0xc0, 0x5e, 0x66, 0x40, 0x55, 0xa2, 0x52, 0x6c, 0x1c, 0x83, 0x8d, + 0xc8, 0x75, 0x14, 0x52, 0x81, 0x4f, 0x6f, 0xd7, 0xbb, 0x77, 0x2e, 0xf9, 0x53, 0xb3, 0x91, 0xa8, + 0x1e, 0xcd, 0x8d, 0xbf, 0x14, 0x83, 0xfe, 0xff, 0x18, 0x8c, 0xfb, 0xa0, 0x9a, 0xa4, 0x94, 0xa5, + 0xc2, 0xdb, 0x9a, 0xbc, 0x40, 0x20, 0x2a, 0xd6, 0x3a, 0xba, 0xf9, 0x59, 0x43, 0x65, 0xce, 0x78, + 0x0c, 0x6a, 0x49, 0xca, 0x3e, 0xd1, 0xa1, 0x10, 0xae, 0x5f, 0x3d, 0x18, 0xcd, 0xe4, 0x76, 0xff, + 0xcb, 0xb4, 0xa5, 0x7d, 0x9f, 0xb6, 0xb4, 0x1f, 0xd3, 0x96, 0xf6, 0x6b, 0xda, 0xd2, 0xc0, 0x5d, + 0xca, 0x72, 0x08, 0x42, 0x34, 0x59, 0xce, 0xc3, 0x6e, 0x28, 0x04, 0x7d, 0xd1, 0xbf, 0xaf, 0xbd, + 0x2f, 0xef, 0xd7, 0x5d, 0x97, 0x23, 0x0f, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x12, 0xe4, 0xf4, + 0x8c, 0xee, 0x04, 0x00, 0x00, } func (this *Endpoint) Equal(that interface{}) bool { @@ -684,7 +682,7 @@ func (this *LocalityLbEndpoints) Equal(that interface{}) bool { return false } for i := range this.LbEndpoints { - if !this.LbEndpoints[i].Equal(&that1.LbEndpoints[i]) { + if !this.LbEndpoints[i].Equal(that1.LbEndpoints[i]) { return false } } @@ -1555,7 +1553,7 @@ func (m *LocalityLbEndpoints) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.LbEndpoints = append(m.LbEndpoints, LbEndpoint{}) + m.LbEndpoints = append(m.LbEndpoints, &LbEndpoint{}) if err := m.LbEndpoints[len(m.LbEndpoints)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go index b1dbd582f2a2..4216b5dbc267 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/endpoint.pb.validate.go @@ -44,32 +44,22 @@ func (m *Endpoint) Validate() error { return nil } - { - tmp := m.GetAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return EndpointValidationError{ - field: "Address", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return EndpointValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHealthCheckConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return EndpointValidationError{ - field: "HealthCheckConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHealthCheckConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return EndpointValidationError{ + field: "HealthCheckConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -140,17 +130,12 @@ func (m *LbEndpoint) Validate() error { // no validation rules for HealthStatus - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LbEndpointValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LbEndpointValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } @@ -170,17 +155,12 @@ func (m *LbEndpoint) Validate() error { case *LbEndpoint_Endpoint: - { - tmp := m.GetEndpoint() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LbEndpointValidationError{ - field: "Endpoint", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEndpoint()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LbEndpointValidationError{ + field: "Endpoint", + reason: "embedded message failed validation", + cause: err, } } } @@ -255,17 +235,12 @@ func (m *LocalityLbEndpoints) Validate() error { return nil } - { - tmp := m.GetLocality() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LocalityLbEndpointsValidationError{ - field: "Locality", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LocalityLbEndpointsValidationError{ + field: "Locality", + reason: "embedded message failed validation", + cause: err, } } } @@ -273,17 +248,12 @@ func (m *LocalityLbEndpoints) Validate() error { for idx, item := range m.GetLbEndpoints() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LocalityLbEndpointsValidationError{ - field: fmt.Sprintf("LbEndpoints[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LocalityLbEndpointsValidationError{ + field: fmt.Sprintf("LbEndpoints[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -308,17 +278,12 @@ func (m *LocalityLbEndpoints) Validate() error { } } - { - tmp := m.GetProximity() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LocalityLbEndpointsValidationError{ - field: "Proximity", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetProximity()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LocalityLbEndpointsValidationError{ + field: "Proximity", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go index 768831faeb59..44fcc629a782 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.go @@ -6,15 +6,13 @@ package endpoint import ( encoding_binary "encoding/binary" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go index cdf2ff80a965..3ab9e459b0a4 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint/load_report.pb.validate.go @@ -41,17 +41,12 @@ func (m *UpstreamLocalityStats) Validate() error { return nil } - { - tmp := m.GetLocality() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamLocalityStatsValidationError{ - field: "Locality", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamLocalityStatsValidationError{ + field: "Locality", + reason: "embedded message failed validation", + cause: err, } } } @@ -67,17 +62,12 @@ func (m *UpstreamLocalityStats) Validate() error { for idx, item := range m.GetLoadMetricStats() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamLocalityStatsValidationError{ - field: fmt.Sprintf("LoadMetricStats[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamLocalityStatsValidationError{ + field: fmt.Sprintf("LoadMetricStats[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -87,17 +77,12 @@ func (m *UpstreamLocalityStats) Validate() error { for idx, item := range m.GetUpstreamEndpointStats() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamLocalityStatsValidationError{ - field: fmt.Sprintf("UpstreamEndpointStats[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamLocalityStatsValidationError{ + field: fmt.Sprintf("UpstreamEndpointStats[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -173,32 +158,22 @@ func (m *UpstreamEndpointStats) Validate() error { return nil } - { - tmp := m.GetAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamEndpointStatsValidationError{ - field: "Address", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamEndpointStatsValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamEndpointStatsValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamEndpointStatsValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } @@ -214,17 +189,12 @@ func (m *UpstreamEndpointStats) Validate() error { for idx, item := range m.GetLoadMetricStats() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return UpstreamEndpointStatsValidationError{ - field: fmt.Sprintf("LoadMetricStats[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return UpstreamEndpointStatsValidationError{ + field: fmt.Sprintf("LoadMetricStats[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -390,17 +360,12 @@ func (m *ClusterStats) Validate() error { for idx, item := range m.GetUpstreamLocalityStats() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterStatsValidationError{ - field: fmt.Sprintf("UpstreamLocalityStats[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterStatsValidationError{ + field: fmt.Sprintf("UpstreamLocalityStats[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -412,34 +377,24 @@ func (m *ClusterStats) Validate() error { for idx, item := range m.GetDroppedRequests() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterStatsValidationError{ - field: fmt.Sprintf("DroppedRequests[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterStatsValidationError{ + field: fmt.Sprintf("DroppedRequests[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetLoadReportInterval() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterStatsValidationError{ - field: "LoadReportInterval", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLoadReportInterval()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterStatsValidationError{ + field: "LoadReportInterval", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go index 3eda7214e483..94f1accb56ee 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.go @@ -7,10 +7,8 @@ import ( bytes "bytes" context "context" fmt "fmt" - io "io" - math "math" - time "time" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + listener "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" @@ -18,9 +16,9 @@ import ( github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - listener "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -74,7 +72,7 @@ type Listener struct { // The address that the listener should listen on. In general, the address must be unique, though // that is governed by the bind rules of the OS. E.g., multiple listeners can listen on port 0 on // Linux as the actual port will be allocated by the OS. - Address core.Address `protobuf:"bytes,2,opt,name=address,proto3" json:"address"` + Address *core.Address `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // A list of filter chains to consider for this listener. The // :ref:`FilterChain ` with the most specific // :ref:`FilterChainMatch ` criteria is used on a @@ -82,7 +80,7 @@ type Listener struct { // // Example using SNI for filter chain selection can be found in the // :ref:`FAQ entry `. - FilterChains []listener.FilterChain `protobuf:"bytes,3,rep,name=filter_chains,json=filterChains,proto3" json:"filter_chains"` + FilterChains []*listener.FilterChain `protobuf:"bytes,3,rep,name=filter_chains,json=filterChains,proto3" json:"filter_chains,omitempty"` // If a connection is redirected using *iptables*, the port on which the proxy // receives it might be different from the original destination address. When this flag is set to // true, the listener hands off redirected connections to the listener associated with the @@ -117,7 +115,7 @@ type Listener struct { // :ref:`protocol ` is :ref:'UDP // `. // UDP listeners currently support a single filter. - ListenerFilters []listener.ListenerFilter `protobuf:"bytes,9,rep,name=listener_filters,json=listenerFilters,proto3" json:"listener_filters"` + ListenerFilters []*listener.ListenerFilter `protobuf:"bytes,9,rep,name=listener_filters,json=listenerFilters,proto3" json:"listener_filters,omitempty"` // The timeout to wait for all listener filters to complete operation. If the timeout is reached, // the accepted socket is closed without a connection being created. Specify 0 to disable the // timeout. If not specified, a default timeout of 15s is used. @@ -207,14 +205,14 @@ func (m *Listener) GetName() string { return "" } -func (m *Listener) GetAddress() core.Address { +func (m *Listener) GetAddress() *core.Address { if m != nil { return m.Address } - return core.Address{} + return nil } -func (m *Listener) GetFilterChains() []listener.FilterChain { +func (m *Listener) GetFilterChains() []*listener.FilterChain { if m != nil { return m.FilterChains } @@ -257,7 +255,7 @@ func (m *Listener) GetDrainType() Listener_DrainType { return Listener_DEFAULT } -func (m *Listener) GetListenerFilters() []listener.ListenerFilter { +func (m *Listener) GetListenerFilters() []*listener.ListenerFilter { if m != nil { return m.ListenerFilters } @@ -366,62 +364,61 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/lds.proto", fileDescriptor_34e2cd84a105bcd1) } var fileDescriptor_34e2cd84a105bcd1 = []byte{ - // 872 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x6f, 0x1b, 0x45, - 0x14, 0xc7, 0x33, 0x8e, 0xdb, 0x38, 0x63, 0xc7, 0xb6, 0x46, 0x28, 0x5d, 0x4c, 0xb0, 0x8d, 0x29, - 0x92, 0xe1, 0xb0, 0xa6, 0xae, 0x04, 0x52, 0xa9, 0x84, 0xba, 0x35, 0x56, 0x8b, 0x1c, 0x1c, 0x36, - 0x69, 0xd4, 0x9c, 0x56, 0xe3, 0xdd, 0x67, 0x67, 0xc5, 0x7a, 0x66, 0x3a, 0x33, 0x6b, 0xf0, 0x95, - 0x13, 0xe2, 0xca, 0x85, 0x8f, 0xc0, 0x67, 0xe0, 0xc4, 0xb1, 0x27, 0x84, 0xc4, 0x1d, 0x50, 0xc4, - 0x85, 0x33, 0x5f, 0x00, 0xed, 0x78, 0xd7, 0xb5, 0x9d, 0xa4, 0xe5, 0xd0, 0xdb, 0x9b, 0x79, 0xff, - 0xff, 0x6f, 0x66, 0xdf, 0x7b, 0xbb, 0x8b, 0xf7, 0x81, 0xcd, 0xf8, 0xbc, 0x43, 0x45, 0xd8, 0x99, - 0x75, 0x3b, 0x51, 0xa0, 0x6c, 0x21, 0xb9, 0xe6, 0xa4, 0x64, 0xf6, 0x6d, 0x2a, 0x42, 0x7b, 0xd6, - 0xad, 0x35, 0xd6, 0x54, 0x3e, 0x97, 0xd0, 0xa1, 0x41, 0x20, 0x41, 0xa5, 0xf2, 0xda, 0xc1, 0x65, - 0xc1, 0x88, 0x2a, 0xb8, 0x32, 0x1b, 0x84, 0xca, 0xe7, 0x33, 0x90, 0xf3, 0x34, 0x7b, 0x7b, 0xfd, - 0x0a, 0xa1, 0xd2, 0xc0, 0x40, 0x2e, 0x83, 0x8c, 0x31, 0xe1, 0x7c, 0x12, 0x81, 0x91, 0x51, 0xc6, - 0xb8, 0xa6, 0x3a, 0xe4, 0x2c, 0x3b, 0xbf, 0x9e, 0x66, 0xcd, 0x6a, 0x14, 0x8f, 0x3b, 0x41, 0x2c, - 0x8d, 0xe0, 0xba, 0xfc, 0xd7, 0x92, 0x0a, 0x01, 0x32, 0xf3, 0xdf, 0x9a, 0xd1, 0x28, 0x0c, 0xa8, - 0x86, 0x4e, 0x16, 0xa4, 0x89, 0x37, 0x26, 0x7c, 0xc2, 0x4d, 0xd8, 0x49, 0xa2, 0xc5, 0x6e, 0xeb, - 0xdf, 0x02, 0x2e, 0x0c, 0xd2, 0xfb, 0x11, 0x82, 0xf3, 0x8c, 0x4e, 0xc1, 0x42, 0x4d, 0xd4, 0xde, - 0x75, 0x4d, 0x4c, 0x7a, 0x78, 0x27, 0x2d, 0x90, 0x95, 0x6b, 0xa2, 0x76, 0xb1, 0x5b, 0xb3, 0x57, - 0x0b, 0x6a, 0x27, 0x15, 0xb2, 0x1f, 0x2c, 0x14, 0x4e, 0xf9, 0xf9, 0x1f, 0x8d, 0xad, 0x9f, 0xff, - 0xf9, 0x65, 0xfb, 0xc6, 0xf7, 0x28, 0x57, 0x45, 0x6e, 0x66, 0x25, 0x87, 0x78, 0x6f, 0x1c, 0x46, - 0x1a, 0xa4, 0xe7, 0x9f, 0xd3, 0x90, 0x29, 0x6b, 0xbb, 0xb9, 0xdd, 0x2e, 0x76, 0x5b, 0xeb, 0xac, - 0x65, 0xa1, 0xfa, 0x46, 0xfb, 0x30, 0x91, 0x3a, 0xf9, 0x84, 0xe9, 0x96, 0xc6, 0x2f, 0xb6, 0x14, - 0x79, 0x84, 0xab, 0xb1, 0x02, 0x8f, 0xcb, 0x70, 0x12, 0x32, 0x1a, 0x79, 0x81, 0xd2, 0x56, 0x3e, - 0xbd, 0xdd, 0xa2, 0x3e, 0x76, 0x56, 0x1f, 0xdb, 0xe1, 0x3c, 0x3a, 0xa5, 0x51, 0x0c, 0x4e, 0xce, - 0x42, 0x6e, 0x39, 0x56, 0x30, 0x4c, 0x6d, 0x3d, 0xa5, 0xc9, 0x18, 0xbf, 0x23, 0x92, 0x5b, 0x71, - 0xc6, 0xc0, 0x4f, 0xca, 0xec, 0x8d, 0xe2, 0xf1, 0x18, 0xa4, 0x17, 0x85, 0xd3, 0x50, 0x7b, 0xa3, - 0xb9, 0x06, 0x65, 0xdd, 0x30, 0xe8, 0x83, 0x4b, 0xe8, 0x27, 0x8f, 0x99, 0xbe, 0xdb, 0x35, 0x70, - 0xf7, 0x6d, 0x01, 0xf2, 0xe1, 0x92, 0xe2, 0x18, 0xc8, 0x20, 0x61, 0x38, 0x09, 0x82, 0x7c, 0x8c, - 0x0b, 0x53, 0xd0, 0x34, 0xa0, 0x9a, 0x5a, 0x37, 0x0d, 0xee, 0xad, 0x2b, 0xea, 0x78, 0x98, 0x4a, - 0xdc, 0xa5, 0x98, 0x3c, 0xc2, 0x7b, 0x01, 0x08, 0x09, 0x3e, 0xd5, 0x10, 0x78, 0xb3, 0x3b, 0xd6, - 0x8e, 0x71, 0xbf, 0xbb, 0xee, 0xce, 0x5a, 0x68, 0xf7, 0x96, 0xda, 0xd3, 0x3b, 0x6e, 0x29, 0x58, - 0x59, 0x91, 0x4f, 0x31, 0x0e, 0x24, 0x0d, 0x99, 0xa7, 0xe7, 0x02, 0xac, 0x42, 0x13, 0xb5, 0xcb, - 0xdd, 0xe6, 0x75, 0x98, 0x44, 0x78, 0x32, 0x17, 0xe0, 0xee, 0x06, 0x59, 0x48, 0x4e, 0x71, 0x35, - 0xeb, 0x90, 0xb7, 0x68, 0x87, 0xb2, 0x76, 0x4d, 0x1f, 0xdf, 0xbb, 0xa6, 0x8f, 0x19, 0x6f, 0xd1, - 0xcf, 0xb4, 0x95, 0x95, 0x68, 0x6d, 0x57, 0x91, 0x33, 0x6c, 0x6d, 0x72, 0x3d, 0x1d, 0x4e, 0x81, - 0xc7, 0xda, 0xaa, 0x98, 0xa7, 0x7d, 0xf3, 0x52, 0xe9, 0x7b, 0xe9, 0x5b, 0xe1, 0xe4, 0x7f, 0xfc, - 0xb3, 0x81, 0xdc, 0xfd, 0x0d, 0xe6, 0xc9, 0xc2, 0x4e, 0xee, 0xe3, 0xa2, 0x96, 0x94, 0x29, 0x41, - 0x25, 0x30, 0x6d, 0xe1, 0x57, 0xcd, 0x88, 0xbb, 0x2a, 0x27, 0x1f, 0xe1, 0xc2, 0x58, 0x02, 0x8c, - 0x42, 0x16, 0x58, 0xc5, 0x57, 0x5a, 0x97, 0x5a, 0xd2, 0xc7, 0x65, 0xc5, 0xfd, 0xaf, 0x40, 0x7b, - 0x5c, 0x98, 0x77, 0xdb, 0xda, 0x33, 0x65, 0x6a, 0x5c, 0xd1, 0xf2, 0x63, 0x23, 0x1c, 0x1a, 0x9d, - 0xbb, 0xa7, 0x56, 0x56, 0x8a, 0x3c, 0xc5, 0x35, 0xed, 0x0b, 0x6f, 0x4c, 0x55, 0x42, 0x02, 0xe6, - 0x3d, 0x8b, 0x21, 0x06, 0x2f, 0x02, 0x36, 0xd1, 0xe7, 0x56, 0xe9, 0x7f, 0x4c, 0xe5, 0xbe, 0xf6, - 0x45, 0x9f, 0x2a, 0x3d, 0x14, 0xc0, 0xbe, 0x4c, 0xcc, 0x03, 0xe3, 0xad, 0x0d, 0x70, 0x69, 0x75, - 0x52, 0xc8, 0x7d, 0x5c, 0x4a, 0x6e, 0xee, 0x69, 0xee, 0x09, 0x2e, 0xb5, 0xf9, 0x02, 0xbc, 0xfc, - 0x69, 0x71, 0xa2, 0x3f, 0xe1, 0x47, 0x5c, 0xea, 0xd6, 0xfb, 0x78, 0x77, 0x39, 0x30, 0xa4, 0x88, - 0x77, 0x7a, 0x9f, 0xf5, 0x1f, 0x3c, 0x19, 0x9c, 0x54, 0xb7, 0x48, 0x05, 0x17, 0x0f, 0x87, 0xbd, - 0xc7, 0xfd, 0x33, 0x6f, 0xf8, 0xc5, 0xe0, 0xac, 0x8a, 0x3e, 0xcf, 0x17, 0xca, 0xd5, 0x4a, 0xf7, - 0xd7, 0x1c, 0xb6, 0xb2, 0xd9, 0xe8, 0x65, 0x1f, 0xd1, 0x63, 0x90, 0xb3, 0xd0, 0x07, 0x42, 0x71, - 0xb9, 0x07, 0x91, 0xa6, 0x99, 0x40, 0x91, 0x8d, 0x61, 0x37, 0xd9, 0xa5, 0xcd, 0x85, 0x67, 0x31, - 0x28, 0x5d, 0xbb, 0xfd, 0x72, 0x91, 0x12, 0x9c, 0x29, 0x68, 0x6d, 0xb5, 0xd1, 0x87, 0x88, 0x3c, - 0xc5, 0x95, 0x63, 0x2d, 0x81, 0x4e, 0x5f, 0x9c, 0x51, 0xdf, 0xb0, 0x6f, 0xe2, 0x1b, 0xd7, 0xe6, - 0xd7, 0xc8, 0x31, 0x2e, 0xf7, 0x41, 0xfb, 0xe7, 0xaf, 0x11, 0xdc, 0xfa, 0xf6, 0xf7, 0xbf, 0x7f, - 0xc8, 0x1d, 0xb4, 0x6e, 0xad, 0xfd, 0x72, 0xee, 0x65, 0x13, 0xaf, 0xee, 0xa1, 0x0f, 0x9c, 0x4f, - 0x7e, 0xba, 0xa8, 0xa3, 0xe7, 0x17, 0x75, 0xf4, 0xdb, 0x45, 0x1d, 0xfd, 0x75, 0x51, 0x47, 0xb8, - 0x16, 0xf2, 0x05, 0x58, 0x48, 0xfe, 0xcd, 0x7c, 0xed, 0x0c, 0xa7, 0x30, 0x08, 0xd4, 0x51, 0xd2, - 0xd2, 0x23, 0xf4, 0x1d, 0x42, 0xa3, 0x9b, 0xa6, 0xbd, 0x77, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, - 0xc4, 0x95, 0x1f, 0x99, 0x42, 0x07, 0x00, 0x00, + // 861 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x41, 0x6f, 0x1b, 0x45, + 0x14, 0xee, 0x38, 0x69, 0xe3, 0x8c, 0x1d, 0xdb, 0x1a, 0xa1, 0x74, 0x31, 0xc1, 0x31, 0xa6, 0x48, + 0x86, 0xc3, 0x9a, 0xba, 0x12, 0x48, 0xa5, 0x12, 0xd4, 0x35, 0xa6, 0x45, 0x2e, 0x0e, 0x9b, 0xb4, + 0x6a, 0x4e, 0xab, 0xf1, 0xee, 0xb3, 0x33, 0x62, 0x3d, 0x33, 0x9d, 0x99, 0x35, 0xf8, 0xca, 0x09, + 0x71, 0xe5, 0xc2, 0x4f, 0xe0, 0x37, 0x70, 0xe2, 0xc8, 0x09, 0x21, 0xf1, 0x03, 0x40, 0x81, 0x0b, + 0xff, 0x02, 0xed, 0x78, 0xd7, 0xb5, 0x9d, 0xb8, 0xe1, 0xd0, 0xdb, 0x7b, 0xfb, 0xbe, 0xef, 0x9b, + 0x37, 0xdf, 0x7b, 0x63, 0xe3, 0x7d, 0xe0, 0x53, 0x31, 0x6b, 0x51, 0xc9, 0x5a, 0xd3, 0x76, 0x2b, + 0x0a, 0xb5, 0x2b, 0x95, 0x30, 0x82, 0x14, 0xed, 0x77, 0x97, 0x4a, 0xe6, 0x4e, 0xdb, 0xd5, 0xc3, + 0x15, 0x54, 0x20, 0x14, 0xb4, 0x68, 0x18, 0x2a, 0xd0, 0x29, 0xbc, 0x7a, 0x70, 0x11, 0x30, 0xa4, + 0x1a, 0x2e, 0xad, 0x86, 0x4c, 0x07, 0x62, 0x0a, 0x6a, 0x96, 0x56, 0x6f, 0xad, 0xb6, 0xc0, 0xb4, + 0x01, 0x0e, 0x6a, 0x11, 0x64, 0x1a, 0x63, 0x21, 0xc6, 0x11, 0x58, 0x18, 0xe5, 0x5c, 0x18, 0x6a, + 0x98, 0xe0, 0xd9, 0xf9, 0xb5, 0xb4, 0x6a, 0xb3, 0x61, 0x3c, 0x6a, 0x85, 0xb1, 0xb2, 0x80, 0x4d, + 0xf5, 0xaf, 0x15, 0x95, 0x12, 0x54, 0xc6, 0xbf, 0x39, 0xa5, 0x11, 0x0b, 0xa9, 0x81, 0x56, 0x16, + 0xa4, 0x85, 0xd7, 0xc6, 0x62, 0x2c, 0x6c, 0xd8, 0x4a, 0xa2, 0xf9, 0xd7, 0xc6, 0xdf, 0x79, 0x9c, + 0xef, 0xa7, 0xfd, 0x11, 0x82, 0xb7, 0x39, 0x9d, 0x80, 0x83, 0xea, 0xa8, 0xb9, 0xeb, 0xd9, 0x98, + 0x7c, 0x82, 0x77, 0x52, 0x83, 0x9c, 0x5c, 0x1d, 0x35, 0x0b, 0xed, 0xaa, 0xbb, 0x6c, 0xa8, 0x9b, + 0x38, 0xe4, 0xde, 0x9f, 0x23, 0x3a, 0xf8, 0xe7, 0x7f, 0x7f, 0xd9, 0xba, 0xfe, 0x3d, 0xca, 0x55, + 0x90, 0x97, 0xd1, 0xc8, 0x67, 0x78, 0x6f, 0xc4, 0x22, 0x03, 0xca, 0x0f, 0xce, 0x28, 0xe3, 0xda, + 0xd9, 0xaa, 0x6f, 0x35, 0x0b, 0xed, 0xc6, 0xaa, 0xce, 0xc2, 0xa4, 0x9e, 0xc5, 0x3e, 0x48, 0xa0, + 0x5e, 0x71, 0xf4, 0x22, 0xd1, 0xe4, 0x21, 0xae, 0xc4, 0x1a, 0x7c, 0xa1, 0xd8, 0x98, 0x71, 0x1a, + 0xf9, 0xa1, 0x36, 0xce, 0x76, 0xda, 0xd3, 0xdc, 0x15, 0x37, 0x73, 0xc5, 0xed, 0x08, 0x11, 0x3d, + 0xa5, 0x51, 0x0c, 0x9d, 0x9c, 0x83, 0xbc, 0x52, 0xac, 0x61, 0x90, 0xd2, 0xba, 0xda, 0x90, 0x11, + 0x7e, 0x4b, 0x26, 0xfd, 0x08, 0xce, 0x21, 0x48, 0xcc, 0xf5, 0x87, 0xf1, 0x68, 0x04, 0xca, 0x8f, + 0xd8, 0x84, 0x19, 0x7f, 0x38, 0x33, 0xa0, 0x9d, 0xeb, 0x56, 0xfa, 0xe0, 0x82, 0xf4, 0x93, 0x47, + 0xdc, 0xdc, 0x69, 0x5b, 0x71, 0xef, 0x4d, 0x09, 0xea, 0xc1, 0x42, 0xa5, 0x63, 0x45, 0xfa, 0x89, + 0x46, 0x27, 0x91, 0x20, 0x1f, 0xe2, 0xfc, 0x04, 0x0c, 0x0d, 0xa9, 0xa1, 0xce, 0x0d, 0x2b, 0xf7, + 0xc6, 0x25, 0xee, 0x3d, 0x4e, 0x21, 0xde, 0x02, 0x4c, 0x1e, 0xe2, 0xbd, 0x10, 0xa4, 0x82, 0x80, + 0x1a, 0x08, 0xfd, 0xe9, 0x6d, 0x67, 0xc7, 0xb2, 0xdf, 0x5e, 0x65, 0x67, 0x83, 0x73, 0xbb, 0x0b, + 0xec, 0xd3, 0xdb, 0x5e, 0x31, 0x5c, 0xca, 0xc8, 0xc7, 0x18, 0x87, 0x8a, 0x32, 0xee, 0x9b, 0x99, + 0x04, 0x27, 0x5f, 0x47, 0xcd, 0x52, 0xbb, 0xbe, 0x49, 0x26, 0x01, 0x9e, 0xcc, 0x24, 0x78, 0xbb, + 0x61, 0x16, 0x92, 0x23, 0x5c, 0xc9, 0x66, 0xe3, 0xcf, 0xc7, 0xa1, 0x9d, 0x5d, 0x3b, 0xc1, 0x77, + 0x36, 0x4c, 0x30, 0xd3, 0x9b, 0x4f, 0xd2, 0x2b, 0x47, 0x2b, 0xb9, 0x26, 0xa7, 0xd8, 0x59, 0x57, + 0xf4, 0x0d, 0x9b, 0x80, 0x88, 0x8d, 0x53, 0xb6, 0xf7, 0x7c, 0xfd, 0x82, 0xe9, 0xdd, 0xf4, 0x15, + 0x74, 0xb6, 0x7f, 0xfc, 0xf3, 0x10, 0x79, 0xfb, 0x6b, 0x9a, 0x27, 0x73, 0x3a, 0xb9, 0x87, 0x0b, + 0x46, 0x51, 0xae, 0x25, 0x55, 0xc0, 0x8d, 0x83, 0xaf, 0xda, 0x0e, 0x6f, 0x19, 0x4e, 0x3e, 0xc0, + 0xf9, 0x91, 0x02, 0x18, 0x32, 0x1e, 0x3a, 0x85, 0x2b, 0xa9, 0x0b, 0x2c, 0xe9, 0xe1, 0x92, 0x16, + 0xc1, 0x57, 0x60, 0x7c, 0x21, 0xed, 0x5b, 0x76, 0xf6, 0xac, 0x41, 0x87, 0x97, 0x0c, 0xfb, 0xd8, + 0x02, 0x07, 0x16, 0xe7, 0xed, 0xe9, 0xa5, 0x4c, 0x93, 0x67, 0xb8, 0x6a, 0x02, 0xe9, 0x8f, 0xa8, + 0x4e, 0x94, 0x80, 0xfb, 0xcf, 0x63, 0x88, 0xc1, 0x8f, 0x80, 0x8f, 0xcd, 0x99, 0x53, 0xfc, 0x1f, + 0xfb, 0xb8, 0x6f, 0x02, 0xd9, 0xa3, 0xda, 0x0c, 0x24, 0xf0, 0x2f, 0x13, 0x72, 0xdf, 0x72, 0xab, + 0x7d, 0x5c, 0x5c, 0xde, 0x11, 0x72, 0x0f, 0x17, 0x93, 0xce, 0x7d, 0x23, 0x7c, 0x29, 0x94, 0xb1, + 0x2f, 0xfe, 0xe5, 0xb7, 0xc5, 0x09, 0xfe, 0x44, 0x1c, 0x09, 0x65, 0x1a, 0xef, 0xe2, 0xdd, 0xc5, + 0xaa, 0x90, 0x02, 0xde, 0xe9, 0x7e, 0xda, 0xbb, 0xff, 0xa4, 0x7f, 0x52, 0xb9, 0x46, 0xca, 0xb8, + 0xf0, 0x78, 0xd0, 0x7d, 0xd4, 0x3b, 0xf5, 0x07, 0x5f, 0xf4, 0x4f, 0x2b, 0xe8, 0xf3, 0xed, 0x7c, + 0xa9, 0x52, 0x6e, 0xff, 0x96, 0xc3, 0x4e, 0xb6, 0x15, 0xdd, 0xec, 0x47, 0xf3, 0x18, 0xd4, 0x94, + 0x05, 0x40, 0x28, 0x2e, 0x75, 0x21, 0x32, 0x34, 0x03, 0x68, 0xb2, 0xb6, 0xe6, 0xb6, 0xba, 0xa0, + 0x79, 0xf0, 0x3c, 0x06, 0x6d, 0xaa, 0xb7, 0x5e, 0x0e, 0xd2, 0x52, 0x70, 0x0d, 0x8d, 0x6b, 0x4d, + 0xf4, 0x3e, 0x22, 0xcf, 0x70, 0xf9, 0xd8, 0x28, 0xa0, 0x93, 0x17, 0x67, 0xd4, 0xd6, 0xe8, 0xeb, + 0xf2, 0x87, 0x1b, 0xeb, 0x2b, 0xca, 0x31, 0x2e, 0xf5, 0xc0, 0x04, 0x67, 0xaf, 0x50, 0xb8, 0xf1, + 0xed, 0x1f, 0xff, 0xfc, 0x90, 0x3b, 0x68, 0xdc, 0x5c, 0xf9, 0x8b, 0xb9, 0x9b, 0x6d, 0xbc, 0xbe, + 0x8b, 0xde, 0xeb, 0x7c, 0xf4, 0xd3, 0x79, 0x0d, 0xfd, 0x7a, 0x5e, 0x43, 0xbf, 0x9f, 0xd7, 0xd0, + 0x5f, 0xe7, 0x35, 0x84, 0xab, 0x4c, 0xcc, 0x85, 0xa5, 0x12, 0xdf, 0xcc, 0x56, 0xce, 0xe8, 0xe4, + 0xfb, 0xa1, 0x3e, 0x4a, 0x46, 0x7a, 0x84, 0xbe, 0x43, 0x68, 0x78, 0xc3, 0x8e, 0xf7, 0xce, 0x7f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x96, 0x7f, 0xe2, 0x0b, 0x32, 0x07, 0x00, 0x00, } func (this *Listener) Equal(that interface{}) bool { @@ -446,14 +443,14 @@ func (this *Listener) Equal(that interface{}) bool { if this.Name != that1.Name { return false } - if !this.Address.Equal(&that1.Address) { + if !this.Address.Equal(that1.Address) { return false } if len(this.FilterChains) != len(that1.FilterChains) { return false } for i := range this.FilterChains { - if !this.FilterChains[i].Equal(&that1.FilterChains[i]) { + if !this.FilterChains[i].Equal(that1.FilterChains[i]) { return false } } @@ -476,7 +473,7 @@ func (this *Listener) Equal(that interface{}) bool { return false } for i := range this.ListenerFilters { - if !this.ListenerFilters[i].Equal(&that1.ListenerFilters[i]) { + if !this.ListenerFilters[i].Equal(that1.ListenerFilters[i]) { return false } } @@ -763,14 +760,16 @@ func (m *Listener) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintLds(dAtA, i, uint64(len(m.Name))) i += copy(dAtA[i:], m.Name) } - dAtA[i] = 0x12 - i++ - i = encodeVarintLds(dAtA, i, uint64(m.Address.Size())) - n1, err := m.Address.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.Address != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintLds(dAtA, i, uint64(m.Address.Size())) + n1, err := m.Address.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n1 } - i += n1 if len(m.FilterChains) > 0 { for _, msg := range m.FilterChains { dAtA[i] = 0x1a @@ -948,8 +947,10 @@ func (m *Listener) Size() (n int) { if l > 0 { n += 1 + l + sovLds(uint64(l)) } - l = m.Address.Size() - n += 1 + l + sovLds(uint64(l)) + if m.Address != nil { + l = m.Address.Size() + n += 1 + l + sovLds(uint64(l)) + } if len(m.FilterChains) > 0 { for _, e := range m.FilterChains { l = e.Size() @@ -1128,6 +1129,9 @@ func (m *Listener) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Address == nil { + m.Address = &core.Address{} + } if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1161,7 +1165,7 @@ func (m *Listener) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.FilterChains = append(m.FilterChains, listener.FilterChain{}) + m.FilterChains = append(m.FilterChains, &listener.FilterChain{}) if err := m.FilterChains[len(m.FilterChains)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1358,7 +1362,7 @@ func (m *Listener) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ListenerFilters = append(m.ListenerFilters, listener.ListenerFilter{}) + m.ListenerFilters = append(m.ListenerFilters, &listener.ListenerFilter{}) if err := m.ListenerFilters[len(m.ListenerFilters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go index c0d410618be1..e4b0956afceb 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/lds.pb.validate.go @@ -42,201 +42,148 @@ func (m *Listener) Validate() error { // no validation rules for Name - { - tmp := m.GetAddress() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: "Address", - reason: "embedded message failed validation", - cause: err, - } - } + if m.GetAddress() == nil { + return ListenerValidationError{ + field: "Address", + reason: "value is required", } } - for idx, item := range m.GetFilterChains() { - _, _ = idx, item - - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: fmt.Sprintf("FilterChains[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, } } - } - { - tmp := m.GetUseOriginalDst() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetFilterChains() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ - field: "UseOriginalDst", + field: fmt.Sprintf("FilterChains[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - - { - tmp := m.GetPerConnectionBufferLimitBytes() - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: "PerConnectionBufferLimitBytes", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUseOriginalDst()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "UseOriginalDst", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "PerConnectionBufferLimitBytes", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDeprecatedV1() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: "DeprecatedV1", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } - // no validation rules for DrainType - - for idx, item := range m.GetListenerFilters() { - _, _ = idx, item - - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: fmt.Sprintf("ListenerFilters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "DeprecatedV1", + reason: "embedded message failed validation", + cause: err, } } - } - { - tmp := m.GetListenerFiltersTimeout() + // no validation rules for DrainType - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetListenerFilters() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ - field: "ListenerFiltersTimeout", + field: fmt.Sprintf("ListenerFilters[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetTransparent() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: "Transparent", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetListenerFiltersTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "ListenerFiltersTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetFreebind() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: "Freebind", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTransparent()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "Transparent", + reason: "embedded message failed validation", + cause: err, } } } - for idx, item := range m.GetSocketOptions() { - _, _ = idx, item - - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerValidationError{ - field: fmt.Sprintf("SocketOptions[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } + if v, ok := interface{}(m.GetFreebind()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "Freebind", + reason: "embedded message failed validation", + cause: err, } } - } - { - tmp := m.GetTcpFastOpenQueueLength() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetSocketOptions() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ListenerValidationError{ - field: "TcpFastOpenQueueLength", + field: fmt.Sprintf("SocketOptions[%v]", idx), reason: "embedded message failed validation", cause: err, } } } + + } + + if v, ok := interface{}(m.GetTcpFastOpenQueueLength()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerValidationError{ + field: "TcpFastOpenQueueLength", + reason: "embedded message failed validation", + cause: err, + } + } } return nil @@ -304,17 +251,12 @@ func (m *Listener_DeprecatedV1) Validate() error { return nil } - { - tmp := m.GetBindToPort() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Listener_DeprecatedV1ValidationError{ - field: "BindToPort", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetBindToPort()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Listener_DeprecatedV1ValidationError{ + field: "BindToPort", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go index 8ff022eabf60..f3f2dc0cce3a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.go @@ -6,16 +6,14 @@ package listener import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - + auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -443,7 +441,7 @@ type FilterChain struct { // connections established with the listener. Order matters as the filters are // processed sequentially as connection events happen. Note: If the filter // list is empty, the connection will close by default. - Filters []Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters"` + Filters []*Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` // Whether the listener should expect a PROXY protocol V1 header on new // connections. If this option is enabled, the listener will assume that that // remote address of the connection is the one specified in the header. Some @@ -507,7 +505,7 @@ func (m *FilterChain) GetTlsContext() *auth.DownstreamTlsContext { return nil } -func (m *FilterChain) GetFilters() []Filter { +func (m *FilterChain) GetFilters() []*Filter { if m != nil { return m.Filters } @@ -716,65 +714,64 @@ func init() { } var fileDescriptor_0ced541f18749edd = []byte{ - // 914 bytes of a gzipped FileDescriptorProto + // 906 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0x41, 0x6f, 0x23, 0x35, - 0x14, 0xae, 0x33, 0x69, 0x9a, 0x78, 0x92, 0x76, 0xb0, 0xba, 0xea, 0x50, 0x76, 0xb3, 0x21, 0x80, - 0x88, 0x90, 0x98, 0x88, 0x54, 0x08, 0x08, 0x70, 0xc8, 0x84, 0xa2, 0xb2, 0x4a, 0x43, 0x34, 0xe9, - 0x56, 0xc0, 0x65, 0xe4, 0x4e, 0x9c, 0xd4, 0x62, 0x62, 0x8f, 0x6c, 0x27, 0xdb, 0x5c, 0xb9, 0x70, - 0xe7, 0x57, 0xa0, 0x15, 0x7f, 0x00, 0x4e, 0x1c, 0xf7, 0xc8, 0x8d, 0x1b, 0x42, 0xbd, 0xc1, 0x9f, - 0x58, 0x34, 0x9e, 0x99, 0xb4, 0x49, 0x23, 0x58, 0x71, 0xd8, 0x9b, 0xfd, 0xbe, 0xef, 0x7b, 0x7e, - 0xfe, 0xde, 0xb3, 0xe1, 0x9b, 0x84, 0xcd, 0xf9, 0xa2, 0x89, 0x23, 0xda, 0x9c, 0xb7, 0x9a, 0x21, - 0x95, 0x8a, 0x30, 0x22, 0x96, 0x0b, 0x27, 0x12, 0x5c, 0x71, 0x74, 0x4f, 0xb3, 0x1c, 0x1c, 0x51, - 0x67, 0xde, 0x72, 0x32, 0xf0, 0xf0, 0xe1, 0x8a, 0x38, 0xe0, 0x82, 0x34, 0xf1, 0x68, 0x24, 0x88, - 0x94, 0x89, 0xee, 0xf0, 0xfe, 0x0a, 0x01, 0xcf, 0xd4, 0x65, 0x33, 0x20, 0x42, 0x6d, 0x44, 0xb5, - 0xfc, 0x02, 0x4b, 0x92, 0xa2, 0xaf, 0x4e, 0x38, 0x9f, 0x84, 0xa4, 0xa9, 0x77, 0x17, 0xb3, 0x71, - 0x13, 0xb3, 0x45, 0x26, 0x5c, 0x87, 0xa4, 0x12, 0xb3, 0x20, 0x4b, 0x5b, 0x5d, 0x47, 0x9f, 0x08, - 0x1c, 0x45, 0x44, 0x64, 0x45, 0x1d, 0xcc, 0x71, 0x48, 0x47, 0x58, 0x91, 0x66, 0xb6, 0x48, 0x81, - 0xfd, 0x09, 0x9f, 0x70, 0xbd, 0x6c, 0xc6, 0xab, 0x24, 0x5a, 0x7f, 0x0a, 0x60, 0xe1, 0x73, 0x1a, - 0x2a, 0x22, 0xd0, 0x03, 0x98, 0x67, 0x78, 0x4a, 0x6c, 0x50, 0x03, 0x8d, 0x92, 0x5b, 0xfa, 0xe5, - 0xaf, 0x5f, 0x8d, 0xbc, 0xc8, 0xd5, 0x80, 0xa7, 0xc3, 0xe8, 0x3d, 0x58, 0x08, 0x38, 0x1b, 0xd3, - 0x89, 0x9d, 0xab, 0x81, 0x86, 0xd9, 0x3a, 0x70, 0x92, 0x4a, 0x9c, 0xac, 0x12, 0x67, 0xa8, 0xeb, - 0x3c, 0xd9, 0xf2, 0x52, 0x22, 0xfa, 0x08, 0x96, 0xd5, 0x22, 0x22, 0x23, 0x3f, 0x15, 0xe6, 0xb5, - 0x70, 0xff, 0x8e, 0xb0, 0xc3, 0x16, 0x27, 0x5b, 0x9e, 0xa9, 0xb9, 0x5d, 0x4d, 0x75, 0x2b, 0xd0, - 0x4c, 0x44, 0x7e, 0x1c, 0x7d, 0x94, 0x2f, 0x1a, 0x56, 0xbe, 0xfe, 0xfb, 0x36, 0xb4, 0x92, 0x62, - 0xbb, 0x97, 0x98, 0xb2, 0x53, 0xac, 0x82, 0x4b, 0x74, 0x0e, 0xad, 0x11, 0x91, 0x8a, 0x32, 0xac, - 0x28, 0x67, 0x7e, 0xc4, 0x85, 0xb2, 0x8b, 0xfa, 0xa0, 0xfb, 0x77, 0x0e, 0x7a, 0xfc, 0x05, 0x53, - 0x47, 0xad, 0x73, 0x1c, 0xce, 0x88, 0x5b, 0x89, 0x2f, 0x58, 0x7c, 0xa7, 0x60, 0x3f, 0x7f, 0x6e, - 0x34, 0x80, 0xb7, 0x77, 0x2b, 0xc9, 0x80, 0x0b, 0x85, 0x3a, 0xb0, 0x12, 0x09, 0x32, 0xa6, 0x57, - 0xbe, 0xc0, 0x6c, 0x42, 0xa4, 0x6d, 0xd4, 0x0c, 0x9d, 0x74, 0x65, 0x5a, 0xe2, 0xbe, 0x3a, 0x5d, - 0x3a, 0x12, 0x5e, 0x4c, 0xf2, 0xca, 0x89, 0x44, 0x6f, 0x24, 0x7a, 0x0b, 0xee, 0xa6, 0x13, 0xe3, - 0xcb, 0xd9, 0x78, 0x4c, 0xaf, 0xb4, 0x03, 0x25, 0xaf, 0x92, 0x46, 0x87, 0x3a, 0x88, 0x3e, 0x86, - 0x30, 0x81, 0xfd, 0x90, 0x30, 0x7b, 0xfb, 0xbf, 0x6b, 0xf7, 0x4a, 0x09, 0xbf, 0x47, 0x18, 0xa2, - 0xd0, 0x94, 0x7c, 0x26, 0x02, 0xa2, 0x8d, 0xb2, 0xcb, 0x35, 0xd0, 0xd8, 0x6d, 0x7d, 0xe2, 0x6c, - 0x1c, 0x69, 0x67, 0xdd, 0x3c, 0xa7, 0xcb, 0x19, 0x23, 0x41, 0x7c, 0xe7, 0xa1, 0x4e, 0x72, 0xb6, - 0x88, 0x88, 0x0b, 0x63, 0x67, 0xb6, 0xbf, 0x03, 0x39, 0x0b, 0x78, 0x50, 0x2e, 0xe3, 0xa8, 0x0f, - 0xf7, 0xd3, 0xa3, 0x56, 0x8d, 0x29, 0xbc, 0x80, 0x31, 0x28, 0x51, 0x0e, 0x6e, 0xdb, 0xf3, 0x3e, - 0x2c, 0x67, 0xf9, 0xb8, 0x50, 0xd2, 0xde, 0xa9, 0x19, 0x8d, 0x8a, 0x8b, 0xe2, 0xd3, 0x2b, 0x3f, - 0x00, 0x58, 0xbf, 0x69, 0x4e, 0x7a, 0xc5, 0xb8, 0x2f, 0x12, 0xbd, 0x0e, 0xcb, 0x92, 0x88, 0x39, - 0x11, 0x7e, 0x3c, 0x97, 0xd2, 0x36, 0x6b, 0x46, 0xa3, 0xe4, 0x99, 0x49, 0xac, 0x1f, 0x87, 0xd0, - 0xbb, 0x10, 0x29, 0x81, 0x99, 0x8c, 0xf3, 0xfa, 0xda, 0xc1, 0x80, 0x87, 0x76, 0x49, 0x9b, 0xff, - 0xca, 0x12, 0x19, 0xa4, 0x00, 0x3a, 0x82, 0xf7, 0x70, 0x14, 0x85, 0x34, 0x48, 0x47, 0x28, 0x8d, - 0x4b, 0x1b, 0xea, 0xd4, 0xfb, 0xb7, 0xc0, 0x4c, 0x23, 0xeb, 0x1f, 0xc2, 0xfd, 0x4d, 0xee, 0xa1, - 0x1d, 0x68, 0x74, 0xfa, 0x5f, 0x5b, 0x5b, 0xa8, 0x04, 0xb7, 0x7b, 0x5f, 0x76, 0x3b, 0x3d, 0x0b, - 0xa0, 0x32, 0x2c, 0x1e, 0x7f, 0x75, 0x76, 0xec, 0xf5, 0x3b, 0x3d, 0x2b, 0xf7, 0x28, 0x5f, 0x04, - 0x56, 0xce, 0x33, 0x25, 0xa3, 0xfe, 0x88, 0x4f, 0x31, 0x65, 0xb2, 0xfe, 0xb3, 0x01, 0xcd, 0x5b, - 0xcd, 0x41, 0x8f, 0x21, 0x1a, 0xeb, 0xad, 0x1f, 0xc4, 0x7b, 0x7f, 0x1a, 0x77, 0x4b, 0xbf, 0x4c, - 0xb3, 0xf5, 0xf6, 0x0b, 0x36, 0xd7, 0xb3, 0xc6, 0xeb, 0x6f, 0xe5, 0x04, 0x9a, 0x2a, 0x94, 0xf1, - 0x73, 0x54, 0xe4, 0x4a, 0xa5, 0x0f, 0x79, 0x2d, 0x5f, 0xfc, 0x8f, 0x39, 0x9f, 0xf1, 0x27, 0x4c, - 0x2a, 0x41, 0xf0, 0xf4, 0x2c, 0x94, 0xdd, 0x84, 0xee, 0x41, 0xb5, 0x5c, 0xa3, 0x4f, 0xe1, 0x4e, - 0x92, 0x3d, 0x7b, 0x17, 0x0f, 0xfe, 0xb5, 0x2a, 0x37, 0xff, 0xec, 0x8f, 0x87, 0x5b, 0x5e, 0xa6, - 0x41, 0x2e, 0xdc, 0x9b, 0xc9, 0x78, 0x8e, 0xf8, 0xd5, 0x22, 0xf1, 0x3b, 0xfd, 0x1c, 0x0e, 0xef, - 0xcc, 0xbd, 0xcb, 0x79, 0x98, 0x4c, 0x7d, 0x65, 0x26, 0xc9, 0x20, 0x56, 0xe8, 0x26, 0xa0, 0x0f, - 0x60, 0x71, 0x4a, 0x14, 0x1e, 0x61, 0x85, 0xd3, 0x47, 0xf3, 0xda, 0x86, 0x11, 0x3c, 0x4d, 0x29, - 0xde, 0x92, 0x8c, 0x4e, 0xa1, 0x75, 0x33, 0x1d, 0x92, 0x07, 0xdf, 0x12, 0x65, 0x17, 0x74, 0x82, - 0xfa, 0x86, 0x04, 0x67, 0x19, 0x75, 0xa8, 0x99, 0xde, 0x9e, 0x5a, 0x0d, 0xd4, 0x7f, 0x02, 0x70, - 0xb7, 0x97, 0x5e, 0xf7, 0xa5, 0x7d, 0xa5, 0xc6, 0xff, 0xfd, 0x4a, 0xdd, 0xef, 0xc1, 0x8f, 0xd7, - 0x55, 0xf0, 0xec, 0xba, 0x0a, 0x7e, 0xbb, 0xae, 0x82, 0x3f, 0xaf, 0xab, 0x00, 0xbe, 0x41, 0x79, - 0x72, 0x71, 0xdd, 0x8f, 0xcd, 0x8d, 0x74, 0x2b, 0xd9, 0x1d, 0xb5, 0xfb, 0x03, 0xf0, 0x4d, 0x31, - 0x83, 0x9e, 0xe6, 0x0e, 0x8e, 0xb5, 0xa4, 0x13, 0x51, 0xe7, 0xbc, 0xe5, 0x64, 0xc4, 0xfe, 0xf0, - 0xef, 0xdc, 0xa1, 0x46, 0xda, 0xed, 0x4e, 0x44, 0xdb, 0xed, 0xf3, 0x56, 0xbb, 0x7d, 0x03, 0x5e, - 0x14, 0x74, 0xd5, 0x47, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x69, 0x6e, 0x03, 0x04, 0xa6, 0x07, - 0x00, 0x00, + 0x14, 0xae, 0x33, 0x69, 0x9a, 0x78, 0x92, 0x76, 0xb0, 0xb2, 0xea, 0x50, 0x76, 0x43, 0x08, 0x20, + 0x22, 0x24, 0x26, 0x22, 0x15, 0x5a, 0x08, 0x5c, 0x32, 0xa1, 0xa8, 0xac, 0xd2, 0x10, 0x4d, 0xba, + 0x15, 0x70, 0x19, 0xb9, 0x13, 0x27, 0xb5, 0x98, 0xd8, 0x23, 0xdb, 0xc9, 0x36, 0x57, 0x2e, 0xdc, + 0xf9, 0x15, 0x68, 0xc5, 0x8d, 0x1b, 0x27, 0x8e, 0x1c, 0xb9, 0x71, 0x45, 0xbd, 0xc1, 0x9f, 0x58, + 0x34, 0x9e, 0x99, 0xb4, 0x49, 0x23, 0x58, 0x71, 0xe0, 0x66, 0xbf, 0xef, 0xfb, 0x9e, 0x9f, 0xbf, + 0xf7, 0x6c, 0xf8, 0x16, 0x61, 0x0b, 0xbe, 0x6c, 0xe1, 0x88, 0xb6, 0x16, 0xed, 0x56, 0x48, 0xa5, + 0x22, 0x8c, 0x88, 0xd5, 0xc2, 0x89, 0x04, 0x57, 0x1c, 0x3d, 0xd0, 0x2c, 0x07, 0x47, 0xd4, 0x59, + 0xb4, 0x9d, 0x0c, 0x3c, 0x7a, 0x7d, 0x4d, 0x1c, 0x70, 0x41, 0x5a, 0x78, 0x3c, 0x16, 0x44, 0xca, + 0x44, 0x77, 0xf4, 0x70, 0x8d, 0x80, 0xe7, 0xea, 0xaa, 0x15, 0x10, 0xa1, 0xb6, 0xa2, 0x5a, 0x7e, + 0x89, 0x25, 0x49, 0xd1, 0x57, 0xa7, 0x9c, 0x4f, 0x43, 0xd2, 0xd2, 0xbb, 0xcb, 0xf9, 0xa4, 0x85, + 0xd9, 0x32, 0x13, 0x6e, 0x42, 0x52, 0x89, 0x79, 0x90, 0xa5, 0xad, 0x6d, 0xa2, 0xcf, 0x04, 0x8e, + 0x22, 0x22, 0xb2, 0xa2, 0x0e, 0x17, 0x38, 0xa4, 0x63, 0xac, 0x48, 0x2b, 0x5b, 0xa4, 0x40, 0x75, + 0xca, 0xa7, 0x5c, 0x2f, 0x5b, 0xf1, 0x2a, 0x89, 0x36, 0x9e, 0x03, 0x58, 0xf8, 0x8c, 0x86, 0x8a, + 0x08, 0xf4, 0x08, 0xe6, 0x19, 0x9e, 0x11, 0x1b, 0xd4, 0x41, 0xb3, 0xe4, 0x96, 0x7e, 0xfe, 0xf3, + 0x17, 0x23, 0x2f, 0x72, 0x75, 0xe0, 0xe9, 0x30, 0x7a, 0x1f, 0x16, 0x02, 0xce, 0x26, 0x74, 0x6a, + 0xe7, 0xea, 0xa0, 0x69, 0xb6, 0x0f, 0x9d, 0xa4, 0x12, 0x27, 0xab, 0xc4, 0x19, 0xe9, 0x3a, 0x4f, + 0x77, 0xbc, 0x94, 0x88, 0x3e, 0x82, 0x65, 0xb5, 0x8c, 0xc8, 0xd8, 0x4f, 0x85, 0x79, 0x2d, 0xac, + 0xde, 0x13, 0x76, 0xd9, 0xf2, 0x74, 0xc7, 0x33, 0x35, 0xb7, 0xa7, 0xa9, 0x6e, 0x05, 0x9a, 0x89, + 0xc8, 0x8f, 0xa3, 0x4f, 0xf2, 0x45, 0xc3, 0xca, 0x37, 0x7e, 0xdf, 0x85, 0x56, 0x52, 0x6c, 0xef, + 0x0a, 0x53, 0x76, 0x86, 0x55, 0x70, 0x85, 0x2e, 0xa0, 0x35, 0x26, 0x52, 0x51, 0x86, 0x15, 0xe5, + 0xcc, 0x8f, 0xb8, 0x50, 0x76, 0x51, 0x1f, 0xf4, 0xf0, 0xde, 0x41, 0x4f, 0x3f, 0x67, 0xea, 0xb8, + 0x7d, 0x81, 0xc3, 0x39, 0x71, 0x2b, 0xf1, 0x05, 0x8b, 0xef, 0x16, 0xec, 0x17, 0x2f, 0x8c, 0x26, + 0xf0, 0x0e, 0xee, 0x24, 0x19, 0x72, 0xa1, 0x50, 0x17, 0x56, 0x22, 0x41, 0x26, 0xf4, 0xda, 0x17, + 0x98, 0x4d, 0x89, 0xb4, 0x8d, 0xba, 0xa1, 0x93, 0xae, 0x4d, 0x4b, 0xdc, 0x57, 0xa7, 0x47, 0xc7, + 0xc2, 0x8b, 0x49, 0x5e, 0x39, 0x91, 0xe8, 0x8d, 0x44, 0x6f, 0xc3, 0xfd, 0x74, 0x62, 0x7c, 0x39, + 0x9f, 0x4c, 0xe8, 0xb5, 0x76, 0xa0, 0xe4, 0x55, 0xd2, 0xe8, 0x48, 0x07, 0xd1, 0xc7, 0x10, 0x26, + 0xb0, 0x1f, 0x12, 0x66, 0xef, 0xfe, 0x7b, 0xed, 0x5e, 0x29, 0xe1, 0xf7, 0x09, 0x43, 0x14, 0x9a, + 0x92, 0xcf, 0x45, 0x40, 0xb4, 0x51, 0x76, 0xb9, 0x0e, 0x9a, 0xfb, 0xed, 0x4f, 0x9c, 0xad, 0x23, + 0xed, 0x6c, 0x9a, 0xe7, 0xf4, 0x38, 0x63, 0x24, 0x88, 0xef, 0x3c, 0xd2, 0x49, 0xce, 0x97, 0x11, + 0x71, 0x61, 0xec, 0xcc, 0xee, 0xb7, 0x20, 0x67, 0x01, 0x0f, 0xca, 0x55, 0x1c, 0x0d, 0x60, 0x35, + 0x3d, 0x6a, 0xdd, 0x98, 0xc2, 0x4b, 0x18, 0x83, 0x12, 0xe5, 0xf0, 0xae, 0x3d, 0x1f, 0xc0, 0x72, + 0x96, 0x8f, 0x0b, 0x25, 0xed, 0xbd, 0xba, 0xd1, 0xac, 0xb8, 0x28, 0x3e, 0xbd, 0xf2, 0x3d, 0x80, + 0x8d, 0xdb, 0xe6, 0xa4, 0x57, 0x8c, 0xfb, 0x22, 0xd1, 0x1b, 0xb0, 0x2c, 0x89, 0x58, 0x10, 0xe1, + 0xc7, 0x73, 0x29, 0x6d, 0xb3, 0x6e, 0x34, 0x4b, 0x9e, 0x99, 0xc4, 0x06, 0x71, 0x08, 0xbd, 0x07, + 0x91, 0x12, 0x98, 0xc9, 0x38, 0xaf, 0xaf, 0x1d, 0x0c, 0x78, 0x68, 0x97, 0xb4, 0xf9, 0xaf, 0xac, + 0x90, 0x61, 0x0a, 0xa0, 0x63, 0xf8, 0x00, 0x47, 0x51, 0x48, 0x83, 0x74, 0x84, 0xd2, 0xb8, 0xb4, + 0xa1, 0x4e, 0x5d, 0xbd, 0x03, 0x66, 0x1a, 0xd9, 0xf8, 0x10, 0x56, 0xb7, 0xb9, 0x87, 0xf6, 0xa0, + 0xd1, 0x1d, 0x7c, 0x65, 0xed, 0xa0, 0x12, 0xdc, 0xed, 0x7f, 0xd1, 0xeb, 0xf6, 0x2d, 0x80, 0xca, + 0xb0, 0x78, 0xf2, 0xe5, 0xf9, 0x89, 0x37, 0xe8, 0xf6, 0xad, 0xdc, 0x93, 0x7c, 0x11, 0x58, 0x39, + 0xcf, 0x94, 0x8c, 0xfa, 0x63, 0x3e, 0xc3, 0x94, 0xc9, 0xc6, 0x4f, 0x06, 0x34, 0xef, 0x34, 0x07, + 0x3d, 0x85, 0x68, 0xa2, 0xb7, 0x7e, 0x10, 0xef, 0xfd, 0x59, 0xdc, 0x2d, 0xfd, 0x32, 0xcd, 0xf6, + 0x3b, 0x2f, 0xd9, 0x5c, 0xcf, 0x9a, 0x6c, 0xbe, 0x95, 0x53, 0x68, 0xaa, 0x50, 0xc6, 0xcf, 0x51, + 0x91, 0x6b, 0x95, 0x3e, 0xe4, 0x8d, 0x7c, 0xf1, 0x3f, 0xe6, 0x7c, 0xca, 0x9f, 0x31, 0xa9, 0x04, + 0xc1, 0xb3, 0xf3, 0x50, 0xf6, 0x12, 0xba, 0x07, 0xd5, 0x6a, 0x8d, 0x1e, 0xc3, 0xbd, 0x24, 0x7b, + 0xf6, 0x2e, 0x1e, 0xfd, 0x63, 0x55, 0x5e, 0xc6, 0x46, 0x2e, 0x3c, 0x98, 0xcb, 0x78, 0x82, 0xf8, + 0xf5, 0x32, 0x71, 0x3a, 0xfd, 0x16, 0x8e, 0xee, 0x4d, 0xbc, 0xcb, 0x79, 0x98, 0xcc, 0x7b, 0x65, + 0x2e, 0xc9, 0x30, 0x56, 0x68, 0xfb, 0xd1, 0x63, 0x58, 0x9c, 0x11, 0x85, 0xc7, 0x58, 0xe1, 0xf4, + 0xb9, 0xbc, 0xb6, 0x65, 0xf8, 0xce, 0x52, 0x8a, 0xb7, 0x22, 0xa3, 0x33, 0x68, 0xdd, 0xce, 0x85, + 0xe4, 0xc1, 0x37, 0x44, 0xd9, 0x05, 0x9d, 0xa0, 0xb1, 0x25, 0xc1, 0x79, 0x46, 0x1d, 0x69, 0xa6, + 0x77, 0xa0, 0xd6, 0x03, 0x8d, 0x1f, 0x01, 0xdc, 0xef, 0xa7, 0x17, 0xfd, 0xdf, 0x3e, 0x51, 0xe3, + 0xbf, 0x7e, 0xa2, 0xee, 0x77, 0xe0, 0x87, 0x9b, 0x1a, 0xf8, 0xf5, 0xa6, 0x06, 0x7e, 0xbb, 0xa9, + 0x81, 0x3f, 0x6e, 0x6a, 0x00, 0xbe, 0x49, 0x79, 0x72, 0x71, 0xdd, 0x8f, 0xed, 0x2d, 0x74, 0x2b, + 0xd9, 0x1d, 0xb5, 0xfb, 0x43, 0xf0, 0x75, 0x31, 0x83, 0x9e, 0xe7, 0x0e, 0x4f, 0xb4, 0xa4, 0x1b, + 0x51, 0xe7, 0xa2, 0xed, 0x64, 0xc4, 0xc1, 0xe8, 0xaf, 0xdc, 0x91, 0x46, 0x3a, 0x9d, 0x6e, 0x44, + 0x3b, 0x9d, 0x8b, 0x76, 0xa7, 0x73, 0x0b, 0x5e, 0x16, 0x74, 0xd5, 0xc7, 0x7f, 0x07, 0x00, 0x00, + 0xff, 0xff, 0x63, 0x49, 0xa2, 0xc7, 0xa0, 0x07, 0x00, 0x00, } func (this *Filter) Equal(that interface{}) bool { @@ -969,7 +966,7 @@ func (this *FilterChain) Equal(that interface{}) bool { return false } for i := range this.Filters { - if !this.Filters[i].Equal(&that1.Filters[i]) { + if !this.Filters[i].Equal(that1.Filters[i]) { return false } } @@ -2319,7 +2316,7 @@ func (m *FilterChain) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Filters = append(m.Filters, Filter{}) + m.Filters = append(m.Filters, &Filter{}) if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go index 137f1ffc083d..48389ef2ce42 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/listener/listener.pb.validate.go @@ -51,34 +51,24 @@ func (m *Filter) Validate() error { case *Filter_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *Filter_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -164,17 +154,12 @@ func (m *FilterChainMatch) Validate() error { for idx, item := range m.GetPrefixRanges() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterChainMatchValidationError{ - field: fmt.Sprintf("PrefixRanges[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainMatchValidationError{ + field: fmt.Sprintf("PrefixRanges[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -183,17 +168,12 @@ func (m *FilterChainMatch) Validate() error { // no validation rules for AddressSuffix - { - tmp := m.GetSuffixLen() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterChainMatchValidationError{ - field: "SuffixLen", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSuffixLen()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainMatchValidationError{ + field: "SuffixLen", + reason: "embedded message failed validation", + cause: err, } } } @@ -208,17 +188,12 @@ func (m *FilterChainMatch) Validate() error { for idx, item := range m.GetSourcePrefixRanges() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterChainMatchValidationError{ - field: fmt.Sprintf("SourcePrefixRanges[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainMatchValidationError{ + field: fmt.Sprintf("SourcePrefixRanges[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -304,32 +279,22 @@ func (m *FilterChain) Validate() error { return nil } - { - tmp := m.GetFilterChainMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterChainValidationError{ - field: "FilterChainMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFilterChainMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainValidationError{ + field: "FilterChainMatch", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetTlsContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterChainValidationError{ - field: "TlsContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTlsContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainValidationError{ + field: "TlsContext", + reason: "embedded message failed validation", + cause: err, } } } @@ -337,64 +302,44 @@ func (m *FilterChain) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FilterChainValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetUseProxyProto() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return FilterChainValidationError{ - field: "UseProxyProto", + field: fmt.Sprintf("Filters[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - - { - tmp := m.GetMetadata() - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return FilterChainValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUseProxyProto()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainValidationError{ + field: "UseProxyProto", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetTransportSocket() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return FilterChainValidationError{ - field: "TransportSocket", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTransportSocket()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterChainValidationError{ + field: "TransportSocket", + reason: "embedded message failed validation", + cause: err, } } } @@ -475,34 +420,24 @@ func (m *ListenerFilter) Validate() error { case *ListenerFilter_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerFilterValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerFilterValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *ListenerFilter_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListenerFilterValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListenerFilterValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go index 6a3b4a56259d..727aa38a05f2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.go @@ -7,18 +7,16 @@ import ( bytes "bytes" context "context" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -40,7 +38,7 @@ type RouteConfiguration struct { // :ref:`envoy_api_msg_config.filter.network.http_connection_manager.v2.Rds`. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // An array of virtual hosts that make up the route table. - VirtualHosts []route.VirtualHost `protobuf:"bytes,2,rep,name=virtual_hosts,json=virtualHosts,proto3" json:"virtual_hosts"` + VirtualHosts []*route.VirtualHost `protobuf:"bytes,2,rep,name=virtual_hosts,json=virtualHosts,proto3" json:"virtual_hosts,omitempty"` // An array of virtual hosts will be dynamically loaded via the VHDS API. // Both *virtual_hosts* and *vhds* fields will be used when present. *virtual_hosts* can be used // for a base routing table or for infrequently changing virtual hosts. *vhds* is used for @@ -133,7 +131,7 @@ func (m *RouteConfiguration) GetName() string { return "" } -func (m *RouteConfiguration) GetVirtualHosts() []route.VirtualHost { +func (m *RouteConfiguration) GetVirtualHosts() []*route.VirtualHost { if m != nil { return m.VirtualHosts } @@ -192,10 +190,10 @@ func (m *RouteConfiguration) GetValidateClusters() *types.BoolValue { // [#not-implemented-hide:] type Vhds struct { // Configuration source specifier for VHDS. - ConfigSource core.ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ConfigSource *core.ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Vhds) Reset() { *m = Vhds{} } @@ -231,11 +229,11 @@ func (m *Vhds) XXX_DiscardUnknown() { var xxx_messageInfo_Vhds proto.InternalMessageInfo -func (m *Vhds) GetConfigSource() core.ConfigSource { +func (m *Vhds) GetConfigSource() *core.ConfigSource { if m != nil { return m.ConfigSource } - return core.ConfigSource{} + return nil } func init() { @@ -246,50 +244,49 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/rds.proto", fileDescriptor_78812f46dcff924a) } var fileDescriptor_78812f46dcff924a = []byte{ - // 673 bytes of a gzipped FileDescriptorProto + // 663 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xbf, 0x6f, 0xd3, 0x40, - 0x18, 0xed, 0x25, 0xe9, 0xaf, 0x4b, 0x8a, 0xda, 0xeb, 0xaf, 0x34, 0xa0, 0x24, 0x0a, 0x05, 0x45, - 0x0c, 0x36, 0x32, 0x13, 0xed, 0x44, 0x5a, 0x41, 0xc5, 0xd2, 0xca, 0x2d, 0x99, 0x10, 0xd6, 0xd5, - 0xbe, 0xc6, 0x96, 0x5c, 0x7f, 0xe6, 0xee, 0x6c, 0xc8, 0x0a, 0x0b, 0x62, 0x84, 0x7f, 0x82, 0xbf, - 0x81, 0x05, 0xc6, 0x8e, 0x48, 0xec, 0x08, 0x05, 0x06, 0xf8, 0x2f, 0x90, 0xcf, 0x36, 0xc4, 0x4d, - 0x61, 0x40, 0x5d, 0xa2, 0xcb, 0xbd, 0xf7, 0xbe, 0xef, 0x7d, 0x77, 0xef, 0x8c, 0xd7, 0x58, 0x10, - 0xc3, 0x50, 0xa7, 0xa1, 0xa7, 0xc7, 0x86, 0xce, 0x1d, 0xa1, 0x85, 0x1c, 0x24, 0x90, 0x9a, 0xda, - 0xd7, 0x68, 0xe8, 0x69, 0xb1, 0xd1, 0xb8, 0x56, 0x60, 0xd9, 0xc0, 0x99, 0x7e, 0x4c, 0x05, 0x4b, - 0xb9, 0x8d, 0x1b, 0x93, 0xa8, 0x0d, 0xc1, 0x89, 0x37, 0xb0, 0x04, 0x44, 0xdc, 0xce, 0x69, 0xc5, - 0x22, 0x8e, 0x27, 0x6c, 0x88, 0x19, 0x1f, 0x66, 0x68, 0xb3, 0x68, 0x04, 0x22, 0xc9, 0xd2, 0xdf, - 0x5c, 0x3d, 0x00, 0x18, 0xf8, 0x4c, 0x11, 0x68, 0x10, 0x80, 0xa4, 0xd2, 0x83, 0x40, 0xe4, 0xea, - 0x0c, 0x55, 0xff, 0x8e, 0xa3, 0x13, 0xfd, 0x19, 0xa7, 0x61, 0xc8, 0x78, 0x8e, 0xaf, 0xc7, 0xd4, - 0xf7, 0x1c, 0x2a, 0x99, 0x9e, 0x2f, 0x32, 0x60, 0x65, 0x00, 0x03, 0x50, 0x4b, 0x3d, 0x59, 0xa5, - 0xbb, 0x9d, 0x6f, 0x15, 0x4c, 0xcc, 0xa4, 0xf9, 0x8e, 0x9a, 0x23, 0xe2, 0xaa, 0x19, 0x21, 0xb8, - 0x12, 0xd0, 0x53, 0x56, 0x47, 0x6d, 0xd4, 0x9d, 0x37, 0xd5, 0x9a, 0x3c, 0xc4, 0x0b, 0xb1, 0xc7, - 0x65, 0x44, 0x7d, 0xcb, 0x05, 0x21, 0x45, 0xbd, 0xd4, 0x2e, 0x77, 0xab, 0x46, 0x4b, 0x1b, 0x3f, - 0x40, 0x2d, 0x9d, 0xa4, 0x9f, 0x12, 0xf7, 0x40, 0xc8, 0x5e, 0xe5, 0xec, 0x4b, 0x6b, 0xca, 0xac, - 0xc5, 0x7f, 0xb6, 0x04, 0xb9, 0x89, 0x2b, 0xb1, 0xeb, 0x88, 0xfa, 0x7c, 0x1b, 0x75, 0xab, 0x06, - 0x29, 0x96, 0xe8, 0xbb, 0x8e, 0x30, 0x15, 0x4e, 0x0c, 0xbc, 0xea, 0x05, 0x92, 0xf1, 0x80, 0xfa, - 0x16, 0x04, 0xfe, 0xd0, 0x72, 0x19, 0x75, 0x18, 0x17, 0xf5, 0x72, 0xbb, 0xdc, 0x9d, 0x37, 0x97, - 0x73, 0x70, 0x3f, 0xf0, 0x87, 0x7b, 0x29, 0x44, 0x5c, 0xbc, 0xce, 0x99, 0x08, 0x21, 0x10, 0x2c, - 0xa7, 0x5b, 0x12, 0x2c, 0xea, 0x38, 0xf5, 0x8a, 0x72, 0xbc, 0x59, 0x6c, 0x97, 0x5c, 0xa3, 0x96, - 0x8a, 0xfb, 0xd4, 0x8f, 0xd8, 0x7e, 0x98, 0x1c, 0x41, 0xaf, 0xfa, 0xfe, 0xe7, 0xc7, 0xf2, 0xcc, - 0x1b, 0x54, 0x5e, 0xfc, 0x31, 0x6b, 0xae, 0xe4, 0x15, 0xb3, 0x26, 0x47, 0x70, 0xcf, 0x71, 0xc8, - 0x36, 0x6e, 0x5c, 0xd4, 0x89, 0xb3, 0x53, 0x88, 0x59, 0x7d, 0x5a, 0x59, 0x5c, 0x9f, 0x50, 0x9a, - 0x0a, 0x26, 0x27, 0x78, 0x8d, 0xb3, 0xa7, 0x11, 0x13, 0xf2, 0xbc, 0xcb, 0x99, 0xff, 0x75, 0xb9, - 0x9c, 0x15, 0x2c, 0x98, 0xbc, 0x8b, 0x37, 0x2e, 0xe8, 0x93, 0x79, 0x9c, 0x53, 0x1e, 0xd7, 0xce, - 0xeb, 0x32, 0x8b, 0x0f, 0xf0, 0x52, 0x1e, 0x22, 0xcb, 0xf6, 0x23, 0x21, 0x93, 0x93, 0x9f, 0x55, - 0x57, 0xd6, 0xd0, 0xd2, 0x1c, 0x6a, 0x79, 0x0e, 0xb5, 0x1e, 0x80, 0xaf, 0x9c, 0x99, 0x8b, 0xb9, - 0x68, 0x27, 0xd3, 0x74, 0x1e, 0xe3, 0x4a, 0x72, 0xa9, 0xe4, 0x08, 0x2f, 0x14, 0xde, 0x8b, 0xca, - 0xd7, 0x44, 0x84, 0xd4, 0xa8, 0x69, 0x1e, 0x0f, 0x15, 0xad, 0x77, 0x25, 0x89, 0x50, 0x32, 0xe9, - 0xf4, 0x6b, 0x54, 0x5a, 0x44, 0x66, 0xcd, 0x1e, 0x43, 0x8d, 0x0f, 0x25, 0xbc, 0xaa, 0x32, 0xbc, - 0x9b, 0xbf, 0xb4, 0x43, 0xc6, 0x63, 0xcf, 0x66, 0xe4, 0x11, 0xae, 0x1d, 0x4a, 0xce, 0xe8, 0xa9, - 0x82, 0x05, 0x69, 0x16, 0x1b, 0xfd, 0xe6, 0x9b, 0xe9, 0xfc, 0x8d, 0xd6, 0x5f, 0xf1, 0xf4, 0x0e, - 0x3b, 0x53, 0x5d, 0x74, 0x1b, 0x91, 0x27, 0xb8, 0xba, 0xcb, 0x7c, 0x49, 0xb3, 0xaa, 0xd7, 0xcf, - 0xa9, 0x12, 0x68, 0xa2, 0xf4, 0xe6, 0xbf, 0x49, 0x85, 0xfa, 0x80, 0xab, 0xf7, 0x99, 0xb4, 0xdd, - 0xcb, 0x72, 0xdd, 0x7a, 0xf1, 0xf9, 0xfb, 0xdb, 0xd2, 0x46, 0x67, 0xa5, 0xf0, 0x39, 0xda, 0x52, - 0x4f, 0x55, 0x6c, 0xa1, 0x5b, 0xc6, 0x4b, 0x84, 0xaf, 0x8e, 0x3d, 0xd9, 0x89, 0x73, 0x74, 0xf0, - 0x92, 0x32, 0xdc, 0x1f, 0x7f, 0xc3, 0x97, 0x3d, 0x76, 0x6f, 0xfb, 0xdd, 0xa8, 0x89, 0xce, 0x46, - 0x4d, 0xf4, 0x69, 0xd4, 0x44, 0x5f, 0x47, 0x4d, 0x84, 0x1b, 0x1e, 0xa4, 0xfa, 0x90, 0xc3, 0xf3, - 0x61, 0xa1, 0x54, 0x6f, 0xce, 0x74, 0xc4, 0x41, 0x12, 0xbe, 0x03, 0xf4, 0x0a, 0xa1, 0xe3, 0x19, - 0x15, 0xc4, 0x3b, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x13, 0x2b, 0xc3, 0xe7, 0x05, 0x00, - 0x00, + 0x14, 0xe6, 0x92, 0xf4, 0xd7, 0x25, 0x95, 0xda, 0xeb, 0xaf, 0x34, 0xa0, 0x34, 0x0a, 0x05, 0x45, + 0x0c, 0x36, 0x32, 0x13, 0xed, 0x44, 0x5a, 0x41, 0xb7, 0x56, 0x2e, 0x44, 0x4c, 0x58, 0x57, 0xfb, + 0x1a, 0x5b, 0x72, 0xfd, 0xcc, 0xdd, 0xd9, 0x90, 0x15, 0x16, 0xc4, 0x08, 0xff, 0x04, 0x7f, 0x03, + 0x0b, 0x8c, 0x8c, 0x48, 0xcc, 0x48, 0x28, 0x62, 0x80, 0xff, 0x02, 0xf9, 0xec, 0x83, 0xb8, 0x29, + 0x0c, 0xa8, 0x4b, 0x74, 0xf6, 0xf7, 0x7d, 0xef, 0x7d, 0xcf, 0xf7, 0xbd, 0xe0, 0x75, 0x16, 0xa5, + 0x30, 0x32, 0x69, 0x1c, 0x98, 0xa9, 0x65, 0x72, 0x4f, 0x18, 0x31, 0x07, 0x09, 0xa4, 0xa1, 0xde, + 0x1b, 0x34, 0x0e, 0x8c, 0xd4, 0x6a, 0x5d, 0x2b, 0xb1, 0x5c, 0xe0, 0xcc, 0x3c, 0xa1, 0x82, 0xe5, + 0xdc, 0xd6, 0x8d, 0x69, 0xd4, 0x85, 0xe8, 0x34, 0x18, 0x3a, 0x02, 0x12, 0xee, 0x6a, 0x5a, 0xb9, + 0x88, 0x17, 0x08, 0x17, 0x52, 0xc6, 0x47, 0x05, 0xda, 0x2e, 0x1b, 0x81, 0x44, 0xb2, 0xfc, 0x57, + 0xab, 0x87, 0x00, 0xc3, 0x90, 0x29, 0x02, 0x8d, 0x22, 0x90, 0x54, 0x06, 0x10, 0x09, 0xad, 0x2e, + 0x50, 0xf5, 0x74, 0x92, 0x9c, 0x9a, 0xcf, 0x38, 0x8d, 0x63, 0xc6, 0x35, 0xbe, 0x91, 0xd2, 0x30, + 0xf0, 0xa8, 0x64, 0xa6, 0x3e, 0x14, 0xc0, 0xea, 0x10, 0x86, 0xa0, 0x8e, 0x66, 0x76, 0xca, 0xdf, + 0x76, 0xbf, 0xd6, 0x30, 0xb1, 0xb3, 0xe6, 0x7b, 0x6a, 0x8e, 0x84, 0xab, 0x66, 0x84, 0xe0, 0x5a, + 0x44, 0xcf, 0x58, 0x13, 0x75, 0x50, 0x6f, 0xc1, 0x56, 0x67, 0xb2, 0x8f, 0x17, 0xd3, 0x80, 0xcb, + 0x84, 0x86, 0x8e, 0x0f, 0x42, 0x8a, 0x66, 0xa5, 0x53, 0xed, 0xd5, 0xad, 0x2d, 0x63, 0xf2, 0x03, + 0x1a, 0xf9, 0x24, 0x83, 0x9c, 0x78, 0x00, 0x42, 0xda, 0x8d, 0xf4, 0xcf, 0x83, 0x20, 0x37, 0x71, + 0x2d, 0xf5, 0x3d, 0xd1, 0x5c, 0xe8, 0xa0, 0x5e, 0xdd, 0x22, 0x65, 0xf1, 0xc0, 0xf7, 0x84, 0xad, + 0x70, 0x62, 0xe1, 0xb5, 0x20, 0x92, 0x8c, 0x47, 0x34, 0x74, 0x20, 0x0a, 0x47, 0x8e, 0xcf, 0xa8, + 0xc7, 0xb8, 0x68, 0x56, 0x3b, 0xd5, 0xde, 0x82, 0xbd, 0xa2, 0xc1, 0xc3, 0x28, 0x1c, 0x1d, 0xe4, + 0x10, 0xf1, 0xf1, 0x06, 0x67, 0x22, 0x86, 0x48, 0x30, 0x4d, 0x77, 0x24, 0x38, 0xd4, 0xf3, 0x9a, + 0x35, 0xe5, 0x75, 0xbb, 0xdc, 0x2e, 0xbb, 0x40, 0x23, 0x17, 0x0f, 0x68, 0x98, 0xb0, 0xc3, 0x38, + 0x1b, 0xbe, 0x5f, 0x7f, 0xff, 0xf3, 0x63, 0x75, 0xf6, 0x0d, 0xaa, 0x2e, 0xfd, 0x98, 0xb3, 0x57, + 0x75, 0xc5, 0xa2, 0xc9, 0x43, 0xb8, 0xe7, 0x79, 0x64, 0x17, 0xb7, 0x2e, 0xea, 0xc4, 0xd9, 0x19, + 0xa4, 0xac, 0x39, 0xa3, 0x2c, 0x6e, 0x4c, 0x29, 0x6d, 0x05, 0x93, 0x53, 0xbc, 0xce, 0xd9, 0xd3, + 0x84, 0x09, 0x79, 0xde, 0xe5, 0xec, 0xff, 0xba, 0x5c, 0x29, 0x0a, 0x96, 0x4c, 0xde, 0xc5, 0x9b, + 0x17, 0xf4, 0x29, 0x3c, 0xce, 0x2b, 0x8f, 0xeb, 0xe7, 0x75, 0x85, 0xc5, 0x07, 0x78, 0x59, 0xc7, + 0xc7, 0x71, 0xc3, 0x44, 0xc8, 0xec, 0xcb, 0xcf, 0xa9, 0x2b, 0x6b, 0x19, 0x79, 0x02, 0x0d, 0x9d, + 0x40, 0xa3, 0x0f, 0x10, 0x2a, 0x67, 0xf6, 0x92, 0x16, 0xed, 0x15, 0x9a, 0xee, 0x63, 0x5c, 0xcb, + 0x2e, 0x95, 0x1c, 0xe1, 0xc5, 0xd2, 0xa6, 0xa8, 0x64, 0x4d, 0x85, 0x47, 0x8d, 0x9a, 0x27, 0xf1, + 0x58, 0xd1, 0xfa, 0x38, 0x9b, 0x72, 0xe6, 0x35, 0xaa, 0x2c, 0x21, 0xbb, 0xe1, 0x4e, 0x20, 0xd6, + 0x87, 0x0a, 0x5e, 0x53, 0xc9, 0xdd, 0xd7, 0xfb, 0x75, 0xcc, 0x78, 0x1a, 0xb8, 0x8c, 0x3c, 0xc2, + 0x8d, 0x63, 0xc9, 0x19, 0x3d, 0x53, 0xb0, 0x20, 0xed, 0x72, 0x93, 0xdf, 0x7c, 0x3b, 0x9f, 0xbd, + 0xb5, 0xf5, 0x57, 0x3c, 0xbf, 0xbf, 0xee, 0x95, 0x1e, 0xba, 0x8d, 0xc8, 0x13, 0x5c, 0xdf, 0x67, + 0xa1, 0xa4, 0x45, 0xd5, 0xeb, 0xe7, 0x54, 0x19, 0x34, 0x55, 0x7a, 0xfb, 0xdf, 0xa4, 0x52, 0x7d, + 0xc0, 0xf5, 0xfb, 0x4c, 0xba, 0xfe, 0x65, 0xb9, 0xde, 0x7a, 0xf1, 0xe5, 0xfb, 0xdb, 0xca, 0x66, + 0x77, 0xb5, 0xf4, 0x27, 0xb4, 0xa3, 0x16, 0x54, 0xec, 0xa0, 0x5b, 0xd6, 0x4b, 0x84, 0xaf, 0x4e, + 0x2c, 0xea, 0xd4, 0x77, 0xf4, 0xf0, 0xb2, 0x32, 0x3c, 0x98, 0xdc, 0xdf, 0xcb, 0x1e, 0xbb, 0xbf, + 0xfb, 0x6e, 0xdc, 0x46, 0x9f, 0xc6, 0x6d, 0xf4, 0x79, 0xdc, 0x46, 0xdf, 0xc6, 0x6d, 0x84, 0x5b, + 0x01, 0xe4, 0xfa, 0x98, 0xc3, 0xf3, 0x51, 0xa9, 0x54, 0x7f, 0xde, 0xf6, 0xc4, 0x51, 0x16, 0xbc, + 0x23, 0xf4, 0x0a, 0xa1, 0x93, 0x59, 0x15, 0xc2, 0x3b, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, + 0xff, 0x10, 0x83, 0xdd, 0x05, 0x00, 0x00, } func (this *RouteConfiguration) Equal(that interface{}) bool { @@ -318,7 +315,7 @@ func (this *RouteConfiguration) Equal(that interface{}) bool { return false } for i := range this.VirtualHosts { - if !this.VirtualHosts[i].Equal(&that1.VirtualHosts[i]) { + if !this.VirtualHosts[i].Equal(that1.VirtualHosts[i]) { return false } } @@ -392,7 +389,7 @@ func (this *Vhds) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.ConfigSource.Equal(&that1.ConfigSource) { + if !this.ConfigSource.Equal(that1.ConfigSource) { return false } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { @@ -843,14 +840,16 @@ func (m *Vhds) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintRds(dAtA, i, uint64(m.ConfigSource.Size())) - n3, err := m.ConfigSource.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.ConfigSource != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintRds(dAtA, i, uint64(m.ConfigSource.Size())) + n3, err := m.ConfigSource.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n3 } - i += n3 if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -932,8 +931,10 @@ func (m *Vhds) Size() (n int) { } var l int _ = l - l = m.ConfigSource.Size() - n += 1 + l + sovRds(uint64(l)) + if m.ConfigSource != nil { + l = m.ConfigSource.Size() + n += 1 + l + sovRds(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1043,7 +1044,7 @@ func (m *RouteConfiguration) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.VirtualHosts = append(m.VirtualHosts, route.VirtualHost{}) + m.VirtualHosts = append(m.VirtualHosts, &route.VirtualHost{}) if err := m.VirtualHosts[len(m.VirtualHosts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1367,6 +1368,9 @@ func (m *Vhds) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.ConfigSource == nil { + m.ConfigSource = &core.ConfigSource{} + } if err := m.ConfigSource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go index a4a6cc5f330d..04d27ca93a4c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/rds.pb.validate.go @@ -46,34 +46,24 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetVirtualHosts() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: fmt.Sprintf("VirtualHosts[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteConfigurationValidationError{ + field: fmt.Sprintf("VirtualHosts[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetVhds() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: "Vhds", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetVhds()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteConfigurationValidationError{ + field: "Vhds", + reason: "embedded message failed validation", + cause: err, } } } @@ -88,17 +78,12 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteConfigurationValidationError{ + field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -115,34 +100,24 @@ func (m *RouteConfiguration) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteConfigurationValidationError{ + field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetValidateClusters() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteConfigurationValidationError{ - field: "ValidateClusters", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValidateClusters()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteConfigurationValidationError{ + field: "ValidateClusters", + reason: "embedded message failed validation", + cause: err, } } } @@ -213,17 +188,19 @@ func (m *Vhds) Validate() error { return nil } - { - tmp := m.GetConfigSource() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { + if m.GetConfigSource() == nil { + return VhdsValidationError{ + field: "ConfigSource", + reason: "value is required", + } + } - if err := v.Validate(); err != nil { - return VhdsValidationError{ - field: "ConfigSource", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfigSource()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VhdsValidationError{ + field: "ConfigSource", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go index 963cba615423..c078d8eaaafc 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go @@ -6,19 +6,17 @@ package route import ( bytes "bytes" fmt "fmt" - io "io" - math "math" - time "time" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -187,7 +185,7 @@ type VirtualHost struct { Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"` // The list of routes that will be matched, in order, for incoming requests. // The first route that matches will be used. - Routes []Route `protobuf:"bytes,3,rep,name=routes,proto3" json:"routes"` + Routes []*Route `protobuf:"bytes,3,rep,name=routes,proto3" json:"routes,omitempty"` // Specifies the type of TLS enforcement the virtual host expects. If this option is not // specified, there is no TLS requirement for the virtual host. RequireTls VirtualHost_TlsRequirementType `protobuf:"varint,4,opt,name=require_tls,json=requireTls,proto3,enum=envoy.api.v2.route.VirtualHost_TlsRequirementType" json:"require_tls,omitempty"` @@ -296,7 +294,7 @@ func (m *VirtualHost) GetDomains() []string { return nil } -func (m *VirtualHost) GetRoutes() []Route { +func (m *VirtualHost) GetRoutes() []*Route { if m != nil { return m.Routes } @@ -406,7 +404,7 @@ type Route struct { // Name for the route. Name string `protobuf:"bytes,14,opt,name=name,proto3" json:"name,omitempty"` // Route matching parameters. - Match RouteMatch `protobuf:"bytes,1,opt,name=match,proto3" json:"match"` + Match *RouteMatch `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"` // Types that are valid to be assigned to Action: // *Route_Route // *Route_Redirect @@ -524,11 +522,11 @@ func (m *Route) GetName() string { return "" } -func (m *Route) GetMatch() RouteMatch { +func (m *Route) GetMatch() *RouteMatch { if m != nil { return m.Match } - return RouteMatch{} + return nil } func (m *Route) GetRoute() *RouteAction { @@ -4753,15 +4751,15 @@ func init() { func init() { proto.RegisterFile("envoy/api/v2/route/route.proto", fileDescriptor_7dc2895fb75d9d41) } var fileDescriptor_7dc2895fb75d9d41 = []byte{ - // 3830 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcb, 0x73, 0x1b, 0xc9, - 0x79, 0xe7, 0x10, 0x20, 0x1e, 0x1f, 0x5e, 0xc3, 0x26, 0x45, 0x82, 0x58, 0x89, 0xa2, 0xa0, 0xdd, - 0x2c, 0xad, 0x78, 0x41, 0x2f, 0x45, 0xaf, 0xac, 0xdd, 0x5a, 0x27, 0x04, 0x09, 0x09, 0xa4, 0xf8, - 0x4a, 0x93, 0x52, 0xa2, 0x75, 0x25, 0x93, 0x11, 0xa6, 0x09, 0x8c, 0x05, 0xcc, 0xcc, 0xf6, 0x34, - 0x28, 0xf2, 0xe6, 0xf8, 0x94, 0x72, 0x2a, 0x55, 0xc9, 0x1e, 0x52, 0xb9, 0xe7, 0x92, 0x72, 0x2a, - 0x29, 0xdf, 0xe2, 0x4a, 0xe5, 0xe0, 0xaa, 0x5c, 0x7c, 0x74, 0xe5, 0xe4, 0x8b, 0x93, 0x94, 0x72, - 0x89, 0xef, 0xf9, 0x03, 0x52, 0xfd, 0x98, 0x19, 0x80, 0x18, 0x12, 0xa0, 0x52, 0xb5, 0x15, 0xe7, - 0x42, 0xce, 0x74, 0xff, 0xbe, 0x5f, 0xf7, 0x74, 0x7f, 0xfd, 0xbd, 0x1a, 0xb0, 0x4c, 0x9c, 0x33, + // 3820 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcb, 0x6f, 0x23, 0xc9, + 0x79, 0x57, 0x8b, 0x14, 0x1f, 0x1f, 0x5f, 0xad, 0x92, 0x46, 0xa2, 0xb8, 0x33, 0x1a, 0x0d, 0x67, + 0x37, 0x2b, 0x4f, 0xbc, 0x94, 0x47, 0x23, 0xef, 0x7a, 0x76, 0xb1, 0x8e, 0x45, 0x89, 0x33, 0x94, + 0x46, 0xaf, 0x94, 0x34, 0x93, 0xcc, 0x1a, 0x49, 0xa7, 0x87, 0x5d, 0x22, 0xdb, 0x43, 0x76, 0xf7, + 0x56, 0x17, 0x35, 0xd2, 0xcd, 0x31, 0x72, 0x08, 0x12, 0x04, 0x48, 0xf6, 0x10, 0xe4, 0x9e, 0x4b, + 0xe0, 0x20, 0x81, 0x6f, 0x31, 0x82, 0x00, 0xf1, 0x31, 0x47, 0x23, 0x27, 0x5f, 0x8c, 0x04, 0x93, + 0x4b, 0x7c, 0xcf, 0x1f, 0x10, 0xd4, 0xa3, 0xbb, 0x49, 0xb1, 0x25, 0x52, 0x13, 0x60, 0x11, 0xfb, + 0x22, 0x75, 0x57, 0xfd, 0xbe, 0x5f, 0x55, 0x57, 0x7d, 0xf5, 0xbd, 0x8a, 0xb0, 0x4c, 0x9c, 0x33, 0xf7, 0x62, 0xcd, 0xf4, 0xec, 0xb5, 0xb3, 0xf5, 0x35, 0xea, 0xf6, 0x19, 0x91, 0x7f, 0x6b, 0x1e, 0x75, 0x99, 0x8b, 0x90, 0xe8, 0xaf, 0x99, 0x9e, 0x5d, 0x3b, 0x5b, 0xaf, 0x89, 0x9e, 0xca, 0xed, 0x21, 0x99, 0x96, 0x4b, 0xc9, 0xda, 0x2b, 0xd3, 0x57, 0x12, 0x95, 0xb2, 0xec, 0x65, 0x17, 0x1e, @@ -4770,230 +4768,229 @@ var fileDescriptor_7dc2895fb75d9d41 = []byte{ 0x96, 0x2f, 0x77, 0x59, 0x7d, 0x6a, 0x32, 0xdb, 0x75, 0x54, 0xff, 0xed, 0xcb, 0xfd, 0x3e, 0xa3, 0xfd, 0x16, 0xbb, 0x4a, 0xfa, 0x0d, 0x35, 0x3d, 0x8f, 0x50, 0x5f, 0xf5, 0x2f, 0x9e, 0x99, 0x5d, 0xdb, 0x32, 0x19, 0x59, 0x0b, 0x1e, 0x54, 0xc7, 0x7c, 0xdb, 0x6d, 0xbb, 0xe2, 0x71, 0x8d, 0x3f, - 0xc9, 0xd6, 0xea, 0x8f, 0x72, 0x90, 0x7b, 0x61, 0x53, 0xd6, 0x37, 0xbb, 0x4d, 0xd7, 0x67, 0xe8, - 0x0e, 0x24, 0x1d, 0xb3, 0x47, 0xca, 0xda, 0x8a, 0xb6, 0x9a, 0xad, 0x67, 0xff, 0xe9, 0xd7, 0x3f, - 0x4b, 0x24, 0xe9, 0xf4, 0x8a, 0x86, 0x45, 0x33, 0x7a, 0x1f, 0xd2, 0x96, 0xdb, 0x33, 0x6d, 0xc7, - 0x2f, 0x4f, 0xaf, 0x24, 0x56, 0xb3, 0x75, 0xe0, 0x88, 0x99, 0xaf, 0xb4, 0xe9, 0x8c, 0x86, 0x83, - 0x2e, 0xf4, 0x08, 0x52, 0x62, 0x55, 0xfd, 0x72, 0x62, 0x25, 0xb1, 0x9a, 0x5b, 0x5f, 0xaa, 0x8d, - 0xae, 0x78, 0x0d, 0xf3, 0xbf, 0xf5, 0xe4, 0xcf, 0xff, 0xed, 0xee, 0x14, 0x56, 0x70, 0x74, 0x0c, - 0x39, 0x4a, 0xbe, 0xec, 0xdb, 0x94, 0x18, 0xac, 0xeb, 0x97, 0x93, 0x2b, 0xda, 0x6a, 0x71, 0x7d, - 0x3d, 0x4e, 0x7a, 0x60, 0xce, 0xb5, 0x93, 0xae, 0x8f, 0xa5, 0x54, 0x8f, 0x38, 0xec, 0xe4, 0xc2, - 0x23, 0x18, 0x14, 0xcd, 0x49, 0xd7, 0x47, 0xfb, 0xa0, 0x9f, 0x49, 0xb4, 0xd1, 0xea, 0xf6, 0x7d, - 0x46, 0xa8, 0x5f, 0x9e, 0x11, 0xf3, 0xaa, 0x5e, 0xc3, 0xbc, 0x25, 0xa1, 0xb8, 0x74, 0x36, 0xf4, - 0xee, 0xa3, 0xef, 0x42, 0x8e, 0x9a, 0x8c, 0x18, 0x5d, 0xbb, 0x67, 0x33, 0xbf, 0x9c, 0x12, 0x4c, - 0x77, 0x62, 0xbf, 0xd0, 0x64, 0x64, 0x8f, 0xa3, 0x30, 0xd0, 0xe0, 0xd1, 0x47, 0xa7, 0xb0, 0xc0, - 0x27, 0x47, 0x7c, 0x66, 0x74, 0x88, 0x69, 0x11, 0xea, 0x1b, 0xcc, 0x35, 0x4c, 0xcb, 0x2a, 0xa7, - 0x05, 0xd5, 0xfb, 0xc3, 0x54, 0x5c, 0x15, 0x6b, 0x4d, 0x01, 0x7c, 0x61, 0x76, 0xfb, 0xe4, 0xd0, - 0xe3, 0xaa, 0x52, 0xcf, 0xf1, 0x75, 0x4f, 0x7d, 0xa5, 0x25, 0xf4, 0xff, 0x4a, 0xe3, 0x39, 0x45, - 0x28, 0x61, 0xfe, 0x89, 0xbb, 0x69, 0x59, 0xe8, 0x31, 0x2c, 0xc5, 0x8c, 0x43, 0x49, 0xcf, 0x3d, - 0x23, 0xe5, 0x02, 0xdf, 0x3c, 0xbc, 0x70, 0x59, 0x0e, 0x8b, 0x5e, 0xd4, 0x81, 0x45, 0x4a, 0x7c, - 0xcf, 0x75, 0x7c, 0x72, 0x79, 0x8e, 0xf0, 0xae, 0x73, 0x9c, 0x0f, 0x18, 0x87, 0x26, 0xf9, 0x19, - 0x54, 0xe2, 0x46, 0x52, 0xb3, 0xcc, 0x89, 0x59, 0x2e, 0x8e, 0x48, 0xaa, 0x69, 0xae, 0x43, 0xb2, - 0xe5, 0x52, 0xbf, 0x9c, 0x59, 0xd1, 0x56, 0x73, 0xeb, 0xcb, 0x71, 0x5b, 0xb0, 0xe5, 0x52, 0xff, - 0xc8, 0xed, 0xda, 0xad, 0x0b, 0x2c, 0xb0, 0xe8, 0x8f, 0x61, 0xd6, 0x23, 0xd4, 0x38, 0xb5, 0xbb, - 0x8c, 0x50, 0xa3, 0xe5, 0x3a, 0xa7, 0x76, 0xbb, 0x9c, 0x17, 0x1f, 0xb5, 0x31, 0x4e, 0xcf, 0x8e, - 0x08, 0x7d, 0x22, 0xe4, 0xb6, 0x84, 0x58, 0xc3, 0x61, 0xf4, 0x02, 0x97, 0xbc, 0xe1, 0x56, 0xe4, - 0xc1, 0x22, 0xb7, 0x06, 0x96, 0x31, 0x3a, 0x4e, 0x49, 0x8c, 0xf3, 0x78, 0xac, 0x3e, 0x73, 0xf1, - 0xd8, 0xc1, 0xe6, 0x59, 0x4c, 0x17, 0xda, 0x84, 0x3b, 0xb6, 0xd3, 0xea, 0xf6, 0x2d, 0x62, 0x04, - 0x3b, 0x6e, 0x32, 0x46, 0x7a, 0x1e, 0x33, 0x5a, 0x6e, 0xdf, 0x61, 0xe5, 0xe2, 0x8a, 0xb6, 0x9a, - 0xc1, 0x15, 0x05, 0xc2, 0x12, 0xb3, 0x29, 0x21, 0x5b, 0x1c, 0x81, 0xea, 0x90, 0xa7, 0x84, 0xd1, - 0x0b, 0xc3, 0x13, 0x8b, 0x55, 0xd6, 0xc5, 0x92, 0xde, 0x8d, 0xd5, 0x6a, 0x8e, 0x53, 0x6b, 0x9a, - 0xa3, 0xd1, 0x0b, 0xe7, 0xe8, 0x10, 0xab, 0x4d, 0x02, 0x8e, 0xd9, 0xab, 0x39, 0x9a, 0x1c, 0x17, - 0x70, 0x74, 0xa2, 0x97, 0xca, 0xf7, 0x60, 0x3e, 0xee, 0xc3, 0x91, 0x0e, 0x89, 0xd7, 0xe4, 0x42, - 0x5a, 0x25, 0xcc, 0x1f, 0xd1, 0x47, 0x30, 0x73, 0xc6, 0x75, 0xad, 0x3c, 0x2d, 0x86, 0x59, 0xac, - 0x49, 0xbb, 0x58, 0x0b, 0xec, 0x62, 0xed, 0x58, 0x58, 0x4d, 0x2c, 0x51, 0x9f, 0x4e, 0x7f, 0x47, - 0xab, 0xfc, 0x21, 0x2c, 0x5d, 0xb9, 0xb4, 0x31, 0x23, 0x3c, 0x18, 0x1e, 0x61, 0x7e, 0x64, 0x84, - 0x4d, 0xe7, 0x62, 0x80, 0xbe, 0xfa, 0x29, 0xa0, 0x51, 0x4b, 0x84, 0x32, 0x90, 0x3c, 0x38, 0x3c, - 0x68, 0xe8, 0x53, 0x68, 0x16, 0x0a, 0x8d, 0x3f, 0x38, 0x69, 0xe0, 0x83, 0xcd, 0x3d, 0xe3, 0xf0, - 0x60, 0xef, 0xa5, 0xae, 0xa1, 0x34, 0x24, 0x36, 0xf7, 0xf6, 0xf4, 0xe9, 0xdd, 0x64, 0x26, 0xab, - 0x43, 0xf5, 0x5f, 0xb2, 0x30, 0x23, 0xcc, 0x22, 0x42, 0xca, 0x0c, 0x17, 0xc5, 0x74, 0xa4, 0xed, - 0xdd, 0x86, 0x99, 0x9e, 0xc9, 0x5a, 0x1d, 0x31, 0xc7, 0x2b, 0xf4, 0x5d, 0x48, 0xef, 0x73, 0x54, - 0xbd, 0xc8, 0x2d, 0xab, 0xb0, 0xce, 0x3f, 0xd2, 0xa6, 0x75, 0x0d, 0x4b, 0x61, 0xf4, 0x08, 0x66, - 0x04, 0x54, 0x7d, 0xd5, 0xdd, 0x2b, 0x59, 0x36, 0x5b, 0xfc, 0x10, 0x37, 0xa7, 0xb0, 0xc4, 0xa3, - 0xdf, 0x85, 0x0c, 0x25, 0x96, 0x4d, 0x49, 0x8b, 0x95, 0x13, 0x42, 0xb6, 0x1a, 0xaf, 0x1e, 0x12, - 0x13, 0x8a, 0x87, 0x52, 0xe8, 0x18, 0x4a, 0xf2, 0xc9, 0x08, 0x4e, 0x74, 0x39, 0x2d, 0x88, 0x56, - 0xe3, 0x88, 0xb6, 0x05, 0x14, 0x2b, 0x64, 0x48, 0x57, 0xb4, 0x86, 0xda, 0xd1, 0x23, 0xc8, 0xf4, - 0x08, 0x33, 0x2d, 0x93, 0x99, 0xc2, 0x5f, 0xe4, 0xd6, 0xdf, 0x8b, 0x31, 0x4e, 0xfb, 0x0a, 0x82, - 0x43, 0x30, 0xfa, 0x0c, 0xb2, 0x16, 0x69, 0xb9, 0xd4, 0x64, 0x2e, 0x2d, 0xcf, 0x08, 0xc9, 0x58, - 0x2b, 0xbe, 0x1d, 0x80, 0x70, 0x84, 0x47, 0x5f, 0xc4, 0x99, 0x91, 0x8c, 0x38, 0xde, 0xb5, 0x2b, - 0x57, 0x74, 0x42, 0x03, 0xf2, 0xfd, 0xab, 0x0d, 0x48, 0x41, 0x8c, 0xf0, 0xf0, 0xea, 0x11, 0x6e, - 0x6a, 0x3a, 0xae, 0x76, 0x46, 0xd9, 0xaf, 0xcf, 0x19, 0xe5, 0xff, 0x3f, 0x38, 0xa3, 0x6f, 0x43, - 0x9a, 0x51, 0xb3, 0x65, 0x3b, 0xdc, 0xcc, 0xc7, 0xa8, 0xa1, 0xdc, 0xa5, 0x13, 0x09, 0xc1, 0x01, - 0xf6, 0x37, 0xd9, 0xe0, 0xd5, 0x4b, 0x90, 0x32, 0xc5, 0xb1, 0x44, 0x33, 0x3f, 0xfd, 0xf5, 0xcf, - 0x12, 0xda, 0x6e, 0x32, 0x93, 0xd2, 0xd3, 0xd5, 0xbf, 0xca, 0x42, 0xe9, 0xf7, 0x89, 0xdd, 0xee, - 0x30, 0x62, 0xa9, 0xa8, 0x09, 0xbd, 0x84, 0x4c, 0x18, 0x7b, 0x69, 0x62, 0xd7, 0x3e, 0x8e, 0x5b, - 0x9e, 0x4b, 0x62, 0x35, 0xf5, 0x5f, 0x36, 0x0f, 0xc5, 0x9a, 0x21, 0x1d, 0xda, 0x85, 0x3c, 0x73, - 0x99, 0xd9, 0x35, 0xde, 0x08, 0x94, 0xb2, 0x4d, 0xb7, 0x47, 0x26, 0xff, 0x7c, 0xc7, 0x61, 0x0f, - 0xd7, 0x85, 0x4a, 0xa8, 0xb8, 0xf6, 0xc1, 0xf4, 0xaa, 0x86, 0x73, 0x42, 0x58, 0x8e, 0x80, 0xbe, - 0x09, 0x88, 0xf6, 0x1d, 0x66, 0xf7, 0x88, 0xf1, 0x9a, 0x5c, 0x18, 0x1e, 0x25, 0xa7, 0xf6, 0xb9, - 0x58, 0x8e, 0x2c, 0xd6, 0x55, 0xcf, 0x33, 0x72, 0x71, 0x24, 0xda, 0x2b, 0x7f, 0x9f, 0x86, 0xc2, - 0xd0, 0x0c, 0xc7, 0x45, 0xcf, 0x1b, 0x90, 0x52, 0x93, 0x9c, 0x1e, 0x3f, 0x49, 0xac, 0xb0, 0xa8, - 0x0e, 0xc5, 0xc0, 0x68, 0x19, 0xd2, 0x01, 0x24, 0xc6, 0xdb, 0xb9, 0x42, 0x20, 0x22, 0x9c, 0xc1, - 0x35, 0xe7, 0x3c, 0xf9, 0xf5, 0x9d, 0xf3, 0xec, 0xbb, 0x9e, 0xf3, 0x99, 0xaf, 0xf3, 0x9c, 0xa7, - 0xae, 0x3f, 0xe7, 0xf4, 0x6a, 0xcb, 0xff, 0xe4, 0xc6, 0x2a, 0x3d, 0xa1, 0x47, 0xf8, 0xa1, 0x76, - 0xb5, 0x4b, 0x90, 0x36, 0xf0, 0xd9, 0xcd, 0x87, 0xbe, 0xa1, 0xab, 0xf8, 0x4d, 0xb6, 0x54, 0xbb, - 0xc9, 0x4c, 0x5a, 0xcf, 0x54, 0xff, 0x22, 0x09, 0x10, 0x05, 0x48, 0xa8, 0x0c, 0x29, 0x75, 0xc0, - 0x05, 0x73, 0x73, 0x0a, 0xab, 0x77, 0x34, 0x0f, 0x49, 0xcf, 0x64, 0x1d, 0x79, 0xf0, 0x9b, 0x53, - 0x58, 0xbc, 0xa1, 0x2a, 0xcc, 0x50, 0xd2, 0x26, 0xe7, 0xe2, 0xf8, 0x05, 0x99, 0x2f, 0x4d, 0xac, - 0xfe, 0x20, 0x23, 0x82, 0x24, 0xde, 0x85, 0x36, 0xa1, 0xd8, 0x32, 0x7d, 0x62, 0xf8, 0xc4, 0xf1, - 0x6d, 0x66, 0x9f, 0x11, 0x15, 0x93, 0x54, 0x46, 0x66, 0x58, 0x77, 0xdd, 0xae, 0x3c, 0xe7, 0x05, - 0x2e, 0x71, 0x1c, 0x08, 0xa0, 0x17, 0x10, 0x58, 0x1a, 0xe3, 0x94, 0x4a, 0xfb, 0x5a, 0xce, 0x0a, - 0x92, 0xdf, 0x8e, 0x39, 0x00, 0x58, 0x42, 0x9f, 0x28, 0xa4, 0xd9, 0x3d, 0x92, 0xe5, 0x09, 0x5c, - 0xa2, 0xc3, 0x3d, 0xe8, 0x33, 0x48, 0x2b, 0x65, 0x57, 0x39, 0xeb, 0xbd, 0xf8, 0xc8, 0x9c, 0x43, - 0xc4, 0x02, 0x11, 0x8a, 0x03, 0x09, 0x74, 0x02, 0xfa, 0x97, 0x7d, 0xc2, 0xf3, 0x03, 0x93, 0x9a, - 0x3d, 0x22, 0xec, 0xb8, 0x4c, 0x57, 0xbf, 0x11, 0xc7, 0xf2, 0x7b, 0x1c, 0x7b, 0x14, 0x40, 0x03, - 0xb6, 0xd2, 0x97, 0x43, 0xcd, 0x3e, 0x6a, 0x42, 0xb2, 0x4d, 0xbd, 0x96, 0x4a, 0xe0, 0x36, 0xae, - 0x0f, 0x68, 0x6b, 0x4f, 0xa9, 0xd7, 0x8a, 0x5e, 0xe5, 0x71, 0xf7, 0xb1, 0x60, 0xa8, 0x2c, 0xc2, - 0xad, 0xd8, 0xee, 0xfa, 0x22, 0x14, 0xf9, 0xe6, 0x19, 0xbe, 0x47, 0x5a, 0xf6, 0xa9, 0x4d, 0x68, - 0xe4, 0xab, 0x66, 0xf4, 0x54, 0xf5, 0x9f, 0x93, 0x00, 0x51, 0x8e, 0x88, 0xee, 0x41, 0xde, 0xec, - 0x76, 0xdd, 0x37, 0x86, 0x4b, 0xed, 0xb6, 0xed, 0x08, 0x57, 0x95, 0xc5, 0x39, 0xd1, 0x76, 0x28, - 0x9a, 0xd0, 0xe7, 0x80, 0x06, 0x21, 0x86, 0x54, 0x89, 0x8c, 0x28, 0x86, 0x94, 0xb8, 0x4a, 0xc0, - 0x57, 0x5a, 0xba, 0x2a, 0xf5, 0x02, 0xeb, 0x03, 0x92, 0x58, 0x28, 0xc8, 0x7d, 0x28, 0x48, 0xf1, - 0x1e, 0x61, 0x1d, 0xd7, 0xf2, 0x95, 0x73, 0x91, 0xc3, 0xee, 0xcb, 0xb6, 0x08, 0x14, 0x6c, 0x58, - 0x62, 0x00, 0xa4, 0x0c, 0x12, 0xfa, 0x00, 0x8a, 0xe4, 0xdc, 0x73, 0x23, 0x1b, 0x26, 0x54, 0x2d, - 0x8b, 0x0b, 0xb2, 0x35, 0x80, 0x2d, 0x42, 0xba, 0x67, 0x9e, 0x1b, 0x66, 0x9b, 0x88, 0x20, 0x37, - 0x8b, 0x53, 0x3d, 0xf3, 0x7c, 0xb3, 0x4d, 0xd0, 0x53, 0x98, 0x95, 0x83, 0xb4, 0x28, 0xb1, 0x88, - 0xc3, 0x6c, 0xb3, 0xcb, 0x35, 0x63, 0x9c, 0xb6, 0xca, 0x4f, 0xda, 0x8a, 0x64, 0xd0, 0xa7, 0x90, - 0x26, 0x8e, 0xf9, 0xaa, 0x4b, 0x2c, 0x15, 0xce, 0x5f, 0x23, 0x5e, 0x9f, 0x2e, 0x6b, 0xcd, 0x29, - 0x1c, 0x08, 0xa0, 0x13, 0x28, 0x2a, 0x73, 0x16, 0x50, 0xdc, 0x5c, 0xd5, 0x9b, 0x53, 0xb8, 0x20, - 0x49, 0x1a, 0x8a, 0x15, 0x43, 0xd1, 0xef, 0x98, 0x96, 0xfb, 0x26, 0x64, 0x85, 0x9b, 0x1f, 0xa0, - 0x82, 0xa4, 0x50, 0x9c, 0xf5, 0x39, 0x98, 0x55, 0x64, 0x91, 0x2e, 0x55, 0x7f, 0x75, 0x0b, 0x72, - 0x03, 0xc9, 0x12, 0xfa, 0x00, 0xd2, 0x2a, 0x2e, 0x19, 0x09, 0x01, 0xf8, 0x57, 0xab, 0x3e, 0xb4, - 0x0e, 0x45, 0xf5, 0xa8, 0xf6, 0x4e, 0x6a, 0xc1, 0x30, 0xba, 0xa0, 0x20, 0x72, 0x23, 0x11, 0x86, - 0xd9, 0x37, 0xca, 0x9e, 0x47, 0x65, 0x2c, 0x19, 0x08, 0xdc, 0x9f, 0xc0, 0xf8, 0x37, 0xa7, 0xb0, - 0xfe, 0x66, 0xb8, 0xc9, 0x47, 0x7f, 0xae, 0xc1, 0xdd, 0x60, 0x22, 0x8e, 0xcb, 0x8c, 0x53, 0xb7, - 0xef, 0x58, 0x61, 0x72, 0x66, 0xb4, 0x5c, 0x8b, 0x94, 0xe7, 0x45, 0x0d, 0xee, 0xb3, 0x31, 0x69, - 0x62, 0xe0, 0x5b, 0x0e, 0x5c, 0xf6, 0x84, 0x93, 0x04, 0xe9, 0xd9, 0x96, 0x6b, 0x11, 0x65, 0x29, - 0x7f, 0x28, 0xb2, 0xd0, 0xf7, 0x5a, 0x57, 0x03, 0x63, 0x22, 0x9d, 0xe4, 0x8d, 0x23, 0x9d, 0x0f, - 0xa0, 0x28, 0xad, 0xb8, 0x41, 0xc9, 0x1b, 0x6a, 0xb3, 0x40, 0xed, 0x0b, 0xb2, 0x15, 0xcb, 0x46, - 0x74, 0x1f, 0xf2, 0x1d, 0xd7, 0x67, 0x21, 0x28, 0x25, 0x4c, 0xbd, 0x86, 0x73, 0xbc, 0x35, 0x00, - 0x35, 0x61, 0xd6, 0xec, 0x33, 0xd7, 0x18, 0x42, 0x8e, 0xd5, 0xf1, 0xa6, 0x86, 0x4b, 0x5c, 0xac, - 0x39, 0xc0, 0xf4, 0x18, 0xca, 0x23, 0x4c, 0xc1, 0xde, 0xdf, 0x51, 0x43, 0xdf, 0xba, 0x24, 0xa4, - 0x36, 0xfe, 0x31, 0xa4, 0xb9, 0x82, 0xba, 0x7d, 0xa6, 0xec, 0xe4, 0xd2, 0xc8, 0xd0, 0xdb, 0xaa, - 0x80, 0x5c, 0x4f, 0xfe, 0xf5, 0xbf, 0xdf, 0xd5, 0x70, 0x80, 0x47, 0x75, 0xc8, 0xdb, 0x56, 0x97, - 0x18, 0x81, 0x7c, 0x79, 0x32, 0xf9, 0x1c, 0x17, 0x3a, 0x89, 0x38, 0x86, 0x2a, 0x43, 0xd9, 0x77, - 0xa8, 0x0c, 0xb5, 0xe1, 0x56, 0x10, 0x15, 0xf6, 0x6c, 0x4a, 0x5d, 0x1a, 0x90, 0xc9, 0x63, 0xf9, - 0x70, 0x9c, 0x72, 0xa9, 0x8a, 0xd5, 0xbe, 0x90, 0x55, 0x03, 0x04, 0xe1, 0xe7, 0x60, 0x23, 0xfa, - 0x2e, 0x64, 0x3c, 0x6a, 0xbb, 0xd4, 0x66, 0x17, 0xe5, 0x9c, 0x50, 0xdc, 0x6a, 0xdc, 0x91, 0x77, - 0xfb, 0xcc, 0x76, 0xda, 0x47, 0x0a, 0x89, 0x43, 0x99, 0xcb, 0xb5, 0xdd, 0xc2, 0x4d, 0x6b, 0xbb, - 0x87, 0xb0, 0x10, 0x54, 0xe2, 0xce, 0x3a, 0xc6, 0x20, 0x55, 0x71, 0xac, 0x61, 0x9d, 0x53, 0x92, - 0x2f, 0x3a, 0x38, 0x22, 0x7c, 0x06, 0xb9, 0x8e, 0xe9, 0x77, 0x82, 0xf5, 0x92, 0x05, 0xc4, 0x07, - 0xe3, 0xd6, 0xab, 0x69, 0xfa, 0x1d, 0xb5, 0x4c, 0xd0, 0x09, 0x9f, 0xc3, 0x7a, 0xe9, 0xec, 0x0d, - 0xea, 0xa5, 0x3b, 0xa0, 0x73, 0xf7, 0xc1, 0x9d, 0x6c, 0xa8, 0x46, 0x8b, 0x93, 0xa9, 0x51, 0xb1, - 0x67, 0x9e, 0x73, 0xa7, 0x1c, 0x68, 0xd2, 0x21, 0xcc, 0x0d, 0xd2, 0x18, 0xee, 0xe9, 0xa9, 0x4f, - 0x58, 0xf9, 0xf6, 0x64, 0x6c, 0xb3, 0xed, 0x88, 0xea, 0x50, 0x48, 0xa2, 0x17, 0x50, 0xea, 0x7b, - 0x6d, 0x6a, 0x5a, 0x44, 0x05, 0xc3, 0x7e, 0x79, 0x49, 0x2c, 0xd0, 0x47, 0xe3, 0x16, 0xe8, 0xb9, - 0x14, 0x93, 0x41, 0x26, 0x2e, 0xf6, 0x07, 0x5f, 0x7d, 0xe4, 0x41, 0xd9, 0x76, 0x18, 0xa1, 0x8e, - 0xd9, 0x35, 0x82, 0xe2, 0x95, 0xa1, 0x22, 0xb1, 0x8a, 0xd0, 0xaa, 0x4f, 0xc6, 0x0d, 0xb0, 0xa3, - 0xe4, 0x87, 0xab, 0x61, 0x78, 0xc1, 0x8e, 0x6d, 0x1f, 0x29, 0x9d, 0xbe, 0xf7, 0x0e, 0xa5, 0xd3, - 0x7f, 0xd4, 0x60, 0x2e, 0xe6, 0xa0, 0xa0, 0xfb, 0x57, 0xfb, 0xa4, 0xc8, 0x23, 0xdd, 0x87, 0xdc, - 0x40, 0xe2, 0xab, 0xdc, 0xd1, 0x74, 0x59, 0xc3, 0x10, 0x65, 0xbd, 0xb1, 0x91, 0x69, 0xe2, 0x7f, - 0x1f, 0x99, 0x56, 0x7e, 0x92, 0x04, 0x88, 0x54, 0x16, 0x3d, 0x83, 0x94, 0xb2, 0x8c, 0xb2, 0xd0, - 0xf9, 0xf1, 0xe4, 0xea, 0xae, 0xc2, 0x57, 0x1e, 0xca, 0x4b, 0x0a, 0x4e, 0xd6, 0x72, 0xdd, 0xd7, - 0x76, 0x90, 0x2a, 0xdc, 0x84, 0x6c, 0x4b, 0x08, 0x72, 0x32, 0x49, 0x81, 0xce, 0xe0, 0x56, 0xcb, - 0x75, 0x1c, 0x22, 0x90, 0x86, 0x47, 0x5d, 0x8f, 0x50, 0x66, 0x93, 0xc0, 0x0f, 0xff, 0xce, 0x8d, - 0xb8, 0x03, 0x9e, 0xa3, 0x90, 0xa6, 0x39, 0x85, 0xe7, 0x5b, 0x31, 0xed, 0xa8, 0x02, 0x19, 0x46, - 0x68, 0xcf, 0x76, 0xcc, 0xae, 0xf0, 0x88, 0x19, 0x1c, 0xbe, 0x57, 0x36, 0x20, 0xa5, 0x1c, 0xc5, - 0x03, 0xc8, 0xc9, 0x8f, 0x36, 0xe2, 0x6b, 0x10, 0x20, 0x7b, 0x0f, 0xcc, 0x1e, 0xa9, 0x38, 0x90, - 0x92, 0x5f, 0x37, 0xae, 0x64, 0xf1, 0x31, 0x24, 0x18, 0xeb, 0xaa, 0xc5, 0x1b, 0x7b, 0x48, 0x39, - 0x16, 0x21, 0x95, 0x3d, 0xc9, 0xa0, 0x55, 0x3c, 0x57, 0x1e, 0xc2, 0x7c, 0xdc, 0x17, 0xa3, 0xf7, - 0x20, 0xeb, 0xbb, 0x7d, 0xda, 0x22, 0x86, 0xed, 0x89, 0x29, 0x64, 0x70, 0x46, 0x36, 0xec, 0x78, - 0xf5, 0x25, 0xd0, 0xe5, 0x79, 0x18, 0x89, 0xde, 0x2b, 0x1d, 0x28, 0x0c, 0x9d, 0x61, 0x1e, 0xb9, - 0x07, 0xb6, 0x80, 0x67, 0xaf, 0x2a, 0x59, 0xcc, 0xa9, 0x36, 0x51, 0x89, 0xdf, 0x88, 0xe2, 0xd4, - 0xe9, 0xb1, 0xd6, 0x38, 0x80, 0x56, 0x1b, 0xf0, 0xde, 0x35, 0xb1, 0x0d, 0x5a, 0x84, 0xb9, 0xe3, - 0x06, 0x7e, 0xb1, 0xb3, 0xd5, 0x30, 0x9e, 0x1f, 0x6c, 0xbe, 0xd8, 0xdc, 0xd9, 0xdb, 0xac, 0xef, - 0x35, 0xf4, 0x29, 0x54, 0x80, 0xec, 0xc1, 0xe1, 0x89, 0xf1, 0xe4, 0xf0, 0xf9, 0xc1, 0xb6, 0xae, - 0x55, 0xbf, 0x80, 0x85, 0x78, 0x9b, 0x80, 0xaa, 0xb0, 0x7c, 0xb4, 0x79, 0x7c, 0x6c, 0x9c, 0x34, - 0xf1, 0xe1, 0xf3, 0xa7, 0x4d, 0x63, 0xe7, 0x40, 0xdd, 0x11, 0xe0, 0xc6, 0xf6, 0x0e, 0x6e, 0x6c, - 0x9d, 0xe8, 0x53, 0xe8, 0x36, 0x94, 0x9b, 0x9b, 0x07, 0xdb, 0x7b, 0x8d, 0x98, 0x5e, 0xad, 0x5e, - 0x81, 0xd9, 0x20, 0x8a, 0xbb, 0xbc, 0x50, 0xf5, 0x32, 0x2c, 0x0c, 0xc5, 0x1c, 0x21, 0x60, 0x37, - 0x99, 0xc9, 0xeb, 0x85, 0xdd, 0x64, 0x06, 0xe9, 0x73, 0xbb, 0xc9, 0xcc, 0x9c, 0x3e, 0xbf, 0x9b, - 0xcc, 0xe8, 0xfa, 0xec, 0x6e, 0x32, 0xb3, 0xa0, 0x2f, 0xee, 0x26, 0x33, 0xb7, 0xf4, 0x85, 0xea, - 0xbf, 0x66, 0x20, 0x37, 0xe0, 0xd5, 0xd1, 0x12, 0x64, 0x64, 0x30, 0xe0, 0x3a, 0x6a, 0x85, 0xd3, - 0xe2, 0xfd, 0x90, 0xe7, 0x45, 0x39, 0xa7, 0xdf, 0x33, 0xf8, 0x2b, 0x3f, 0x11, 0x93, 0x14, 0xb8, - 0xc0, 0xe9, 0xf7, 0xb0, 0xc4, 0xa3, 0xa7, 0x50, 0xf2, 0x08, 0x35, 0x38, 0x77, 0xe0, 0x66, 0x12, - 0x93, 0xe9, 0x5c, 0xc1, 0x23, 0xf4, 0x84, 0x5e, 0x04, 0x5e, 0xe6, 0x04, 0x8a, 0x2a, 0x5e, 0x09, - 0x02, 0x01, 0x19, 0x43, 0x7e, 0x34, 0x26, 0x62, 0x51, 0xcf, 0x41, 0x4c, 0x50, 0xa0, 0x83, 0xaf, - 0xc8, 0x82, 0x79, 0xc9, 0x2a, 0x16, 0xd3, 0xe3, 0x5e, 0xa1, 0x65, 0x8a, 0xd8, 0x92, 0xfb, 0x9b, - 0xf5, 0x89, 0xb8, 0x79, 0x68, 0x77, 0x14, 0x48, 0x62, 0x44, 0x47, 0xda, 0x50, 0x13, 0xee, 0x09, - 0x7e, 0x9f, 0x74, 0x95, 0x8d, 0x91, 0x83, 0x8a, 0x04, 0x4e, 0x5e, 0xd7, 0xc9, 0x14, 0x2d, 0x81, - 0xef, 0x70, 0xe0, 0x71, 0x80, 0x13, 0xfc, 0xfb, 0xe6, 0xb9, 0xba, 0xd3, 0xf3, 0xd1, 0x06, 0x2c, - 0x88, 0x9d, 0xe0, 0x3a, 0x6c, 0xf8, 0xcc, 0x64, 0x7d, 0x5f, 0x84, 0xf3, 0x32, 0x6b, 0x2f, 0xe0, - 0xf9, 0xb0, 0xf7, 0x58, 0x74, 0x72, 0x5d, 0xf6, 0x79, 0xde, 0x24, 0x07, 0x7c, 0x65, 0xb6, 0x5e, - 0x73, 0xff, 0xac, 0x22, 0xce, 0x6f, 0x4e, 0xf4, 0x7d, 0x75, 0xb3, 0xf5, 0xfa, 0xf0, 0xf4, 0x14, - 0xcb, 0x78, 0x51, 0xbd, 0x55, 0xfe, 0x4e, 0x83, 0xc2, 0xd0, 0xd2, 0x8e, 0xb7, 0x38, 0x29, 0x55, - 0xda, 0xba, 0xbe, 0x7c, 0x24, 0xed, 0xb2, 0x38, 0xfc, 0x8f, 0x21, 0x2f, 0xcb, 0x63, 0x4a, 0x30, - 0x71, 0x75, 0x55, 0xa8, 0x39, 0x85, 0x73, 0x02, 0x2b, 0xed, 0x46, 0xbd, 0x00, 0x39, 0x29, 0x24, - 0xcc, 0x46, 0xe5, 0x27, 0x1a, 0xa0, 0xd1, 0xcd, 0xfa, 0x3f, 0x3d, 0xe5, 0x7f, 0xd0, 0x20, 0x3f, - 0xb8, 0xfe, 0xe8, 0x08, 0x0a, 0xaf, 0x4c, 0x9f, 0x18, 0x22, 0xd6, 0x38, 0x33, 0xbb, 0xca, 0x8d, - 0x5e, 0x73, 0x90, 0x74, 0x7e, 0x90, 0xf8, 0x47, 0xa5, 0x7f, 0xac, 0x25, 0x33, 0xda, 0x83, 0x29, - 0x9c, 0xe7, 0x0c, 0x3b, 0x8a, 0x00, 0xed, 0x41, 0x9e, 0xab, 0x60, 0x48, 0x38, 0xd6, 0x1b, 0x14, - 0x03, 0xc2, 0x99, 0x1f, 0x6b, 0xd3, 0x0f, 0xa6, 0x70, 0xae, 0x67, 0x9e, 0x07, 0x6c, 0xd5, 0xff, - 0xd6, 0x20, 0x37, 0x10, 0xc5, 0x20, 0x0c, 0xba, 0xed, 0xd8, 0xcc, 0x16, 0xd1, 0x96, 0x88, 0x5f, - 0x7c, 0x35, 0xe5, 0x89, 0x8b, 0xf8, 0x25, 0x45, 0xa0, 0xe2, 0x1f, 0x1f, 0xbd, 0x84, 0x25, 0xd3, - 0xb2, 0x6c, 0x19, 0x78, 0x84, 0xb7, 0xe2, 0xad, 0x8e, 0xe9, 0xb4, 0x82, 0x48, 0x20, 0x08, 0xeb, - 0xf9, 0x22, 0xd6, 0x46, 0xa3, 0x94, 0xc5, 0x48, 0x5e, 0xb1, 0x6e, 0x09, 0x69, 0xf4, 0x09, 0x94, - 0x65, 0xac, 0xc6, 0x43, 0x80, 0x18, 0x93, 0x95, 0xc1, 0xf3, 0xa2, 0xff, 0xd0, 0x39, 0x1a, 0x34, - 0x4c, 0xd5, 0x9f, 0x26, 0xa1, 0x78, 0xc9, 0xf4, 0x7f, 0x08, 0xc5, 0x0e, 0x63, 0x9e, 0x1f, 0x46, - 0x99, 0xd2, 0xbb, 0xf3, 0xe4, 0x5f, 0xb4, 0x07, 0x70, 0xf4, 0x0d, 0x28, 0xf9, 0xad, 0x0e, 0xe9, - 0x91, 0x08, 0x99, 0x56, 0xb5, 0xc9, 0xa2, 0xec, 0x08, 0xa1, 0xf7, 0xa1, 0xa0, 0x0c, 0xbe, 0x02, - 0x4a, 0x3b, 0x9d, 0x97, 0x79, 0x6d, 0x04, 0xf2, 0x5c, 0x3a, 0x00, 0xe2, 0xe7, 0xbc, 0x80, 0xf3, - 0xbc, 0x31, 0x04, 0x7d, 0x00, 0x05, 0x51, 0x3a, 0x0b, 0x41, 0xd3, 0x2a, 0x51, 0xcd, 0xf3, 0xe6, - 0x10, 0xf6, 0x61, 0x7c, 0xc2, 0xdd, 0xd4, 0x2e, 0xa7, 0xdc, 0x1d, 0x28, 0x0c, 0x97, 0x16, 0x12, - 0x22, 0x96, 0x7e, 0x34, 0xfe, 0x16, 0x39, 0x7c, 0xbd, 0xb2, 0xac, 0x90, 0xa7, 0x83, 0x4e, 0xf9, - 0x2e, 0xe4, 0x7c, 0x46, 0x6d, 0xcf, 0x10, 0x05, 0x47, 0x61, 0x31, 0x33, 0x18, 0x44, 0x93, 0xa8, - 0x4c, 0x56, 0xdf, 0xc0, 0x7c, 0x1c, 0x25, 0xba, 0x05, 0xb3, 0xfb, 0x87, 0x2f, 0x1a, 0xdb, 0xc6, - 0x51, 0x03, 0xef, 0x6f, 0x1e, 0x34, 0x0e, 0x4e, 0xf6, 0x5e, 0xea, 0x53, 0x28, 0x0b, 0x33, 0xca, - 0x8f, 0x73, 0xb7, 0x7e, 0xdc, 0x68, 0x18, 0x87, 0x27, 0xcd, 0x06, 0xd6, 0xa7, 0xd1, 0x02, 0xa0, - 0x93, 0xc6, 0xfe, 0xd1, 0x21, 0xde, 0xc4, 0x2f, 0x23, 0x97, 0x9c, 0xe0, 0xed, 0x21, 0x45, 0xd4, - 0x9e, 0xac, 0x57, 0xa0, 0x1c, 0x6e, 0xe4, 0x25, 0x87, 0xcc, 0x5d, 0xb5, 0x5a, 0xef, 0x4b, 0x3d, - 0x55, 0x17, 0xe6, 0xe3, 0x6e, 0xc3, 0xd1, 0xfb, 0x90, 0x92, 0xb6, 0x5d, 0x6c, 0x72, 0xa1, 0x9e, - 0x17, 0x67, 0xf8, 0xc1, 0x8c, 0xfe, 0xcb, 0xe4, 0xaa, 0x85, 0x55, 0x1f, 0xfa, 0x18, 0x92, 0xaf, - 0x5c, 0xeb, 0xe2, 0x92, 0xda, 0x0f, 0x86, 0xea, 0xdb, 0x26, 0x33, 0x8f, 0x45, 0xd4, 0x85, 0x05, - 0xb4, 0xba, 0x01, 0xd9, 0xf0, 0xda, 0x1b, 0x7d, 0x08, 0x59, 0x1e, 0xaf, 0x89, 0x93, 0x3d, 0x6a, - 0x01, 0xa3, 0xbe, 0xea, 0x7f, 0x6a, 0x90, 0x56, 0x17, 0x9c, 0xe8, 0x09, 0x94, 0x5a, 0x5d, 0x9b, - 0x38, 0xcc, 0xf0, 0xcd, 0x9e, 0xd7, 0xb5, 0x9d, 0xb6, 0x3a, 0xd3, 0x63, 0x8e, 0x5d, 0x51, 0x4a, - 0x1d, 0x2b, 0x21, 0xce, 0x43, 0x4d, 0xc7, 0x72, 0x7b, 0x11, 0xcf, 0x44, 0xc7, 0xb7, 0x28, 0xa5, - 0x42, 0x9e, 0x26, 0xe8, 0xee, 0x19, 0xa1, 0x66, 0xb7, 0x1b, 0x11, 0x25, 0x26, 0x21, 0x2a, 0x29, - 0xb1, 0x80, 0xa9, 0xfa, 0x97, 0x1a, 0x14, 0x87, 0x7f, 0x23, 0x86, 0x7e, 0x0b, 0xd2, 0x1e, 0xf7, - 0xcf, 0x34, 0x58, 0x1f, 0xb9, 0x11, 0x94, 0x1f, 0x84, 0x1f, 0x64, 0x70, 0xd0, 0x19, 0xba, 0x91, - 0xe9, 0x78, 0x37, 0xf2, 0x1d, 0x48, 0xc9, 0xaa, 0xb0, 0x3a, 0x19, 0x2b, 0x71, 0x59, 0x95, 0xca, - 0xf0, 0x04, 0x0e, 0x2b, 0x7c, 0xf5, 0x57, 0x59, 0xc8, 0x86, 0x55, 0x03, 0xf4, 0x39, 0xcc, 0xf8, - 0xcc, 0x6c, 0x93, 0x1b, 0x59, 0xd1, 0x32, 0x60, 0x29, 0xc5, 0x4f, 0x8f, 0x65, 0xfb, 0x22, 0x72, - 0x08, 0x73, 0x41, 0x0c, 0xaa, 0x89, 0xe7, 0x81, 0xbb, 0x90, 0x96, 0xab, 0x14, 0xfc, 0xbe, 0xef, - 0xfd, 0x6b, 0x2b, 0x24, 0x35, 0xa9, 0xad, 0xc3, 0x3f, 0x15, 0x54, 0x04, 0x95, 0xbf, 0xc9, 0x40, - 0x4a, 0x69, 0xf3, 0xf7, 0xa0, 0xa8, 0x72, 0x81, 0xc1, 0x7c, 0xf5, 0xaa, 0xe8, 0xea, 0x12, 0x7b, - 0x4d, 0xea, 0x6f, 0x54, 0xed, 0x2c, 0xf8, 0x83, 0x0d, 0xe8, 0xfb, 0x30, 0x67, 0x11, 0x9f, 0xd9, - 0x8e, 0x50, 0xd5, 0x70, 0x04, 0xa9, 0x4b, 0x8f, 0x26, 0x1a, 0x61, 0x3b, 0x92, 0x8f, 0x86, 0x41, - 0xd6, 0x48, 0x2b, 0xfa, 0x23, 0x28, 0x5d, 0xba, 0x04, 0x55, 0xaa, 0xf6, 0x70, 0xa2, 0x71, 0xf0, - 0xd0, 0xfd, 0x28, 0x37, 0xf1, 0xc3, 0x37, 0xa6, 0x7c, 0xa1, 0x28, 0xe9, 0xb9, 0x8c, 0x18, 0xa6, - 0x65, 0x51, 0xe2, 0xfb, 0x2a, 0xc4, 0x5d, 0x9f, 0x90, 0x9e, 0x8b, 0x6e, 0x4a, 0x49, 0xbe, 0x50, - 0x74, 0xb0, 0x01, 0x61, 0xc8, 0xb5, 0x89, 0x43, 0xa8, 0xdd, 0x12, 0xbb, 0x2f, 0x7f, 0x18, 0xb3, - 0x36, 0x11, 0xf3, 0x53, 0x29, 0xf7, 0x8c, 0xf0, 0x90, 0x05, 0xda, 0xe1, 0x1b, 0x22, 0x80, 0x54, - 0x66, 0x2a, 0xae, 0xe4, 0x54, 0x6d, 0x57, 0xde, 0x35, 0x7c, 0x7b, 0x22, 0xea, 0x81, 0x7b, 0x5e, - 0x51, 0xe6, 0x6d, 0x4e, 0x61, 0xbd, 0x73, 0xa9, 0xad, 0x52, 0x82, 0xc2, 0x90, 0x16, 0x54, 0xe6, - 0x01, 0x8d, 0x6e, 0x5a, 0xc5, 0xe1, 0x7e, 0x78, 0x68, 0x41, 0x6f, 0x90, 0x39, 0xa3, 0x6f, 0x41, - 0xd1, 0x22, 0x7e, 0x8b, 0xda, 0x1e, 0x73, 0xe9, 0x40, 0xb1, 0x64, 0x00, 0x5e, 0x88, 0x00, 0xcf, - 0xc8, 0x05, 0x9f, 0xd6, 0xd0, 0x9a, 0x57, 0xea, 0x00, 0xd1, 0x52, 0xa1, 0x0d, 0xd0, 0x07, 0x08, - 0xe5, 0xb5, 0xe6, 0xc8, 0x0c, 0x4a, 0x11, 0x44, 0x7c, 0x70, 0xe5, 0x17, 0x1a, 0xe8, 0x97, 0x17, - 0xe5, 0xdd, 0xa8, 0xd0, 0xe7, 0x90, 0x27, 0xe7, 0x1e, 0x69, 0x31, 0xb5, 0x2f, 0xe3, 0x93, 0xe3, - 0x9c, 0xc4, 0xcb, 0x41, 0x9f, 0x46, 0xf7, 0x8a, 0x89, 0x09, 0xef, 0x15, 0x87, 0x4d, 0x81, 0x92, - 0xe6, 0xe9, 0xbe, 0xb4, 0x0a, 0x23, 0x59, 0x6c, 0xf5, 0xcf, 0x12, 0x50, 0x18, 0x62, 0x18, 0x17, - 0x91, 0xdf, 0x83, 0x1c, 0x39, 0x37, 0xc3, 0x4f, 0x4a, 0xaa, 0x60, 0x09, 0x44, 0xa3, 0x9c, 0xf7, - 0x47, 0x90, 0x13, 0x77, 0x77, 0x0a, 0x32, 0x13, 0x73, 0xa9, 0x0b, 0x02, 0x20, 0xe1, 0x8f, 0x21, - 0x27, 0x7e, 0xdf, 0x3d, 0xa4, 0xbc, 0x0b, 0x83, 0xbe, 0x63, 0xc7, 0x61, 0x9f, 0x6c, 0x60, 0x8e, - 0x11, 0xa2, 0xfc, 0x21, 0xb8, 0x92, 0xe0, 0x91, 0x90, 0xcf, 0x9d, 0xa1, 0x14, 0x4e, 0xab, 0x28, - 0x2f, 0xaf, 0x9a, 0x25, 0xac, 0x06, 0x79, 0x15, 0x48, 0x49, 0x54, 0x76, 0xf4, 0x4e, 0x28, 0x27, - 0x01, 0x21, 0xde, 0xef, 0x9f, 0x46, 0x78, 0x88, 0xc1, 0x4b, 0x80, 0xc4, 0xdf, 0x83, 0xbc, 0xed, - 0x9c, 0x11, 0x1a, 0xcc, 0x22, 0x23, 0xc2, 0xa2, 0x9c, 0x6c, 0x93, 0xbf, 0x19, 0x2c, 0xc3, 0x82, - 0x3a, 0x08, 0x02, 0x32, 0x54, 0x2d, 0x98, 0xd6, 0x13, 0xbb, 0xc9, 0x4c, 0x42, 0x4f, 0x56, 0xff, - 0x44, 0x83, 0x5b, 0xb1, 0x37, 0xbc, 0x68, 0x65, 0x68, 0x57, 0x86, 0xbd, 0xa0, 0xdc, 0x98, 0xf9, - 0xe0, 0xe6, 0x5e, 0x56, 0x87, 0xe4, 0x0b, 0xfa, 0x56, 0x70, 0xb5, 0x3e, 0xfe, 0xb6, 0x5c, 0x02, - 0xeb, 0x07, 0x7f, 0xfb, 0x76, 0x59, 0xfb, 0xf9, 0xdb, 0x65, 0xed, 0x17, 0x6f, 0x97, 0xb5, 0x5f, - 0xbe, 0x5d, 0xd6, 0xfe, 0xe3, 0xed, 0xb2, 0x06, 0x2b, 0xb6, 0x2b, 0x77, 0xc4, 0xa3, 0xee, 0xf9, - 0x45, 0x8c, 0x1e, 0xd6, 0xe5, 0x0f, 0x00, 0x8e, 0x38, 0xef, 0x91, 0xf6, 0x85, 0xfc, 0x69, 0xe3, - 0x9f, 0x6a, 0xda, 0xab, 0x94, 0x18, 0xea, 0xe1, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xba, 0x27, - 0xf8, 0x26, 0x3c, 0x30, 0x00, 0x00, + 0xc9, 0xd6, 0xea, 0x9f, 0xe4, 0x20, 0xf7, 0xc2, 0xa6, 0xac, 0x6f, 0x76, 0x9b, 0xae, 0xcf, 0xd0, + 0x1d, 0x48, 0x3a, 0x66, 0x8f, 0x94, 0xb5, 0x15, 0x6d, 0x35, 0x5b, 0xcf, 0xfe, 0xf3, 0xaf, 0x7e, + 0x96, 0x48, 0xd2, 0xe9, 0x15, 0x0d, 0x8b, 0x66, 0xf4, 0x3e, 0xa4, 0x2d, 0xb7, 0x67, 0xda, 0x8e, + 0x5f, 0x9e, 0x5e, 0x49, 0xac, 0x66, 0xeb, 0xc0, 0x11, 0x33, 0x5f, 0x69, 0xd3, 0x19, 0x0d, 0x07, + 0x5d, 0xe8, 0x21, 0xa4, 0xc4, 0xaa, 0xfa, 0xe5, 0xc4, 0x4a, 0x62, 0x35, 0xb7, 0xbe, 0x54, 0x1b, + 0x5d, 0xf1, 0x1a, 0xe6, 0x7f, 0xb1, 0x02, 0xa2, 0x63, 0xc8, 0x51, 0xf2, 0x65, 0xdf, 0xa6, 0xc4, + 0x60, 0x5d, 0xbf, 0x9c, 0x5c, 0xd1, 0x56, 0x8b, 0xeb, 0xeb, 0x71, 0x72, 0x03, 0xb3, 0xad, 0x9d, + 0x74, 0x7d, 0x2c, 0xa5, 0x7a, 0xc4, 0x61, 0x27, 0x17, 0x1e, 0xc1, 0xa0, 0x68, 0x4e, 0xba, 0x3e, + 0xda, 0x07, 0xfd, 0x4c, 0xa2, 0x8d, 0x56, 0xb7, 0xef, 0x33, 0x42, 0xfd, 0xf2, 0x8c, 0x98, 0x51, + 0xf5, 0x1a, 0xe6, 0x2d, 0x09, 0xc5, 0xa5, 0xb3, 0xa1, 0x77, 0x1f, 0x7d, 0x17, 0x72, 0xd4, 0x64, + 0xc4, 0xe8, 0xda, 0x3d, 0x9b, 0xf9, 0xe5, 0x94, 0x60, 0xba, 0x13, 0xfb, 0x6d, 0x26, 0x23, 0x7b, + 0x1c, 0x85, 0x81, 0x06, 0x8f, 0x3e, 0x3a, 0x85, 0x05, 0x3e, 0x39, 0xe2, 0x33, 0xa3, 0x43, 0x4c, + 0x8b, 0x50, 0xdf, 0x60, 0xae, 0x61, 0x5a, 0x56, 0x39, 0x2d, 0xa8, 0xde, 0x1f, 0xa6, 0xe2, 0x4a, + 0x58, 0x6b, 0x0a, 0xe0, 0x0b, 0xb3, 0xdb, 0x27, 0x87, 0x1e, 0x57, 0x92, 0x7a, 0x8e, 0xaf, 0x78, + 0xea, 0x2b, 0x2d, 0xa1, 0xff, 0x77, 0x1a, 0xcf, 0x29, 0x42, 0x09, 0xf3, 0x4f, 0xdc, 0x4d, 0xcb, + 0x42, 0x8f, 0x61, 0x29, 0x66, 0x1c, 0x4a, 0x7a, 0xee, 0x19, 0x29, 0x17, 0xf8, 0xb6, 0xe1, 0x85, + 0xcb, 0x72, 0x58, 0xf4, 0xa2, 0x0e, 0x2c, 0x52, 0xe2, 0x7b, 0xae, 0xe3, 0x93, 0xcb, 0x73, 0x84, + 0x77, 0x9d, 0xe3, 0x7c, 0xc0, 0x38, 0x34, 0xc9, 0xcf, 0xa0, 0x12, 0x37, 0x92, 0x9a, 0x65, 0x4e, + 0xcc, 0x72, 0x71, 0x44, 0x52, 0x4d, 0x73, 0x1d, 0x92, 0x2d, 0x97, 0xfa, 0xe5, 0xcc, 0x8a, 0xb6, + 0x9a, 0x5b, 0x5f, 0x8e, 0xdb, 0x82, 0x2d, 0x97, 0xfa, 0x47, 0x6e, 0xd7, 0x6e, 0x5d, 0x60, 0x81, + 0x45, 0x7f, 0x04, 0xb3, 0x1e, 0xa1, 0xc6, 0xa9, 0xdd, 0x65, 0x84, 0x1a, 0x2d, 0xd7, 0x39, 0xb5, + 0xdb, 0xe5, 0xbc, 0xf8, 0xa8, 0x8d, 0x71, 0x7a, 0x76, 0x44, 0xe8, 0x13, 0x21, 0xb7, 0x25, 0xc4, + 0x1a, 0x0e, 0xa3, 0x17, 0xb8, 0xe4, 0x0d, 0xb7, 0x22, 0x0f, 0x16, 0xb9, 0x1d, 0xb0, 0x8c, 0xd1, + 0x71, 0x4a, 0x62, 0x9c, 0xc7, 0x63, 0xf5, 0x99, 0x8b, 0xc7, 0x0e, 0x36, 0xcf, 0x62, 0xba, 0xd0, + 0x26, 0xdc, 0xb1, 0x9d, 0x56, 0xb7, 0x6f, 0x11, 0x23, 0xd8, 0x71, 0x93, 0x31, 0xd2, 0xf3, 0x98, + 0xd1, 0x72, 0xfb, 0x0e, 0x2b, 0x17, 0x57, 0xb4, 0xd5, 0x0c, 0xae, 0x28, 0x10, 0x96, 0x98, 0x4d, + 0x09, 0xd9, 0xe2, 0x08, 0x54, 0x87, 0x3c, 0x25, 0x8c, 0x5e, 0x18, 0x9e, 0x58, 0xac, 0xb2, 0x2e, + 0x96, 0xf4, 0x6e, 0xac, 0x56, 0x73, 0x9c, 0x5a, 0xd3, 0x1c, 0x8d, 0x5e, 0x38, 0x47, 0x87, 0x58, + 0x6d, 0x12, 0x70, 0xcc, 0x5e, 0xcd, 0xd1, 0xe4, 0xb8, 0x80, 0xa3, 0x13, 0xbd, 0x54, 0xbe, 0x0f, + 0xf3, 0x71, 0x1f, 0x8e, 0x74, 0x48, 0xbc, 0x26, 0x17, 0xd2, 0x1e, 0x61, 0xfe, 0x88, 0x3e, 0x82, + 0x99, 0x33, 0xae, 0x6b, 0xe5, 0x69, 0x31, 0xcc, 0x62, 0x4d, 0x5a, 0xc4, 0x5a, 0x60, 0x11, 0x6b, + 0xc7, 0xc2, 0x5e, 0x62, 0x89, 0xfa, 0x74, 0xfa, 0x3b, 0x5a, 0xe5, 0x0f, 0x60, 0xe9, 0xca, 0xa5, + 0x8d, 0x19, 0xe1, 0xc1, 0xf0, 0x08, 0xf3, 0x23, 0x23, 0x6c, 0x3a, 0x17, 0x03, 0xf4, 0xd5, 0x4f, + 0x01, 0x8d, 0x5a, 0x22, 0x94, 0x81, 0xe4, 0xc1, 0xe1, 0x41, 0x43, 0x9f, 0x42, 0xb3, 0x50, 0x68, + 0xfc, 0xfe, 0x49, 0x03, 0x1f, 0x6c, 0xee, 0x19, 0x87, 0x07, 0x7b, 0x2f, 0x75, 0x0d, 0xa5, 0x21, + 0xb1, 0xb9, 0xb7, 0xa7, 0x4f, 0xef, 0x26, 0x33, 0x59, 0x1d, 0xaa, 0xff, 0x9a, 0x85, 0x19, 0x61, + 0x10, 0x11, 0x52, 0x06, 0xb8, 0x28, 0xa6, 0x23, 0xad, 0xee, 0xf7, 0x60, 0xa6, 0x67, 0xb2, 0x56, + 0x47, 0xcc, 0xf1, 0x0a, 0x7d, 0x17, 0xd2, 0xfb, 0x1c, 0xa5, 0x6c, 0xf2, 0x9f, 0x69, 0xd3, 0xba, + 0x86, 0xa5, 0x20, 0xfa, 0x04, 0x66, 0x04, 0x4c, 0x7d, 0xd1, 0xdd, 0x2b, 0x19, 0x36, 0x5b, 0xfc, + 0x00, 0x37, 0xa7, 0xb0, 0xc4, 0xa3, 0xef, 0x41, 0x86, 0x12, 0xcb, 0xa6, 0xa4, 0xc5, 0xca, 0x09, + 0x21, 0x5b, 0x8d, 0x57, 0x0d, 0x89, 0x09, 0xc5, 0x43, 0x29, 0x74, 0x0c, 0x25, 0xf9, 0x64, 0x04, + 0xa7, 0xb9, 0x9c, 0x16, 0x44, 0xab, 0x71, 0x44, 0xdb, 0x02, 0x8a, 0x15, 0x32, 0xa4, 0x2b, 0x5a, + 0x43, 0xed, 0xe8, 0x13, 0xc8, 0xf4, 0x08, 0x33, 0x2d, 0x93, 0x99, 0xc2, 0x57, 0xe4, 0xd6, 0xdf, + 0x8b, 0x31, 0x4c, 0xfb, 0x0a, 0x82, 0x43, 0x30, 0xfa, 0x0c, 0xb2, 0x16, 0x69, 0xb9, 0xd4, 0x64, + 0x2e, 0x2d, 0xcf, 0x08, 0xc9, 0x58, 0x0b, 0xbe, 0x1d, 0x80, 0x70, 0x84, 0x47, 0x5f, 0xc4, 0x99, + 0x90, 0x8c, 0x38, 0xda, 0xb5, 0x2b, 0x57, 0x74, 0x42, 0xe3, 0xf1, 0x83, 0xab, 0x8d, 0x47, 0x41, + 0x8c, 0xf0, 0xe8, 0xea, 0x11, 0x6e, 0x6a, 0x36, 0xae, 0x76, 0x44, 0xd9, 0xaf, 0xcf, 0x11, 0xe5, + 0x7f, 0x13, 0x1c, 0xd1, 0xb7, 0x21, 0xcd, 0xa8, 0xd9, 0xb2, 0x1d, 0x6e, 0xe2, 0x63, 0xd4, 0x50, + 0xee, 0xd2, 0x89, 0x84, 0xe0, 0x00, 0xfb, 0xeb, 0x6c, 0xec, 0xea, 0x25, 0x48, 0x99, 0xe2, 0x58, + 0xa2, 0x99, 0x9f, 0xfe, 0xea, 0x67, 0x09, 0x6d, 0x37, 0x99, 0x49, 0xe9, 0xe9, 0xea, 0x5f, 0x67, + 0xa1, 0xf4, 0x7b, 0xc4, 0x6e, 0x77, 0x18, 0xb1, 0x54, 0xc4, 0x84, 0x5e, 0x42, 0x26, 0x8c, 0xbb, + 0x34, 0xb1, 0x6b, 0x0f, 0xe3, 0x96, 0xe7, 0x92, 0x58, 0x4d, 0xfd, 0x97, 0xcd, 0x43, 0x11, 0x66, + 0x48, 0x87, 0x76, 0x21, 0xcf, 0x5c, 0x66, 0x76, 0x8d, 0x37, 0x02, 0xa5, 0x6c, 0xd3, 0xed, 0x91, + 0xc9, 0x3f, 0xdf, 0x71, 0xd8, 0xa3, 0x75, 0xa1, 0x12, 0x2a, 0x9a, 0x7d, 0x30, 0xbd, 0xaa, 0xe1, + 0x9c, 0x10, 0x96, 0x23, 0xa0, 0x6f, 0x02, 0xa2, 0x7d, 0x87, 0xd9, 0x3d, 0x62, 0xbc, 0x26, 0x17, + 0x86, 0x47, 0xc9, 0xa9, 0x7d, 0x2e, 0x96, 0x23, 0x8b, 0x75, 0xd5, 0xf3, 0x8c, 0x5c, 0x1c, 0x89, + 0xf6, 0xca, 0x3f, 0xa4, 0xa1, 0x30, 0x34, 0xc3, 0x71, 0x31, 0xf3, 0x06, 0xa4, 0xd4, 0x24, 0xa7, + 0xc7, 0x4f, 0x12, 0x2b, 0x2c, 0xaa, 0x43, 0x31, 0x30, 0x5a, 0x86, 0x34, 0xfe, 0x89, 0xf1, 0x76, + 0xae, 0x10, 0x88, 0x08, 0x47, 0x70, 0xcd, 0x39, 0x4f, 0x7e, 0x7d, 0xe7, 0x3c, 0xfb, 0xae, 0xe7, + 0x7c, 0xe6, 0xeb, 0x3c, 0xe7, 0xa9, 0xeb, 0xcf, 0x39, 0xbd, 0xda, 0xf2, 0x3f, 0xb9, 0xb1, 0x4a, + 0x4f, 0xe8, 0x11, 0x7e, 0xa4, 0x5d, 0xed, 0x12, 0xa4, 0x0d, 0x7c, 0x76, 0xf3, 0xa1, 0x6f, 0xe8, + 0x2a, 0x7e, 0x9d, 0x2d, 0xd5, 0x6e, 0x32, 0x93, 0xd6, 0x33, 0xd5, 0xbf, 0x4c, 0x02, 0x44, 0xc1, + 0x11, 0x2a, 0x43, 0x4a, 0x1d, 0x70, 0xc1, 0xdc, 0x9c, 0xc2, 0xea, 0x1d, 0xcd, 0x43, 0xd2, 0x33, + 0x59, 0x47, 0x1e, 0xfc, 0xe6, 0x14, 0x16, 0x6f, 0xa8, 0x0a, 0x33, 0x94, 0xb4, 0xc9, 0xb9, 0x38, + 0x7e, 0x41, 0xbe, 0x4b, 0x13, 0xab, 0x3f, 0xcc, 0x88, 0x20, 0x89, 0x77, 0xa1, 0x4d, 0x28, 0xb6, + 0x4c, 0x9f, 0x18, 0x3e, 0x71, 0x7c, 0x9b, 0xd9, 0x67, 0x44, 0xc5, 0x24, 0x95, 0x91, 0x19, 0xd6, + 0x5d, 0xb7, 0x2b, 0xcf, 0x79, 0x81, 0x4b, 0x1c, 0x07, 0x02, 0xe8, 0x05, 0x04, 0x96, 0xc6, 0x38, + 0xa5, 0xd2, 0xbe, 0x96, 0xb3, 0x82, 0xe4, 0xb7, 0x63, 0x0e, 0x00, 0x96, 0xd0, 0x27, 0x0a, 0x69, + 0x76, 0x8f, 0x64, 0x51, 0x02, 0x97, 0xe8, 0x70, 0x0f, 0xfa, 0x0c, 0xd2, 0x4a, 0xd9, 0x55, 0xbe, + 0x7a, 0x2f, 0x3e, 0x2a, 0xe7, 0x10, 0xb1, 0x40, 0x84, 0xe2, 0x40, 0x02, 0x9d, 0x80, 0xfe, 0x65, + 0x9f, 0xf0, 0xdc, 0xc0, 0xa4, 0x66, 0x8f, 0x08, 0x3b, 0x2e, 0x53, 0xd5, 0x6f, 0xc4, 0xb1, 0xfc, + 0x2e, 0xc7, 0x1e, 0x05, 0xd0, 0x80, 0xad, 0xf4, 0xe5, 0x50, 0xb3, 0x8f, 0x9a, 0x90, 0x6c, 0x53, + 0xaf, 0xa5, 0x92, 0xb7, 0x8d, 0xeb, 0x83, 0xd9, 0xda, 0x53, 0xea, 0xb5, 0xa2, 0x57, 0x79, 0xdc, + 0x7d, 0x2c, 0x18, 0x2a, 0x8b, 0x70, 0x2b, 0xb6, 0xbb, 0xbe, 0x08, 0x45, 0xbe, 0x79, 0x86, 0xef, + 0x91, 0x96, 0x7d, 0x6a, 0x13, 0x1a, 0xf9, 0xaa, 0x19, 0x3d, 0x55, 0xfd, 0x97, 0x24, 0x40, 0x94, + 0x1f, 0xa2, 0x7b, 0x90, 0x37, 0xbb, 0x5d, 0xf7, 0x8d, 0xe1, 0x52, 0xbb, 0x6d, 0x3b, 0xc2, 0x55, + 0x65, 0x71, 0x4e, 0xb4, 0x1d, 0x8a, 0x26, 0xf4, 0x39, 0xa0, 0x41, 0x88, 0x21, 0x55, 0x22, 0x23, + 0x4a, 0x20, 0x25, 0xae, 0x12, 0xf0, 0x95, 0x96, 0xae, 0x4a, 0xbd, 0xc0, 0xfa, 0x80, 0x24, 0x16, + 0x0a, 0x72, 0x1f, 0x0a, 0x52, 0xbc, 0x47, 0x58, 0xc7, 0xb5, 0x7c, 0xe5, 0x5c, 0xe4, 0xb0, 0xfb, + 0xb2, 0x2d, 0x02, 0x05, 0x1b, 0x96, 0x18, 0x00, 0x29, 0x83, 0x84, 0x3e, 0x80, 0x22, 0x39, 0xf7, + 0xdc, 0xc8, 0x86, 0x09, 0x55, 0xcb, 0xe2, 0x82, 0x6c, 0x0d, 0x60, 0x8b, 0x90, 0xee, 0x99, 0xe7, + 0x86, 0xd9, 0x26, 0x22, 0xc8, 0xcd, 0xe2, 0x54, 0xcf, 0x3c, 0xdf, 0x6c, 0x13, 0xf4, 0x14, 0x66, + 0xe5, 0x20, 0x2d, 0x4a, 0x2c, 0xe2, 0x30, 0xdb, 0xec, 0x72, 0xcd, 0x18, 0xa7, 0xad, 0xf2, 0x93, + 0xb6, 0x22, 0x19, 0xf4, 0x29, 0xa4, 0x89, 0x63, 0xbe, 0xea, 0x12, 0x4b, 0x85, 0xf3, 0xd7, 0x88, + 0xd7, 0xa7, 0xcb, 0x5a, 0x73, 0x0a, 0x07, 0x02, 0xe8, 0x04, 0x8a, 0xca, 0x9c, 0x05, 0x14, 0x37, + 0x57, 0xf5, 0xe6, 0x14, 0x2e, 0x48, 0x92, 0x86, 0x62, 0xc5, 0x50, 0xf4, 0x3b, 0xa6, 0xe5, 0xbe, + 0x09, 0x59, 0xe1, 0xe6, 0x07, 0xa8, 0x20, 0x29, 0x14, 0x67, 0x7d, 0x0e, 0x66, 0x15, 0x59, 0xa4, + 0x4b, 0xd5, 0x5f, 0xde, 0x82, 0xdc, 0x40, 0xb2, 0x84, 0x3e, 0x80, 0xb4, 0x8a, 0x4b, 0x46, 0x42, + 0x00, 0xfe, 0xd5, 0xaa, 0x0f, 0xad, 0x43, 0x51, 0x3d, 0xaa, 0xbd, 0x93, 0x5a, 0x30, 0x8c, 0x2e, + 0x28, 0x88, 0xdc, 0x48, 0x84, 0x61, 0xf6, 0x8d, 0xb2, 0xe7, 0x51, 0x09, 0x4b, 0x06, 0x02, 0xf7, + 0x27, 0x30, 0xfe, 0xcd, 0x29, 0xac, 0xbf, 0x19, 0x6e, 0xf2, 0xd1, 0x5f, 0x68, 0x70, 0x37, 0x98, + 0x88, 0xe3, 0x32, 0xe3, 0xd4, 0xed, 0x3b, 0x56, 0x98, 0x9c, 0x19, 0x2d, 0xd7, 0x22, 0xe5, 0x79, + 0x51, 0x7f, 0xfb, 0x6c, 0x4c, 0x9a, 0x18, 0xf8, 0x96, 0x03, 0x97, 0x3d, 0xe1, 0x24, 0x41, 0x7a, + 0xb6, 0xe5, 0x5a, 0x44, 0x59, 0xca, 0x1f, 0x89, 0x2c, 0xf4, 0xbd, 0xd6, 0xd5, 0xc0, 0x98, 0x48, + 0x27, 0x79, 0xe3, 0x48, 0xe7, 0x03, 0x28, 0x4a, 0x2b, 0x6e, 0x50, 0xf2, 0x86, 0xda, 0x2c, 0x50, + 0xfb, 0x82, 0x6c, 0xc5, 0xb2, 0x11, 0xdd, 0x87, 0x7c, 0xc7, 0xf5, 0x59, 0x08, 0x4a, 0x09, 0x53, + 0xaf, 0xe1, 0x1c, 0x6f, 0x0d, 0x40, 0x4d, 0x98, 0x35, 0xfb, 0xcc, 0x35, 0x86, 0x90, 0x63, 0x75, + 0xbc, 0xa9, 0xe1, 0x12, 0x17, 0x6b, 0x0e, 0x30, 0x3d, 0x86, 0xf2, 0x08, 0x53, 0xb0, 0xf7, 0x77, + 0xd4, 0xd0, 0xb7, 0x2e, 0x09, 0xa9, 0x8d, 0x7f, 0x0c, 0x69, 0xae, 0xa0, 0x6e, 0x9f, 0x29, 0x3b, + 0xb9, 0x34, 0x32, 0xf4, 0xb6, 0x2a, 0x1b, 0xd7, 0x93, 0x7f, 0xf3, 0x1f, 0x77, 0x35, 0x1c, 0xe0, + 0x51, 0x1d, 0xf2, 0xb6, 0xd5, 0x25, 0x46, 0x20, 0x5f, 0x9e, 0x4c, 0x3e, 0xc7, 0x85, 0x4e, 0x22, + 0x8e, 0xa1, 0xaa, 0x50, 0xf6, 0x1d, 0xaa, 0x42, 0x6d, 0xb8, 0x15, 0x44, 0x85, 0x3d, 0x9b, 0x52, + 0x97, 0x06, 0x64, 0xf2, 0x58, 0x3e, 0x1a, 0xa7, 0x5c, 0xaa, 0x5a, 0xb5, 0x2f, 0x64, 0xd5, 0x00, + 0x41, 0xf8, 0x39, 0xd8, 0x88, 0xbe, 0x0b, 0x19, 0x8f, 0xda, 0x2e, 0xb5, 0xd9, 0x45, 0x39, 0x27, + 0x14, 0xb7, 0x1a, 0x77, 0xe4, 0xdd, 0x3e, 0xb3, 0x9d, 0xf6, 0x91, 0x42, 0xe2, 0x50, 0xe6, 0x72, + 0x5d, 0xb7, 0x70, 0xd3, 0xba, 0xee, 0x21, 0x2c, 0x04, 0x55, 0xb8, 0xb3, 0x8e, 0x31, 0x48, 0x55, + 0x1c, 0x6b, 0x58, 0xe7, 0x94, 0xe4, 0x8b, 0x0e, 0x8e, 0x08, 0x9f, 0x41, 0xae, 0x63, 0xfa, 0x9d, + 0x60, 0xbd, 0x64, 0xf1, 0xf0, 0xc1, 0xb8, 0xf5, 0x6a, 0x9a, 0x7e, 0x47, 0x2d, 0x13, 0x74, 0xc2, + 0xe7, 0xb0, 0x56, 0x3a, 0x7b, 0x83, 0x5a, 0xe9, 0x0e, 0xe8, 0xdc, 0x7d, 0x70, 0x27, 0x1b, 0xaa, + 0xd1, 0xe2, 0x64, 0x6a, 0x54, 0xec, 0x99, 0xe7, 0xdc, 0x29, 0x07, 0x9a, 0x74, 0x08, 0x73, 0x83, + 0x34, 0x86, 0x7b, 0x7a, 0xea, 0x13, 0x56, 0xbe, 0x3d, 0x19, 0xdb, 0x6c, 0x3b, 0xa2, 0x3a, 0x14, + 0x92, 0xe8, 0x05, 0x94, 0xfa, 0x5e, 0x9b, 0x9a, 0x16, 0x51, 0xc1, 0xb0, 0x5f, 0x5e, 0x12, 0x0b, + 0xf4, 0xd1, 0xb8, 0x05, 0x7a, 0x2e, 0xc5, 0x64, 0x90, 0x89, 0x8b, 0xfd, 0xc1, 0x57, 0x1f, 0x79, + 0x50, 0xb6, 0x1d, 0x46, 0xa8, 0x63, 0x76, 0x8d, 0xa0, 0x78, 0x65, 0xa8, 0x48, 0xac, 0x22, 0xb4, + 0xea, 0xe3, 0x71, 0x03, 0xec, 0x28, 0xf9, 0xe1, 0x6a, 0x18, 0x5e, 0xb0, 0x63, 0xdb, 0x47, 0xca, + 0xa6, 0xef, 0xbd, 0x43, 0xd9, 0xf4, 0x9f, 0x34, 0x98, 0x8b, 0x39, 0x28, 0xe8, 0xfe, 0xd5, 0x3e, + 0x29, 0xf2, 0x48, 0xf7, 0x21, 0x37, 0x90, 0xf8, 0x2a, 0x77, 0x34, 0x5d, 0xd6, 0x30, 0x44, 0x59, + 0x6f, 0x6c, 0x64, 0x9a, 0xf8, 0xbf, 0x47, 0xa6, 0x95, 0x9f, 0x24, 0x01, 0x22, 0x95, 0x45, 0xcf, + 0x20, 0xa5, 0x2c, 0xa3, 0x2c, 0x72, 0x3e, 0x9c, 0x5c, 0xdd, 0x55, 0xf8, 0xca, 0x43, 0x79, 0x49, + 0xc1, 0xc9, 0x5a, 0xae, 0xfb, 0xda, 0x0e, 0x52, 0x85, 0x9b, 0x90, 0x6d, 0x09, 0x41, 0x4e, 0x26, + 0x29, 0xd0, 0x19, 0xdc, 0x6a, 0xb9, 0x8e, 0x43, 0x04, 0xd2, 0xf0, 0xa8, 0xeb, 0x11, 0xca, 0x6c, + 0x12, 0xf8, 0xe1, 0xdf, 0xb9, 0x11, 0x77, 0xc0, 0x73, 0x14, 0xd2, 0x34, 0xa7, 0xf0, 0x7c, 0x2b, + 0xa6, 0x1d, 0x55, 0x20, 0xc3, 0x08, 0xed, 0xd9, 0x8e, 0xd9, 0x15, 0x1e, 0x31, 0x83, 0xc3, 0xf7, + 0xca, 0x06, 0xa4, 0x94, 0xa3, 0x78, 0x00, 0x39, 0xf9, 0xd1, 0x46, 0x7c, 0x0d, 0x02, 0x64, 0xef, + 0x81, 0xd9, 0x23, 0x15, 0x07, 0x52, 0xf2, 0xeb, 0xc6, 0x95, 0x2c, 0x1e, 0x42, 0x82, 0xb1, 0xae, + 0x5a, 0xbc, 0xb1, 0x87, 0x94, 0x63, 0x11, 0x52, 0xd9, 0x93, 0x0c, 0x5a, 0xc5, 0x73, 0xe5, 0x11, + 0xcc, 0xc7, 0x7d, 0x31, 0x7a, 0x0f, 0xb2, 0xbe, 0xdb, 0xa7, 0x2d, 0x62, 0xd8, 0x9e, 0x98, 0x42, + 0x06, 0x67, 0x64, 0xc3, 0x8e, 0x57, 0x5f, 0x02, 0x5d, 0x9e, 0x87, 0x91, 0xe8, 0xbd, 0xd2, 0x81, + 0xc2, 0xd0, 0x19, 0xe6, 0x91, 0x7b, 0x60, 0x0b, 0x78, 0xf6, 0xaa, 0x92, 0xc5, 0x9c, 0x6a, 0x13, + 0x55, 0xf8, 0x8d, 0x28, 0x4e, 0x9d, 0x1e, 0x6b, 0x8d, 0x03, 0x68, 0xb5, 0x01, 0xef, 0x5d, 0x13, + 0xdb, 0xa0, 0x45, 0x98, 0x3b, 0x6e, 0xe0, 0x17, 0x3b, 0x5b, 0x0d, 0xe3, 0xf9, 0xc1, 0xe6, 0x8b, + 0xcd, 0x9d, 0xbd, 0xcd, 0xfa, 0x5e, 0x43, 0x9f, 0x42, 0x05, 0xc8, 0x1e, 0x1c, 0x9e, 0x18, 0x4f, + 0x0e, 0x9f, 0x1f, 0x6c, 0xeb, 0x5a, 0xf5, 0x0b, 0x58, 0x88, 0xb7, 0x09, 0xa8, 0x0a, 0xcb, 0x47, + 0x9b, 0xc7, 0xc7, 0xc6, 0x49, 0x13, 0x1f, 0x3e, 0x7f, 0xda, 0x34, 0x76, 0x0e, 0xd4, 0xfd, 0x00, + 0x6e, 0x6c, 0xef, 0xe0, 0xc6, 0xd6, 0x89, 0x3e, 0x85, 0x6e, 0x43, 0xb9, 0xb9, 0x79, 0xb0, 0xbd, + 0xd7, 0x88, 0xe9, 0xd5, 0xea, 0x15, 0x98, 0x0d, 0xa2, 0xb8, 0xcb, 0x0b, 0x55, 0x2f, 0xc3, 0xc2, + 0x50, 0xcc, 0x11, 0x02, 0x76, 0x93, 0x99, 0xbc, 0x5e, 0xd8, 0x4d, 0x66, 0x90, 0x3e, 0xb7, 0x9b, + 0xcc, 0xcc, 0xe9, 0xf3, 0xbb, 0xc9, 0x8c, 0xae, 0xcf, 0xee, 0x26, 0x33, 0x0b, 0xfa, 0xe2, 0x6e, + 0x32, 0x73, 0x4b, 0x5f, 0xa8, 0xfe, 0x7b, 0x06, 0x72, 0x03, 0x5e, 0x1d, 0x2d, 0x41, 0x46, 0x06, + 0x03, 0xae, 0xa3, 0x56, 0x38, 0x2d, 0xde, 0x0f, 0x79, 0x5e, 0x94, 0x73, 0xfa, 0x3d, 0x83, 0xbf, + 0xf2, 0x13, 0x31, 0x49, 0x81, 0x0b, 0x9c, 0x7e, 0x0f, 0x4b, 0x3c, 0x7a, 0x0a, 0x25, 0x8f, 0x50, + 0x83, 0x73, 0x07, 0x6e, 0x26, 0x31, 0x99, 0xce, 0x15, 0x3c, 0x42, 0x4f, 0xe8, 0x45, 0xe0, 0x65, + 0x4e, 0xa0, 0xa8, 0xe2, 0x95, 0x20, 0x10, 0x90, 0x31, 0xe4, 0x47, 0x63, 0x22, 0x16, 0xf5, 0x1c, + 0xc4, 0x04, 0x05, 0x3a, 0xf8, 0x8a, 0x2c, 0x98, 0x97, 0xac, 0x62, 0x31, 0x3d, 0xee, 0x15, 0x5a, + 0xa6, 0x88, 0x2d, 0xb9, 0xbf, 0x59, 0x9f, 0x88, 0x9b, 0x87, 0x76, 0x47, 0x81, 0x24, 0x46, 0x74, + 0xa4, 0x0d, 0x35, 0xe1, 0x9e, 0xe0, 0xf7, 0x49, 0x57, 0xd9, 0x18, 0x39, 0xa8, 0x48, 0xe0, 0xe4, + 0x55, 0x9d, 0x4c, 0xd1, 0x12, 0xf8, 0x0e, 0x07, 0x1e, 0x07, 0x38, 0xc1, 0xbf, 0x6f, 0x9e, 0xab, + 0xfb, 0x3c, 0x1f, 0x6d, 0xc0, 0x82, 0xd8, 0x09, 0xae, 0xc3, 0x86, 0xcf, 0x4c, 0xd6, 0xf7, 0x45, + 0x38, 0x2f, 0xb3, 0xf6, 0x02, 0x9e, 0x0f, 0x7b, 0x8f, 0x45, 0x27, 0xd7, 0x65, 0x9f, 0xe7, 0x4d, + 0x72, 0xc0, 0x57, 0x66, 0xeb, 0x35, 0xf7, 0xcf, 0x2a, 0xe2, 0xfc, 0xe6, 0x44, 0xdf, 0x57, 0x37, + 0x5b, 0xaf, 0x0f, 0x4f, 0x4f, 0xb1, 0x8c, 0x17, 0xd5, 0x5b, 0xe5, 0xef, 0x35, 0x28, 0x0c, 0x2d, + 0xed, 0x78, 0x8b, 0x93, 0x52, 0xa5, 0xad, 0xeb, 0xcb, 0x47, 0xd2, 0x2e, 0x8b, 0xc3, 0xff, 0x18, + 0xf2, 0xb2, 0x3c, 0xa6, 0x04, 0x13, 0x57, 0x57, 0x85, 0x9a, 0x53, 0x38, 0x27, 0xb0, 0xd2, 0x6e, + 0xd4, 0x0b, 0x90, 0x93, 0x42, 0xc2, 0x6c, 0x54, 0x7e, 0xa2, 0x01, 0x1a, 0xdd, 0xac, 0xff, 0xd7, + 0x53, 0xfe, 0x47, 0x0d, 0xf2, 0x83, 0xeb, 0x8f, 0x8e, 0xa0, 0xf0, 0xca, 0xf4, 0x89, 0x21, 0x62, + 0x8d, 0x33, 0xb3, 0xab, 0xdc, 0xe8, 0x35, 0x07, 0x49, 0xe7, 0x07, 0x89, 0x7f, 0x54, 0xfa, 0xc7, + 0x5a, 0x32, 0xa3, 0x3d, 0x98, 0xc2, 0x79, 0xce, 0xb0, 0xa3, 0x08, 0xd0, 0x1e, 0xe4, 0xb9, 0x0a, + 0x86, 0x84, 0x63, 0xbd, 0x41, 0x31, 0x20, 0x9c, 0xf9, 0xb1, 0x36, 0xfd, 0x60, 0x0a, 0xe7, 0x7a, + 0xe6, 0x79, 0xc0, 0x56, 0xfd, 0x1f, 0x0d, 0x72, 0x03, 0x51, 0x0c, 0xc2, 0xa0, 0xdb, 0x8e, 0xcd, + 0x6c, 0x11, 0x6d, 0x89, 0xf8, 0xc5, 0x57, 0x53, 0x9e, 0xb8, 0x88, 0x5f, 0x52, 0x04, 0x2a, 0xfe, + 0xf1, 0xd1, 0x4b, 0x58, 0x32, 0x2d, 0xcb, 0x96, 0x81, 0x47, 0x78, 0x23, 0xde, 0xea, 0x98, 0x4e, + 0x2b, 0x88, 0x04, 0x82, 0xb0, 0x9e, 0x2f, 0x62, 0x6d, 0x34, 0x4a, 0x59, 0x8c, 0xe4, 0x15, 0xeb, + 0x96, 0x90, 0x46, 0x1f, 0x43, 0x59, 0xc6, 0x6a, 0x3c, 0x04, 0x88, 0x31, 0x59, 0x19, 0x3c, 0x2f, + 0xfa, 0x0f, 0x9d, 0xa3, 0x41, 0xc3, 0x54, 0xfd, 0x69, 0x12, 0x8a, 0x97, 0x4c, 0xff, 0x87, 0x50, + 0xec, 0x30, 0xe6, 0xf9, 0x61, 0x94, 0x29, 0xbd, 0x3b, 0x4f, 0xfe, 0x45, 0x7b, 0x00, 0x47, 0xdf, + 0x80, 0x92, 0xdf, 0xea, 0x90, 0x1e, 0x89, 0x90, 0x69, 0x55, 0x9b, 0x2c, 0xca, 0x8e, 0x10, 0x7a, + 0x1f, 0x0a, 0xca, 0xe0, 0x2b, 0xa0, 0xb4, 0xd3, 0x79, 0x99, 0xd7, 0x46, 0x20, 0xcf, 0xa5, 0x03, + 0x20, 0x7e, 0xce, 0x0b, 0x38, 0xcf, 0x1b, 0x43, 0xd0, 0x07, 0x50, 0x10, 0xa5, 0xb3, 0x10, 0x34, + 0xad, 0x12, 0xd5, 0x3c, 0x6f, 0x0e, 0x61, 0x1f, 0xc6, 0x27, 0xdc, 0x4d, 0xed, 0x72, 0xca, 0xdd, + 0x81, 0xc2, 0x70, 0x69, 0x21, 0x21, 0x62, 0xe9, 0x4f, 0xc6, 0xdf, 0x22, 0x87, 0xaf, 0x57, 0x96, + 0x15, 0xf2, 0x74, 0xd0, 0x29, 0xdf, 0x85, 0x9c, 0xcf, 0xa8, 0xed, 0x19, 0xa2, 0xe0, 0x28, 0x2c, + 0x66, 0x06, 0x83, 0x68, 0x12, 0x95, 0xc9, 0xea, 0x1b, 0x98, 0x8f, 0xa3, 0x44, 0xb7, 0x60, 0x76, + 0xff, 0xf0, 0x45, 0x63, 0xdb, 0x38, 0x6a, 0xe0, 0xfd, 0xcd, 0x83, 0xc6, 0xc1, 0xc9, 0xde, 0x4b, + 0x7d, 0x0a, 0x65, 0x61, 0x46, 0xf9, 0x71, 0xee, 0xd6, 0x8f, 0x1b, 0x0d, 0xe3, 0xf0, 0xa4, 0xd9, + 0xc0, 0xfa, 0x34, 0x5a, 0x00, 0x74, 0xd2, 0xd8, 0x3f, 0x3a, 0xc4, 0x9b, 0xf8, 0x65, 0xe4, 0x92, + 0x13, 0xbc, 0x3d, 0xa4, 0x88, 0xda, 0x93, 0xf5, 0x0a, 0x94, 0xc3, 0x8d, 0xbc, 0xe4, 0x90, 0xb9, + 0xab, 0x56, 0xeb, 0x7d, 0xa9, 0xa7, 0xea, 0xc2, 0x7c, 0xdc, 0x6d, 0x38, 0x7a, 0x1f, 0x52, 0xd2, + 0xb6, 0x8b, 0x4d, 0x2e, 0xd4, 0xf3, 0xe2, 0x0c, 0x3f, 0x98, 0xd1, 0x7f, 0x91, 0x5c, 0xb5, 0xb0, + 0xea, 0x43, 0x0f, 0x21, 0xf9, 0xca, 0xb5, 0x2e, 0x2e, 0xa9, 0xfd, 0x60, 0xa8, 0xbe, 0x6d, 0x32, + 0xf3, 0x58, 0x44, 0x5d, 0x58, 0x40, 0xab, 0x1b, 0x90, 0x0d, 0xaf, 0xbd, 0xd1, 0x87, 0x90, 0xe5, + 0xf1, 0x9a, 0x38, 0xd9, 0xa3, 0x16, 0x30, 0xea, 0xab, 0xfe, 0x97, 0x06, 0x69, 0x75, 0xc1, 0x89, + 0x9e, 0x40, 0xa9, 0xd5, 0xb5, 0x89, 0xc3, 0x0c, 0xdf, 0xec, 0x79, 0x5d, 0xdb, 0x69, 0xab, 0x33, + 0x3d, 0xe6, 0xd8, 0x15, 0xa5, 0xd4, 0xb1, 0x12, 0xe2, 0x3c, 0xd4, 0x74, 0x2c, 0xb7, 0x17, 0xf1, + 0x4c, 0x74, 0x7c, 0x8b, 0x52, 0x2a, 0xe4, 0x69, 0x82, 0xee, 0x9e, 0x11, 0x6a, 0x76, 0xbb, 0x11, + 0x51, 0x62, 0x12, 0xa2, 0x92, 0x12, 0x0b, 0x98, 0xaa, 0x7f, 0xa5, 0x41, 0x71, 0xf8, 0xf7, 0x61, + 0xe8, 0xb7, 0x20, 0xed, 0x71, 0xff, 0x4c, 0x83, 0xf5, 0x91, 0x1b, 0x41, 0xf9, 0x41, 0xf8, 0x61, + 0x06, 0x07, 0x9d, 0xa1, 0x1b, 0x99, 0x8e, 0x77, 0x23, 0xdf, 0x81, 0x94, 0xac, 0x0a, 0xab, 0x93, + 0xb1, 0x12, 0x97, 0x55, 0xa9, 0x0c, 0x4f, 0xe0, 0xb0, 0xc2, 0x57, 0x7f, 0x99, 0x85, 0x6c, 0x58, + 0x35, 0x40, 0x9f, 0xc3, 0x8c, 0xcf, 0xcc, 0x36, 0xb9, 0x91, 0x15, 0x2d, 0x03, 0x96, 0x52, 0xfc, + 0xf4, 0x58, 0xb6, 0x2f, 0x22, 0x87, 0x30, 0x17, 0xc4, 0xa0, 0x9a, 0x78, 0x1e, 0xb8, 0x0b, 0x69, + 0xb9, 0x4a, 0xc1, 0xaf, 0xfa, 0xde, 0xbf, 0xb6, 0x42, 0x52, 0x93, 0xda, 0x3a, 0xfc, 0x03, 0x41, + 0x45, 0x50, 0xf9, 0xdb, 0x0c, 0xa4, 0x94, 0x36, 0x7f, 0x1f, 0x8a, 0x2a, 0x17, 0x18, 0xcc, 0x57, + 0xaf, 0x8a, 0xae, 0x2e, 0xb1, 0xd7, 0xa4, 0xfe, 0x46, 0xd5, 0xce, 0x82, 0x3f, 0xd8, 0x80, 0x7e, + 0x00, 0x73, 0x16, 0xf1, 0x99, 0xed, 0x08, 0x55, 0x0d, 0x47, 0x90, 0xba, 0xf4, 0xc9, 0x44, 0x23, + 0x6c, 0x47, 0xf2, 0xd1, 0x30, 0xc8, 0x1a, 0x69, 0x45, 0x7f, 0x08, 0xa5, 0x4b, 0x97, 0xa0, 0x4a, + 0xd5, 0x1e, 0x4d, 0x34, 0x0e, 0x1e, 0xba, 0x1f, 0xe5, 0x26, 0x7e, 0xf8, 0xc6, 0x94, 0x2f, 0x14, + 0x25, 0x3d, 0x97, 0x11, 0xc3, 0xb4, 0x2c, 0x4a, 0x7c, 0x5f, 0x85, 0xb8, 0xeb, 0x13, 0xd2, 0x73, + 0xd1, 0x4d, 0x29, 0xc9, 0x17, 0x8a, 0x0e, 0x36, 0x20, 0x0c, 0xb9, 0x36, 0x71, 0x08, 0xb5, 0x5b, + 0x62, 0xf7, 0xe5, 0x0f, 0x63, 0xd6, 0x26, 0x62, 0x7e, 0x2a, 0xe5, 0x9e, 0x11, 0x1e, 0xb2, 0x40, + 0x3b, 0x7c, 0x43, 0x04, 0x90, 0xca, 0x4c, 0xc5, 0x95, 0x9c, 0xaa, 0xed, 0xca, 0xbb, 0x86, 0x6f, + 0x4f, 0x44, 0x3d, 0x70, 0xcf, 0x2b, 0xca, 0xbc, 0xcd, 0x29, 0xac, 0x77, 0x2e, 0xb5, 0x55, 0x4a, + 0x50, 0x18, 0xd2, 0x82, 0xca, 0x3c, 0xa0, 0xd1, 0x4d, 0xab, 0x38, 0xdc, 0x0f, 0x0f, 0x2d, 0xe8, + 0x0d, 0x32, 0x67, 0xf4, 0x2d, 0x28, 0x5a, 0xc4, 0x6f, 0x51, 0xdb, 0x63, 0x2e, 0x1d, 0x28, 0x96, + 0x0c, 0xc0, 0x0b, 0x11, 0xe0, 0x19, 0xb9, 0xe0, 0xd3, 0x1a, 0x5a, 0xf3, 0x4a, 0x1d, 0x20, 0x5a, + 0x2a, 0xb4, 0x01, 0xfa, 0x00, 0xa1, 0xbc, 0xd6, 0x1c, 0x99, 0x41, 0x29, 0x82, 0x88, 0x0f, 0xae, + 0xfc, 0x5c, 0x03, 0xfd, 0xf2, 0xa2, 0xbc, 0x1b, 0x15, 0xfa, 0x1c, 0xf2, 0xe4, 0xdc, 0x23, 0x2d, + 0xa6, 0xf6, 0x65, 0x7c, 0x72, 0x9c, 0x93, 0x78, 0x39, 0xe8, 0xd3, 0xe8, 0x5e, 0x31, 0x31, 0xe1, + 0xbd, 0xe2, 0xb0, 0x29, 0x50, 0xd2, 0x3c, 0xdd, 0x97, 0x56, 0x61, 0x24, 0x8b, 0xad, 0xfe, 0x79, + 0x02, 0x0a, 0x43, 0x0c, 0xe3, 0x22, 0xf2, 0x7b, 0x90, 0x23, 0xe7, 0x66, 0xf8, 0x49, 0x49, 0x15, + 0x2c, 0x81, 0x68, 0x94, 0xf3, 0xfe, 0x08, 0x72, 0xe2, 0xee, 0x4e, 0x41, 0x66, 0x62, 0x2e, 0x75, + 0x41, 0x00, 0x24, 0xfc, 0x31, 0xe4, 0xc4, 0xaf, 0xba, 0x87, 0x94, 0x77, 0x61, 0xd0, 0x77, 0xec, + 0x38, 0xec, 0xe3, 0x0d, 0xcc, 0x31, 0x42, 0x94, 0x3f, 0x04, 0x57, 0x12, 0x3c, 0x12, 0xf2, 0xb9, + 0x33, 0x94, 0xc2, 0x69, 0x15, 0xe5, 0xe5, 0x55, 0xb3, 0x84, 0xd5, 0x20, 0xaf, 0x02, 0x29, 0x89, + 0xca, 0x8e, 0xde, 0x09, 0xe5, 0x24, 0x20, 0xc4, 0xfb, 0xfd, 0xd3, 0x08, 0x0f, 0x31, 0x78, 0x09, + 0x90, 0xf8, 0x7b, 0x90, 0xb7, 0x9d, 0x33, 0x42, 0x83, 0x59, 0x64, 0x44, 0x58, 0x94, 0x93, 0x6d, + 0xf2, 0xf7, 0x82, 0x65, 0x58, 0x50, 0x07, 0x41, 0x40, 0x86, 0xaa, 0x05, 0xd3, 0x7a, 0x62, 0x37, + 0x99, 0x49, 0xe8, 0xc9, 0xea, 0x1f, 0x6b, 0x70, 0x2b, 0xf6, 0x86, 0x17, 0xad, 0x0c, 0xed, 0xca, + 0xb0, 0x17, 0x94, 0x1b, 0x33, 0x1f, 0xdc, 0xdc, 0xcb, 0xea, 0x90, 0x7c, 0x41, 0xdf, 0x0a, 0xae, + 0xd6, 0xc7, 0xdf, 0x96, 0x4b, 0x60, 0xfd, 0xe0, 0xef, 0xde, 0x2e, 0x6b, 0xff, 0xf6, 0x76, 0x59, + 0xfb, 0xf9, 0xdb, 0x65, 0xed, 0x17, 0x6f, 0x97, 0xb5, 0xff, 0x7c, 0xbb, 0xac, 0xc1, 0x8a, 0xed, + 0xca, 0x1d, 0xf1, 0xa8, 0x7b, 0x7e, 0x11, 0xa3, 0x87, 0x75, 0xf9, 0x03, 0x80, 0x23, 0xce, 0x7b, + 0xa4, 0x7d, 0x21, 0x7f, 0xda, 0xf8, 0xa7, 0x9a, 0xf6, 0x2a, 0x25, 0x86, 0x7a, 0xf4, 0xbf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x1c, 0x7e, 0x04, 0x95, 0x32, 0x30, 0x00, 0x00, } func (this *VirtualHost) Equal(that interface{}) bool { @@ -5030,7 +5027,7 @@ func (this *VirtualHost) Equal(that interface{}) bool { return false } for i := range this.Routes { - if !this.Routes[i].Equal(&that1.Routes[i]) { + if !this.Routes[i].Equal(that1.Routes[i]) { return false } } @@ -5140,7 +5137,7 @@ func (this *Route) Equal(that interface{}) bool { if this.Name != that1.Name { return false } - if !this.Match.Equal(&that1.Match) { + if !this.Match.Equal(that1.Match) { return false } if that1.Action == nil { @@ -7654,14 +7651,16 @@ func (m *Route) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintRoute(dAtA, i, uint64(m.Match.Size())) - n6, err := m.Match.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.Match != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintRoute(dAtA, i, uint64(m.Match.Size())) + n6, err := m.Match.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n6 } - i += n6 if m.Action != nil { nn7, err := m.Action.MarshalTo(dAtA[i:]) if err != nil { @@ -10044,8 +10043,10 @@ func (m *Route) Size() (n int) { } var l int _ = l - l = m.Match.Size() - n += 1 + l + sovRoute(uint64(l)) + if m.Match != nil { + l = m.Match.Size() + n += 1 + l + sovRoute(uint64(l)) + } if m.Action != nil { n += m.Action.Size() } @@ -11501,7 +11502,7 @@ func (m *VirtualHost) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Routes = append(m.Routes, Route{}) + m.Routes = append(m.Routes, &Route{}) if err := m.Routes[len(m.Routes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -12194,6 +12195,9 @@ func (m *Route) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Match == nil { + m.Match = &RouteMatch{} + } if err := m.Match.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go index a183c6f96aa8..0aa34255552c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.validate.go @@ -64,17 +64,12 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetRoutes() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: fmt.Sprintf("Routes[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: fmt.Sprintf("Routes[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -86,17 +81,12 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetVirtualClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: fmt.Sprintf("VirtualClusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: fmt.Sprintf("VirtualClusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -106,17 +96,12 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetRateLimits() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: fmt.Sprintf("RateLimits[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: fmt.Sprintf("RateLimits[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -133,17 +118,12 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -160,34 +140,24 @@ func (m *VirtualHost) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetCors() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: "Cors", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCors()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: "Cors", + reason: "embedded message failed validation", + cause: err, } } } @@ -198,32 +168,22 @@ func (m *VirtualHost) Validate() error { // no validation rules for IncludeRequestAttemptCount - { - tmp := m.GetRetryPolicy() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: "RetryPolicy", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRetryPolicy()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: "RetryPolicy", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHedgePolicy() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return VirtualHostValidationError{ - field: "HedgePolicy", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHedgePolicy()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return VirtualHostValidationError{ + field: "HedgePolicy", + reason: "embedded message failed validation", + cause: err, } } } @@ -294,47 +254,39 @@ func (m *Route) Validate() error { // no validation rules for Name - { - tmp := m.GetMatch() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { + if m.GetMatch() == nil { + return RouteValidationError{ + field: "Match", + reason: "value is required", + } + } - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "Match", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "Match", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDecorator() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "Decorator", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDecorator()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "Decorator", + reason: "embedded message failed validation", + cause: err, } } } @@ -353,17 +305,12 @@ func (m *Route) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -380,34 +327,24 @@ func (m *Route) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetTracing() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "Tracing", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTracing()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "Tracing", + reason: "embedded message failed validation", + cause: err, } } } @@ -416,51 +353,36 @@ func (m *Route) Validate() error { case *Route_Route: - { - tmp := m.GetRoute() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "Route", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRoute()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "Route", + reason: "embedded message failed validation", + cause: err, } } } case *Route_Redirect: - { - tmp := m.GetRedirect() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "Redirect", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRedirect()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "Redirect", + reason: "embedded message failed validation", + cause: err, } } } case *Route_DirectResponse: - { - tmp := m.GetDirectResponse() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteValidationError{ - field: "DirectResponse", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDirectResponse()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteValidationError{ + field: "DirectResponse", + reason: "embedded message failed validation", + cause: err, } } } @@ -548,17 +470,12 @@ func (m *WeightedCluster) Validate() error { for idx, item := range m.GetClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WeightedClusterValidationError{ - field: fmt.Sprintf("Clusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WeightedClusterValidationError{ + field: fmt.Sprintf("Clusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -642,32 +559,22 @@ func (m *RouteMatch) Validate() error { return nil } - { - tmp := m.GetCaseSensitive() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteMatchValidationError{ - field: "CaseSensitive", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCaseSensitive()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteMatchValidationError{ + field: "CaseSensitive", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRuntimeFraction() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteMatchValidationError{ - field: "RuntimeFraction", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRuntimeFraction()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteMatchValidationError{ + field: "RuntimeFraction", + reason: "embedded message failed validation", + cause: err, } } } @@ -675,17 +582,12 @@ func (m *RouteMatch) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteMatchValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteMatchValidationError{ + field: fmt.Sprintf("Headers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -695,34 +597,24 @@ func (m *RouteMatch) Validate() error { for idx, item := range m.GetQueryParameters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteMatchValidationError{ - field: fmt.Sprintf("QueryParameters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteMatchValidationError{ + field: fmt.Sprintf("QueryParameters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetGrpc() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteMatchValidationError{ - field: "Grpc", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpc()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteMatchValidationError{ + field: "Grpc", + reason: "embedded message failed validation", + cause: err, } } } @@ -836,32 +728,22 @@ func (m *CorsPolicy) Validate() error { // no validation rules for MaxAge - { - tmp := m.GetAllowCredentials() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CorsPolicyValidationError{ - field: "AllowCredentials", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAllowCredentials()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CorsPolicyValidationError{ + field: "AllowCredentials", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetShadowEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CorsPolicyValidationError{ - field: "ShadowEnabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetShadowEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CorsPolicyValidationError{ + field: "ShadowEnabled", + reason: "embedded message failed validation", + cause: err, } } } @@ -870,34 +752,24 @@ func (m *CorsPolicy) Validate() error { case *CorsPolicy_Enabled: - { - tmp := m.GetEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CorsPolicyValidationError{ - field: "Enabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CorsPolicyValidationError{ + field: "Enabled", + reason: "embedded message failed validation", + cause: err, } } } case *CorsPolicy_FilterEnabled: - { - tmp := m.GetFilterEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CorsPolicyValidationError{ - field: "FilterEnabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFilterEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CorsPolicyValidationError{ + field: "FilterEnabled", + reason: "embedded message failed validation", + cause: err, } } } @@ -976,79 +848,54 @@ func (m *RouteAction) Validate() error { } } - { - tmp := m.GetMetadataMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "MetadataMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadataMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "MetadataMatch", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for PrefixRewrite - { - tmp := m.GetTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "Timeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "Timeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetIdleTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "IdleTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetIdleTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "IdleTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRetryPolicy() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "RetryPolicy", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRetryPolicy()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "RetryPolicy", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRequestMirrorPolicy() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "RequestMirrorPolicy", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestMirrorPolicy()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "RequestMirrorPolicy", + reason: "embedded message failed validation", + cause: err, } } } @@ -1058,99 +905,69 @@ func (m *RouteAction) Validate() error { for idx, item := range m.GetRateLimits() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: fmt.Sprintf("RateLimits[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetIncludeVhRateLimits() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ - field: "IncludeVhRateLimits", + field: fmt.Sprintf("RateLimits[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - for idx, item := range m.GetHashPolicy() { - _, _ = idx, item - - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: fmt.Sprintf("HashPolicy[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } + if v, ok := interface{}(m.GetIncludeVhRateLimits()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "IncludeVhRateLimits", + reason: "embedded message failed validation", + cause: err, } } - } - { - tmp := m.GetCors() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetHashPolicy() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return RouteActionValidationError{ - field: "Cors", + field: fmt.Sprintf("HashPolicy[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetMaxGrpcTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "MaxGrpcTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCors()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "Cors", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetGrpcTimeoutOffset() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetMaxGrpcTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "MaxGrpcTimeout", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "GrpcTimeoutOffset", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcTimeoutOffset()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "GrpcTimeoutOffset", + reason: "embedded message failed validation", + cause: err, } } } @@ -1158,17 +975,12 @@ func (m *RouteAction) Validate() error { for idx, item := range m.GetUpgradeConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: fmt.Sprintf("UpgradeConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: fmt.Sprintf("UpgradeConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1177,17 +989,12 @@ func (m *RouteAction) Validate() error { // no validation rules for InternalRedirectAction - { - tmp := m.GetHedgePolicy() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "HedgePolicy", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHedgePolicy()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "HedgePolicy", + reason: "embedded message failed validation", + cause: err, } } } @@ -1214,17 +1021,12 @@ func (m *RouteAction) Validate() error { case *RouteAction_WeightedClusters: - { - tmp := m.GetWeightedClusters() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "WeightedClusters", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetWeightedClusters()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "WeightedClusters", + reason: "embedded message failed validation", + cause: err, } } } @@ -1244,17 +1046,12 @@ func (m *RouteAction) Validate() error { case *RouteAction_AutoHostRewrite: - { - tmp := m.GetAutoHostRewrite() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteActionValidationError{ - field: "AutoHostRewrite", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAutoHostRewrite()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteActionValidationError{ + field: "AutoHostRewrite", + reason: "embedded message failed validation", + cause: err, } } } @@ -1331,47 +1128,32 @@ func (m *RetryPolicy) Validate() error { // no validation rules for RetryOn - { - tmp := m.GetNumRetries() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicyValidationError{ - field: "NumRetries", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNumRetries()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicyValidationError{ + field: "NumRetries", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetPerTryTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicyValidationError{ - field: "PerTryTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPerTryTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicyValidationError{ + field: "PerTryTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRetryPriority() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicyValidationError{ - field: "RetryPriority", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRetryPriority()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicyValidationError{ + field: "RetryPriority", + reason: "embedded message failed validation", + cause: err, } } } @@ -1379,17 +1161,12 @@ func (m *RetryPolicy) Validate() error { for idx, item := range m.GetRetryHostPredicate() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicyValidationError{ - field: fmt.Sprintf("RetryHostPredicate[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicyValidationError{ + field: fmt.Sprintf("RetryHostPredicate[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1398,17 +1175,12 @@ func (m *RetryPolicy) Validate() error { // no validation rules for HostSelectionRetryMaxAttempts - { - tmp := m.GetRetryBackOff() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicyValidationError{ - field: "RetryBackOff", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRetryBackOff()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicyValidationError{ + field: "RetryBackOff", + reason: "embedded message failed validation", + cause: err, } } } @@ -1489,17 +1261,12 @@ func (m *HedgePolicy) Validate() error { } - { - tmp := m.GetAdditionalRequestChance() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HedgePolicyValidationError{ - field: "AdditionalRequestChance", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAdditionalRequestChance()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HedgePolicyValidationError{ + field: "AdditionalRequestChance", + reason: "embedded message failed validation", + cause: err, } } } @@ -1676,17 +1443,12 @@ func (m *DirectResponseAction) Validate() error { } } - { - tmp := m.GetBody() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DirectResponseActionValidationError{ - field: "Body", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetBody()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DirectResponseActionValidationError{ + field: "Body", + reason: "embedded message failed validation", + cause: err, } } } @@ -1828,47 +1590,32 @@ func (m *Tracing) Validate() error { return nil } - { - tmp := m.GetClientSampling() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TracingValidationError{ - field: "ClientSampling", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetClientSampling()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TracingValidationError{ + field: "ClientSampling", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRandomSampling() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TracingValidationError{ - field: "RandomSampling", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRandomSampling()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TracingValidationError{ + field: "RandomSampling", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetOverallSampling() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TracingValidationError{ - field: "OverallSampling", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOverallSampling()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TracingValidationError{ + field: "OverallSampling", + reason: "embedded message failed validation", + cause: err, } } } @@ -2041,17 +1788,12 @@ func (m *RateLimit) Validate() error { for idx, item := range m.GetActions() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimitValidationError{ - field: fmt.Sprintf("Actions[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimitValidationError{ + field: fmt.Sprintf("Actions[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -2148,17 +1890,12 @@ func (m *HeaderMatcher) Validate() error { case *HeaderMatcher_RangeMatch: - { - tmp := m.GetRangeMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HeaderMatcherValidationError{ - field: "RangeMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRangeMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HeaderMatcherValidationError{ + field: "RangeMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -2260,17 +1997,12 @@ func (m *QueryParameterMatcher) Validate() error { // no validation rules for Value - { - tmp := m.GetRegex() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return QueryParameterMatcherValidationError{ - field: "Regex", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRegex()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return QueryParameterMatcherValidationError{ + field: "Regex", + reason: "embedded message failed validation", + cause: err, } } } @@ -2349,32 +2081,22 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { } } - { - tmp := m.GetWeight() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WeightedCluster_ClusterWeightValidationError{ - field: "Weight", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetWeight()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WeightedCluster_ClusterWeightValidationError{ + field: "Weight", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMetadataMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WeightedCluster_ClusterWeightValidationError{ - field: "MetadataMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadataMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WeightedCluster_ClusterWeightValidationError{ + field: "MetadataMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -2389,17 +2111,12 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { for idx, item := range m.GetRequestHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WeightedCluster_ClusterWeightValidationError{ - field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WeightedCluster_ClusterWeightValidationError{ + field: fmt.Sprintf("RequestHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -2416,17 +2133,12 @@ func (m *WeightedCluster_ClusterWeight) Validate() error { for idx, item := range m.GetResponseHeadersToAdd() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WeightedCluster_ClusterWeightValidationError{ - field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WeightedCluster_ClusterWeightValidationError{ + field: fmt.Sprintf("ResponseHeadersToAdd[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -2582,17 +2294,12 @@ func (m *RouteAction_RequestMirrorPolicy) Validate() error { // no validation rules for RuntimeKey - { - tmp := m.GetRuntimeFraction() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteAction_RequestMirrorPolicyValidationError{ - field: "RuntimeFraction", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRuntimeFraction()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteAction_RequestMirrorPolicyValidationError{ + field: "RuntimeFraction", + reason: "embedded message failed validation", + cause: err, } } } @@ -2671,51 +2378,36 @@ func (m *RouteAction_HashPolicy) Validate() error { case *RouteAction_HashPolicy_Header_: - { - tmp := m.GetHeader() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteAction_HashPolicyValidationError{ - field: "Header", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteAction_HashPolicyValidationError{ + field: "Header", + reason: "embedded message failed validation", + cause: err, } } } case *RouteAction_HashPolicy_Cookie_: - { - tmp := m.GetCookie() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteAction_HashPolicyValidationError{ - field: "Cookie", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCookie()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteAction_HashPolicyValidationError{ + field: "Cookie", + reason: "embedded message failed validation", + cause: err, } } } case *RouteAction_HashPolicy_ConnectionProperties_: - { - tmp := m.GetConnectionProperties() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteAction_HashPolicyValidationError{ - field: "ConnectionProperties", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConnectionProperties()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteAction_HashPolicyValidationError{ + field: "ConnectionProperties", + reason: "embedded message failed validation", + cause: err, } } } @@ -2797,17 +2489,12 @@ func (m *RouteAction_UpgradeConfig) Validate() error { // no validation rules for UpgradeType - { - tmp := m.GetEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteAction_UpgradeConfigValidationError{ - field: "Enabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteAction_UpgradeConfigValidationError{ + field: "Enabled", + reason: "embedded message failed validation", + cause: err, } } } @@ -2961,17 +2648,12 @@ func (m *RouteAction_HashPolicy_Cookie) Validate() error { } } - { - tmp := m.GetTtl() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RouteAction_HashPolicy_CookieValidationError{ - field: "Ttl", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTtl()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RouteAction_HashPolicy_CookieValidationError{ + field: "Ttl", + reason: "embedded message failed validation", + cause: err, } } } @@ -3127,34 +2809,24 @@ func (m *RetryPolicy_RetryPriority) Validate() error { case *RetryPolicy_RetryPriority_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicy_RetryPriorityValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicy_RetryPriorityValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *RetryPolicy_RetryPriority_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicy_RetryPriorityValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicy_RetryPriorityValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -3239,34 +2911,24 @@ func (m *RetryPolicy_RetryHostPredicate) Validate() error { case *RetryPolicy_RetryHostPredicate_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicy_RetryHostPredicateValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicy_RetryHostPredicateValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *RetryPolicy_RetryHostPredicate_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RetryPolicy_RetryHostPredicateValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RetryPolicy_RetryHostPredicateValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -3447,102 +3109,72 @@ func (m *RateLimit_Action) Validate() error { case *RateLimit_Action_SourceCluster_: - { - tmp := m.GetSourceCluster() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_ActionValidationError{ - field: "SourceCluster", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSourceCluster()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_ActionValidationError{ + field: "SourceCluster", + reason: "embedded message failed validation", + cause: err, } } } case *RateLimit_Action_DestinationCluster_: - { - tmp := m.GetDestinationCluster() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_ActionValidationError{ - field: "DestinationCluster", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDestinationCluster()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_ActionValidationError{ + field: "DestinationCluster", + reason: "embedded message failed validation", + cause: err, } } } case *RateLimit_Action_RequestHeaders_: - { - tmp := m.GetRequestHeaders() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_ActionValidationError{ - field: "RequestHeaders", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestHeaders()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_ActionValidationError{ + field: "RequestHeaders", + reason: "embedded message failed validation", + cause: err, } } } case *RateLimit_Action_RemoteAddress_: - { - tmp := m.GetRemoteAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_ActionValidationError{ - field: "RemoteAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRemoteAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_ActionValidationError{ + field: "RemoteAddress", + reason: "embedded message failed validation", + cause: err, } } } case *RateLimit_Action_GenericKey_: - { - tmp := m.GetGenericKey() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_ActionValidationError{ - field: "GenericKey", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGenericKey()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_ActionValidationError{ + field: "GenericKey", + reason: "embedded message failed validation", + cause: err, } } } case *RateLimit_Action_HeaderValueMatch_: - { - tmp := m.GetHeaderValueMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_ActionValidationError{ - field: "HeaderValueMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeaderValueMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_ActionValidationError{ + field: "HeaderValueMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -3988,17 +3620,12 @@ func (m *RateLimit_Action_HeaderValueMatch) Validate() error { } } - { - tmp := m.GetExpectMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_Action_HeaderValueMatchValidationError{ - field: "ExpectMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetExpectMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_Action_HeaderValueMatchValidationError{ + field: "ExpectMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -4013,17 +3640,12 @@ func (m *RateLimit_Action_HeaderValueMatch) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RateLimit_Action_HeaderValueMatchValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RateLimit_Action_HeaderValueMatchValidationError{ + field: fmt.Sprintf("Headers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go index 7ce4049ec807..6c22550d0494 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.go @@ -7,14 +7,13 @@ import ( bytes "bytes" context "context" fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.validate.go index a9abda6293ee..b91409905766 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/srds.pb.validate.go @@ -62,17 +62,12 @@ func (m *ScopedRouteConfiguration) Validate() error { } } - { - tmp := m.GetKey() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRouteConfigurationValidationError{ - field: "Key", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetKey()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRouteConfigurationValidationError{ + field: "Key", + reason: "embedded message failed validation", + cause: err, } } } @@ -154,17 +149,12 @@ func (m *ScopedRouteConfiguration_Key) Validate() error { for idx, item := range m.GetFragments() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRouteConfiguration_KeyValidationError{ - field: fmt.Sprintf("Fragments[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRouteConfiguration_KeyValidationError{ + field: fmt.Sprintf("Fragments[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.go index 2952df3c09f5..0a8975e8f8af 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.go @@ -5,13 +5,11 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go index deb8d2caed0e..4e4e64478e2e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/als.pb.validate.go @@ -48,17 +48,12 @@ func (m *HttpGrpcAccessLogConfig) Validate() error { } } - { - tmp := m.GetCommonConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpGrpcAccessLogConfigValidationError{ - field: "CommonConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommonConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpGrpcAccessLogConfigValidationError{ + field: "CommonConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -137,17 +132,12 @@ func (m *TcpGrpcAccessLogConfig) Validate() error { } } - { - tmp := m.GetCommonConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpGrpcAccessLogConfigValidationError{ - field: "CommonConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCommonConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpGrpcAccessLogConfigValidationError{ + field: "CommonConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -233,17 +223,12 @@ func (m *CommonGrpcAccessLogConfig) Validate() error { } } - { - tmp := m.GetGrpcService() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return CommonGrpcAccessLogConfigValidationError{ - field: "GrpcService", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CommonGrpcAccessLogConfigValidationError{ + field: "GrpcService", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.go index 3420c924807e..dc84b1f7f34e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.go @@ -5,12 +5,11 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.validate.go index bdfc881f9715..cfee64dcc528 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2/file.pb.validate.go @@ -55,17 +55,12 @@ func (m *FileAccessLog) Validate() error { case *FileAccessLog_JsonFormat: - { - tmp := m.GetJsonFormat() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FileAccessLogValidationError{ - field: "JsonFormat", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetJsonFormat()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FileAccessLogValidationError{ + field: "JsonFormat", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.go index eee52b5962ca..b400ba3474ca 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.go @@ -5,22 +5,20 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - time "time" - - _ "github.com/envoyproxy/protoc-gen-validate/validate" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/gogo/protobuf/types" - v22 "github.com/envoyproxy/go-control-plane/envoy/api/v2" auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" v2 "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2" v2alpha "github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha" v21 "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2" + _ "github.com/envoyproxy/protoc-gen-validate/validate" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + types "github.com/gogo/protobuf/types" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -84,10 +82,20 @@ type Bootstrap struct { // :ref:`statsd `, it will send each observed value // over the wire individually because the statsd protocol doesn't have any way to represent a // histogram summary. Be aware that this can be a very large volume of data. - EnableDispatcherStats bool `protobuf:"varint,16,opt,name=enable_dispatcher_stats,json=enableDispatcherStats,proto3" json:"enable_dispatcher_stats,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + EnableDispatcherStats bool `protobuf:"varint,16,opt,name=enable_dispatcher_stats,json=enableDispatcherStats,proto3" json:"enable_dispatcher_stats,omitempty"` + // Optional string which will be used in lieu of x-envoy in prefixing headers. + // + // For example, if this string is present and set to X-Foo, then x-envoy-retry-on will be + // transformed into x-foo-retry-on etc. + // + // Note this applies to the headers Envoy will generate, the headers Envoy will sanitize, and the + // headers Envoy will trust for core code and core extensions only. Be VERY careful making + // changes to this string, especially in multi-layer Envoy deployments or deployments using + // extensions which are not upstream. + HeaderPrefix string `protobuf:"bytes,18,opt,name=header_prefix,json=headerPrefix,proto3" json:"header_prefix,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Bootstrap) Reset() { *m = Bootstrap{} } @@ -236,23 +244,30 @@ func (m *Bootstrap) GetEnableDispatcherStats() bool { return false } +func (m *Bootstrap) GetHeaderPrefix() string { + if m != nil { + return m.HeaderPrefix + } + return "" +} + type Bootstrap_StaticResources struct { // Static :ref:`Listeners `. These listeners are // available regardless of LDS configuration. - Listeners []v22.Listener `protobuf:"bytes,1,rep,name=listeners,proto3" json:"listeners"` + Listeners []*v22.Listener `protobuf:"bytes,1,rep,name=listeners,proto3" json:"listeners,omitempty"` // If a network based configuration source is specified for :ref:`cds_config // `, it's necessary // to have some initial cluster definitions available to allow Envoy to know // how to speak to the management server. These cluster definitions may not // use :ref:`EDS ` (i.e. they should be static // IP or DNS-based). - Clusters []v22.Cluster `protobuf:"bytes,2,rep,name=clusters,proto3" json:"clusters"` + Clusters []*v22.Cluster `protobuf:"bytes,2,rep,name=clusters,proto3" json:"clusters,omitempty"` // These static secrets can be used by :ref:`SdsSecretConfig // ` - Secrets []auth.Secret `protobuf:"bytes,3,rep,name=secrets,proto3" json:"secrets"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Secrets []*auth.Secret `protobuf:"bytes,3,rep,name=secrets,proto3" json:"secrets,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Bootstrap_StaticResources) Reset() { *m = Bootstrap_StaticResources{} } @@ -288,21 +303,21 @@ func (m *Bootstrap_StaticResources) XXX_DiscardUnknown() { var xxx_messageInfo_Bootstrap_StaticResources proto.InternalMessageInfo -func (m *Bootstrap_StaticResources) GetListeners() []v22.Listener { +func (m *Bootstrap_StaticResources) GetListeners() []*v22.Listener { if m != nil { return m.Listeners } return nil } -func (m *Bootstrap_StaticResources) GetClusters() []v22.Cluster { +func (m *Bootstrap_StaticResources) GetClusters() []*v22.Cluster { if m != nil { return m.Clusters } return nil } -func (m *Bootstrap_StaticResources) GetSecrets() []auth.Secret { +func (m *Bootstrap_StaticResources) GetSecrets() []*auth.Secret { if m != nil { return m.Secrets } @@ -396,10 +411,13 @@ type Admin struct { ProfilePath string `protobuf:"bytes,2,opt,name=profile_path,json=profilePath,proto3" json:"profile_path,omitempty"` // The TCP address that the administration server will listen on. // If not specified, Envoy will not start an administration server. - Address *core.Address `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Address *core.Address `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` + // Additional socket options that may not be present in Envoy source code or + // precompiled binaries. + SocketOptions []*core.SocketOption `protobuf:"bytes,4,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Admin) Reset() { *m = Admin{} } @@ -456,6 +474,13 @@ func (m *Admin) GetAddress() *core.Address { return nil } +func (m *Admin) GetSocketOptions() []*core.SocketOption { + if m != nil { + return m.SocketOptions + } + return nil +} + // Cluster manager :ref:`architecture overview `. type ClusterManager struct { // Name of the local cluster (i.e., the cluster that owns the Envoy running @@ -1238,97 +1263,100 @@ func init() { } var fileDescriptor_f1197defdf9c5e6a = []byte{ - // 1439 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4d, 0x73, 0x13, 0xc7, - 0x16, 0x65, 0x24, 0x19, 0x4b, 0x57, 0xc2, 0x92, 0xbb, 0x0c, 0x16, 0xaa, 0x87, 0x6d, 0x04, 0xef, - 0x01, 0x05, 0x35, 0xaa, 0x27, 0x78, 0x3c, 0x1e, 0x45, 0x01, 0x16, 0x2e, 0x1e, 0x21, 0x84, 0x8f, - 0x36, 0xa9, 0x54, 0xb2, 0x99, 0x6a, 0xcd, 0xb4, 0xa5, 0x2e, 0x8f, 0xa6, 0x55, 0xdd, 0x2d, 0x25, - 0xde, 0x66, 0xc5, 0x0f, 0xc8, 0x82, 0xdf, 0x91, 0x65, 0x56, 0xc9, 0x8e, 0x65, 0xf6, 0xa9, 0x4a, - 0x52, 0xec, 0xf2, 0x13, 0xb2, 0x4b, 0x4d, 0x7f, 0x8c, 0x3c, 0x46, 0xfe, 0x20, 0x3b, 0xf5, 0xed, - 0x73, 0x4e, 0xdf, 0xee, 0xbe, 0xf7, 0xf4, 0x08, 0xae, 0xd1, 0x64, 0xca, 0xf7, 0x3a, 0x21, 0x4f, - 0x76, 0xd8, 0xa0, 0xd3, 0xe7, 0x5c, 0x49, 0x25, 0xc8, 0xb8, 0x33, 0xed, 0xce, 0x06, 0xfe, 0x58, - 0x70, 0xc5, 0xd1, 0x79, 0x0d, 0xf5, 0x0d, 0xd4, 0x9f, 0xcd, 0x4e, 0xbb, 0xad, 0x75, 0xa3, 0x42, - 0xc6, 0x2c, 0x25, 0x86, 0x5c, 0xd0, 0x0e, 0x89, 0x22, 0x41, 0xa5, 0x34, 0xdc, 0xd6, 0x3f, 0x3e, - 0x04, 0xf4, 0x89, 0xa4, 0x73, 0x67, 0xc9, 0x44, 0x0d, 0x3b, 0x21, 0x15, 0xca, 0xce, 0xfe, 0xf3, - 0x43, 0xae, 0xc9, 0x21, 0x90, 0x7c, 0x22, 0x42, 0x27, 0x72, 0x2e, 0x0f, 0x8b, 0xe4, 0xdc, 0x78, - 0x9c, 0xc5, 0x2f, 0xe6, 0x76, 0xae, 0x04, 0x09, 0x69, 0x0a, 0xd0, 0x3f, 0x2c, 0xe4, 0x52, 0x0e, - 0x32, 0xa2, 0x4a, 0xb0, 0x50, 0xa6, 0x20, 0xa9, 0x88, 0x72, 0x3a, 0x37, 0x72, 0x20, 0x3e, 0xa5, - 0x22, 0xe6, 0x24, 0xea, 0x4c, 0xbb, 0x24, 0x1e, 0x0f, 0x49, 0x16, 0xb0, 0xe8, 0xb5, 0x01, 0xe7, - 0x83, 0x98, 0x76, 0xf4, 0xa8, 0x3f, 0xd9, 0xe9, 0x44, 0x13, 0x41, 0x14, 0xe3, 0x89, 0x3b, 0x8a, - 0x83, 0xf3, 0x52, 0x89, 0x49, 0xe8, 0x8e, 0x62, 0x75, 0x4a, 0x62, 0x16, 0x11, 0x45, 0x3b, 0xee, - 0x87, 0x9d, 0x58, 0x19, 0xf0, 0x01, 0xd7, 0x3f, 0x3b, 0xe9, 0x2f, 0x13, 0x6d, 0xbf, 0xad, 0x41, - 0xa5, 0xe7, 0xee, 0x09, 0x5d, 0x87, 0x52, 0xc2, 0x23, 0xda, 0xf4, 0x36, 0xbc, 0xab, 0xd5, 0xee, - 0xaa, 0x6f, 0xae, 0x93, 0x8c, 0x99, 0x3f, 0xed, 0xfa, 0xe9, 0xb1, 0xfa, 0xcf, 0x79, 0x44, 0xb1, - 0x06, 0xa1, 0x00, 0x1a, 0xe9, 0x26, 0x59, 0x18, 0x08, 0x6a, 0x8e, 0x59, 0x36, 0x0b, 0x9a, 0x78, - 0xcb, 0x3f, 0xb4, 0x0e, 0xfc, 0x6c, 0x31, 0x7f, 0x5b, 0x93, 0xb1, 0xe3, 0xe2, 0xba, 0xcc, 0x07, - 0x50, 0x1f, 0x96, 0xa3, 0xbd, 0x84, 0x8c, 0x72, 0x2b, 0x14, 0xf5, 0x0a, 0xff, 0x39, 0xd1, 0x0a, - 0x5b, 0x86, 0x3d, 0x5b, 0xa2, 0x11, 0x1d, 0x88, 0x20, 0x0c, 0xf5, 0x30, 0x9e, 0x48, 0x45, 0x45, - 0x30, 0x22, 0x09, 0x19, 0x50, 0xd1, 0x2c, 0xe9, 0x15, 0xae, 0x1d, 0xb1, 0xc2, 0x23, 0xc3, 0xf8, - 0xcc, 0x10, 0xf0, 0x52, 0x98, 0x1b, 0xa3, 0x4d, 0x80, 0x61, 0x24, 0x03, 0xc3, 0x6c, 0x2e, 0x69, - 0xb9, 0xf6, 0x9c, 0xb3, 0xdc, 0x1c, 0xb3, 0x47, 0x1a, 0xb3, 0xad, 0x93, 0xc1, 0x95, 0x61, 0x24, - 0x4d, 0x00, 0x5d, 0x00, 0xd8, 0x89, 0xc9, 0x40, 0x06, 0x63, 0xa2, 0x86, 0xcd, 0x85, 0x0d, 0xef, - 0x6a, 0x05, 0x57, 0x74, 0xe4, 0x25, 0x51, 0x43, 0xf4, 0x08, 0xaa, 0xba, 0xbe, 0x02, 0xc9, 0x92, - 0x5d, 0xd9, 0x3c, 0xbd, 0x51, 0xdc, 0xb7, 0x84, 0xcd, 0xd8, 0xd6, 0x62, 0xba, 0x5a, 0x7a, 0xd2, - 0x72, 0x9b, 0x25, 0xbb, 0x18, 0xa4, 0xfb, 0x29, 0xd1, 0xff, 0xa1, 0x66, 0x44, 0x6c, 0xa2, 0x67, - 0x74, 0xa2, 0x97, 0x8f, 0x56, 0x31, 0xf9, 0x61, 0xb3, 0xbc, 0x4d, 0xf6, 0x15, 0xac, 0x18, 0xa1, - 0x9d, 0x78, 0x22, 0x87, 0x01, 0x4b, 0x14, 0x15, 0x53, 0x12, 0x37, 0x17, 0xb5, 0xe0, 0x79, 0xdf, - 0xd4, 0xab, 0xef, 0xea, 0xd5, 0xdf, 0xb2, 0xf5, 0xdc, 0x2b, 0xbd, 0xfd, 0x6d, 0xdd, 0xc3, 0x48, - 0x93, 0x1f, 0xa7, 0xdc, 0x4f, 0x2c, 0x15, 0x3d, 0x80, 0xf2, 0xd7, 0x44, 0x85, 0xc3, 0x88, 0x0f, - 0x9a, 0x65, 0x2d, 0x73, 0xe9, 0x88, 0xfb, 0xf8, 0xc2, 0x42, 0x71, 0x46, 0x42, 0x77, 0x60, 0x31, - 0x6d, 0x53, 0x96, 0x0c, 0x9a, 0x15, 0xcd, 0x5f, 0xcb, 0xf3, 0x4d, 0x0f, 0x4f, 0xbb, 0xfe, 0x6b, - 0x83, 0xc2, 0x0e, 0x8e, 0x1e, 0xc2, 0xa2, 0x98, 0x24, 0x8a, 0x8d, 0x68, 0xb3, 0x9a, 0xbb, 0xba, - 0x79, 0x2b, 0x63, 0x83, 0xec, 0x15, 0x9a, 0x1e, 0x76, 0xb4, 0xb4, 0xa6, 0x62, 0xb2, 0x47, 0x05, - 0x8d, 0x02, 0xa7, 0xb4, 0x7c, 0x6c, 0x4d, 0x3d, 0x33, 0x0c, 0x2b, 0x88, 0x97, 0xe2, 0xdc, 0x18, - 0xdd, 0x86, 0x05, 0x12, 0x8d, 0x58, 0xd2, 0xac, 0x69, 0xa5, 0x8d, 0x23, 0x94, 0x36, 0x53, 0x1c, - 0x36, 0x70, 0xf4, 0x25, 0x34, 0x9c, 0xbd, 0x64, 0x05, 0x5e, 0xd7, 0x12, 0x7e, 0x5e, 0x22, 0x33, - 0x21, 0xeb, 0x4a, 0xfe, 0x0b, 0x1b, 0x70, 0x55, 0x5e, 0xe7, 0xf9, 0x00, 0xba, 0x0d, 0xab, 0x34, - 0x21, 0xfd, 0x98, 0x06, 0x11, 0x93, 0xe3, 0xf4, 0xe0, 0xa9, 0x08, 0xf4, 0x5d, 0x36, 0x1b, 0x1b, - 0xde, 0xd5, 0x32, 0x3e, 0x6b, 0xa6, 0xb7, 0xb2, 0x59, 0x5d, 0x41, 0xad, 0x9f, 0x3c, 0xa8, 0x1f, - 0xe8, 0x7d, 0x74, 0x17, 0x2a, 0x31, 0x93, 0x8a, 0x26, 0x54, 0xc8, 0xa6, 0xa7, 0xcb, 0xf9, 0x5c, - 0xbe, 0x63, 0x9e, 0xd9, 0xe9, 0x5e, 0xe9, 0xdd, 0xaf, 0xeb, 0xa7, 0xf0, 0x0c, 0x8e, 0xfe, 0x0b, - 0x65, 0xdb, 0x80, 0xa9, 0xff, 0xa4, 0xd4, 0xb3, 0x79, 0xaa, 0x6d, 0x57, 0xcb, 0xcc, 0xc0, 0xe8, - 0x7f, 0xb0, 0x28, 0x69, 0x28, 0xa8, 0x4a, 0x5d, 0xa5, 0xa8, 0x4b, 0x35, 0xc7, 0x4b, 0x5f, 0x19, - 0x7f, 0x5b, 0x23, 0x2c, 0xd7, 0xe1, 0x5b, 0xbf, 0x78, 0xd0, 0x38, 0xe8, 0x2e, 0xe8, 0x3e, 0x40, - 0x3c, 0xeb, 0x7b, 0xe3, 0xa1, 0xeb, 0x73, 0xfa, 0x3e, 0xdf, 0xf4, 0x71, 0xd6, 0xf4, 0xf7, 0x01, - 0xc2, 0x19, 0xbf, 0x70, 0x42, 0x7e, 0x98, 0xf1, 0x37, 0x01, 0xc8, 0x8c, 0x5f, 0x3c, 0xb9, 0xef, - 0x10, 0x27, 0xf1, 0xb4, 0x54, 0x2e, 0x35, 0x16, 0x9e, 0x96, 0xca, 0xd0, 0xa8, 0xb6, 0xdf, 0x78, - 0xb0, 0xa0, 0x6b, 0x09, 0xfd, 0x0b, 0xea, 0x24, 0x0c, 0xa9, 0x94, 0x41, 0xcc, 0x07, 0xc6, 0x92, - 0x3c, 0x6d, 0x49, 0x67, 0x4c, 0xf8, 0x19, 0x1f, 0x68, 0x5b, 0xba, 0x08, 0xb5, 0xb1, 0xe0, 0x3b, - 0x2c, 0xa6, 0x06, 0x54, 0xd0, 0xa0, 0xaa, 0x8d, 0x69, 0xc8, 0x2d, 0x58, 0xb4, 0xcf, 0xbe, 0x4d, - 0xb0, 0x35, 0x2f, 0x41, 0x83, 0xc0, 0x0e, 0xda, 0xfe, 0xb6, 0x08, 0x4b, 0x79, 0xd3, 0x45, 0x37, - 0x00, 0xc5, 0x3c, 0x24, 0x71, 0xe0, 0xec, 0x3b, 0x21, 0x23, 0x6a, 0xd3, 0x6a, 0xe8, 0x19, 0x4b, - 0x78, 0x4e, 0x46, 0x14, 0x0d, 0x60, 0x99, 0x4f, 0x54, 0xcc, 0xa8, 0x08, 0x22, 0xaa, 0x68, 0x98, - 0xda, 0x8f, 0x3d, 0xe1, 0xbb, 0x27, 0x36, 0x7a, 0xff, 0x85, 0x91, 0xd8, 0x72, 0x0a, 0xb8, 0xc1, - 0x0f, 0x44, 0xd0, 0x0b, 0x58, 0x99, 0x8c, 0xa5, 0x12, 0x94, 0x8c, 0x82, 0x3e, 0x4b, 0xa2, 0xfc, - 0x6d, 0x5c, 0x98, 0xb3, 0xd9, 0x1e, 0x4b, 0x22, 0xeb, 0xaa, 0xc8, 0x51, 0x67, 0x31, 0xf4, 0x1c, - 0x96, 0x75, 0xf3, 0xe6, 0xac, 0xba, 0x74, 0xe2, 0xbb, 0xad, 0xa7, 0xe4, 0x7d, 0xce, 0xdd, 0xba, - 0x03, 0x8d, 0x83, 0xdb, 0x40, 0x97, 0x61, 0x89, 0x4e, 0x69, 0xa2, 0x0e, 0x5e, 0x6f, 0x4d, 0x47, - 0xed, 0xed, 0xb6, 0xbf, 0x2b, 0x40, 0xd9, 0x39, 0x2d, 0xba, 0x07, 0xb5, 0x11, 0x93, 0x32, 0x48, - 0xcd, 0x89, 0x4f, 0x94, 0xad, 0xf6, 0xc3, 0xbd, 0x1e, 0x57, 0x53, 0xf8, 0x6b, 0x83, 0x46, 0x5b, - 0xd0, 0x18, 0xd1, 0x01, 0xc9, 0x29, 0x14, 0x8e, 0x53, 0xa8, 0x3b, 0x8a, 0x53, 0xb9, 0x07, 0xb5, - 0x5d, 0x16, 0xc7, 0x99, 0x42, 0xf1, 0xd8, 0x1c, 0x52, 0xb8, 0x63, 0x3f, 0x86, 0xe5, 0xd1, 0x24, - 0x56, 0x2c, 0x27, 0x51, 0x3a, 0x4e, 0xa2, 0x91, 0x71, 0xac, 0x4e, 0xfb, 0x7b, 0x0f, 0x16, 0x9d, - 0x4b, 0x5f, 0x84, 0x9a, 0xdc, 0x1b, 0xc5, 0x2c, 0xd9, 0x0d, 0x04, 0xe7, 0xca, 0x1e, 0x63, 0xd5, - 0xc6, 0x30, 0xe7, 0x0a, 0xb5, 0xa1, 0x26, 0x27, 0xfd, 0x88, 0x09, 0x1a, 0x2a, 0x2e, 0xf6, 0x6c, - 0x8f, 0xe4, 0x62, 0xe8, 0x26, 0x9c, 0x4d, 0xcd, 0x56, 0xb0, 0x88, 0x06, 0x39, 0x70, 0x51, 0x83, - 0x57, 0xdc, 0xe4, 0xf6, 0x7e, 0xd2, 0x75, 0x28, 0xa5, 0xdf, 0xcb, 0x76, 0x0b, 0xab, 0x1f, 0x6c, - 0x61, 0x5b, 0x7f, 0x25, 0x62, 0x0d, 0x6a, 0xff, 0x59, 0x82, 0x9a, 0x4d, 0x5a, 0x3f, 0x3c, 0xe8, - 0x02, 0x94, 0x66, 0x0d, 0xd4, 0xab, 0xfc, 0xf0, 0xc7, 0x8f, 0xc5, 0x92, 0x28, 0x6c, 0x78, 0x58, - 0x87, 0xd3, 0xa3, 0xb6, 0xdf, 0x7a, 0xfa, 0x5d, 0xb2, 0x97, 0x75, 0xd8, 0x22, 0x4f, 0x4e, 0x99, - 0x0f, 0x04, 0x16, 0x1a, 0x71, 0x0c, 0x10, 0x31, 0xb9, 0x6b, 0xb9, 0xe6, 0x9a, 0xfe, 0x7d, 0xfc, - 0xab, 0xaa, 0xc9, 0xfe, 0x16, 0x93, 0xbb, 0xfa, 0xd7, 0x93, 0x53, 0xb8, 0x12, 0xb9, 0x01, 0xfa, - 0x1c, 0xaa, 0xfa, 0x85, 0xb3, 0xa2, 0x66, 0xd7, 0xdd, 0x93, 0x8a, 0x6a, 0x5f, 0x73, 0xaa, 0x40, - 0xb2, 0x51, 0x9a, 0xaa, 0x50, 0x91, 0xb4, 0xaa, 0x0b, 0x1f, 0x97, 0x2a, 0x56, 0x91, 0xcc, 0x52, - 0x15, 0x6e, 0xd0, 0x7a, 0xe3, 0x41, 0x25, 0xdb, 0xc5, 0xdf, 0xa9, 0x91, 0xe2, 0x9c, 0x1a, 0xb9, - 0x05, 0xe7, 0xc8, 0x78, 0x4c, 0x93, 0x28, 0x90, 0x54, 0x4c, 0x59, 0x48, 0x9d, 0x11, 0xea, 0xbb, - 0x29, 0xe3, 0x15, 0x33, 0xbb, 0x6d, 0x26, 0xad, 0x91, 0xb5, 0x6a, 0x00, 0xb3, 0xad, 0xb7, 0x08, - 0x54, 0xb2, 0x94, 0x11, 0xda, 0x5f, 0x01, 0xf6, 0xda, 0x1f, 0x42, 0x55, 0x9f, 0xc6, 0xc7, 0x3d, - 0x49, 0xfa, 0x04, 0x4d, 0xa4, 0xb7, 0x6c, 0xbf, 0x85, 0x02, 0x39, 0xa6, 0x21, 0xdb, 0x61, 0x54, - 0xb4, 0x5f, 0xc1, 0x52, 0xfe, 0x63, 0x07, 0x3d, 0x80, 0xd3, 0x1a, 0xe4, 0x9e, 0xfe, 0x2b, 0x27, - 0x3c, 0x70, 0x6c, 0x69, 0xbd, 0x4f, 0xdf, 0xbd, 0x5f, 0xf3, 0x7e, 0x7e, 0xbf, 0xe6, 0xfd, 0xfe, - 0x7e, 0xcd, 0x83, 0x2b, 0x8c, 0x1b, 0x81, 0xb1, 0xe0, 0xdf, 0xec, 0x1d, 0xae, 0xd5, 0x5b, 0xca, - 0xfe, 0x2a, 0xbc, 0x4c, 0x0b, 0xf8, 0xa5, 0xf7, 0x55, 0x61, 0xda, 0xed, 0x9f, 0xd6, 0xd5, 0x7c, - 0xf3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x46, 0x37, 0xbf, 0xf8, 0x0e, 0x00, 0x00, + // 1482 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x73, 0x13, 0xbf, + 0x15, 0x67, 0x6d, 0x87, 0xd8, 0xcf, 0x8e, 0xed, 0x68, 0x02, 0x59, 0x3c, 0x25, 0x04, 0x43, 0x0b, + 0x0c, 0xcc, 0x7a, 0x30, 0x29, 0xc3, 0x74, 0x18, 0x20, 0x26, 0x43, 0x29, 0xa5, 0x24, 0xc8, 0x74, + 0x3a, 0xed, 0x65, 0x47, 0xde, 0x55, 0x6c, 0x4d, 0xd6, 0xab, 0x1d, 0x49, 0x76, 0xc9, 0xb5, 0xa7, + 0xfe, 0x01, 0x3d, 0xf4, 0x7f, 0xe8, 0xa1, 0x33, 0x3d, 0xf6, 0xd4, 0x63, 0x8f, 0xdc, 0x7b, 0x68, + 0x87, 0x5b, 0xff, 0x84, 0xde, 0x3a, 0x2b, 0x69, 0xd7, 0xd9, 0xe0, 0xfc, 0xe0, 0x7b, 0x5b, 0x3d, + 0x7d, 0x3e, 0x1f, 0x3d, 0xbd, 0xf7, 0xf4, 0xa4, 0x85, 0x07, 0x34, 0x9e, 0xf3, 0xe3, 0x5e, 0xc0, + 0xe3, 0x43, 0x36, 0xee, 0x8d, 0x38, 0x57, 0x52, 0x09, 0x92, 0xf4, 0xe6, 0xfd, 0xc5, 0xc0, 0x4b, + 0x04, 0x57, 0x1c, 0xdd, 0xd0, 0x50, 0xcf, 0x40, 0xbd, 0xc5, 0xec, 0xbc, 0xdf, 0xb9, 0x65, 0x54, + 0x48, 0xc2, 0x52, 0x62, 0xc0, 0x05, 0xed, 0x91, 0x30, 0x14, 0x54, 0x4a, 0xc3, 0xed, 0xfc, 0xe8, + 0x5b, 0xc0, 0x88, 0x48, 0xba, 0x74, 0x96, 0xcc, 0xd4, 0xa4, 0x17, 0x50, 0xa1, 0xec, 0xec, 0x8f, + 0xbf, 0xe5, 0x1a, 0x1f, 0x7c, 0xc9, 0x67, 0x22, 0xc8, 0x44, 0xae, 0x17, 0x61, 0xa1, 0x5c, 0x6a, + 0x8f, 0x72, 0xfb, 0xed, 0xc2, 0xce, 0x95, 0x20, 0x01, 0x4d, 0x01, 0xfa, 0xc3, 0x42, 0xee, 0x14, + 0x20, 0x53, 0xaa, 0x04, 0x0b, 0x64, 0x0a, 0x92, 0x8a, 0xa8, 0x4c, 0xe7, 0x51, 0x01, 0xc4, 0xe7, + 0x54, 0x44, 0x9c, 0x84, 0xbd, 0x79, 0x9f, 0x44, 0xc9, 0x84, 0xe4, 0x06, 0x8b, 0xde, 0x1a, 0x73, + 0x3e, 0x8e, 0x68, 0x4f, 0x8f, 0x46, 0xb3, 0xc3, 0x5e, 0x38, 0x13, 0x44, 0x31, 0x1e, 0x67, 0xa1, + 0x38, 0x3d, 0x2f, 0x95, 0x98, 0x05, 0x59, 0x28, 0x36, 0xe7, 0x24, 0x62, 0x21, 0x51, 0xb4, 0x97, + 0x7d, 0xd8, 0x89, 0x8d, 0x31, 0x1f, 0x73, 0xfd, 0xd9, 0x4b, 0xbf, 0x8c, 0xb5, 0xfb, 0x97, 0x06, + 0xd4, 0x06, 0x59, 0x9e, 0xd0, 0x43, 0xa8, 0xc4, 0x3c, 0xa4, 0xae, 0xb3, 0xed, 0xdc, 0xaf, 0xf7, + 0x37, 0x3d, 0x93, 0x4e, 0x92, 0x30, 0x6f, 0xde, 0xf7, 0xd2, 0xb0, 0x7a, 0x1f, 0x78, 0x48, 0xb1, + 0x06, 0x21, 0x1f, 0xda, 0xe9, 0x26, 0x59, 0xe0, 0x0b, 0x6a, 0xc2, 0x2c, 0xdd, 0x92, 0x26, 0xee, + 0x78, 0x67, 0xd6, 0x81, 0x97, 0x2f, 0xe6, 0x0d, 0x35, 0x19, 0x67, 0x5c, 0xdc, 0x92, 0x45, 0x03, + 0x1a, 0xc1, 0x7a, 0x78, 0x1c, 0x93, 0x69, 0x61, 0x85, 0xb2, 0x5e, 0xe1, 0xa7, 0x97, 0x5a, 0x61, + 0xcf, 0xb0, 0x17, 0x4b, 0xb4, 0xc3, 0x53, 0x16, 0x84, 0xa1, 0x15, 0x44, 0x33, 0xa9, 0xa8, 0xf0, + 0xa7, 0x24, 0x26, 0x63, 0x2a, 0xdc, 0x8a, 0x5e, 0xe1, 0xc1, 0x39, 0x2b, 0xbc, 0x36, 0x8c, 0x5f, + 0x19, 0x02, 0x6e, 0x06, 0x85, 0x31, 0xda, 0x05, 0x98, 0x84, 0xd2, 0x37, 0x4c, 0xb7, 0xa9, 0xe5, + 0xba, 0x4b, 0x62, 0xb9, 0x9b, 0xb0, 0xd7, 0x1a, 0x33, 0xd4, 0xce, 0xe0, 0xda, 0x24, 0x94, 0xc6, + 0x80, 0x6e, 0x02, 0x1c, 0x46, 0x64, 0x2c, 0xfd, 0x84, 0xa8, 0x89, 0xbb, 0xb2, 0xed, 0xdc, 0xaf, + 0xe1, 0x9a, 0xb6, 0x1c, 0x10, 0x35, 0x41, 0xaf, 0xa1, 0xae, 0xeb, 0xcb, 0x97, 0x2c, 0x3e, 0x92, + 0xee, 0xd5, 0xed, 0xf2, 0x89, 0x25, 0xac, 0xc7, 0xb6, 0x16, 0xd3, 0xd5, 0xd2, 0x48, 0xcb, 0x21, + 0x8b, 0x8f, 0x30, 0xc8, 0xec, 0x53, 0xa2, 0x9f, 0x43, 0xc3, 0x88, 0x58, 0x47, 0xd7, 0xb4, 0xa3, + 0x77, 0xcf, 0x57, 0x31, 0xfe, 0x61, 0xb3, 0xbc, 0x75, 0xf6, 0x23, 0x6c, 0x18, 0xa1, 0xc3, 0x68, + 0x26, 0x27, 0x3e, 0x8b, 0x15, 0x15, 0x73, 0x12, 0xb9, 0xab, 0x5a, 0xf0, 0x86, 0x67, 0xea, 0xd5, + 0xcb, 0xea, 0xd5, 0xdb, 0xb3, 0xf5, 0x3c, 0xa8, 0xfc, 0xf9, 0xdf, 0xb7, 0x1c, 0x8c, 0x34, 0xf9, + 0x4d, 0xca, 0xfd, 0x85, 0xa5, 0xa2, 0x97, 0x50, 0xfd, 0x3d, 0x51, 0xc1, 0x24, 0xe4, 0x63, 0xb7, + 0xaa, 0x65, 0xee, 0x9c, 0x93, 0x8f, 0xdf, 0x58, 0x28, 0xce, 0x49, 0xe8, 0x19, 0xac, 0xa6, 0xc7, + 0x94, 0xc5, 0x63, 0xb7, 0xa6, 0xf9, 0x5b, 0x45, 0xbe, 0x39, 0xc3, 0xf3, 0xbe, 0xf7, 0xc9, 0xa0, + 0x70, 0x06, 0x47, 0xaf, 0x60, 0x55, 0xcc, 0x62, 0xc5, 0xa6, 0xd4, 0xad, 0x17, 0x52, 0xb7, 0x6c, + 0x65, 0x6c, 0x90, 0x83, 0x92, 0xeb, 0xe0, 0x8c, 0x96, 0xd6, 0x54, 0x44, 0x8e, 0xa9, 0xa0, 0xa1, + 0x9f, 0x29, 0xad, 0x5f, 0x58, 0x53, 0xef, 0x0d, 0xc3, 0x0a, 0xe2, 0x66, 0x54, 0x18, 0xa3, 0xa7, + 0xb0, 0x42, 0xc2, 0x29, 0x8b, 0xdd, 0x86, 0x56, 0xda, 0x3e, 0x47, 0x69, 0x37, 0xc5, 0x61, 0x03, + 0x47, 0xbf, 0x85, 0x76, 0xd6, 0x5e, 0xf2, 0x02, 0x6f, 0x69, 0x09, 0xaf, 0x28, 0x91, 0x37, 0x21, + 0xdb, 0x95, 0xbc, 0x7d, 0x6b, 0xc8, 0xaa, 0xbc, 0xc5, 0x8b, 0x06, 0xf4, 0x14, 0x36, 0x69, 0x4c, + 0x46, 0x11, 0xf5, 0x43, 0x26, 0x93, 0x34, 0xf0, 0x54, 0xf8, 0x3a, 0x97, 0x6e, 0x7b, 0xdb, 0xb9, + 0x5f, 0xc5, 0xd7, 0xcc, 0xf4, 0x5e, 0x3e, 0xab, 0x2b, 0x08, 0xdd, 0x81, 0xb5, 0x09, 0x25, 0x21, + 0x15, 0x7e, 0x22, 0xe8, 0x21, 0xfb, 0xec, 0x22, 0x5d, 0xde, 0x0d, 0x63, 0x3c, 0xd0, 0xb6, 0xce, + 0x5f, 0x1d, 0x68, 0x9d, 0x6a, 0x10, 0x68, 0x07, 0x6a, 0x11, 0x93, 0x8a, 0xc6, 0x54, 0x48, 0xd7, + 0xd1, 0x35, 0x7f, 0xbd, 0x78, 0xac, 0xde, 0xdb, 0x69, 0xbc, 0x00, 0xa2, 0xc7, 0x50, 0xb5, 0xe7, + 0x33, 0x6d, 0x4f, 0x29, 0xe9, 0x5a, 0x91, 0x64, 0x4f, 0x33, 0xce, 0x61, 0xe8, 0x09, 0xac, 0x4a, + 0x1a, 0x08, 0xaa, 0xd2, 0x76, 0x53, 0xd6, 0x35, 0x5c, 0x60, 0xa4, 0xd7, 0x8f, 0x37, 0xd4, 0x08, + 0x9c, 0x21, 0x3b, 0xff, 0x72, 0xa0, 0x7d, 0xba, 0xe1, 0xa0, 0x17, 0x00, 0xd1, 0xa2, 0x15, 0x98, + 0xb6, 0x7a, 0x6b, 0x49, 0x2b, 0x28, 0xf6, 0x81, 0x28, 0xef, 0x03, 0x2f, 0x00, 0x82, 0x05, 0xbf, + 0x74, 0x49, 0x7e, 0x90, 0xf3, 0x77, 0x01, 0xc8, 0x82, 0x5f, 0xbe, 0x7c, 0x2b, 0x22, 0x99, 0xc4, + 0xbb, 0x4a, 0xb5, 0xd2, 0x5e, 0x79, 0x57, 0xa9, 0x42, 0xbb, 0xde, 0xfd, 0xe2, 0xc0, 0x8a, 0x2e, + 0x2f, 0xf4, 0x13, 0x68, 0x91, 0x20, 0xa0, 0x52, 0xfa, 0x11, 0x1f, 0x9b, 0x2e, 0xe5, 0xe8, 0x34, + 0xae, 0x19, 0xf3, 0x7b, 0x3e, 0xd6, 0x9d, 0xea, 0x36, 0x34, 0x12, 0xc1, 0x0f, 0x59, 0x44, 0x0d, + 0xa8, 0xa4, 0x41, 0x75, 0x6b, 0xd3, 0x90, 0x1d, 0x58, 0xb5, 0x2f, 0x01, 0xeb, 0x60, 0x67, 0x99, + 0x83, 0x06, 0x81, 0x33, 0x28, 0x7a, 0x03, 0x4d, 0xc9, 0x83, 0x23, 0xaa, 0x7c, 0x9e, 0xa4, 0xcd, + 0x44, 0xba, 0x15, 0x9d, 0xaa, 0x65, 0xd1, 0x19, 0x6a, 0xe0, 0xbe, 0xc6, 0xe1, 0x35, 0x79, 0x62, + 0x24, 0xbb, 0x7f, 0x28, 0x43, 0xb3, 0xd8, 0xcf, 0xd1, 0x23, 0x40, 0x11, 0x0f, 0x48, 0xe4, 0x67, + 0x37, 0x43, 0x4c, 0xa6, 0xd4, 0x6e, 0xaf, 0xad, 0x67, 0x2c, 0xe1, 0x03, 0x99, 0x52, 0x34, 0x86, + 0x75, 0x3e, 0x53, 0x11, 0xa3, 0xc2, 0x0f, 0xa9, 0xa2, 0x41, 0x2a, 0x6b, 0x33, 0xf5, 0xb3, 0x4b, + 0xdf, 0x21, 0xde, 0xbe, 0x91, 0xd8, 0xcb, 0x14, 0x70, 0x9b, 0x9f, 0xb2, 0xa0, 0x7d, 0xd8, 0x98, + 0x25, 0x52, 0x09, 0x4a, 0xa6, 0xfe, 0x88, 0xc5, 0x61, 0x31, 0xab, 0x37, 0x97, 0xec, 0x7b, 0xc0, + 0xe2, 0xd0, 0x36, 0x6c, 0x94, 0x51, 0x17, 0x36, 0xf4, 0x01, 0xd6, 0x75, 0x5f, 0x28, 0xdc, 0x02, + 0x95, 0x4b, 0xd7, 0x48, 0x2b, 0x25, 0x9f, 0xb8, 0x14, 0x3a, 0xcf, 0xa0, 0x7d, 0x7a, 0x1b, 0xe8, + 0x2e, 0x34, 0xe9, 0x9c, 0xc6, 0xea, 0x74, 0x99, 0x34, 0xb4, 0xd5, 0x56, 0x49, 0xf7, 0x4f, 0x25, + 0xa8, 0x66, 0x4d, 0x1c, 0x3d, 0x87, 0xc6, 0x94, 0x49, 0xe9, 0xa7, 0x7d, 0x8f, 0xcf, 0x94, 0x3d, + 0x35, 0x67, 0x5f, 0x23, 0xb8, 0x9e, 0xc2, 0x3f, 0x19, 0x34, 0xda, 0x83, 0xf6, 0x94, 0x8e, 0x49, + 0x41, 0xa1, 0x74, 0x91, 0x42, 0x2b, 0xa3, 0x64, 0x2a, 0xcf, 0xa1, 0x71, 0xc4, 0xa2, 0x28, 0x57, + 0x28, 0x5f, 0xe8, 0x43, 0x0a, 0xcf, 0xd8, 0x6f, 0x60, 0x7d, 0x3a, 0x8b, 0x14, 0x2b, 0x48, 0x54, + 0x2e, 0x92, 0x68, 0xe7, 0x1c, 0xab, 0xd3, 0xfd, 0x9b, 0x03, 0xab, 0xd9, 0x05, 0x70, 0x1b, 0x1a, + 0xf2, 0x78, 0x1a, 0xb1, 0xf8, 0xc8, 0x17, 0x9c, 0x2b, 0x1b, 0xc6, 0xba, 0xb5, 0x61, 0xce, 0x15, + 0xea, 0x42, 0x43, 0xce, 0x46, 0x21, 0x13, 0x34, 0x50, 0x5c, 0x1c, 0xdb, 0xb3, 0x56, 0xb0, 0xa1, + 0x27, 0x70, 0x2d, 0xed, 0xe3, 0x82, 0x85, 0xd4, 0x2f, 0x80, 0xcb, 0x1a, 0xbc, 0x91, 0x4d, 0x0e, + 0x4f, 0x92, 0x1e, 0x42, 0x25, 0x7d, 0x8a, 0xdb, 0x2d, 0x6c, 0x7e, 0xb3, 0x85, 0xa1, 0x7e, 0x80, + 0x62, 0x0d, 0xea, 0xfe, 0xaf, 0x02, 0x0d, 0xeb, 0xb4, 0xbe, 0xd3, 0xd0, 0x4d, 0xa8, 0x2c, 0x0e, + 0xd0, 0xa0, 0xf6, 0xf7, 0xff, 0xfe, 0xa3, 0x5c, 0x11, 0xa5, 0x6d, 0x07, 0x6b, 0x73, 0x1a, 0x6a, + 0xfb, 0x8c, 0xd4, 0x57, 0x9e, 0x4d, 0xd6, 0x59, 0x8b, 0xbc, 0xbd, 0x62, 0xde, 0x1e, 0x2c, 0x30, + 0xe2, 0x18, 0x20, 0x64, 0xf2, 0xc8, 0x72, 0x4d, 0x9a, 0x1e, 0x5f, 0x7c, 0x61, 0x6b, 0xb2, 0xb7, + 0xc7, 0xe4, 0x91, 0xfe, 0x7a, 0x7b, 0x05, 0xd7, 0xc2, 0x6c, 0x80, 0x7e, 0x0d, 0x75, 0x7d, 0x79, + 0x5a, 0x51, 0xb3, 0xeb, 0xfe, 0x65, 0x45, 0x75, 0x7f, 0xcc, 0x54, 0x81, 0xe4, 0xa3, 0xd4, 0x55, + 0xa1, 0x42, 0x69, 0x55, 0x57, 0xbe, 0xcf, 0x55, 0xac, 0x42, 0x99, 0xbb, 0x2a, 0xb2, 0x41, 0xe7, + 0x8f, 0x0e, 0xd4, 0xf2, 0x5d, 0xfc, 0x90, 0x1a, 0x29, 0x2f, 0xa9, 0x91, 0x1d, 0xb8, 0x4e, 0x92, + 0x84, 0xc6, 0xa1, 0x2f, 0xa9, 0x98, 0xb3, 0x80, 0x66, 0x8d, 0x50, 0xe7, 0xa6, 0x8a, 0x37, 0xcc, + 0xec, 0xd0, 0x4c, 0xda, 0x46, 0xd6, 0x69, 0x00, 0x2c, 0xb6, 0xde, 0x21, 0x50, 0xcb, 0x5d, 0x46, + 0xe8, 0x64, 0x05, 0xd8, 0xb4, 0xbf, 0x82, 0xba, 0x8e, 0xc6, 0xf7, 0x5d, 0x6d, 0x3a, 0x82, 0xc6, + 0x32, 0x58, 0xb7, 0xcf, 0x2c, 0x5f, 0x26, 0x34, 0x60, 0x87, 0x8c, 0x8a, 0xee, 0x47, 0x68, 0x16, + 0xdf, 0x51, 0xe8, 0x25, 0x5c, 0xd5, 0xa0, 0xec, 0xc1, 0x70, 0xef, 0x92, 0x01, 0xc7, 0x96, 0x36, + 0xf8, 0xe5, 0x3f, 0xbf, 0x6e, 0x39, 0x5f, 0xbe, 0x6e, 0x39, 0xff, 0xf9, 0xba, 0xe5, 0xc0, 0x3d, + 0xc6, 0x8d, 0x40, 0x22, 0xf8, 0xe7, 0xe3, 0xb3, 0xb5, 0x06, 0xcd, 0xfc, 0x2f, 0xe4, 0x20, 0x2d, + 0xe0, 0x03, 0xe7, 0x77, 0xa5, 0x79, 0x7f, 0x74, 0x55, 0x57, 0xf3, 0x93, 0xff, 0x07, 0x00, 0x00, + 0xff, 0xff, 0xd6, 0xab, 0x7e, 0xcc, 0x53, 0x0f, 0x00, 0x00, } func (m *Bootstrap) Marshal() (dAtA []byte, err error) { @@ -1508,6 +1536,14 @@ func (m *Bootstrap) MarshalTo(dAtA []byte) (int, error) { } i += n13 } + if len(m.HeaderPrefix) > 0 { + dAtA[i] = 0x92 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintBootstrap(dAtA, i, uint64(len(m.HeaderPrefix))) + i += copy(dAtA[i:], m.HeaderPrefix) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -1659,6 +1695,18 @@ func (m *Admin) MarshalTo(dAtA []byte) (int, error) { } i += n17 } + if len(m.SocketOptions) > 0 { + for _, msg := range m.SocketOptions { + dAtA[i] = 0x22 + i++ + i = encodeVarintBootstrap(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2163,6 +2211,10 @@ func (m *Bootstrap) Size() (n int) { l = m.LayeredRuntime.Size() n += 2 + l + sovBootstrap(uint64(l)) } + l = len(m.HeaderPrefix) + if l > 0 { + n += 2 + l + sovBootstrap(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2241,6 +2293,12 @@ func (m *Admin) Size() (n int) { l = m.Address.Size() n += 1 + l + sovBootstrap(uint64(l)) } + if len(m.SocketOptions) > 0 { + for _, e := range m.SocketOptions { + l = e.Size() + n += 1 + l + sovBootstrap(uint64(l)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3083,6 +3141,38 @@ func (m *Bootstrap) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HeaderPrefix", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBootstrap + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthBootstrap + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthBootstrap + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HeaderPrefix = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipBootstrap(dAtA[iNdEx:]) @@ -3166,7 +3256,7 @@ func (m *Bootstrap_StaticResources) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Listeners = append(m.Listeners, v22.Listener{}) + m.Listeners = append(m.Listeners, &v22.Listener{}) if err := m.Listeners[len(m.Listeners)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3200,7 +3290,7 @@ func (m *Bootstrap_StaticResources) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Clusters = append(m.Clusters, v22.Cluster{}) + m.Clusters = append(m.Clusters, &v22.Cluster{}) if err := m.Clusters[len(m.Clusters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3234,7 +3324,7 @@ func (m *Bootstrap_StaticResources) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Secrets = append(m.Secrets, auth.Secret{}) + m.Secrets = append(m.Secrets, &auth.Secret{}) if err := m.Secrets[len(m.Secrets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3555,6 +3645,40 @@ func (m *Admin) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SocketOptions", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBootstrap + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthBootstrap + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthBootstrap + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SocketOptions = append(m.SocketOptions, &core.SocketOption{}) + if err := m.SocketOptions[len(m.SocketOptions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipBootstrap(dAtA[iNdEx:]) diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go index 5f74cf1f2e78..bd20fd5d9436 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2/bootstrap.pb.validate.go @@ -40,77 +40,52 @@ func (m *Bootstrap) Validate() error { return nil } - { - tmp := m.GetNode() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "Node", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "Node", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetStaticResources() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "StaticResources", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStaticResources()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "StaticResources", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDynamicResources() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "DynamicResources", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDynamicResources()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "DynamicResources", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetClusterManager() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "ClusterManager", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetClusterManager()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "ClusterManager", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "HdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "HdsConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -120,145 +95,102 @@ func (m *Bootstrap) Validate() error { for idx, item := range m.GetStatsSinks() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: fmt.Sprintf("StatsSinks[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetStatsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return BootstrapValidationError{ - field: "StatsConfig", + field: fmt.Sprintf("StatsSinks[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - - { - tmp := m.GetStatsFlushInterval() - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "StatsFlushInterval", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStatsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "StatsConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetWatchdog() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "Watchdog", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStatsFlushInterval()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "StatsFlushInterval", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetTracing() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "Tracing", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetWatchdog()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "Watchdog", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRuntime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "Runtime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTracing()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "Tracing", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLayeredRuntime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "LayeredRuntime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRuntime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "Runtime", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetAdmin() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "Admin", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLayeredRuntime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "LayeredRuntime", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetOverloadManager() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetAdmin()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "Admin", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return BootstrapValidationError{ - field: "OverloadManager", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOverloadManager()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return BootstrapValidationError{ + field: "OverloadManager", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for EnableDispatcherStats + // no validation rules for HeaderPrefix + return nil } @@ -327,19 +259,29 @@ func (m *Admin) Validate() error { // no validation rules for ProfilePath - { - tmp := m.GetAddress() + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AdminValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, + } + } + } - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + for idx, item := range m.GetSocketOptions() { + _, _ = idx, item + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return AdminValidationError{ - field: "Address", + field: fmt.Sprintf("SocketOptions[%v]", idx), reason: "embedded message failed validation", cause: err, } } } + } return nil @@ -409,47 +351,32 @@ func (m *ClusterManager) Validate() error { // no validation rules for LocalClusterName - { - tmp := m.GetOutlierDetection() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterManagerValidationError{ - field: "OutlierDetection", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOutlierDetection()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterManagerValidationError{ + field: "OutlierDetection", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetUpstreamBindConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterManagerValidationError{ - field: "UpstreamBindConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUpstreamBindConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterManagerValidationError{ + field: "UpstreamBindConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetLoadStatsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterManagerValidationError{ - field: "LoadStatsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLoadStatsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterManagerValidationError{ + field: "LoadStatsConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -518,62 +445,42 @@ func (m *Watchdog) Validate() error { return nil } - { - tmp := m.GetMissTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WatchdogValidationError{ - field: "MissTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMissTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WatchdogValidationError{ + field: "MissTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMegamissTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WatchdogValidationError{ - field: "MegamissTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMegamissTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WatchdogValidationError{ + field: "MegamissTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetKillTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WatchdogValidationError{ - field: "KillTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetKillTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WatchdogValidationError{ + field: "KillTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetMultikillTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return WatchdogValidationError{ - field: "MultikillTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMultikillTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WatchdogValidationError{ + field: "MultikillTimeout", + reason: "embedded message failed validation", + cause: err, } } } @@ -648,17 +555,12 @@ func (m *Runtime) Validate() error { // no validation rules for OverrideSubdirectory - { - tmp := m.GetBase() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeValidationError{ - field: "Base", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetBase()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeValidationError{ + field: "Base", + reason: "embedded message failed validation", + cause: err, } } } @@ -739,68 +641,48 @@ func (m *RuntimeLayer) Validate() error { case *RuntimeLayer_StaticLayer: - { - tmp := m.GetStaticLayer() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeLayerValidationError{ - field: "StaticLayer", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStaticLayer()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeLayerValidationError{ + field: "StaticLayer", + reason: "embedded message failed validation", + cause: err, } } } case *RuntimeLayer_DiskLayer_: - { - tmp := m.GetDiskLayer() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeLayerValidationError{ - field: "DiskLayer", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDiskLayer()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeLayerValidationError{ + field: "DiskLayer", + reason: "embedded message failed validation", + cause: err, } } } case *RuntimeLayer_AdminLayer_: - { - tmp := m.GetAdminLayer() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeLayerValidationError{ - field: "AdminLayer", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAdminLayer()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeLayerValidationError{ + field: "AdminLayer", + reason: "embedded message failed validation", + cause: err, } } } case *RuntimeLayer_RtdsLayer_: - { - tmp := m.GetRtdsLayer() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeLayerValidationError{ - field: "RtdsLayer", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRtdsLayer()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeLayerValidationError{ + field: "RtdsLayer", + reason: "embedded message failed validation", + cause: err, } } } @@ -875,17 +757,12 @@ func (m *LayeredRuntime) Validate() error { for idx, item := range m.GetLayers() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LayeredRuntimeValidationError{ - field: fmt.Sprintf("Layers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LayeredRuntimeValidationError{ + field: fmt.Sprintf("Layers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -960,17 +837,12 @@ func (m *Bootstrap_StaticResources) Validate() error { for idx, item := range m.GetListeners() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Bootstrap_StaticResourcesValidationError{ - field: fmt.Sprintf("Listeners[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Bootstrap_StaticResourcesValidationError{ + field: fmt.Sprintf("Listeners[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -980,17 +852,12 @@ func (m *Bootstrap_StaticResources) Validate() error { for idx, item := range m.GetClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Bootstrap_StaticResourcesValidationError{ - field: fmt.Sprintf("Clusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Bootstrap_StaticResourcesValidationError{ + field: fmt.Sprintf("Clusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1000,17 +867,12 @@ func (m *Bootstrap_StaticResources) Validate() error { for idx, item := range m.GetSecrets() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Bootstrap_StaticResourcesValidationError{ - field: fmt.Sprintf("Secrets[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Bootstrap_StaticResourcesValidationError{ + field: fmt.Sprintf("Secrets[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1084,47 +946,32 @@ func (m *Bootstrap_DynamicResources) Validate() error { return nil } - { - tmp := m.GetLdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Bootstrap_DynamicResourcesValidationError{ - field: "LdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Bootstrap_DynamicResourcesValidationError{ + field: "LdsConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Bootstrap_DynamicResourcesValidationError{ - field: "CdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Bootstrap_DynamicResourcesValidationError{ + field: "CdsConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetAdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Bootstrap_DynamicResourcesValidationError{ - field: "AdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Bootstrap_DynamicResourcesValidationError{ + field: "AdsConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -1408,17 +1255,12 @@ func (m *RuntimeLayer_RtdsLayer) Validate() error { // no validation rules for Name - { - tmp := m.GetRtdsConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeLayer_RtdsLayerValidationError{ - field: "RtdsConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRtdsConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeLayer_RtdsLayerValidationError{ + field: "RtdsConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go index 1624da5600c4..bb6af6aaf3d4 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.go @@ -5,16 +5,14 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" _type "github.com/envoyproxy/go-control-plane/envoy/type" + _ "github.com/envoyproxy/protoc-gen-validate/validate" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go index 0d4b6932d403..96611b7643be 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go @@ -42,17 +42,12 @@ func (m *AccessLog) Validate() error { // no validation rules for Name - { - tmp := m.GetFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogValidationError{ - field: "Filter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogValidationError{ + field: "Filter", + reason: "embedded message failed validation", + cause: err, } } } @@ -61,34 +56,24 @@ func (m *AccessLog) Validate() error { case *AccessLog_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLog_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -164,170 +149,120 @@ func (m *AccessLogFilter) Validate() error { case *AccessLogFilter_StatusCodeFilter: - { - tmp := m.GetStatusCodeFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "StatusCodeFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStatusCodeFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "StatusCodeFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_DurationFilter: - { - tmp := m.GetDurationFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "DurationFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDurationFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "DurationFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_NotHealthCheckFilter: - { - tmp := m.GetNotHealthCheckFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "NotHealthCheckFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNotHealthCheckFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "NotHealthCheckFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_TraceableFilter: - { - tmp := m.GetTraceableFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "TraceableFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTraceableFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "TraceableFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_RuntimeFilter: - { - tmp := m.GetRuntimeFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "RuntimeFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRuntimeFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "RuntimeFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_AndFilter: - { - tmp := m.GetAndFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "AndFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAndFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "AndFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_OrFilter: - { - tmp := m.GetOrFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "OrFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOrFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "OrFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_HeaderFilter: - { - tmp := m.GetHeaderFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "HeaderFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeaderFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "HeaderFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_ResponseFlagFilter: - { - tmp := m.GetResponseFlagFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "ResponseFlagFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResponseFlagFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "ResponseFlagFilter", + reason: "embedded message failed validation", + cause: err, } } } case *AccessLogFilter_GrpcStatusFilter: - { - tmp := m.GetGrpcStatusFilter() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AccessLogFilterValidationError{ - field: "GrpcStatusFilter", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcStatusFilter()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AccessLogFilterValidationError{ + field: "GrpcStatusFilter", + reason: "embedded message failed validation", + cause: err, } } } @@ -412,17 +347,12 @@ func (m *ComparisonFilter) Validate() error { } } - { - tmp := m.GetValue() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ComparisonFilterValidationError{ - field: "Value", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValue()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ComparisonFilterValidationError{ + field: "Value", + reason: "embedded message failed validation", + cause: err, } } } @@ -499,17 +429,12 @@ func (m *StatusCodeFilter) Validate() error { } } - { - tmp := m.GetComparison() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatusCodeFilterValidationError{ - field: "Comparison", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetComparison()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatusCodeFilterValidationError{ + field: "Comparison", + reason: "embedded message failed validation", + cause: err, } } } @@ -586,17 +511,12 @@ func (m *DurationFilter) Validate() error { } } - { - tmp := m.GetComparison() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DurationFilterValidationError{ - field: "Comparison", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetComparison()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DurationFilterValidationError{ + field: "Comparison", + reason: "embedded message failed validation", + cause: err, } } } @@ -805,17 +725,12 @@ func (m *RuntimeFilter) Validate() error { } } - { - tmp := m.GetPercentSampled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeFilterValidationError{ - field: "PercentSampled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPercentSampled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeFilterValidationError{ + field: "PercentSampled", + reason: "embedded message failed validation", + cause: err, } } } @@ -896,17 +811,12 @@ func (m *AndFilter) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return AndFilterValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return AndFilterValidationError{ + field: fmt.Sprintf("Filters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -987,17 +897,12 @@ func (m *OrFilter) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OrFilterValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OrFilterValidationError{ + field: fmt.Sprintf("Filters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1076,17 +981,12 @@ func (m *HeaderFilter) Validate() error { } } - { - tmp := m.GetHeader() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HeaderFilterValidationError{ - field: "Header", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HeaderFilterValidationError{ + field: "Header", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.go index 8c6a4b1f30a9..70382098f356 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.go @@ -5,17 +5,15 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - time "time" - + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go index c4f783120ccd..d8b82252a59c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2/fault.pb.validate.go @@ -42,17 +42,12 @@ func (m *FaultDelay) Validate() error { // no validation rules for Type - { - tmp := m.GetPercentage() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FaultDelayValidationError{ - field: "Percentage", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPercentage()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FaultDelayValidationError{ + field: "Percentage", + reason: "embedded message failed validation", + cause: err, } } } @@ -77,17 +72,12 @@ func (m *FaultDelay) Validate() error { case *FaultDelay_HeaderDelay_: - { - tmp := m.GetHeaderDelay() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FaultDelayValidationError{ - field: "HeaderDelay", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeaderDelay()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FaultDelayValidationError{ + field: "HeaderDelay", + reason: "embedded message failed validation", + cause: err, } } } @@ -165,17 +155,12 @@ func (m *FaultRateLimit) Validate() error { return nil } - { - tmp := m.GetPercentage() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FaultRateLimitValidationError{ - field: "Percentage", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPercentage()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FaultRateLimitValidationError{ + field: "Percentage", + reason: "embedded message failed validation", + cause: err, } } } @@ -184,34 +169,24 @@ func (m *FaultRateLimit) Validate() error { case *FaultRateLimit_FixedLimit_: - { - tmp := m.GetFixedLimit() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FaultRateLimitValidationError{ - field: "FixedLimit", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFixedLimit()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FaultRateLimitValidationError{ + field: "FixedLimit", + reason: "embedded message failed validation", + cause: err, } } } case *FaultRateLimit_HeaderLimit_: - { - tmp := m.GetHeaderLimit() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FaultRateLimitValidationError{ - field: "HeaderLimit", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeaderLimit()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FaultRateLimitValidationError{ + field: "HeaderLimit", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.go index 355608b792d7..6bbe6ddd98cd 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.go @@ -5,16 +5,14 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - - _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" - route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2" _type "github.com/envoyproxy/go-control-plane/envoy/type" + _ "github.com/envoyproxy/protoc-gen-validate/validate" + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -204,10 +202,28 @@ type HTTPFault struct { // .. attention:: // This is a per-stream limit versus a connection level limit. This means that concurrent streams // will each get an independent limit. - ResponseRateLimit *v2.FaultRateLimit `protobuf:"bytes,7,opt,name=response_rate_limit,json=responseRateLimit,proto3" json:"response_rate_limit,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ResponseRateLimit *v2.FaultRateLimit `protobuf:"bytes,7,opt,name=response_rate_limit,json=responseRateLimit,proto3" json:"response_rate_limit,omitempty"` + // The runtime key to override the :ref:`default ` + // runtime. The default is: fault.http.delay.fixed_delay_percent + DelayPercentRuntime string `protobuf:"bytes,8,opt,name=delay_percent_runtime,json=delayPercentRuntime,proto3" json:"delay_percent_runtime,omitempty"` + // The runtime key to override the :ref:`default ` + // runtime. The default is: fault.http.abort.abort_percent + AbortPercentRuntime string `protobuf:"bytes,9,opt,name=abort_percent_runtime,json=abortPercentRuntime,proto3" json:"abort_percent_runtime,omitempty"` + // The runtime key to override the :ref:`default ` + // runtime. The default is: fault.http.delay.fixed_duration_ms + DelayDurationRuntime string `protobuf:"bytes,10,opt,name=delay_duration_runtime,json=delayDurationRuntime,proto3" json:"delay_duration_runtime,omitempty"` + // The runtime key to override the :ref:`default ` + // runtime. The default is: fault.http.abort.http_status + AbortHttpStatusRuntime string `protobuf:"bytes,11,opt,name=abort_http_status_runtime,json=abortHttpStatusRuntime,proto3" json:"abort_http_status_runtime,omitempty"` + // The runtime key to override the :ref:`default ` + // runtime. The default is: fault.http.max_active_faults + MaxActiveFaultsRuntime string `protobuf:"bytes,12,opt,name=max_active_faults_runtime,json=maxActiveFaultsRuntime,proto3" json:"max_active_faults_runtime,omitempty"` + // The runtime key to override the :ref:`default ` + // runtime. The default is: fault.http.rate_limit.response_percent + ResponseRateLimitPercentRuntime string `protobuf:"bytes,13,opt,name=response_rate_limit_percent_runtime,json=responseRateLimitPercentRuntime,proto3" json:"response_rate_limit_percent_runtime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HTTPFault) Reset() { *m = HTTPFault{} } @@ -292,6 +308,48 @@ func (m *HTTPFault) GetResponseRateLimit() *v2.FaultRateLimit { return nil } +func (m *HTTPFault) GetDelayPercentRuntime() string { + if m != nil { + return m.DelayPercentRuntime + } + return "" +} + +func (m *HTTPFault) GetAbortPercentRuntime() string { + if m != nil { + return m.AbortPercentRuntime + } + return "" +} + +func (m *HTTPFault) GetDelayDurationRuntime() string { + if m != nil { + return m.DelayDurationRuntime + } + return "" +} + +func (m *HTTPFault) GetAbortHttpStatusRuntime() string { + if m != nil { + return m.AbortHttpStatusRuntime + } + return "" +} + +func (m *HTTPFault) GetMaxActiveFaultsRuntime() string { + if m != nil { + return m.MaxActiveFaultsRuntime + } + return "" +} + +func (m *HTTPFault) GetResponseRateLimitPercentRuntime() string { + if m != nil { + return m.ResponseRateLimitPercentRuntime + } + return "" +} + func init() { proto.RegisterType((*FaultAbort)(nil), "envoy.config.filter.http.fault.v2.FaultAbort") proto.RegisterType((*HTTPFault)(nil), "envoy.config.filter.http.fault.v2.HTTPFault") @@ -302,41 +360,48 @@ func init() { } var fileDescriptor_26070db6b6576d5c = []byte{ - // 544 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0xc6, 0x4d, 0xdb, 0x6d, 0xae, 0xa6, 0x75, 0xd9, 0x81, 0xa8, 0x82, 0xaa, 0xdb, 0x29, 0x20, - 0xe6, 0xa0, 0xec, 0x88, 0x40, 0x5a, 0x87, 0xa6, 0x82, 0xf8, 0x51, 0x85, 0xc1, 0x01, 0x21, 0x45, - 0x6e, 0xf3, 0xda, 0x46, 0x4a, 0x63, 0xcb, 0x76, 0xb2, 0xf6, 0x3f, 0xe1, 0x4f, 0x41, 0x9c, 0x76, - 0x9c, 0xc4, 0x85, 0x23, 0x47, 0xd4, 0xdb, 0xfe, 0x0b, 0x64, 0xbb, 0x61, 0x1c, 0x2a, 0x8d, 0x4b, - 0xe4, 0x3c, 0x7f, 0xdf, 0xfb, 0xde, 0xf7, 0xf9, 0xe1, 0x63, 0xc8, 0x4b, 0xb6, 0x0c, 0xc6, 0x2c, - 0x9f, 0xa4, 0xd3, 0x60, 0x92, 0x66, 0x0a, 0x44, 0x30, 0x53, 0x8a, 0x07, 0x13, 0x5a, 0x64, 0x2a, - 0x28, 0x43, 0x7b, 0x20, 0x5c, 0x30, 0xc5, 0xdc, 0x43, 0x03, 0x27, 0x16, 0x4e, 0x2c, 0x9c, 0x68, - 0x38, 0xb1, 0xa8, 0x32, 0xec, 0x74, 0x6d, 0x47, 0xca, 0x53, 0x4d, 0x16, 0xac, 0x50, 0x60, 0xbf, - 0xb6, 0x45, 0xc7, 0xdf, 0xa4, 0xb8, 0x49, 0xac, 0xe3, 0x59, 0xa4, 0x5a, 0x72, 0x08, 0x38, 0x88, - 0x31, 0xe4, 0xd5, 0x4d, 0x77, 0xca, 0xd8, 0x34, 0x83, 0xc0, 0xfc, 0x8d, 0x8a, 0x49, 0x70, 0x29, - 0x28, 0xe7, 0x20, 0xe4, 0xfa, 0xfe, 0x7e, 0x49, 0xb3, 0x34, 0xa1, 0x0a, 0x82, 0xea, 0x60, 0x2f, - 0x8e, 0xbe, 0x22, 0x8c, 0xcf, 0xb5, 0xc4, 0xe9, 0x88, 0x09, 0xe5, 0x3e, 0xc5, 0x2d, 0x3d, 0x7c, - 0x2c, 0x15, 0x55, 0x85, 0xf4, 0x6a, 0x3d, 0xe4, 0xef, 0xf6, 0x77, 0xbf, 0xdf, 0x5c, 0x39, 0xdb, - 0x8f, 0x9b, 0xed, 0x5f, 0x75, 0xff, 0x1a, 0x0d, 0xee, 0x45, 0x58, 0x63, 0x3e, 0x18, 0x88, 0xfb, - 0x1c, 0xe3, 0xf5, 0x28, 0x74, 0x0a, 0x9e, 0xd3, 0x43, 0x7e, 0x2b, 0x7c, 0x48, 0x6c, 0x2a, 0x7a, - 0x50, 0x72, 0x2e, 0xe8, 0x58, 0xa5, 0x2c, 0xa7, 0xd9, 0xd0, 0xe2, 0xa2, 0x7f, 0x08, 0xfd, 0x03, - 0x8c, 0x41, 0x08, 0x26, 0x62, 0x8d, 0x75, 0x1b, 0xdf, 0x6e, 0xae, 0x1c, 0xf4, 0xba, 0xbe, 0x8d, - 0xda, 0xb5, 0xa3, 0x1f, 0x0e, 0xde, 0x19, 0x5c, 0x5c, 0x0c, 0xcd, 0x78, 0xee, 0x0b, 0xdc, 0x48, - 0x20, 0xa3, 0x4b, 0x0f, 0x19, 0x09, 0x9f, 0x6c, 0x0a, 0xbe, 0xca, 0x9c, 0x18, 0xce, 0x4b, 0x8d, - 0x8f, 0x2c, 0xcd, 0x3d, 0xc3, 0x0d, 0xaa, 0x2d, 0x1a, 0x4f, 0xad, 0xf0, 0x98, 0xdc, 0xf9, 0x70, - 0xe4, 0x36, 0x97, 0xc8, 0x72, 0xdd, 0x47, 0xb8, 0x5d, 0x70, 0xa9, 0x04, 0xd0, 0x79, 0x3c, 0xce, - 0x0a, 0xa9, 0x40, 0x18, 0xcb, 0x3b, 0xd1, 0x5e, 0x55, 0x3f, 0xb3, 0x65, 0xf7, 0x19, 0xde, 0x9a, - 0x01, 0x4d, 0x40, 0x48, 0xaf, 0xde, 0x73, 0xfc, 0x56, 0x78, 0xb8, 0x56, 0xa4, 0x3c, 0xd5, 0xcd, - 0xed, 0x06, 0x0c, 0x0c, 0xe4, 0x2d, 0x55, 0xe3, 0x19, 0x88, 0xa8, 0x62, 0x68, 0x9d, 0x84, 0x5d, - 0xe6, 0x6b, 0xa5, 0x9c, 0x25, 0x20, 0xbd, 0x46, 0xcf, 0xd1, 0x3a, 0xb7, 0xf5, 0x77, 0xba, 0xec, - 0x0e, 0xf0, 0xfe, 0x9c, 0x2e, 0x62, 0x9d, 0x71, 0x09, 0xb1, 0x99, 0x5d, 0x7a, 0x4d, 0xe3, 0xf1, - 0x01, 0xb1, 0x5b, 0x41, 0xaa, 0xad, 0x20, 0x1f, 0x5f, 0xe5, 0xea, 0x24, 0xfc, 0x44, 0xb3, 0x02, - 0xa2, 0xbd, 0x39, 0x5d, 0x9c, 0x1a, 0x96, 0xf1, 0x29, 0xdd, 0x2f, 0xf8, 0x40, 0x80, 0xe4, 0x2c, - 0x97, 0x10, 0x0b, 0xaa, 0x20, 0xce, 0xd2, 0x79, 0xaa, 0xbc, 0x2d, 0xd3, 0xeb, 0xc9, 0x7f, 0xe4, - 0x1d, 0x51, 0x05, 0x6f, 0x34, 0x27, 0xda, 0xaf, 0x1a, 0xfd, 0x2d, 0xf5, 0xdf, 0x5f, 0xaf, 0xba, - 0xe8, 0xe7, 0xaa, 0x8b, 0x7e, 0xaf, 0xba, 0x08, 0x07, 0x29, 0xb3, 0x0d, 0xb9, 0x60, 0x8b, 0xe5, - 0xdd, 0x6f, 0xd1, 0xb7, 0x4b, 0x3a, 0xd4, 0x46, 0x86, 0xe8, 0x73, 0xad, 0x0c, 0x47, 0x4d, 0xe3, - 0xea, 0xe4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x47, 0x26, 0x1a, 0x15, 0xb1, 0x03, 0x00, 0x00, + // 653 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xc1, 0x4f, 0x13, 0x4f, + 0x14, 0xc7, 0x7f, 0x4b, 0x69, 0x81, 0xe9, 0x8f, 0x00, 0x8b, 0xe2, 0x4a, 0xb4, 0x16, 0xbc, 0xac, + 0x46, 0x66, 0xcd, 0xe2, 0xc5, 0x18, 0x4d, 0x28, 0x84, 0x54, 0x83, 0xda, 0xac, 0xe8, 0xc1, 0x98, + 0x6c, 0x86, 0xee, 0x6b, 0xd9, 0x64, 0xbb, 0xb3, 0x99, 0x9d, 0x5d, 0xe8, 0x7f, 0xe2, 0x3f, 0xe1, + 0xdd, 0x78, 0xe2, 0xc8, 0xd1, 0xa3, 0x47, 0xc3, 0x8d, 0xff, 0xc2, 0xcc, 0x9b, 0xdd, 0x52, 0x69, + 0x13, 0xbc, 0x90, 0x65, 0xde, 0xf7, 0xf3, 0xde, 0xbc, 0xef, 0x7c, 0x53, 0xb2, 0x05, 0x71, 0xce, + 0x87, 0x4e, 0x97, 0xc7, 0xbd, 0xb0, 0xef, 0xf4, 0xc2, 0x48, 0x82, 0x70, 0x8e, 0xa5, 0x4c, 0x9c, + 0x1e, 0xcb, 0x22, 0xe9, 0xe4, 0xae, 0xfe, 0xa0, 0x89, 0xe0, 0x92, 0x9b, 0x1b, 0x28, 0xa7, 0x5a, + 0x4e, 0xb5, 0x9c, 0x2a, 0x39, 0xd5, 0xaa, 0xdc, 0x5d, 0x6f, 0xe8, 0x8e, 0x2c, 0x09, 0x15, 0x2c, + 0x78, 0x26, 0x41, 0xff, 0xd5, 0x2d, 0xd6, 0xed, 0x69, 0x13, 0xa7, 0x0d, 0x5b, 0xb7, 0xb4, 0x52, + 0x0e, 0x13, 0x70, 0x12, 0x10, 0x5d, 0x88, 0xcb, 0x4a, 0xa3, 0xcf, 0x79, 0x3f, 0x02, 0x07, 0xff, + 0x3b, 0xca, 0x7a, 0xce, 0x89, 0x60, 0x49, 0x02, 0x22, 0x2d, 0xea, 0x77, 0x72, 0x16, 0x85, 0x01, + 0x93, 0xe0, 0x94, 0x1f, 0xba, 0xb0, 0xf9, 0xd5, 0x20, 0x64, 0x5f, 0x8d, 0xd8, 0x39, 0xe2, 0x42, + 0x9a, 0x4f, 0x49, 0x5d, 0x5d, 0xde, 0x4f, 0x25, 0x93, 0x59, 0x6a, 0xcd, 0x34, 0x0d, 0x7b, 0xb1, + 0xb5, 0xf8, 0xe3, 0xf2, 0xac, 0x32, 0xff, 0xb8, 0xb6, 0xfc, 0x6b, 0xd6, 0x3e, 0x37, 0xda, 0xff, + 0x79, 0x44, 0x69, 0x3e, 0xa0, 0xc4, 0x7c, 0x49, 0x48, 0x71, 0x15, 0xd6, 0x07, 0xab, 0xd2, 0x34, + 0xec, 0xba, 0x7b, 0x9f, 0x6a, 0x57, 0xd4, 0x45, 0xe9, 0xbe, 0x60, 0x5d, 0x19, 0xf2, 0x98, 0x45, + 0x1d, 0xad, 0xf3, 0xc6, 0x80, 0xd6, 0x2a, 0x21, 0x20, 0x04, 0x17, 0xbe, 0xd2, 0x9a, 0xd5, 0xef, + 0x97, 0x67, 0x15, 0xe3, 0xcd, 0xec, 0xbc, 0xb1, 0x3c, 0xb3, 0xf9, 0xad, 0x46, 0x16, 0xda, 0x87, + 0x87, 0x1d, 0xbc, 0x9e, 0xf9, 0x8a, 0x54, 0x03, 0x88, 0xd8, 0xd0, 0x32, 0x70, 0x84, 0x4d, 0xa7, + 0x19, 0x5f, 0x7a, 0x4e, 0x91, 0xd9, 0x53, 0x7a, 0x4f, 0x63, 0xe6, 0x2e, 0xa9, 0x32, 0xb5, 0x22, + 0xee, 0x54, 0x77, 0xb7, 0xe8, 0x8d, 0x0f, 0x47, 0xaf, 0x7c, 0xf1, 0x34, 0x6b, 0x3e, 0x22, 0xcb, + 0x59, 0x92, 0x4a, 0x01, 0x6c, 0xe0, 0x77, 0xa3, 0x2c, 0x95, 0x20, 0x70, 0xe5, 0x05, 0x6f, 0xa9, + 0x3c, 0xdf, 0xd5, 0xc7, 0xe6, 0x0b, 0x32, 0x77, 0x0c, 0x2c, 0x00, 0x91, 0x5a, 0xb3, 0xcd, 0x8a, + 0x5d, 0x77, 0x37, 0x8a, 0x89, 0x2c, 0x09, 0x55, 0x73, 0x9d, 0x80, 0x36, 0x4a, 0xde, 0x32, 0xd9, + 0x3d, 0x06, 0xe1, 0x95, 0x84, 0x9a, 0x13, 0xf0, 0x93, 0xb8, 0x98, 0x14, 0xf3, 0x00, 0x52, 0xab, + 0xda, 0xac, 0xa8, 0x39, 0x57, 0xe7, 0xef, 0xd4, 0xb1, 0xd9, 0x26, 0x2b, 0x03, 0x76, 0xea, 0x2b, + 0x8f, 0x73, 0xf0, 0xf1, 0xee, 0xa9, 0x55, 0xc3, 0x1d, 0xef, 0x51, 0x9d, 0x0a, 0x5a, 0xa6, 0x82, + 0x7e, 0x7c, 0x1d, 0xcb, 0x6d, 0xf7, 0x13, 0x8b, 0x32, 0xf0, 0x96, 0x06, 0xec, 0x74, 0x07, 0x29, + 0xdc, 0x33, 0x35, 0xbf, 0x90, 0x55, 0x01, 0x69, 0xc2, 0xe3, 0x14, 0x7c, 0xc1, 0x24, 0xf8, 0x51, + 0x38, 0x08, 0xa5, 0x35, 0x87, 0xbd, 0x9e, 0xfc, 0x83, 0xdf, 0x1e, 0x93, 0x70, 0xa0, 0x18, 0x6f, + 0xa5, 0x6c, 0x34, 0x3a, 0x32, 0x5d, 0x72, 0x1b, 0x1f, 0xc2, 0x2f, 0x1e, 0xdf, 0x17, 0x59, 0x2c, + 0xc3, 0x01, 0x58, 0xf3, 0xe8, 0xdf, 0x2a, 0x16, 0xcb, 0x84, 0xe8, 0x92, 0x62, 0xd0, 0xf7, 0x09, + 0x66, 0x41, 0x33, 0x58, 0xbc, 0xc6, 0x3c, 0x23, 0x6b, 0x7a, 0x4e, 0x90, 0x09, 0xa6, 0x72, 0x37, + 0x82, 0x08, 0x42, 0xb7, 0xb0, 0xba, 0x57, 0x14, 0x4b, 0xea, 0x39, 0xb9, 0xab, 0x27, 0x8d, 0xa5, + 0x7f, 0x04, 0xd6, 0x11, 0x5c, 0x43, 0x41, 0x7b, 0x94, 0xfc, 0x31, 0x74, 0xe2, 0x01, 0x46, 0xe8, + 0xff, 0x1a, 0xbd, 0x66, 0x75, 0x89, 0x1e, 0x90, 0x87, 0x53, 0x1c, 0x9f, 0xd8, 0x76, 0x11, 0x9b, + 0x3c, 0x98, 0xf0, 0xf4, 0xef, 0xcd, 0x5b, 0xef, 0xcf, 0x2f, 0x1a, 0xc6, 0xcf, 0x8b, 0x86, 0xf1, + 0xfb, 0xa2, 0x61, 0x10, 0x27, 0xe4, 0xfa, 0xc9, 0x12, 0xc1, 0x4f, 0x87, 0x37, 0xa7, 0xbd, 0xa5, + 0x7f, 0x06, 0x3a, 0x2a, 0x2a, 0x1d, 0xe3, 0xf3, 0x4c, 0xee, 0x1e, 0xd5, 0x30, 0x37, 0xdb, 0x7f, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xc6, 0xb2, 0x39, 0x13, 0x05, 0x00, 0x00, } func (m *FaultAbort) Marshal() (dAtA []byte, err error) { @@ -472,6 +537,42 @@ func (m *HTTPFault) MarshalTo(dAtA []byte) (int, error) { } i += n6 } + if len(m.DelayPercentRuntime) > 0 { + dAtA[i] = 0x42 + i++ + i = encodeVarintFault(dAtA, i, uint64(len(m.DelayPercentRuntime))) + i += copy(dAtA[i:], m.DelayPercentRuntime) + } + if len(m.AbortPercentRuntime) > 0 { + dAtA[i] = 0x4a + i++ + i = encodeVarintFault(dAtA, i, uint64(len(m.AbortPercentRuntime))) + i += copy(dAtA[i:], m.AbortPercentRuntime) + } + if len(m.DelayDurationRuntime) > 0 { + dAtA[i] = 0x52 + i++ + i = encodeVarintFault(dAtA, i, uint64(len(m.DelayDurationRuntime))) + i += copy(dAtA[i:], m.DelayDurationRuntime) + } + if len(m.AbortHttpStatusRuntime) > 0 { + dAtA[i] = 0x5a + i++ + i = encodeVarintFault(dAtA, i, uint64(len(m.AbortHttpStatusRuntime))) + i += copy(dAtA[i:], m.AbortHttpStatusRuntime) + } + if len(m.MaxActiveFaultsRuntime) > 0 { + dAtA[i] = 0x62 + i++ + i = encodeVarintFault(dAtA, i, uint64(len(m.MaxActiveFaultsRuntime))) + i += copy(dAtA[i:], m.MaxActiveFaultsRuntime) + } + if len(m.ResponseRateLimitPercentRuntime) > 0 { + dAtA[i] = 0x6a + i++ + i = encodeVarintFault(dAtA, i, uint64(len(m.ResponseRateLimitPercentRuntime))) + i += copy(dAtA[i:], m.ResponseRateLimitPercentRuntime) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -553,6 +654,30 @@ func (m *HTTPFault) Size() (n int) { l = m.ResponseRateLimit.Size() n += 1 + l + sovFault(uint64(l)) } + l = len(m.DelayPercentRuntime) + if l > 0 { + n += 1 + l + sovFault(uint64(l)) + } + l = len(m.AbortPercentRuntime) + if l > 0 { + n += 1 + l + sovFault(uint64(l)) + } + l = len(m.DelayDurationRuntime) + if l > 0 { + n += 1 + l + sovFault(uint64(l)) + } + l = len(m.AbortHttpStatusRuntime) + if l > 0 { + n += 1 + l + sovFault(uint64(l)) + } + l = len(m.MaxActiveFaultsRuntime) + if l > 0 { + n += 1 + l + sovFault(uint64(l)) + } + l = len(m.ResponseRateLimitPercentRuntime) + if l > 0 { + n += 1 + l + sovFault(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -953,6 +1078,198 @@ func (m *HTTPFault) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DelayPercentRuntime", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFault + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFault + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFault + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DelayPercentRuntime = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AbortPercentRuntime", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFault + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFault + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFault + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AbortPercentRuntime = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DelayDurationRuntime", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFault + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFault + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFault + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DelayDurationRuntime = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AbortHttpStatusRuntime", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFault + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFault + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFault + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AbortHttpStatusRuntime = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxActiveFaultsRuntime", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFault + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFault + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFault + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MaxActiveFaultsRuntime = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ResponseRateLimitPercentRuntime", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFault + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFault + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFault + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ResponseRateLimitPercentRuntime = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipFault(dAtA[iNdEx:]) diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go index 62ee7011cf95..c9c9897bfcf9 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/fault/v2/fault.pb.validate.go @@ -40,17 +40,12 @@ func (m *FaultAbort) Validate() error { return nil } - { - tmp := m.GetPercentage() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FaultAbortValidationError{ - field: "Percentage", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPercentage()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FaultAbortValidationError{ + field: "Percentage", + reason: "embedded message failed validation", + cause: err, } } } @@ -138,32 +133,22 @@ func (m *HTTPFault) Validate() error { return nil } - { - tmp := m.GetDelay() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HTTPFaultValidationError{ - field: "Delay", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDelay()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HTTPFaultValidationError{ + field: "Delay", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetAbort() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HTTPFaultValidationError{ - field: "Abort", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAbort()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HTTPFaultValidationError{ + field: "Abort", + reason: "embedded message failed validation", + cause: err, } } } @@ -173,53 +158,50 @@ func (m *HTTPFault) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HTTPFaultValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetMaxActiveFaults() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HTTPFaultValidationError{ - field: "MaxActiveFaults", + field: fmt.Sprintf("Headers[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetResponseRateLimit() + } - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetMaxActiveFaults()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HTTPFaultValidationError{ + field: "MaxActiveFaults", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return HTTPFaultValidationError{ - field: "ResponseRateLimit", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResponseRateLimit()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HTTPFaultValidationError{ + field: "ResponseRateLimit", + reason: "embedded message failed validation", + cause: err, } } } + // no validation rules for DelayPercentRuntime + + // no validation rules for AbortPercentRuntime + + // no validation rules for DelayDurationRuntime + + // no validation rules for AbortHttpStatusRuntime + + // no validation rules for MaxActiveFaultsRuntime + + // no validation rules for ResponseRateLimitPercentRuntime + return nil } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.go index 3ad68a262c19..597aa3f57c42 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.go @@ -5,19 +5,17 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - time "time" - + route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" - - route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go index bdec67bf14b5..84a7aa8d11d2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go @@ -48,32 +48,22 @@ func (m *HealthCheck) Validate() error { } } - { - tmp := m.GetPassThroughMode() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "PassThroughMode", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPassThroughMode()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "PassThroughMode", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCacheTime() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: "CacheTime", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCacheTime()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: "CacheTime", + reason: "embedded message failed validation", + cause: err, } } } @@ -83,17 +73,12 @@ func (m *HealthCheck) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckValidationError{ + field: fmt.Sprintf("Headers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go index 6e4a7d2fe2ac..91e90fce09e1 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go @@ -5,17 +5,15 @@ package envoy_config_filter_http_jwt_authn_v2alpha import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go index 023eda4c2b3c..64c3b66ae7c2 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go @@ -53,17 +53,12 @@ func (m *JwtProvider) Validate() error { for idx, item := range m.GetFromHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtProviderValidationError{ - field: fmt.Sprintf("FromHeaders[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtProviderValidationError{ + field: fmt.Sprintf("FromHeaders[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -78,34 +73,24 @@ func (m *JwtProvider) Validate() error { case *JwtProvider_RemoteJwks: - { - tmp := m.GetRemoteJwks() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtProviderValidationError{ - field: "RemoteJwks", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRemoteJwks()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtProviderValidationError{ + field: "RemoteJwks", + reason: "embedded message failed validation", + cause: err, } } } case *JwtProvider_LocalJwks: - { - tmp := m.GetLocalJwks() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtProviderValidationError{ - field: "LocalJwks", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalJwks()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtProviderValidationError{ + field: "LocalJwks", + reason: "embedded message failed validation", + cause: err, } } } @@ -182,32 +167,22 @@ func (m *RemoteJwks) Validate() error { return nil } - { - tmp := m.GetHttpUri() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RemoteJwksValidationError{ - field: "HttpUri", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpUri()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RemoteJwksValidationError{ + field: "HttpUri", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCacheDuration() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RemoteJwksValidationError{ - field: "CacheDuration", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCacheDuration()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RemoteJwksValidationError{ + field: "CacheDuration", + reason: "embedded message failed validation", + cause: err, } } } @@ -426,68 +401,48 @@ func (m *JwtRequirement) Validate() error { case *JwtRequirement_ProviderAndAudiences: - { - tmp := m.GetProviderAndAudiences() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtRequirementValidationError{ - field: "ProviderAndAudiences", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetProviderAndAudiences()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtRequirementValidationError{ + field: "ProviderAndAudiences", + reason: "embedded message failed validation", + cause: err, } } } case *JwtRequirement_RequiresAny: - { - tmp := m.GetRequiresAny() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtRequirementValidationError{ - field: "RequiresAny", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequiresAny()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtRequirementValidationError{ + field: "RequiresAny", + reason: "embedded message failed validation", + cause: err, } } } case *JwtRequirement_RequiresAll: - { - tmp := m.GetRequiresAll() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtRequirementValidationError{ - field: "RequiresAll", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequiresAll()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtRequirementValidationError{ + field: "RequiresAll", + reason: "embedded message failed validation", + cause: err, } } } case *JwtRequirement_AllowMissingOrFailed: - { - tmp := m.GetAllowMissingOrFailed() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtRequirementValidationError{ - field: "AllowMissingOrFailed", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAllowMissingOrFailed()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtRequirementValidationError{ + field: "AllowMissingOrFailed", + reason: "embedded message failed validation", + cause: err, } } } @@ -569,17 +524,12 @@ func (m *JwtRequirementOrList) Validate() error { for idx, item := range m.GetRequirements() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtRequirementOrListValidationError{ - field: fmt.Sprintf("Requirements[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtRequirementOrListValidationError{ + field: fmt.Sprintf("Requirements[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -663,17 +613,12 @@ func (m *JwtRequirementAndList) Validate() error { for idx, item := range m.GetRequirements() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtRequirementAndListValidationError{ - field: fmt.Sprintf("Requirements[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtRequirementAndListValidationError{ + field: fmt.Sprintf("Requirements[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -754,32 +699,22 @@ func (m *RequirementRule) Validate() error { } } - { - tmp := m.GetMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RequirementRuleValidationError{ - field: "Match", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RequirementRuleValidationError{ + field: "Match", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRequires() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RequirementRuleValidationError{ - field: "Requires", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequires()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RequirementRuleValidationError{ + field: "Requires", + reason: "embedded message failed validation", + cause: err, } } } @@ -928,34 +863,24 @@ func (m *JwtAuthentication) Validate() error { for idx, item := range m.GetRules() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtAuthenticationValidationError{ - field: fmt.Sprintf("Rules[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtAuthenticationValidationError{ + field: fmt.Sprintf("Rules[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetFilterStateRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return JwtAuthenticationValidationError{ - field: "FilterStateRules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFilterStateRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return JwtAuthenticationValidationError{ + field: "FilterStateRules", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.go index 28e7de19cdd6..c24f5a400f9f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.go @@ -5,14 +5,12 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - - v2 "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go index c9e14b0af37b..860f5ffbde5a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go @@ -40,32 +40,22 @@ func (m *RBAC) Validate() error { return nil } - { - tmp := m.GetRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RBACValidationError{ - field: "Rules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RBACValidationError{ + field: "Rules", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetShadowRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RBACValidationError{ - field: "ShadowRules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetShadowRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RBACValidationError{ + field: "ShadowRules", + reason: "embedded message failed validation", + cause: err, } } } @@ -135,17 +125,12 @@ func (m *RBACPerRoute) Validate() error { return nil } - { - tmp := m.GetRbac() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RBACPerRouteValidationError{ - field: "Rbac", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRbac()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RBACPerRouteValidationError{ + field: "Rbac", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go index 6f9e7283ef3b..5f3cb72fd983 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go @@ -5,20 +5,18 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - time "time" - + v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + v21 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" - - v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - v21 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -142,7 +140,7 @@ func (HttpConnectionManager_Tracing_OperationName) EnumDescriptor() ([]byte, []i return fileDescriptor_8fe65268985a88f7, []int{0, 0, 0} } -// [#comment:next free field: 33] +// [#comment:next free field: 34] type HttpConnectionManager struct { // Supplies the type of codec that the connection manager should use. CodecType HttpConnectionManager_CodecType `protobuf:"varint,1,opt,name=codec_type,json=codecType,proto3,enum=envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager_CodecType" json:"codec_type,omitempty"` @@ -346,10 +344,16 @@ type HttpConnectionManager struct { // for details of normalization. // Note that Envoy does not perform // `case normalization ` - NormalizePath *types.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + NormalizePath *types.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"` + // Determines if adjacent slashes in the path are merged into one before any processing of + // requests by HTTP filters or routing. This affects the upstream *:path* header as well. Without + // setting this option, incoming requests with path `//dir///file` will not match against route + // with `prefix` match set to `/dir`. Defaults to `false`. Note that slash merging is not part of + // `HTTP spec ` and is provided for convenience. + MergeSlashes bool `protobuf:"varint,33,opt,name=merge_slashes,json=mergeSlashes,proto3" json:"merge_slashes,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HttpConnectionManager) Reset() { *m = HttpConnectionManager{} } @@ -629,6 +633,13 @@ func (m *HttpConnectionManager) GetNormalizePath() *types.BoolValue { return nil } +func (m *HttpConnectionManager) GetMergeSlashes() bool { + if m != nil { + return m.MergeSlashes + } + return false +} + // XXX_OneofFuncs is for the internal use of the proto package. func (*HttpConnectionManager) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { return _HttpConnectionManager_OneofMarshaler, _HttpConnectionManager_OneofUnmarshaler, _HttpConnectionManager_OneofSizer, []interface{}{ @@ -1070,7 +1081,7 @@ func (m *HttpConnectionManager_UpgradeConfig) GetEnabled() *types.BoolValue { type Rds struct { // Configuration source specifier for RDS. - ConfigSource core.ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source"` + ConfigSource *core.ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source,omitempty"` // The name of the route configuration. This name will be passed to the RDS // API. This allows an Envoy configuration with multiple HTTP listeners (and // associated HTTP connection manager filters) to use different route @@ -1114,11 +1125,11 @@ func (m *Rds) XXX_DiscardUnknown() { var xxx_messageInfo_Rds proto.InternalMessageInfo -func (m *Rds) GetConfigSource() core.ConfigSource { +func (m *Rds) GetConfigSource() *core.ConfigSource { if m != nil { return m.ConfigSource } - return core.ConfigSource{} + return nil } func (m *Rds) GetRouteConfigName() string { @@ -1184,7 +1195,7 @@ type ScopedRoutes struct { // Configuration source specifier for RDS. // This config source is used to subscribe to RouteConfiguration resources specified in // ScopedRouteConfiguration messages. - RdsConfigSource core.ConfigSource `protobuf:"bytes,3,opt,name=rds_config_source,json=rdsConfigSource,proto3" json:"rds_config_source"` + RdsConfigSource *core.ConfigSource `protobuf:"bytes,3,opt,name=rds_config_source,json=rdsConfigSource,proto3" json:"rds_config_source,omitempty"` // Types that are valid to be assigned to ConfigSpecifier: // *ScopedRoutes_ScopedRouteConfigurationsList // *ScopedRoutes_ScopedRds @@ -1264,11 +1275,11 @@ func (m *ScopedRoutes) GetScopeKeyBuilder() *ScopedRoutes_ScopeKeyBuilder { return nil } -func (m *ScopedRoutes) GetRdsConfigSource() core.ConfigSource { +func (m *ScopedRoutes) GetRdsConfigSource() *core.ConfigSource { if m != nil { return m.RdsConfigSource } - return core.ConfigSource{} + return nil } func (m *ScopedRoutes) GetScopedRouteConfigurationsList() *ScopedRouteConfigurationsList { @@ -1806,10 +1817,10 @@ func (m *ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvEle type ScopedRds struct { // Configuration source specifier for scoped RDS. - ScopedRdsConfigSource core.ConfigSource `protobuf:"bytes,1,opt,name=scoped_rds_config_source,json=scopedRdsConfigSource,proto3" json:"scoped_rds_config_source"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ScopedRdsConfigSource *core.ConfigSource `protobuf:"bytes,1,opt,name=scoped_rds_config_source,json=scopedRdsConfigSource,proto3" json:"scoped_rds_config_source,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ScopedRds) Reset() { *m = ScopedRds{} } @@ -1845,11 +1856,11 @@ func (m *ScopedRds) XXX_DiscardUnknown() { var xxx_messageInfo_ScopedRds proto.InternalMessageInfo -func (m *ScopedRds) GetScopedRdsConfigSource() core.ConfigSource { +func (m *ScopedRds) GetScopedRdsConfigSource() *core.ConfigSource { if m != nil { return m.ScopedRdsConfigSource } - return core.ConfigSource{} + return nil } type HttpFilter struct { @@ -2044,145 +2055,146 @@ func init() { } var fileDescriptor_8fe65268985a88f7 = []byte{ - // 2204 bytes of a gzipped FileDescriptorProto + // 2220 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcb, 0x6f, 0x23, 0x49, - 0x19, 0x77, 0xc7, 0xce, 0xc4, 0xfe, 0x6c, 0xc7, 0x4e, 0xe5, 0x31, 0x1d, 0x67, 0x26, 0x31, 0x91, - 0xd8, 0x8d, 0x66, 0x91, 0x33, 0xf1, 0x0e, 0x83, 0x78, 0x08, 0xb0, 0x93, 0x0c, 0xce, 0xcc, 0x6c, - 0x12, 0xda, 0x0e, 0xc3, 0xee, 0x80, 0x9a, 0x4a, 0x77, 0xd9, 0x69, 0x62, 0x77, 0x37, 0x55, 0xd5, - 0x9e, 0x84, 0x0b, 0x68, 0xe1, 0x80, 0x10, 0xe2, 0xb0, 0x48, 0x08, 0x89, 0x0b, 0x12, 0x07, 0x6e, - 0x20, 0x6e, 0x68, 0x4f, 0x7b, 0x42, 0x7b, 0xe4, 0xc6, 0x8d, 0xc7, 0xdc, 0xf6, 0x7f, 0x00, 0x09, - 0xd5, 0xa3, 0xfd, 0xc8, 0x6b, 0x46, 0xb3, 0x59, 0xf6, 0xe4, 0xea, 0xef, 0xf1, 0xab, 0xaf, 0xea, - 0x7b, 0x96, 0xa1, 0x45, 0xfc, 0x7e, 0x70, 0xba, 0xee, 0x04, 0x7e, 0xdb, 0xeb, 0xac, 0xb7, 0xbd, - 0x2e, 0x27, 0x74, 0xdd, 0x27, 0xfc, 0x59, 0x40, 0x8f, 0xd7, 0x8f, 0x38, 0x0f, 0x6d, 0x27, 0xf0, - 0x7d, 0xe2, 0x70, 0x2f, 0xf0, 0xed, 0x1e, 0xf6, 0x71, 0x87, 0xd0, 0xf5, 0x7e, 0xf5, 0x32, 0x56, - 0x25, 0xa4, 0x01, 0x0f, 0xd0, 0x7d, 0x89, 0x5a, 0x51, 0xa8, 0x15, 0x85, 0x5a, 0xd1, 0xa8, 0x95, - 0xcb, 0x54, 0xfb, 0xd5, 0xd2, 0x67, 0x95, 0x35, 0x38, 0xf4, 0xc4, 0x1e, 0x4e, 0x40, 0x89, 0xb6, - 0xcc, 0x66, 0x41, 0x44, 0x1d, 0xa2, 0xe0, 0x4b, 0xe5, 0xf3, 0x62, 0x92, 0xe1, 0x04, 0x5d, 0x2d, - 0xb1, 0x30, 0x26, 0x41, 0x5d, 0xa6, 0xe9, 0x37, 0xc7, 0xe8, 0x6c, 0xc8, 0xb8, 0x7b, 0xd1, 0x3d, - 0x60, 0xc7, 0x21, 0x8c, 0x75, 0x83, 0x8e, 0x10, 0x1e, 0x7c, 0x68, 0x0d, 0x53, 0x69, 0xf0, 0xd3, - 0x90, 0xac, 0x87, 0x84, 0x3a, 0xc4, 0xe7, 0x9a, 0xb3, 0xd8, 0x09, 0x82, 0x4e, 0x57, 0xdb, 0x74, - 0x18, 0xb5, 0xd7, 0xb1, 0x7f, 0xaa, 0x59, 0xcb, 0x67, 0x59, 0x6e, 0x44, 0xb1, 0xb8, 0x05, 0xcd, - 0xbf, 0x75, 0x96, 0xcf, 0x38, 0x8d, 0x1c, 0x7e, 0x99, 0xf6, 0x33, 0x8a, 0xc3, 0x90, 0xd0, 0xc1, - 0xe9, 0xfa, 0xb8, 0xeb, 0xb9, 0x98, 0x93, 0xf5, 0x78, 0xa1, 0x19, 0x73, 0x9d, 0xa0, 0x13, 0xc8, - 0xe5, 0xba, 0x58, 0x29, 0xea, 0xea, 0x7f, 0x6f, 0xc3, 0x7c, 0x83, 0xf3, 0x70, 0x73, 0xe0, 0x8b, - 0xb7, 0x94, 0x2b, 0xd0, 0xbb, 0x06, 0x80, 0x13, 0xb8, 0xc4, 0xb1, 0xc5, 0xf1, 0x4c, 0xa3, 0x6c, - 0xac, 0x4d, 0x57, 0x9f, 0x54, 0x5e, 0xcd, 0xab, 0x95, 0x0b, 0xf7, 0xa8, 0x6c, 0x0a, 0xfc, 0xd6, - 0x69, 0x48, 0xea, 0xf0, 0xfe, 0x47, 0x1f, 0x24, 0x27, 0xdf, 0x35, 0x26, 0x8a, 0x86, 0x95, 0x71, - 0x62, 0x32, 0xba, 0x03, 0x59, 0xc6, 0x31, 0xb7, 0x43, 0x4a, 0xda, 0xde, 0x89, 0x39, 0x51, 0x36, - 0xd6, 0x32, 0xf5, 0x8c, 0x90, 0x4d, 0xd1, 0x89, 0xb2, 0x61, 0x81, 0xe0, 0xee, 0x4b, 0x26, 0xda, - 0x83, 0x24, 0x75, 0x99, 0x99, 0x2c, 0x1b, 0x6b, 0xd9, 0xea, 0x97, 0x5f, 0xd5, 0x50, 0xcb, 0x65, - 0x8d, 0x84, 0x25, 0x90, 0xd0, 0x36, 0xe4, 0x68, 0x10, 0x71, 0x62, 0x2b, 0x10, 0x33, 0x25, 0x91, - 0xcb, 0x1a, 0x19, 0x87, 0x9e, 0x94, 0x17, 0x12, 0x9b, 0x52, 0x40, 0xbb, 0xb1, 0x91, 0xb0, 0xb2, - 0x74, 0x48, 0x45, 0xc7, 0x90, 0x67, 0x4e, 0x10, 0x12, 0xd7, 0x96, 0x54, 0x66, 0xae, 0x48, 0x9c, - 0xad, 0x57, 0xb5, 0xb0, 0x29, 0xc1, 0xe4, 0xbe, 0xc2, 0xd4, 0x1c, 0x1b, 0xf9, 0x46, 0x04, 0x72, - 0x52, 0x55, 0xc1, 0x31, 0x73, 0xb2, 0x9c, 0x5c, 0xcb, 0x56, 0xeb, 0x1f, 0xc7, 0x6d, 0x0f, 0xa4, - 0xb4, 0x95, 0x3d, 0x1a, 0xac, 0x19, 0xfa, 0x3a, 0x4c, 0x63, 0xd7, 0xb5, 0x23, 0x46, 0xa8, 0x8d, - 0x3b, 0xc4, 0xe7, 0xe6, 0x0d, 0x79, 0xa8, 0x52, 0x45, 0x85, 0x67, 0x25, 0x0e, 0xcf, 0x4a, 0x3d, - 0x08, 0xba, 0xdf, 0xc2, 0xdd, 0x88, 0x58, 0x39, 0xec, 0xba, 0x07, 0x8c, 0xd0, 0x9a, 0x90, 0x47, - 0x01, 0x4c, 0x71, 0x8a, 0x1d, 0xcf, 0xef, 0x98, 0x53, 0x52, 0xf5, 0xe0, 0x7a, 0x43, 0xab, 0xa5, - 0xc0, 0xad, 0x78, 0x17, 0xf4, 0x14, 0xe6, 0x25, 0x48, 0x5c, 0x25, 0xec, 0x20, 0x14, 0xf2, 0xcc, - 0x4c, 0xcb, 0xed, 0x5f, 0x1f, 0x77, 0xab, 0x28, 0x28, 0x12, 0x79, 0x63, 0x5f, 0xcb, 0xef, 0x29, - 0x71, 0x6b, 0x56, 0xa0, 0x9c, 0x21, 0xa2, 0xef, 0xc2, 0x82, 0x20, 0x57, 0xcf, 0xa3, 0x67, 0xae, - 0x44, 0xaf, 0x9e, 0x45, 0x9f, 0x3b, 0xba, 0x80, 0x8a, 0x56, 0x20, 0xcb, 0x08, 0xed, 0x13, 0x6a, - 0xfb, 0xb8, 0x47, 0x4c, 0x10, 0x69, 0x60, 0x81, 0x22, 0xed, 0xe2, 0x1e, 0x41, 0x04, 0x16, 0x7a, - 0xf8, 0xc4, 0xa6, 0xe4, 0x07, 0x11, 0x61, 0xdc, 0x3e, 0x22, 0xd8, 0x25, 0x94, 0xd9, 0xc7, 0x87, - 0xe6, 0x6d, 0xb9, 0xff, 0xad, 0x73, 0x7e, 0x39, 0xd8, 0xf1, 0xf9, 0x9b, 0x55, 0xe9, 0x99, 0x3a, - 0x92, 0x09, 0x75, 0x67, 0xa2, 0x9c, 0xd0, 0x0b, 0xf3, 0x7b, 0xd6, 0x6c, 0x0f, 0x9f, 0x58, 0x0a, - 0xae, 0xa1, 0xd0, 0x1e, 0x1d, 0xa2, 0x3a, 0xe4, 0x3c, 0xb7, 0x4b, 0x6c, 0xee, 0xf5, 0x48, 0x10, - 0x71, 0x33, 0x2b, 0xc1, 0x17, 0xcf, 0x81, 0x6f, 0xe9, 0x54, 0xa8, 0xa7, 0x7e, 0xf3, 0xcf, 0x15, - 0xc3, 0xca, 0x0a, 0xa5, 0x96, 0xd2, 0x41, 0x7b, 0x30, 0xcb, 0x38, 0x25, 0xb8, 0x67, 0x8f, 0x41, - 0x99, 0x2f, 0x07, 0x35, 0xa3, 0x74, 0x77, 0x46, 0x00, 0x1b, 0x50, 0x88, 0xcf, 0x1d, 0x83, 0xdd, - 0x7a, 0x39, 0xb0, 0x69, 0xad, 0x17, 0x23, 0x6d, 0x41, 0xde, 0xa5, 0xd8, 0xf3, 0x07, 0x38, 0xb9, - 0x97, 0xc3, 0xc9, 0x49, 0xad, 0x18, 0xa5, 0x09, 0xf3, 0x2e, 0xe9, 0xe2, 0x53, 0xe2, 0xda, 0x4e, - 0x37, 0x60, 0xc3, 0x23, 0x96, 0x5e, 0x0e, 0x6d, 0x56, 0x6b, 0x6f, 0x0a, 0xe5, 0x18, 0xf4, 0x21, - 0x80, 0x6a, 0x3e, 0x76, 0x37, 0xe8, 0x98, 0x79, 0x99, 0xd5, 0x6f, 0x5c, 0x98, 0x31, 0xc3, 0x1e, - 0xd5, 0xaf, 0x56, 0x6a, 0xf2, 0xe3, 0x71, 0xd0, 0xb1, 0x32, 0x38, 0x5e, 0xa2, 0x06, 0xa0, 0x88, - 0x11, 0x9b, 0x92, 0x5e, 0xc0, 0x89, 0x8d, 0x5d, 0x97, 0x12, 0xc6, 0xcc, 0xe9, 0x17, 0x26, 0x70, - 0x31, 0x62, 0xc4, 0x92, 0x4a, 0x35, 0xa5, 0x83, 0xd6, 0x61, 0xee, 0xa4, 0xdd, 0xb6, 0xfd, 0xa8, - 0x67, 0x73, 0x1a, 0x31, 0x4e, 0x5c, 0xfb, 0x28, 0x08, 0x99, 0x39, 0x5b, 0x36, 0xd6, 0xf2, 0xd6, - 0xcc, 0x49, 0xbb, 0xbd, 0x1b, 0xf5, 0x5a, 0x8a, 0xd3, 0x08, 0x42, 0x86, 0x7e, 0x6b, 0xc0, 0x4d, - 0xcf, 0xe7, 0x84, 0xfa, 0xb8, 0x1b, 0xef, 0x1c, 0x97, 0xd7, 0x45, 0x69, 0x80, 0x73, 0xbd, 0x65, - 0x60, 0x47, 0x6f, 0xa6, 0x2d, 0x56, 0x25, 0xd9, 0x9a, 0xf7, 0x2e, 0x22, 0xa3, 0xd7, 0xa0, 0xc0, - 0x8e, 0xbd, 0xd0, 0x16, 0x67, 0x12, 0x4d, 0xd5, 0x77, 0xcd, 0xf9, 0xb2, 0xb1, 0x96, 0xb6, 0xf2, - 0x82, 0xfc, 0xed, 0x76, 0xbb, 0x26, 0x89, 0xa8, 0x08, 0xc9, 0xbe, 0x87, 0xcd, 0x05, 0x99, 0x86, - 0x62, 0x89, 0x1e, 0xc2, 0x6c, 0x87, 0xf8, 0x84, 0x62, 0x4e, 0x06, 0x49, 0xe8, 0xb9, 0x66, 0xe1, - 0x85, 0x77, 0x3a, 0x13, 0xab, 0xe9, 0x5c, 0xdb, 0x71, 0xd1, 0xd7, 0xe0, 0x56, 0x48, 0x89, 0x4c, - 0x6e, 0x9b, 0x9c, 0xe8, 0xbb, 0x1a, 0x01, 0x2d, 0x4b, 0x93, 0x16, 0x63, 0x99, 0x6d, 0x2d, 0x32, - 0x04, 0xf8, 0xb3, 0x01, 0x4b, 0xed, 0x80, 0x3e, 0xc3, 0x54, 0x44, 0xa0, 0x47, 0x7c, 0x6e, 0x3b, - 0x84, 0x72, 0xdb, 0x25, 0x1c, 0x7b, 0x5d, 0x66, 0x16, 0x65, 0x2b, 0x6f, 0x5f, 0xef, 0x45, 0x3f, - 0x50, 0x1b, 0x6e, 0xca, 0xfd, 0x36, 0x09, 0xe5, 0x5b, 0x6a, 0xb7, 0xb1, 0xce, 0x6e, 0xb6, 0x2f, - 0x91, 0x42, 0x7f, 0x32, 0x60, 0x85, 0x11, 0x6e, 0x3b, 0x11, 0xa5, 0xd2, 0xe0, 0x0b, 0xec, 0x9e, - 0x91, 0xb7, 0xe9, 0x5d, 0xaf, 0xdd, 0x4d, 0xc2, 0x37, 0xd5, 0x9e, 0xe7, 0x8c, 0xb2, 0x96, 0xd8, - 0xe5, 0x4c, 0xf4, 0x39, 0x40, 0x21, 0x0d, 0x4e, 0x4e, 0xed, 0x8d, 0xbb, 0x77, 0xc5, 0x8e, 0xdc, - 0xf3, 0x23, 0x62, 0x22, 0xe9, 0x9c, 0xa2, 0xe4, 0x6c, 0xdc, 0xbd, 0xbb, 0xa9, 0xe9, 0x88, 0xc0, - 0x06, 0x25, 0xd2, 0x65, 0x3e, 0xb7, 0xbd, 0xb0, 0x7f, 0xef, 0x4c, 0xfa, 0xd9, 0x98, 0x29, 0x72, - 0x4f, 0x04, 0x9e, 0x2b, 0xd6, 0xf7, 0xcd, 0x39, 0x09, 0x76, 0x67, 0xa0, 0xb8, 0x13, 0xf6, 0xef, - 0x8d, 0x25, 0x60, 0x8d, 0x09, 0xd2, 0x5b, 0x52, 0x65, 0x27, 0xec, 0xdf, 0x47, 0x3f, 0x35, 0xa0, - 0x10, 0x85, 0x1d, 0x8a, 0xdd, 0x78, 0x6a, 0x61, 0xe6, 0x4d, 0x59, 0x2c, 0x9e, 0x5e, 0xef, 0xb5, - 0x1d, 0xa8, 0x4d, 0x74, 0x3e, 0x4d, 0x47, 0xa3, 0x9f, 0x0c, 0xd5, 0x60, 0xda, 0x0f, 0x68, 0x0f, - 0x77, 0xbd, 0x1f, 0x12, 0x3b, 0xc4, 0xfc, 0xc8, 0x5c, 0x7e, 0x61, 0x26, 0xe4, 0x07, 0x1a, 0xfb, - 0x98, 0x1f, 0x95, 0xfe, 0x9d, 0x84, 0x29, 0xdd, 0xc3, 0xd1, 0xaf, 0x0d, 0x98, 0x0e, 0x42, 0xa2, - 0xaa, 0xa4, 0x6a, 0x81, 0x6a, 0x1c, 0x75, 0x3e, 0x91, 0x99, 0xa1, 0xb2, 0x17, 0xef, 0x25, 0x7a, - 0xeb, 0x58, 0x00, 0xe7, 0x83, 0x51, 0x16, 0xfa, 0x02, 0x98, 0x67, 0x5b, 0x6e, 0x3b, 0xa0, 0x36, - 0xc7, 0x1d, 0x66, 0x4e, 0x94, 0x93, 0x6b, 0x19, 0x6b, 0x9e, 0x8e, 0xf5, 0xd0, 0x07, 0x01, 0x6d, - 0xe1, 0x0e, 0x43, 0x5f, 0x81, 0x82, 0x8e, 0x70, 0x86, 0x7b, 0x61, 0x57, 0x4c, 0x41, 0x6a, 0x6e, - 0x9d, 0xd5, 0x27, 0x12, 0x33, 0x77, 0x65, 0x5f, 0x3d, 0x29, 0xac, 0x69, 0x25, 0xdb, 0xd4, 0xa2, - 0x42, 0x9b, 0x62, 0xdf, 0x0d, 0x7a, 0x43, 0xed, 0xd4, 0x15, 0xda, 0x4a, 0x76, 0xa0, 0xfd, 0x55, - 0x28, 0x06, 0x7d, 0x42, 0x71, 0xb7, 0x3b, 0x54, 0x9f, 0xbc, 0x5c, 0xbd, 0xa0, 0x85, 0x07, 0xfa, - 0x26, 0x4c, 0xf5, 0x09, 0x3d, 0x0c, 0x18, 0x91, 0x43, 0x5f, 0xda, 0x8a, 0x3f, 0x57, 0x2b, 0x90, - 0x1f, 0xbb, 0x3a, 0x94, 0x85, 0xa9, 0x9d, 0xdd, 0x6f, 0x58, 0xdb, 0xcd, 0x66, 0x31, 0x81, 0x00, - 0x6e, 0x6c, 0xab, 0xb5, 0x51, 0x4a, 0xfd, 0xec, 0xf7, 0xcb, 0x89, 0xd2, 0x97, 0x60, 0xfe, 0xc2, - 0xfa, 0x8c, 0x3e, 0x03, 0xb9, 0xc8, 0xf7, 0x4e, 0x6c, 0x16, 0x38, 0xc7, 0x84, 0x33, 0xe9, 0xed, - 0xb4, 0x95, 0x15, 0xb4, 0xa6, 0x22, 0x95, 0xfe, 0x60, 0xc0, 0xd2, 0x15, 0xb9, 0x8b, 0xee, 0xc1, - 0x14, 0x8b, 0x0e, 0xbf, 0x4f, 0x1c, 0x2e, 0xb5, 0xaf, 0x8e, 0xbd, 0x58, 0x14, 0x21, 0x48, 0x89, - 0x92, 0x23, 0x9d, 0x91, 0xb6, 0xe4, 0x1a, 0xcd, 0xc1, 0xa4, 0x73, 0x84, 0x3d, 0x5f, 0x9f, 0x56, - 0x7d, 0x88, 0x1e, 0xe0, 0xfa, 0x4c, 0xde, 0x7b, 0xda, 0x12, 0x4b, 0x41, 0x89, 0xa8, 0x27, 0xaf, - 0x32, 0x6d, 0x89, 0xe5, 0xc3, 0x54, 0x7a, 0xa2, 0x98, 0x2c, 0xfd, 0xd5, 0x80, 0xfc, 0x58, 0xba, - 0xc8, 0xe3, 0xe9, 0x24, 0x1d, 0xbc, 0xad, 0x32, 0x56, 0x56, 0xd3, 0xe4, 0xc3, 0xe7, 0x3b, 0x30, - 0x15, 0x8f, 0xf0, 0x13, 0xd7, 0x36, 0xc2, 0xc7, 0x90, 0xe2, 0x72, 0x88, 0x8f, 0x0f, 0xbb, 0xc4, - 0xd5, 0x61, 0x77, 0xe5, 0xe5, 0x68, 0xd1, 0xd5, 0x0d, 0xc8, 0x0c, 0x1e, 0x6c, 0x28, 0x0d, 0xa9, - 0xda, 0x41, 0x6b, 0xaf, 0x98, 0x40, 0x19, 0x98, 0x6c, 0xb4, 0x5a, 0xfb, 0x1b, 0x45, 0x23, 0x5e, - 0x56, 0x8b, 0x13, 0xca, 0xc3, 0xab, 0x3f, 0x02, 0xf3, 0xb2, 0xc6, 0x80, 0x72, 0x90, 0x6e, 0xd6, - 0x76, 0x77, 0x5a, 0x3b, 0xef, 0x6c, 0x17, 0x13, 0xa8, 0x08, 0xb9, 0x07, 0x7b, 0xd6, 0x93, 0x9a, - 0xb5, 0x65, 0xef, 0xed, 0x3e, 0x7e, 0xbb, 0x68, 0x20, 0x04, 0xd3, 0xb5, 0xfd, 0xfd, 0xed, 0xdd, - 0x2d, 0x5b, 0x33, 0x8a, 0x13, 0x42, 0x2a, 0xd6, 0xb1, 0x9b, 0xdb, 0xad, 0x62, 0x12, 0xdd, 0x84, - 0xd9, 0xda, 0xe3, 0x27, 0xb5, 0xb7, 0x9b, 0xf6, 0x98, 0x7a, 0x4a, 0x19, 0x50, 0x37, 0xa1, 0xa0, - 0xde, 0x70, 0x2c, 0x24, 0x8e, 0xd7, 0xf6, 0x08, 0x45, 0x93, 0x7f, 0xf9, 0xe8, 0x83, 0xa4, 0xf1, - 0x30, 0x95, 0x5e, 0x2a, 0xde, 0x5a, 0x7d, 0xcf, 0x80, 0xa4, 0xe5, 0x32, 0xd4, 0x82, 0xfc, 0xd8, - 0xbf, 0x0c, 0x3a, 0x68, 0x56, 0x2e, 0x98, 0xdb, 0x95, 0x13, 0x9b, 0x52, 0xac, 0x3e, 0xfd, 0xe1, - 0x3f, 0x56, 0xe4, 0xd4, 0x3c, 0xf9, 0x73, 0x59, 0x20, 0x72, 0xce, 0x08, 0x17, 0x7d, 0x1e, 0x66, - 0x46, 0x5f, 0x90, 0xaa, 0x74, 0x9d, 0x7b, 0xc4, 0x16, 0x46, 0x5e, 0x8b, 0x22, 0x6d, 0x56, 0x7f, - 0x65, 0xc0, 0xed, 0x91, 0x57, 0xde, 0xd8, 0xeb, 0x92, 0x3d, 0xf6, 0x18, 0x47, 0x14, 0x96, 0x46, - 0xdf, 0x94, 0x1a, 0x3f, 0x16, 0x31, 0x0d, 0x19, 0x32, 0xaf, 0x8d, 0x1b, 0x7f, 0x19, 0xa2, 0x2e, - 0x70, 0xef, 0x19, 0x13, 0x69, 0xc3, 0x5a, 0x64, 0x97, 0xed, 0xbb, 0xfa, 0x3e, 0x40, 0x6e, 0xf4, - 0xed, 0x89, 0x6e, 0x43, 0x6a, 0x50, 0x8b, 0xc7, 0x0e, 0x24, 0xc9, 0xe8, 0x17, 0x06, 0xcc, 0x48, - 0x34, 0xfb, 0x98, 0x9c, 0xda, 0x87, 0x91, 0xd7, 0x75, 0x09, 0x95, 0xa7, 0xcf, 0x56, 0x5b, 0xd7, - 0xf1, 0xf8, 0x55, 0x1f, 0x8f, 0xc8, 0x69, 0x5d, 0x61, 0xeb, 0x83, 0x28, 0x47, 0x14, 0xd8, 0x38, - 0x13, 0x3d, 0x85, 0x19, 0xea, 0xc6, 0xc3, 0x66, 0xec, 0xe5, 0xe4, 0xab, 0x79, 0xb9, 0x40, 0x5d, - 0x36, 0x2a, 0x80, 0x7e, 0x67, 0x40, 0xf9, 0x0a, 0x87, 0xd8, 0x5d, 0x8f, 0x71, 0x5d, 0xa3, 0x0f, - 0xae, 0xe1, 0xe8, 0xe7, 0x23, 0xa2, 0x91, 0xb0, 0x6e, 0xb3, 0x2b, 0x43, 0xe6, 0x10, 0x20, 0xb6, - 0xd0, 0x65, 0xba, 0xe0, 0xd7, 0x3e, 0xa6, 0x2d, 0xf2, 0xbf, 0x92, 0x0c, 0x8b, 0x3f, 0x4a, 0xff, - 0x99, 0x84, 0xc2, 0x19, 0xa7, 0xa0, 0x5f, 0x1a, 0x90, 0x69, 0x53, 0xdc, 0xe9, 0x11, 0x9f, 0xc7, - 0x91, 0xe9, 0x7e, 0x12, 0xee, 0xaf, 0x3c, 0xd0, 0xbb, 0x8c, 0x87, 0x83, 0x8a, 0xeb, 0xa1, 0x09, - 0xa5, 0xbf, 0xa7, 0xa0, 0x70, 0x46, 0x54, 0x8c, 0xcc, 0x0b, 0xaa, 0x83, 0xdb, 0x7d, 0x51, 0xf4, - 0xc4, 0xe0, 0x4d, 0xb1, 0xc3, 0x03, 0xaa, 0x0b, 0xc1, 0xe9, 0xff, 0xc3, 0xe2, 0x8a, 0x9a, 0x12, - 0x64, 0xd9, 0xdd, 0x8e, 0x0d, 0x68, 0x24, 0xac, 0xb9, 0xa3, 0x0b, 0xe8, 0xa5, 0x1f, 0x27, 0x61, - 0xee, 0x22, 0x85, 0x17, 0xe5, 0xe5, 0x1b, 0x30, 0x43, 0xba, 0xa4, 0x27, 0x87, 0x0f, 0x12, 0x62, - 0x8a, 0xc5, 0x29, 0x65, 0x51, 0xb2, 0x8a, 0x9a, 0xd1, 0x8c, 0xe9, 0x68, 0x01, 0x26, 0x3d, 0xdf, - 0x25, 0x27, 0x32, 0x53, 0xf2, 0x8d, 0x84, 0xa5, 0x3e, 0x45, 0xc0, 0x4f, 0x69, 0x61, 0x1d, 0xd7, - 0x3f, 0x31, 0x3e, 0xb5, 0x2b, 0xaa, 0x3c, 0xea, 0x6f, 0x2b, 0x5b, 0x1a, 0x09, 0x2b, 0x36, 0xab, - 0xf4, 0x4d, 0xc8, 0x0c, 0xe8, 0xe8, 0x75, 0xc8, 0x0c, 0x0f, 0x7b, 0xee, 0x62, 0x86, 0x3c, 0xb4, - 0x04, 0xc9, 0x63, 0x72, 0x7a, 0xbe, 0x48, 0x0b, 0x6a, 0x7d, 0x1a, 0x72, 0x3a, 0x30, 0x64, 0xe3, - 0xae, 0xe7, 0x21, 0x25, 0x7e, 0x75, 0x4b, 0xa9, 0x2f, 0x42, 0x31, 0x2e, 0x2f, 0x67, 0xba, 0xcd, - 0x6a, 0x04, 0x99, 0x41, 0xce, 0xa0, 0x23, 0x30, 0x87, 0xa9, 0x68, 0x5f, 0x4b, 0xdf, 0x99, 0x1f, - 0x24, 0xe1, 0xa8, 0xd8, 0xea, 0x1f, 0x0d, 0x80, 0xe1, 0x00, 0xf0, 0xa2, 0xc8, 0xd8, 0x80, 0x1b, - 0xfa, 0x2d, 0xae, 0xaa, 0xf4, 0xcd, 0x73, 0x53, 0x41, 0x53, 0xfe, 0x15, 0xdd, 0x48, 0x58, 0x5a, - 0x10, 0x7d, 0x11, 0x72, 0xe2, 0x06, 0xdc, 0xf1, 0xff, 0x48, 0xe7, 0xce, 0x29, 0xd6, 0xfc, 0xd3, - 0x46, 0xc2, 0xca, 0x4a, 0x59, 0x65, 0x61, 0x3d, 0x0f, 0x59, 0x7d, 0x74, 0x41, 0x7d, 0x98, 0x4a, - 0x27, 0x8b, 0xa9, 0x3a, 0xff, 0xf0, 0xf9, 0xb2, 0xf1, 0xb7, 0xe7, 0xcb, 0xc6, 0xbf, 0x9e, 0x2f, - 0x1b, 0xb0, 0xe5, 0x05, 0xea, 0x22, 0xe4, 0x7b, 0xea, 0x15, 0xe3, 0xab, 0x5e, 0xba, 0x70, 0xda, - 0x97, 0xff, 0xb1, 0xed, 0x1b, 0xef, 0x4c, 0xf4, 0xab, 0x87, 0x37, 0xa4, 0x9d, 0x6f, 0xfe, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0x0d, 0xa7, 0x2b, 0x94, 0x0a, 0x19, 0x00, 0x00, + 0xfd, 0x77, 0xc7, 0xce, 0xc4, 0xfe, 0xda, 0x8e, 0x9d, 0xca, 0x63, 0x3a, 0xce, 0x4c, 0xc6, 0x9b, + 0x9f, 0x7e, 0xbb, 0xd1, 0x2e, 0x72, 0x26, 0xde, 0x65, 0x10, 0x0f, 0x01, 0x76, 0x92, 0xc1, 0x99, + 0x99, 0x4d, 0x42, 0xdb, 0x61, 0xd8, 0x5d, 0x50, 0x53, 0xe9, 0x2e, 0x3b, 0x4d, 0xec, 0xee, 0xde, + 0xaa, 0x6a, 0x4f, 0xc2, 0x05, 0xb4, 0x70, 0x40, 0x08, 0xed, 0x01, 0x24, 0x84, 0xc4, 0x05, 0xc1, + 0x81, 0x1b, 0x88, 0x0b, 0x42, 0x9c, 0xf6, 0x84, 0x38, 0x72, 0xe3, 0x08, 0xcc, 0x6d, 0xff, 0x07, + 0x0e, 0xa8, 0x1e, 0xed, 0x47, 0xe2, 0x64, 0x86, 0x99, 0x2c, 0x9c, 0x5c, 0xfd, 0x7d, 0x7c, 0xea, + 0x5b, 0xf5, 0x7d, 0x96, 0xa1, 0x45, 0xfc, 0x7e, 0x70, 0xb6, 0xe1, 0x04, 0x7e, 0xdb, 0xeb, 0x6c, + 0xb4, 0xbd, 0x2e, 0x27, 0x74, 0xc3, 0x27, 0xfc, 0x49, 0x40, 0x4f, 0x36, 0x8e, 0x39, 0x0f, 0x6d, + 0x27, 0xf0, 0x7d, 0xe2, 0x70, 0x2f, 0xf0, 0xed, 0x1e, 0xf6, 0x71, 0x87, 0xd0, 0x8d, 0x7e, 0xf5, + 0x32, 0x56, 0x25, 0xa4, 0x01, 0x0f, 0xd0, 0x3d, 0x89, 0x5a, 0x51, 0xa8, 0x15, 0x85, 0x5a, 0xd1, + 0xa8, 0x95, 0xcb, 0x54, 0xfb, 0xd5, 0xd2, 0xff, 0x2b, 0x6b, 0x70, 0xe8, 0x89, 0x3d, 0x9c, 0x80, + 0x12, 0x6d, 0x99, 0xcd, 0x82, 0x88, 0x3a, 0x44, 0xc1, 0x97, 0xca, 0x17, 0xc5, 0x24, 0xc3, 0x09, + 0xba, 0x5a, 0x62, 0x69, 0x4c, 0x82, 0xba, 0x4c, 0xd3, 0x6f, 0x8e, 0xd1, 0xd9, 0x90, 0x71, 0x77, + 0xd2, 0x3d, 0x60, 0xc7, 0x21, 0x8c, 0x75, 0x83, 0x8e, 0x10, 0x1e, 0x7c, 0x68, 0x0d, 0x53, 0x69, + 0xf0, 0xb3, 0x90, 0x6c, 0x84, 0x84, 0x3a, 0xc4, 0xe7, 0x9a, 0xb3, 0xdc, 0x09, 0x82, 0x4e, 0x57, + 0xdb, 0x74, 0x14, 0xb5, 0x37, 0xb0, 0x7f, 0xa6, 0x59, 0xab, 0xe7, 0x59, 0x6e, 0x44, 0xb1, 0xb8, + 0x05, 0xcd, 0xbf, 0x75, 0x9e, 0xcf, 0x38, 0x8d, 0x1c, 0x7e, 0x99, 0xf6, 0x13, 0x8a, 0xc3, 0x90, + 0xd0, 0xc1, 0xe9, 0xfa, 0xb8, 0xeb, 0xb9, 0x98, 0x93, 0x8d, 0x78, 0xa1, 0x19, 0x0b, 0x9d, 0xa0, + 0x13, 0xc8, 0xe5, 0x86, 0x58, 0x29, 0xea, 0xda, 0xaf, 0x56, 0x61, 0xb1, 0xc1, 0x79, 0xb8, 0x35, + 0xf0, 0xc5, 0xdb, 0xca, 0x15, 0xe8, 0x03, 0x03, 0xc0, 0x09, 0x5c, 0xe2, 0xd8, 0xe2, 0x78, 0xa6, + 0x51, 0x36, 0xd6, 0x67, 0xab, 0x8f, 0x2b, 0x2f, 0xe6, 0xd5, 0xca, 0xc4, 0x3d, 0x2a, 0x5b, 0x02, + 0xbf, 0x75, 0x16, 0x92, 0x3a, 0xfc, 0xe9, 0xe3, 0x8f, 0x92, 0xd3, 0x1f, 0x18, 0x53, 0x45, 0xc3, + 0xca, 0x38, 0x31, 0x19, 0xbd, 0x0e, 0x59, 0xc6, 0x31, 0xb7, 0x43, 0x4a, 0xda, 0xde, 0xa9, 0x39, + 0x55, 0x36, 0xd6, 0x33, 0xf5, 0x8c, 0x90, 0x4d, 0xd1, 0xa9, 0xb2, 0x61, 0x81, 0xe0, 0x1e, 0x48, + 0x26, 0xda, 0x87, 0x24, 0x75, 0x99, 0x99, 0x2c, 0x1b, 0xeb, 0xd9, 0xea, 0xe7, 0x5f, 0xd4, 0x50, + 0xcb, 0x65, 0x8d, 0x84, 0x25, 0x90, 0xd0, 0x0e, 0xe4, 0x68, 0x10, 0x71, 0x62, 0x2b, 0x10, 0x33, + 0x25, 0x91, 0xcb, 0x1a, 0x19, 0x87, 0x9e, 0x94, 0x17, 0x12, 0x5b, 0x52, 0x40, 0xbb, 0xb1, 0x91, + 0xb0, 0xb2, 0x74, 0x48, 0x45, 0x27, 0x90, 0x67, 0x4e, 0x10, 0x12, 0xd7, 0x96, 0x54, 0x66, 0xde, + 0x91, 0x38, 0xdb, 0x2f, 0x6a, 0x61, 0x53, 0x82, 0xc9, 0x7d, 0x85, 0xa9, 0x39, 0x36, 0xf2, 0x8d, + 0x08, 0xe4, 0xa4, 0xaa, 0x82, 0x63, 0xe6, 0x74, 0x39, 0xb9, 0x9e, 0xad, 0xd6, 0x5f, 0xc6, 0x6d, + 0xf7, 0xa5, 0xb4, 0x95, 0x3d, 0x1e, 0xac, 0x19, 0xfa, 0x32, 0xcc, 0x62, 0xd7, 0xb5, 0x23, 0x46, + 0xa8, 0x8d, 0x3b, 0xc4, 0xe7, 0xe6, 0x0d, 0x79, 0xa8, 0x52, 0x45, 0x85, 0x67, 0x25, 0x0e, 0xcf, + 0x4a, 0x3d, 0x08, 0xba, 0x5f, 0xc3, 0xdd, 0x88, 0x58, 0x39, 0xec, 0xba, 0x87, 0x8c, 0xd0, 0x9a, + 0x90, 0x47, 0x01, 0xcc, 0x70, 0x8a, 0x1d, 0xcf, 0xef, 0x98, 0x33, 0x52, 0xf5, 0xf0, 0x7a, 0x43, + 0xab, 0xa5, 0xc0, 0xad, 0x78, 0x17, 0xf4, 0x1e, 0x2c, 0x4a, 0x90, 0xb8, 0x4a, 0xd8, 0x41, 0x28, + 0xe4, 0x99, 0x99, 0x96, 0xdb, 0xbf, 0x36, 0xee, 0x56, 0x51, 0x50, 0x24, 0xf2, 0xe6, 0x81, 0x96, + 0xdf, 0x57, 0xe2, 0xd6, 0xbc, 0x40, 0x39, 0x47, 0x44, 0xdf, 0x84, 0x25, 0x41, 0xae, 0x5e, 0x44, + 0xcf, 0x5c, 0x89, 0x5e, 0x3d, 0x8f, 0xbe, 0x70, 0x3c, 0x81, 0x8a, 0xee, 0x40, 0x96, 0x11, 0xda, + 0x27, 0xd4, 0xf6, 0x71, 0x8f, 0x98, 0x20, 0xd2, 0xc0, 0x02, 0x45, 0xda, 0xc3, 0x3d, 0x82, 0x08, + 0x2c, 0xf5, 0xf0, 0xa9, 0x4d, 0xc9, 0xfb, 0x11, 0x61, 0xdc, 0x3e, 0x26, 0xd8, 0x25, 0x94, 0xd9, + 0x27, 0x47, 0xe6, 0x6d, 0xb9, 0xff, 0xad, 0x0b, 0x7e, 0x39, 0xdc, 0xf5, 0xf9, 0x9b, 0x55, 0xe9, + 0x99, 0x3a, 0x92, 0x09, 0xf5, 0xfa, 0x54, 0x39, 0xa1, 0x17, 0xe6, 0xb7, 0xac, 0xf9, 0x1e, 0x3e, + 0xb5, 0x14, 0x5c, 0x43, 0xa1, 0x3d, 0x3c, 0x42, 0x75, 0xc8, 0x79, 0x6e, 0x97, 0xd8, 0xdc, 0xeb, + 0x91, 0x20, 0xe2, 0x66, 0x56, 0x82, 0x2f, 0x5f, 0x00, 0xdf, 0xd6, 0xa9, 0x50, 0x4f, 0xfd, 0xfc, + 0xef, 0x77, 0x0c, 0x2b, 0x2b, 0x94, 0x5a, 0x4a, 0x07, 0xed, 0xc3, 0x3c, 0xe3, 0x94, 0xe0, 0x9e, + 0x3d, 0x06, 0x65, 0x3e, 0x1f, 0xd4, 0x9c, 0xd2, 0xdd, 0x1d, 0x01, 0x6c, 0x40, 0x21, 0x3e, 0x77, + 0x0c, 0x76, 0xeb, 0xf9, 0xc0, 0x66, 0xb5, 0x5e, 0x8c, 0xb4, 0x0d, 0x79, 0x97, 0x62, 0xcf, 0x1f, + 0xe0, 0xe4, 0x9e, 0x0f, 0x27, 0x27, 0xb5, 0x62, 0x94, 0x26, 0x2c, 0xba, 0xa4, 0x8b, 0xcf, 0x88, + 0x6b, 0x3b, 0xdd, 0x80, 0x0d, 0x8f, 0x58, 0x7a, 0x3e, 0xb4, 0x79, 0xad, 0xbd, 0x25, 0x94, 0x63, + 0xd0, 0x07, 0x00, 0xaa, 0xf9, 0xd8, 0xdd, 0xa0, 0x63, 0xe6, 0x65, 0x56, 0xbf, 0x31, 0x31, 0x63, + 0x86, 0x3d, 0xaa, 0x5f, 0xad, 0xd4, 0xe4, 0xc7, 0xa3, 0xa0, 0x63, 0x65, 0x70, 0xbc, 0x44, 0x0d, + 0x40, 0x11, 0x23, 0x36, 0x25, 0xbd, 0x80, 0x13, 0x1b, 0xbb, 0x2e, 0x25, 0x8c, 0x99, 0xb3, 0xcf, + 0x4c, 0xe0, 0x62, 0xc4, 0x88, 0x25, 0x95, 0x6a, 0x4a, 0x07, 0x6d, 0xc0, 0xc2, 0x69, 0xbb, 0x6d, + 0xfb, 0x51, 0xcf, 0xe6, 0x34, 0x62, 0x9c, 0xb8, 0xf6, 0x71, 0x10, 0x32, 0x73, 0xbe, 0x6c, 0xac, + 0xe7, 0xad, 0xb9, 0xd3, 0x76, 0x7b, 0x2f, 0xea, 0xb5, 0x14, 0xa7, 0x11, 0x84, 0x0c, 0xfd, 0xc2, + 0x80, 0x9b, 0x9e, 0xcf, 0x09, 0xf5, 0x71, 0x37, 0xde, 0x39, 0x2e, 0xaf, 0xcb, 0xd2, 0x00, 0xe7, + 0x7a, 0xcb, 0xc0, 0xae, 0xde, 0x4c, 0x5b, 0xac, 0x4a, 0xb2, 0xb5, 0xe8, 0x4d, 0x22, 0xa3, 0x57, + 0xa1, 0xc0, 0x4e, 0xbc, 0xd0, 0x16, 0x67, 0x12, 0x4d, 0xd5, 0x77, 0xcd, 0xc5, 0xb2, 0xb1, 0x9e, + 0xb6, 0xf2, 0x82, 0xfc, 0xf5, 0x76, 0xbb, 0x26, 0x89, 0xa8, 0x08, 0xc9, 0xbe, 0x87, 0xcd, 0x25, + 0x99, 0x86, 0x62, 0x89, 0x1e, 0xc0, 0x7c, 0x87, 0xf8, 0x84, 0x62, 0x4e, 0x06, 0x49, 0xe8, 0xb9, + 0x66, 0xe1, 0x99, 0x77, 0x3a, 0x17, 0xab, 0xe9, 0x5c, 0xdb, 0x75, 0xd1, 0x97, 0xe0, 0x56, 0x48, + 0x89, 0x4c, 0x6e, 0x9b, 0x9c, 0xea, 0xbb, 0x1a, 0x01, 0x2d, 0x4b, 0x93, 0x96, 0x63, 0x99, 0x1d, + 0x2d, 0x32, 0x04, 0xf8, 0xbd, 0x01, 0x2b, 0xed, 0x80, 0x3e, 0xc1, 0x54, 0x44, 0xa0, 0x47, 0x7c, + 0x6e, 0x3b, 0x84, 0x72, 0xdb, 0x25, 0x1c, 0x7b, 0x5d, 0x66, 0x16, 0x65, 0x2b, 0x6f, 0x5f, 0xef, + 0x45, 0xdf, 0x57, 0x1b, 0x6e, 0xc9, 0xfd, 0xb6, 0x08, 0xe5, 0xdb, 0x6a, 0xb7, 0xb1, 0xce, 0x6e, + 0xb6, 0x2f, 0x91, 0x42, 0xbf, 0x33, 0xe0, 0x0e, 0x23, 0xdc, 0x76, 0x22, 0x4a, 0xa5, 0xc1, 0x13, + 0xec, 0x9e, 0x93, 0xb7, 0xe9, 0x5d, 0xaf, 0xdd, 0x4d, 0xc2, 0xb7, 0xd4, 0x9e, 0x17, 0x8c, 0xb2, + 0x56, 0xd8, 0xe5, 0x4c, 0xf4, 0x29, 0x40, 0x21, 0x0d, 0x4e, 0xcf, 0xec, 0xcd, 0xbb, 0x77, 0xc5, + 0x8e, 0xdc, 0xf3, 0x23, 0x62, 0x22, 0xe9, 0x9c, 0xa2, 0xe4, 0x6c, 0xde, 0xbd, 0xbb, 0xa5, 0xe9, + 0x88, 0xc0, 0x26, 0x25, 0xd2, 0x65, 0x3e, 0xb7, 0xbd, 0xb0, 0xff, 0xd6, 0xb9, 0xf4, 0xb3, 0x31, + 0x53, 0xe4, 0x9e, 0x08, 0x3c, 0x57, 0xac, 0xef, 0x99, 0x0b, 0x12, 0xec, 0xf5, 0x81, 0xe2, 0x6e, + 0xd8, 0x7f, 0x6b, 0x2c, 0x01, 0x6b, 0x4c, 0x90, 0xde, 0x96, 0x2a, 0xbb, 0x61, 0xff, 0x1e, 0xfa, + 0x81, 0x01, 0x85, 0x28, 0xec, 0x50, 0xec, 0xc6, 0x53, 0x0b, 0x33, 0x6f, 0xca, 0x62, 0xf1, 0xde, + 0xf5, 0x5e, 0xdb, 0xa1, 0xda, 0x44, 0xe7, 0xd3, 0x6c, 0x34, 0xfa, 0xc9, 0x50, 0x0d, 0x66, 0xfd, + 0x80, 0xf6, 0x70, 0xd7, 0xfb, 0x0e, 0xb1, 0x43, 0xcc, 0x8f, 0xcd, 0xd5, 0x67, 0x66, 0x42, 0x7e, + 0xa0, 0x71, 0x80, 0xf9, 0x31, 0xfa, 0x3f, 0xc8, 0xf7, 0x08, 0xed, 0x10, 0x9b, 0x75, 0x31, 0x3b, + 0x26, 0xcc, 0x7c, 0x45, 0x5e, 0x46, 0x4e, 0x12, 0x9b, 0x8a, 0x56, 0xfa, 0x67, 0x12, 0x66, 0x74, + 0xa3, 0x47, 0x3f, 0x33, 0x60, 0x36, 0x08, 0x89, 0x2a, 0xa5, 0xaa, 0x4f, 0xaa, 0x99, 0xd5, 0xf9, + 0x44, 0x06, 0x8b, 0xca, 0x7e, 0xbc, 0x97, 0x68, 0xc0, 0x63, 0x51, 0x9e, 0x0f, 0x46, 0x59, 0xe8, + 0x33, 0x60, 0x9e, 0xef, 0xcb, 0xed, 0x80, 0xda, 0x1c, 0x77, 0x98, 0x39, 0x55, 0x4e, 0xae, 0x67, + 0xac, 0x45, 0x3a, 0xd6, 0x68, 0xef, 0x07, 0xb4, 0x85, 0x3b, 0x0c, 0x7d, 0x01, 0x0a, 0x3a, 0x0d, + 0x18, 0xee, 0x85, 0x5d, 0x31, 0x2a, 0xa9, 0xe1, 0x76, 0x5e, 0x9f, 0x48, 0x0c, 0xe6, 0x95, 0x03, + 0xf5, 0xee, 0xb0, 0x66, 0x95, 0x6c, 0x53, 0x8b, 0x0a, 0x6d, 0x8a, 0x7d, 0x37, 0xe8, 0x0d, 0xb5, + 0x53, 0x57, 0x68, 0x2b, 0xd9, 0x81, 0xf6, 0x17, 0xa1, 0x18, 0xf4, 0x09, 0xc5, 0xdd, 0xee, 0x50, + 0x7d, 0xfa, 0x72, 0xf5, 0x82, 0x16, 0x1e, 0xe8, 0x9b, 0x30, 0xd3, 0x27, 0xf4, 0x28, 0x60, 0x44, + 0x4e, 0x86, 0x69, 0x2b, 0xfe, 0x5c, 0xab, 0x40, 0x7e, 0xec, 0xea, 0x50, 0x16, 0x66, 0x76, 0xf7, + 0xbe, 0x62, 0xed, 0x34, 0x9b, 0xc5, 0x04, 0x02, 0xb8, 0xb1, 0xa3, 0xd6, 0x46, 0x29, 0xf5, 0xc3, + 0x5f, 0xaf, 0x26, 0x4a, 0x9f, 0x83, 0xc5, 0x89, 0x45, 0x1c, 0xbd, 0x02, 0xb9, 0xc8, 0xf7, 0x4e, + 0x6d, 0x16, 0x38, 0x27, 0x84, 0x33, 0xe9, 0xed, 0xb4, 0x95, 0x15, 0xb4, 0xa6, 0x22, 0x95, 0x7e, + 0x63, 0xc0, 0xca, 0x15, 0x09, 0x8e, 0xde, 0x82, 0x19, 0x16, 0x1d, 0x7d, 0x9b, 0x38, 0x5c, 0x6a, + 0x5f, 0x1d, 0xa0, 0xb1, 0x28, 0x42, 0x90, 0x12, 0x75, 0x49, 0x3a, 0x23, 0x6d, 0xc9, 0x35, 0x5a, + 0x80, 0x69, 0xe7, 0x18, 0x7b, 0xbe, 0x3e, 0xad, 0xfa, 0x10, 0x8d, 0xc2, 0xf5, 0x99, 0xbc, 0xf7, + 0xb4, 0x25, 0x96, 0x82, 0x12, 0x51, 0x4f, 0x5e, 0x65, 0xda, 0x12, 0xcb, 0x07, 0xa9, 0xf4, 0x54, + 0x31, 0x59, 0xfa, 0xb3, 0x01, 0xf9, 0xb1, 0x9c, 0x92, 0xc7, 0xd3, 0x99, 0x3c, 0x78, 0x80, 0x65, + 0xac, 0xac, 0xa6, 0xc9, 0xd7, 0xd1, 0x37, 0x60, 0x26, 0x9e, 0xf3, 0xa7, 0xae, 0x6d, 0xce, 0x8f, + 0x21, 0xc5, 0xe5, 0x10, 0x1f, 0x1f, 0x75, 0x89, 0xab, 0xc3, 0xee, 0xca, 0xcb, 0xd1, 0xa2, 0x6b, + 0x9b, 0x90, 0x19, 0xbc, 0xea, 0x50, 0x1a, 0x52, 0xb5, 0xc3, 0xd6, 0x7e, 0x31, 0x81, 0x32, 0x30, + 0xdd, 0x68, 0xb5, 0x0e, 0x36, 0x8b, 0x46, 0xbc, 0xac, 0x16, 0xa7, 0x94, 0x87, 0xd7, 0xbe, 0x0b, + 0xe6, 0x65, 0xdd, 0x03, 0xe5, 0x20, 0xdd, 0xac, 0xed, 0xed, 0xb6, 0x76, 0xdf, 0xdd, 0x29, 0x26, + 0x50, 0x11, 0x72, 0xf7, 0xf7, 0xad, 0xc7, 0x35, 0x6b, 0xdb, 0xde, 0xdf, 0x7b, 0xf4, 0x4e, 0xd1, + 0x40, 0x08, 0x66, 0x6b, 0x07, 0x07, 0x3b, 0x7b, 0xdb, 0xb6, 0x66, 0x14, 0xa7, 0x84, 0x54, 0xac, + 0x63, 0x37, 0x77, 0x5a, 0xc5, 0x24, 0xba, 0x09, 0xf3, 0xb5, 0x47, 0x8f, 0x6b, 0xef, 0x34, 0xed, + 0x31, 0xf5, 0x94, 0x32, 0xa0, 0x6e, 0x42, 0x41, 0x3d, 0xf4, 0x58, 0x48, 0x1c, 0xaf, 0xed, 0x11, + 0x8a, 0xa6, 0xff, 0xf8, 0xf1, 0x47, 0x49, 0xe3, 0x41, 0x2a, 0xbd, 0x52, 0xbc, 0xb5, 0xf6, 0xa1, + 0x01, 0x49, 0xcb, 0x65, 0xe8, 0x00, 0xf2, 0x63, 0x7f, 0x45, 0xe8, 0xa0, 0xb9, 0x33, 0x61, 0xb8, + 0x57, 0x4e, 0x6c, 0x4a, 0x31, 0x5d, 0x1c, 0x7e, 0x24, 0x8b, 0x43, 0xce, 0x19, 0xe1, 0xa0, 0x4f, + 0xc3, 0xdc, 0xe8, 0x13, 0x53, 0x95, 0xad, 0x0b, 0xaf, 0xdc, 0xc2, 0xc8, 0x73, 0x52, 0xa4, 0xcc, + 0xda, 0x4f, 0x0d, 0xb8, 0x3d, 0xf2, 0x0c, 0x1c, 0x7b, 0x7e, 0xb2, 0x47, 0x1e, 0xe3, 0x88, 0xc2, + 0xca, 0xe8, 0xa3, 0x53, 0xe3, 0xc7, 0x22, 0xa6, 0x21, 0xc3, 0xe5, 0xd5, 0x71, 0xc3, 0x2f, 0x43, + 0xd4, 0xf6, 0xff, 0xc4, 0x98, 0x4a, 0x1b, 0xd6, 0x32, 0xbb, 0x6c, 0xdf, 0xb5, 0x3f, 0x00, 0xe4, + 0x46, 0x1f, 0xa7, 0xe8, 0x36, 0xa4, 0x06, 0x75, 0x78, 0xec, 0x40, 0x92, 0x8c, 0x7e, 0x6c, 0xc0, + 0x9c, 0x44, 0xb3, 0x4f, 0xc8, 0x99, 0x7d, 0x14, 0x79, 0x5d, 0x97, 0x50, 0x79, 0xfa, 0x6c, 0xb5, + 0x75, 0x1d, 0xaf, 0x63, 0xf5, 0xf1, 0x90, 0x9c, 0xd5, 0x15, 0xf6, 0x98, 0x23, 0x0a, 0x6c, 0x9c, + 0x89, 0x1e, 0xc3, 0x1c, 0x75, 0xe3, 0x69, 0x34, 0xf6, 0x70, 0xf2, 0x3f, 0xf7, 0x70, 0x81, 0xba, + 0x6c, 0x94, 0x89, 0x7e, 0x69, 0x40, 0xf9, 0x0a, 0x67, 0xd8, 0x5d, 0x8f, 0x71, 0x5d, 0x9b, 0x0f, + 0xaf, 0xe1, 0xd8, 0x17, 0xa3, 0xa1, 0x91, 0xb0, 0x6e, 0xb3, 0x2b, 0xc3, 0xe5, 0x08, 0x20, 0xb6, + 0xd0, 0x65, 0xba, 0xd0, 0xd7, 0x5e, 0xd2, 0x16, 0xf9, 0x47, 0x4a, 0x86, 0xc5, 0x1f, 0xa5, 0x7f, + 0x4d, 0x43, 0xe1, 0x9c, 0x43, 0xd0, 0x87, 0x06, 0x64, 0xda, 0x14, 0x77, 0x7a, 0xc4, 0xe7, 0x71, + 0x54, 0xba, 0x9f, 0x84, 0xeb, 0x2b, 0xf7, 0xf5, 0x2e, 0xe3, 0xa1, 0xa0, 0x62, 0x7a, 0x68, 0x42, + 0xe9, 0x6f, 0x29, 0x28, 0x9c, 0x13, 0x15, 0xf3, 0xf4, 0x92, 0xea, 0xdc, 0x76, 0x5f, 0x14, 0x3b, + 0x31, 0x95, 0x53, 0xec, 0xf0, 0x80, 0xea, 0x02, 0x70, 0xf6, 0xdf, 0xb0, 0xb8, 0xa2, 0xa6, 0x03, + 0x59, 0x6e, 0x77, 0x62, 0x03, 0x1a, 0x09, 0x6b, 0xe1, 0x78, 0x02, 0xbd, 0xf4, 0xbd, 0x24, 0x2c, + 0x4c, 0x52, 0x78, 0x56, 0x4e, 0xbe, 0x01, 0x73, 0xa4, 0x4b, 0x7a, 0x72, 0xe8, 0x20, 0x21, 0xa6, + 0x58, 0x9c, 0x52, 0x16, 0x24, 0xab, 0xa8, 0x19, 0xcd, 0x98, 0x8e, 0x96, 0x60, 0xda, 0xf3, 0x5d, + 0x72, 0x2a, 0xb3, 0x24, 0xdf, 0x48, 0x58, 0xea, 0x53, 0x04, 0xfc, 0x8c, 0x16, 0xd6, 0x71, 0xfd, + 0x7d, 0xe3, 0x7f, 0x76, 0x45, 0x95, 0x87, 0xfd, 0x1d, 0x65, 0x4b, 0x23, 0x61, 0xc5, 0x66, 0x95, + 0xbe, 0x0a, 0x99, 0x01, 0x1d, 0xbd, 0x06, 0x99, 0xe1, 0x61, 0x2f, 0x5c, 0xcc, 0x90, 0x87, 0x56, + 0x20, 0x79, 0x42, 0xce, 0x2e, 0x16, 0x68, 0x41, 0xad, 0xcf, 0x42, 0x4e, 0x07, 0x86, 0x6c, 0xd8, + 0xf5, 0x3c, 0xa4, 0xc4, 0xaf, 0x6e, 0x25, 0xf5, 0x65, 0x28, 0xc6, 0xa5, 0xe5, 0x5c, 0x97, 0x59, + 0x7b, 0x1f, 0x32, 0x83, 0x9c, 0x41, 0x2e, 0x98, 0xc3, 0x54, 0xb4, 0x5f, 0xba, 0xdf, 0x2c, 0x0e, + 0x12, 0x70, 0x54, 0x64, 0xed, 0xb7, 0x06, 0xc0, 0xb0, 0xe9, 0x3f, 0x2b, 0x2a, 0x36, 0xe1, 0x86, + 0x7e, 0xa4, 0xab, 0xea, 0x7c, 0xf3, 0xc2, 0x24, 0xd0, 0x94, 0xff, 0x51, 0x37, 0x12, 0x96, 0x16, + 0x44, 0x9f, 0x85, 0x9c, 0x38, 0xbd, 0x3b, 0xfe, 0xe7, 0xe9, 0xc2, 0x05, 0xc5, 0x9a, 0x7f, 0xd6, + 0x48, 0x58, 0x59, 0x29, 0xab, 0x2c, 0xac, 0xe7, 0x21, 0xab, 0x8f, 0x2d, 0xa8, 0x0f, 0x52, 0xe9, + 0x64, 0x31, 0x55, 0xe7, 0x7f, 0x79, 0xba, 0x6a, 0xfc, 0xf5, 0xe9, 0xaa, 0xf1, 0x8f, 0xa7, 0xab, + 0x06, 0x6c, 0x7b, 0x81, 0xba, 0x04, 0xf9, 0xd0, 0x7a, 0xc1, 0xd8, 0xaa, 0x97, 0x26, 0x4e, 0xf8, + 0xf2, 0xcf, 0xb7, 0x03, 0xe3, 0xdd, 0xa9, 0x7e, 0xf5, 0xe8, 0x86, 0xb4, 0xf3, 0xcd, 0x7f, 0x07, + 0x00, 0x00, 0xff, 0xff, 0xf1, 0x99, 0x89, 0x02, 0x23, 0x19, 0x00, 0x00, } func (m *HttpConnectionManager) Marshal() (dAtA []byte, err error) { @@ -2496,6 +2508,18 @@ func (m *HttpConnectionManager) MarshalTo(dAtA []byte) (int, error) { } i++ } + if m.MergeSlashes { + dAtA[i] = 0x88 + i++ + dAtA[i] = 0x2 + i++ + if m.MergeSlashes { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2793,14 +2817,16 @@ func (m *Rds) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintHttpConnectionManager(dAtA, i, uint64(m.ConfigSource.Size())) - n25, err := m.ConfigSource.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.ConfigSource != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintHttpConnectionManager(dAtA, i, uint64(m.ConfigSource.Size())) + n25, err := m.ConfigSource.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n25 } - i += n25 if len(m.RouteConfigName) > 0 { dAtA[i] = 0x12 i++ @@ -2877,14 +2903,16 @@ func (m *ScopedRoutes) MarshalTo(dAtA []byte) (int, error) { } i += n26 } - dAtA[i] = 0x1a - i++ - i = encodeVarintHttpConnectionManager(dAtA, i, uint64(m.RdsConfigSource.Size())) - n27, err := m.RdsConfigSource.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.RdsConfigSource != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintHttpConnectionManager(dAtA, i, uint64(m.RdsConfigSource.Size())) + n27, err := m.RdsConfigSource.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n27 } - i += n27 if m.ConfigSpecifier != nil { nn28, err := m.ConfigSpecifier.MarshalTo(dAtA[i:]) if err != nil { @@ -3110,14 +3138,16 @@ func (m *ScopedRds) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintHttpConnectionManager(dAtA, i, uint64(m.ScopedRdsConfigSource.Size())) - n35, err := m.ScopedRdsConfigSource.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.ScopedRdsConfigSource != nil { + dAtA[i] = 0xa + i++ + i = encodeVarintHttpConnectionManager(dAtA, i, uint64(m.ScopedRdsConfigSource.Size())) + n35, err := m.ScopedRdsConfigSource.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n35 } - i += n35 if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -3315,6 +3345,9 @@ func (m *HttpConnectionManager) Size() (n int) { if m.PreserveExternalRequestId { n += 3 } + if m.MergeSlashes { + n += 3 + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3468,8 +3501,10 @@ func (m *Rds) Size() (n int) { } var l int _ = l - l = m.ConfigSource.Size() - n += 1 + l + sovHttpConnectionManager(uint64(l)) + if m.ConfigSource != nil { + l = m.ConfigSource.Size() + n += 1 + l + sovHttpConnectionManager(uint64(l)) + } l = len(m.RouteConfigName) if l > 0 { n += 1 + l + sovHttpConnectionManager(uint64(l)) @@ -3512,8 +3547,10 @@ func (m *ScopedRoutes) Size() (n int) { l = m.ScopeKeyBuilder.Size() n += 1 + l + sovHttpConnectionManager(uint64(l)) } - l = m.RdsConfigSource.Size() - n += 1 + l + sovHttpConnectionManager(uint64(l)) + if m.RdsConfigSource != nil { + l = m.RdsConfigSource.Size() + n += 1 + l + sovHttpConnectionManager(uint64(l)) + } if m.ConfigSpecifier != nil { n += m.ConfigSpecifier.Size() } @@ -3662,8 +3699,10 @@ func (m *ScopedRds) Size() (n int) { } var l int _ = l - l = m.ScopedRdsConfigSource.Size() - n += 1 + l + sovHttpConnectionManager(uint64(l)) + if m.ScopedRdsConfigSource != nil { + l = m.ScopedRdsConfigSource.Size() + n += 1 + l + sovHttpConnectionManager(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4736,6 +4775,26 @@ func (m *HttpConnectionManager) Unmarshal(dAtA []byte) error { } } m.PreserveExternalRequestId = bool(v != 0) + case 33: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MergeSlashes", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowHttpConnectionManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.MergeSlashes = bool(v != 0) default: iNdEx = preIndex skippy, err := skipHttpConnectionManager(dAtA[iNdEx:]) @@ -5452,6 +5511,9 @@ func (m *Rds) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.ConfigSource == nil { + m.ConfigSource = &core.ConfigSource{} + } if err := m.ConfigSource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5727,6 +5789,9 @@ func (m *ScopedRoutes) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.RdsConfigSource == nil { + m.RdsConfigSource = &core.ConfigSource{} + } if err := m.RdsConfigSource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -6352,6 +6417,9 @@ func (m *ScopedRds) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.ScopedRdsConfigSource == nil { + m.ScopedRdsConfigSource = &core.ConfigSource{} + } if err := m.ScopedRdsConfigSource.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go index 557c888f1f66..9c85f2c5f2a5 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go @@ -58,79 +58,54 @@ func (m *HttpConnectionManager) Validate() error { for idx, item := range m.GetHttpFilters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: fmt.Sprintf("HttpFilters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetAddUserAgent() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return HttpConnectionManagerValidationError{ - field: "AddUserAgent", + field: fmt.Sprintf("HttpFilters[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetTracing() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + } - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "Tracing", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAddUserAgent()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "AddUserAgent", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHttpProtocolOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "HttpProtocolOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTracing()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "Tracing", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetHttp2ProtocolOptions() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetHttpProtocolOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "HttpProtocolOptions", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "Http2ProtocolOptions", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttp2ProtocolOptions()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "Http2ProtocolOptions", + reason: "embedded message failed validation", + cause: err, } } } @@ -148,77 +123,52 @@ func (m *HttpConnectionManager) Validate() error { } - { - tmp := m.GetIdleTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "IdleTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetIdleTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "IdleTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetStreamIdleTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "StreamIdleTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStreamIdleTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "StreamIdleTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRequestTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "RequestTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "RequestTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDrainTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "DrainTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDrainTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "DrainTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDelayedCloseTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "DelayedCloseTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDelayedCloseTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "DelayedCloseTimeout", + reason: "embedded message failed validation", + cause: err, } } } @@ -226,51 +176,36 @@ func (m *HttpConnectionManager) Validate() error { for idx, item := range m.GetAccessLog() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: fmt.Sprintf("AccessLog[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: fmt.Sprintf("AccessLog[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetUseRemoteAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "UseRemoteAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUseRemoteAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "UseRemoteAddress", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for XffNumTrustedHops - { - tmp := m.GetInternalAddressConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "InternalAddressConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetInternalAddressConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "InternalAddressConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -279,17 +214,12 @@ func (m *HttpConnectionManager) Validate() error { // no validation rules for Via - { - tmp := m.GetGenerateRequestId() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "GenerateRequestId", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGenerateRequestId()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "GenerateRequestId", + reason: "embedded message failed validation", + cause: err, } } } @@ -303,17 +233,12 @@ func (m *HttpConnectionManager) Validate() error { } } - { - tmp := m.GetSetCurrentClientCertDetails() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "SetCurrentClientCertDetails", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSetCurrentClientCertDetails()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "SetCurrentClientCertDetails", + reason: "embedded message failed validation", + cause: err, } } } @@ -325,87 +250,64 @@ func (m *HttpConnectionManager) Validate() error { for idx, item := range m.GetUpgradeConfigs() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: fmt.Sprintf("UpgradeConfigs[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: fmt.Sprintf("UpgradeConfigs[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetNormalizePath() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "NormalizePath", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNormalizePath()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "NormalizePath", + reason: "embedded message failed validation", + cause: err, } } } + // no validation rules for MergeSlashes + switch m.RouteSpecifier.(type) { case *HttpConnectionManager_Rds: - { - tmp := m.GetRds() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "Rds", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRds()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "Rds", + reason: "embedded message failed validation", + cause: err, } } } case *HttpConnectionManager_RouteConfig: - { - tmp := m.GetRouteConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "RouteConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRouteConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "RouteConfig", + reason: "embedded message failed validation", + cause: err, } } } case *HttpConnectionManager_ScopedRoutes: - { - tmp := m.GetScopedRoutes() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManagerValidationError{ - field: "ScopedRoutes", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetScopedRoutes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManagerValidationError{ + field: "ScopedRoutes", + reason: "embedded message failed validation", + cause: err, } } } @@ -484,17 +386,19 @@ func (m *Rds) Validate() error { return nil } - { - tmp := m.GetConfigSource() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { + if m.GetConfigSource() == nil { + return RdsValidationError{ + field: "ConfigSource", + reason: "value is required", + } + } - if err := v.Validate(); err != nil { - return RdsValidationError{ - field: "ConfigSource", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfigSource()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RdsValidationError{ + field: "ConfigSource", + reason: "embedded message failed validation", + cause: err, } } } @@ -581,17 +485,12 @@ func (m *ScopedRouteConfigurationsList) Validate() error { for idx, item := range m.GetScopedRouteConfigurations() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRouteConfigurationsListValidationError{ - field: fmt.Sprintf("ScopedRouteConfigurations[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRouteConfigurationsListValidationError{ + field: fmt.Sprintf("ScopedRouteConfigurations[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -680,32 +579,29 @@ func (m *ScopedRoutes) Validate() error { } } - { - tmp := m.GetScopeKeyBuilder() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesValidationError{ - field: "ScopeKeyBuilder", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetScopeKeyBuilder()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesValidationError{ + field: "ScopeKeyBuilder", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRdsConfigSource() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { + if m.GetRdsConfigSource() == nil { + return ScopedRoutesValidationError{ + field: "RdsConfigSource", + reason: "value is required", + } + } - if err := v.Validate(); err != nil { - return ScopedRoutesValidationError{ - field: "RdsConfigSource", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRdsConfigSource()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesValidationError{ + field: "RdsConfigSource", + reason: "embedded message failed validation", + cause: err, } } } @@ -714,34 +610,24 @@ func (m *ScopedRoutes) Validate() error { case *ScopedRoutes_ScopedRouteConfigurationsList: - { - tmp := m.GetScopedRouteConfigurationsList() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesValidationError{ - field: "ScopedRouteConfigurationsList", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetScopedRouteConfigurationsList()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesValidationError{ + field: "ScopedRouteConfigurationsList", + reason: "embedded message failed validation", + cause: err, } } } case *ScopedRoutes_ScopedRds: - { - tmp := m.GetScopedRds() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutesValidationError{ - field: "ScopedRds", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetScopedRds()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutesValidationError{ + field: "ScopedRds", + reason: "embedded message failed validation", + cause: err, } } } @@ -818,17 +704,19 @@ func (m *ScopedRds) Validate() error { return nil } - { - tmp := m.GetScopedRdsConfigSource() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { + if m.GetScopedRdsConfigSource() == nil { + return ScopedRdsValidationError{ + field: "ScopedRdsConfigSource", + reason: "value is required", + } + } - if err := v.Validate(); err != nil { - return ScopedRdsValidationError{ - field: "ScopedRdsConfigSource", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetScopedRdsConfigSource()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRdsValidationError{ + field: "ScopedRdsConfigSource", + reason: "embedded message failed validation", + cause: err, } } } @@ -908,34 +796,24 @@ func (m *HttpFilter) Validate() error { case *HttpFilter_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpFilterValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpFilterValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *HttpFilter_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpFilterValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpFilterValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -1014,47 +892,32 @@ func (m *HttpConnectionManager_Tracing) Validate() error { } } - { - tmp := m.GetClientSampling() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManager_TracingValidationError{ - field: "ClientSampling", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetClientSampling()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManager_TracingValidationError{ + field: "ClientSampling", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRandomSampling() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManager_TracingValidationError{ - field: "RandomSampling", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRandomSampling()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManager_TracingValidationError{ + field: "RandomSampling", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetOverallSampling() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManager_TracingValidationError{ - field: "OverallSampling", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOverallSampling()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManager_TracingValidationError{ + field: "OverallSampling", + reason: "embedded message failed validation", + cause: err, } } } @@ -1200,17 +1063,12 @@ func (m *HttpConnectionManager_SetCurrentClientCertDetails) Validate() error { return nil } - { - tmp := m.GetSubject() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManager_SetCurrentClientCertDetailsValidationError{ - field: "Subject", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSubject()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManager_SetCurrentClientCertDetailsValidationError{ + field: "Subject", + reason: "embedded message failed validation", + cause: err, } } } @@ -1303,34 +1161,24 @@ func (m *HttpConnectionManager_UpgradeConfig) Validate() error { for idx, item := range m.GetFilters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManager_UpgradeConfigValidationError{ - field: fmt.Sprintf("Filters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManager_UpgradeConfigValidationError{ + field: fmt.Sprintf("Filters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpConnectionManager_UpgradeConfigValidationError{ - field: "Enabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpConnectionManager_UpgradeConfigValidationError{ + field: "Enabled", + reason: "embedded message failed validation", + cause: err, } } } @@ -1413,17 +1261,12 @@ func (m *ScopedRoutes_ScopeKeyBuilder) Validate() error { for idx, item := range m.GetFragments() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutes_ScopeKeyBuilderValidationError{ - field: fmt.Sprintf("Fragments[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutes_ScopeKeyBuilderValidationError{ + field: fmt.Sprintf("Fragments[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -1502,17 +1345,12 @@ func (m *ScopedRoutes_ScopeKeyBuilder_FragmentBuilder) Validate() error { case *ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_: - { - tmp := m.GetHeaderValueExtractor() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutes_ScopeKeyBuilder_FragmentBuilderValidationError{ - field: "HeaderValueExtractor", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeaderValueExtractor()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutes_ScopeKeyBuilder_FragmentBuilderValidationError{ + field: "HeaderValueExtractor", + reason: "embedded message failed validation", + cause: err, } } } @@ -1611,17 +1449,12 @@ func (m *ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor) Vali case *ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_Element: - { - tmp := m.GetElement() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractorValidationError{ - field: "Element", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetElement()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractorValidationError{ + field: "Element", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.go index 197099cd6888..303cfc555a1d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.go @@ -5,13 +5,11 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" - - v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/fault/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go index 1f62f8a9d82c..8ce6562e535c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go @@ -49,17 +49,12 @@ func (m *MongoProxy) Validate() error { // no validation rules for AccessLog - { - tmp := m.GetDelay() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MongoProxyValidationError{ - field: "Delay", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDelay()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MongoProxyValidationError{ + field: "Delay", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.go index edb81ce71d54..e2665ca6ef9c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.go @@ -5,11 +5,10 @@ package v1alpha1 import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.go index 35b464c6c3c5..98a285919cc3 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.go @@ -5,14 +5,12 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - - v2 "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go index cea2e8a4b3e2..bcbacd8bcd01 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go @@ -40,32 +40,22 @@ func (m *RBAC) Validate() error { return nil } - { - tmp := m.GetRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RBACValidationError{ - field: "Rules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RBACValidationError{ + field: "Rules", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetShadowRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RBACValidationError{ - field: "ShadowRules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetShadowRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RBACValidationError{ + field: "ShadowRules", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go index ad278f8eb3a8..261ef56ee2e9 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go @@ -5,17 +5,15 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - time "time" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + types "github.com/gogo/protobuf/types" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. @@ -75,7 +73,7 @@ type RedisProxy struct { // See the :ref:`configuration section // ` of the architecture overview for recommendations on // configuring the backing clusters. - PrefixRoutes RedisProxy_PrefixRoutes `protobuf:"bytes,5,opt,name=prefix_routes,json=prefixRoutes,proto3" json:"prefix_routes"` + PrefixRoutes *RedisProxy_PrefixRoutes `protobuf:"bytes,5,opt,name=prefix_routes,json=prefixRoutes,proto3" json:"prefix_routes,omitempty"` // Authenticate Redis client connections locally by forcing downstream clients to issue a 'Redis // AUTH command `_ with this password before enabling any other // command. If an AUTH command's password matches this password, an "OK" response will be returned @@ -152,11 +150,11 @@ func (m *RedisProxy) GetLatencyInMicros() bool { return false } -func (m *RedisProxy) GetPrefixRoutes() RedisProxy_PrefixRoutes { +func (m *RedisProxy) GetPrefixRoutes() *RedisProxy_PrefixRoutes { if m != nil { return m.PrefixRoutes } - return RedisProxy_PrefixRoutes{} + return nil } func (m *RedisProxy) GetDownstreamAuthPassword() *core.DataSource { @@ -210,10 +208,16 @@ type RedisProxy_ConnPoolSettings struct { // before the timer fires. // If `max_buffer_size_before_flush` is set, but `buffer_flush_timeout` is not, the latter // defaults to 3ms. - BufferFlushTimeout *time.Duration `protobuf:"bytes,5,opt,name=buffer_flush_timeout,json=bufferFlushTimeout,proto3,stdduration" json:"buffer_flush_timeout,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + BufferFlushTimeout *time.Duration `protobuf:"bytes,5,opt,name=buffer_flush_timeout,json=bufferFlushTimeout,proto3,stdduration" json:"buffer_flush_timeout,omitempty"` + // `max_upstream_unknown_connections` controls how many upstream connections to unknown hosts + // can be created at any given time by any given worker thread (see `enable_redirection` for + // more details). If the host is unknown and a connection cannot be created due to enforcing + // this limit, then redirection will fail and the original redirection error will be passed + // downstream unchanged. This limit defaults to 100. + MaxUpstreamUnknownConnections *types.UInt32Value `protobuf:"bytes,6,opt,name=max_upstream_unknown_connections,json=maxUpstreamUnknownConnections,proto3" json:"max_upstream_unknown_connections,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RedisProxy_ConnPoolSettings) Reset() { *m = RedisProxy_ConnPoolSettings{} } @@ -284,9 +288,16 @@ func (m *RedisProxy_ConnPoolSettings) GetBufferFlushTimeout() *time.Duration { return nil } +func (m *RedisProxy_ConnPoolSettings) GetMaxUpstreamUnknownConnections() *types.UInt32Value { + if m != nil { + return m.MaxUpstreamUnknownConnections + } + return nil +} + type RedisProxy_PrefixRoutes struct { // List of prefix routes. - Routes []RedisProxy_PrefixRoutes_Route `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes"` + Routes []*RedisProxy_PrefixRoutes_Route `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` // Indicates that prefix matching should be case insensitive. CaseInsensitive bool `protobuf:"varint,2,opt,name=case_insensitive,json=caseInsensitive,proto3" json:"case_insensitive,omitempty"` // Optional catch-all route to forward commands that doesn't match any of the routes. The @@ -338,7 +349,7 @@ func (m *RedisProxy_PrefixRoutes) XXX_DiscardUnknown() { var xxx_messageInfo_RedisProxy_PrefixRoutes proto.InternalMessageInfo -func (m *RedisProxy_PrefixRoutes) GetRoutes() []RedisProxy_PrefixRoutes_Route { +func (m *RedisProxy_PrefixRoutes) GetRoutes() []*RedisProxy_PrefixRoutes_Route { if m != nil { return m.Routes } @@ -596,63 +607,66 @@ func init() { } var fileDescriptor_67e7179f1292d5ae = []byte{ - // 884 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0x23, 0x35, - 0x1c, 0xc7, 0x49, 0x9a, 0x6d, 0xdd, 0x84, 0xb4, 0x6e, 0x77, 0x19, 0xa2, 0xd2, 0x8d, 0x96, 0x4b, - 0x29, 0x62, 0x46, 0x0a, 0x17, 0x0e, 0x08, 0x69, 0xd3, 0xd5, 0xb2, 0x3d, 0xac, 0x08, 0x2e, 0x02, - 0x69, 0xa5, 0x95, 0xe5, 0x4c, 0x3c, 0x13, 0x8b, 0x19, 0x7b, 0xd6, 0xf6, 0xa4, 0xe9, 0x3e, 0x02, - 0x07, 0x24, 0x6e, 0x5c, 0x78, 0x01, 0x1e, 0x81, 0x13, 0xa7, 0xd5, 0x5e, 0x90, 0x78, 0x02, 0x40, - 0xbd, 0xf1, 0x16, 0x68, 0x6c, 0x27, 0x99, 0x42, 0x11, 0x15, 0xea, 0x69, 0xc6, 0xff, 0xdf, 0xef, - 0xff, 0xfd, 0x01, 0x3f, 0x66, 0x62, 0x2e, 0x2f, 0xa2, 0x58, 0x8a, 0x84, 0xa7, 0x51, 0xc2, 0x33, - 0xc3, 0x54, 0x24, 0x98, 0x39, 0x97, 0xea, 0xeb, 0x48, 0xb1, 0x29, 0xd7, 0xa4, 0x50, 0x72, 0x71, - 0x11, 0xcd, 0x87, 0xf5, 0x67, 0x58, 0x28, 0x69, 0x24, 0x3a, 0xb6, 0xda, 0xa1, 0xd3, 0x0e, 0x9d, - 0x76, 0xe8, 0xb5, 0xc3, 0x3a, 0x7d, 0x3e, 0xec, 0x1f, 0x38, 0x4f, 0xb4, 0xe0, 0x95, 0xad, 0x58, - 0x2a, 0x16, 0x4d, 0xa8, 0x66, 0xce, 0x52, 0xff, 0x30, 0x95, 0x32, 0xcd, 0x58, 0x64, 0x5f, 0x93, - 0x32, 0x89, 0xa6, 0xa5, 0xa2, 0x86, 0x4b, 0xe1, 0xf1, 0xb7, 0xe6, 0x34, 0xe3, 0x53, 0x6a, 0x58, - 0xb4, 0xfc, 0xf1, 0xc0, 0x7e, 0x2a, 0x53, 0x69, 0x7f, 0xa3, 0xea, 0xcf, 0x49, 0x1f, 0xfc, 0xd0, - 0x81, 0x10, 0x57, 0xfe, 0xc7, 0x95, 0x7b, 0x74, 0x0c, 0xb7, 0xb5, 0xa1, 0x86, 0x14, 0x8a, 0x25, - 0x7c, 0x11, 0x80, 0x01, 0x38, 0xda, 0x1a, 0x6d, 0xfd, 0xf4, 0xe7, 0xcf, 0xcd, 0x96, 0x6a, 0x0c, - 0x00, 0x86, 0x15, 0x3a, 0xb6, 0x20, 0x3a, 0x80, 0x77, 0xe2, 0xac, 0xd4, 0x86, 0xa9, 0xa0, 0x61, - 0x79, 0x8d, 0x00, 0xe0, 0xa5, 0x08, 0x49, 0xb8, 0xa9, 0x99, 0x31, 0x5c, 0xa4, 0x3a, 0x68, 0x0e, - 0xc0, 0xd1, 0xf6, 0xf0, 0xd3, 0xf0, 0xe6, 0x45, 0x08, 0xd7, 0x31, 0x85, 0x27, 0x52, 0x88, 0xb1, - 0x94, 0xd9, 0x99, 0x37, 0x37, 0x82, 0x55, 0x3c, 0x1b, 0xdf, 0x80, 0xc6, 0x0e, 0xc0, 0x2b, 0x27, - 0xe8, 0x18, 0xee, 0x66, 0xd4, 0x30, 0x11, 0x5f, 0x10, 0x2e, 0x48, 0xce, 0x63, 0x25, 0x75, 0xd0, - 0x1a, 0x80, 0xa3, 0x4d, 0xdc, 0xf3, 0xc0, 0xa9, 0x78, 0x6a, 0xc5, 0x48, 0xc0, 0xae, 0xcb, 0x90, - 0x28, 0x59, 0x1a, 0xa6, 0x83, 0x0d, 0x1b, 0xe1, 0xc9, 0xff, 0x8c, 0xd0, 0x15, 0x04, 0x5b, 0x53, - 0xa3, 0xd6, 0xeb, 0xdf, 0xee, 0xbf, 0x81, 0x3b, 0x45, 0x4d, 0x86, 0xbe, 0x82, 0xc1, 0x54, 0x9e, - 0x0b, 0x6d, 0x14, 0xa3, 0x39, 0xa1, 0xa5, 0x99, 0x91, 0x82, 0x6a, 0x7d, 0x2e, 0xd5, 0x34, 0x68, - 0x5b, 0xd7, 0xef, 0x78, 0xd7, 0xb4, 0xe0, 0x95, 0xf1, 0xaa, 0xeb, 0xe1, 0x23, 0x6a, 0xe8, 0x99, - 0x2c, 0x55, 0xcc, 0xf0, 0xbd, 0xb5, 0xfa, 0xc3, 0xd2, 0xcc, 0xc6, 0x5e, 0xb9, 0xff, 0x4b, 0x03, - 0xee, 0xfc, 0xbd, 0x3e, 0xe8, 0x09, 0x84, 0xb2, 0x20, 0x86, 0xe7, 0x4c, 0x96, 0xc6, 0xf6, 0x70, - 0x7b, 0xf8, 0x76, 0xe8, 0xe6, 0x26, 0x5c, 0xce, 0x4d, 0xf8, 0xc8, 0xcf, 0xcd, 0xe8, 0xcd, 0xef, - 0x7f, 0xbf, 0x0f, 0x6c, 0x49, 0x7f, 0x04, 0x8d, 0x4d, 0x80, 0xb7, 0x64, 0xf1, 0x85, 0xd3, 0x45, - 0x1f, 0x40, 0xc4, 0x04, 0x9d, 0x64, 0x8c, 0xcc, 0xa8, 0x9e, 0x19, 0x9a, 0xa6, 0x5c, 0xa4, 0xb6, - 0xdb, 0x9b, 0x78, 0xd7, 0x21, 0x4f, 0xd6, 0x40, 0x8d, 0x5e, 0xd5, 0x4a, 0xb1, 0xb8, 0xb2, 0x6f, - 0xbb, 0xbf, 0xa2, 0xe3, 0x35, 0x80, 0x3e, 0x81, 0x07, 0x39, 0x5d, 0x90, 0x49, 0x99, 0x24, 0x4c, - 0x11, 0xcd, 0x5f, 0x32, 0x32, 0x61, 0x89, 0x54, 0x8c, 0x24, 0x59, 0xa9, 0x67, 0xb6, 0x79, 0x5d, - 0x1c, 0xe4, 0x74, 0x31, 0xb2, 0x94, 0x33, 0xfe, 0x92, 0x8d, 0x2c, 0xe1, 0x71, 0x85, 0xa3, 0xcf, - 0xe1, 0xbe, 0xd7, 0xb5, 0xfc, 0x55, 0xc6, 0x1b, 0xff, 0x95, 0x71, 0xab, 0xca, 0x18, 0x23, 0xa7, - 0x6c, 0x6d, 0xf9, 0x84, 0xfb, 0xdf, 0xb6, 0x61, 0xa7, 0xde, 0x4d, 0x94, 0xc2, 0xb6, 0x1f, 0x11, - 0x30, 0x68, 0x1e, 0x6d, 0x0f, 0x4f, 0x6f, 0x61, 0x44, 0x42, 0xfb, 0xf1, 0x83, 0xe2, 0xcd, 0xa3, - 0xf7, 0xe0, 0x4e, 0x4c, 0x35, 0x23, 0x5c, 0x68, 0x26, 0x34, 0x37, 0x7c, 0xce, 0x7c, 0xa1, 0x7b, - 0x95, 0xfc, 0x74, 0x2d, 0x46, 0x21, 0xdc, 0x8d, 0xa9, 0x89, 0x67, 0x84, 0x66, 0x19, 0x59, 0xae, - 0x60, 0x73, 0xb5, 0x82, 0x3d, 0x0b, 0x3e, 0xcc, 0xb2, 0x13, 0xbf, 0x8a, 0x2f, 0x60, 0x6f, 0xcd, - 0xb7, 0xee, 0x6c, 0x69, 0x6f, 0x33, 0x19, 0xdc, 0x5d, 0x3a, 0xb5, 0xcf, 0xfe, 0xab, 0x26, 0xdc, - 0xb0, 0x7f, 0xe8, 0x1e, 0x6c, 0xd7, 0x8f, 0x09, 0xf6, 0x2f, 0xf4, 0x2e, 0xec, 0x2a, 0x96, 0xcb, - 0x39, 0x5b, 0xde, 0x1a, 0x97, 0x6c, 0xc7, 0x09, 0xc7, 0x4b, 0xd2, 0x9d, 0xab, 0xf9, 0xd5, 0x4e, - 0xd1, 0xea, 0xd2, 0x7c, 0x07, 0xe0, 0x5d, 0xc5, 0x5e, 0x94, 0x4c, 0x1b, 0x92, 0x73, 0xa5, 0xa4, - 0x22, 0x85, 0xcc, 0x78, 0x7c, 0x11, 0xb4, 0x6c, 0xcb, 0x9e, 0xdf, 0x5a, 0x96, 0x21, 0x76, 0x6e, - 0x9e, 0x5a, 0x2f, 0x63, 0xeb, 0x04, 0xef, 0xa9, 0x7f, 0x0a, 0xfb, 0xaf, 0x00, 0xdc, 0xbb, 0x86, - 0x5c, 0x4f, 0x08, 0xfc, 0x6b, 0x42, 0x5f, 0xc2, 0x1d, 0x55, 0x8a, 0x6a, 0x9a, 0x49, 0xa2, 0xa8, - 0x5b, 0xa2, 0x86, 0x6d, 0xd8, 0xfb, 0xd7, 0x5c, 0x09, 0xec, 0xa8, 0x8f, 0x3d, 0x93, 0x66, 0x63, - 0xa6, 0x62, 0x26, 0x0c, 0xee, 0xa9, 0xab, 0x08, 0x1a, 0xc2, 0xbb, 0x6c, 0x11, 0x67, 0xe5, 0xb4, - 0xda, 0x4f, 0x3a, 0x25, 0xb1, 0xcc, 0x73, 0x2a, 0xa6, 0xda, 0x6f, 0xe8, 0x9e, 0x07, 0x31, 0xa3, - 0xd3, 0x13, 0x0f, 0x3d, 0x78, 0x06, 0xf7, 0x97, 0x25, 0x31, 0x32, 0x96, 0xd9, 0x67, 0x45, 0x65, - 0x4a, 0xa3, 0x11, 0xec, 0x5e, 0x3d, 0x63, 0xe0, 0x26, 0x67, 0xac, 0x43, 0x6b, 0xc7, 0x6b, 0xf4, - 0xfc, 0xf5, 0xe5, 0x21, 0xf8, 0xf5, 0xf2, 0x10, 0xfc, 0x71, 0x79, 0x08, 0xe0, 0x47, 0x5c, 0x3a, - 0x65, 0xd7, 0x8b, 0x9b, 0xf7, 0x6c, 0xd4, 0x5b, 0x37, 0xcd, 0x86, 0x39, 0x06, 0xcf, 0x1a, 0xf3, - 0xe1, 0xa4, 0x6d, 0x17, 0xff, 0xc3, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x29, 0x5f, 0xad, - 0xba, 0x07, 0x00, 0x00, + // 930 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xd7, 0xd8, 0x49, 0x9a, 0x4c, 0x12, 0x9c, 0x4c, 0xd2, 0xb2, 0x58, 0x69, 0xb0, 0xca, 0x25, + 0x04, 0xb1, 0x2b, 0xb9, 0x17, 0x0e, 0x08, 0xa9, 0x4e, 0x55, 0x9a, 0x43, 0x85, 0x99, 0x90, 0x22, + 0x55, 0xaa, 0x46, 0xe3, 0xf5, 0xb3, 0x3d, 0xea, 0xee, 0xcc, 0x76, 0x66, 0xd6, 0x76, 0xfa, 0x09, + 0x10, 0x37, 0x6e, 0x7c, 0x06, 0xce, 0x9c, 0x38, 0x71, 0xaa, 0x38, 0xf2, 0x0d, 0x40, 0xb9, 0xf1, + 0x0d, 0x38, 0xa2, 0x9d, 0x19, 0xff, 0x09, 0x6d, 0x45, 0x84, 0x72, 0xda, 0x9d, 0xf7, 0x7b, 0xff, + 0x7f, 0xef, 0x3d, 0xfc, 0x39, 0xc8, 0xb1, 0xba, 0x48, 0x52, 0x25, 0x07, 0x62, 0x98, 0x0c, 0x44, + 0x66, 0x41, 0x27, 0x12, 0xec, 0x44, 0xe9, 0x17, 0x89, 0x86, 0xbe, 0x30, 0xac, 0xd0, 0x6a, 0x7a, + 0x91, 0x8c, 0xdb, 0xcb, 0xcf, 0xb8, 0xd0, 0xca, 0x2a, 0x72, 0xec, 0xac, 0x63, 0x6f, 0x1d, 0x7b, + 0xeb, 0x38, 0x58, 0xc7, 0xcb, 0xea, 0xe3, 0x76, 0xf3, 0xc0, 0x47, 0xe2, 0x85, 0xa8, 0x7c, 0xa5, + 0x4a, 0x43, 0xd2, 0xe3, 0x06, 0xbc, 0xa7, 0xe6, 0xe1, 0x50, 0xa9, 0x61, 0x06, 0x89, 0x7b, 0xf5, + 0xca, 0x41, 0xd2, 0x2f, 0x35, 0xb7, 0x42, 0xc9, 0x77, 0xe1, 0x13, 0xcd, 0x8b, 0x02, 0xb4, 0x09, + 0xf8, 0xfb, 0x63, 0x9e, 0x89, 0x3e, 0xb7, 0x90, 0xcc, 0x7e, 0x02, 0xb0, 0x3f, 0x54, 0x43, 0xe5, + 0x7e, 0x93, 0xea, 0xcf, 0x4b, 0xef, 0xfd, 0xbd, 0x85, 0x31, 0xad, 0xf2, 0xeb, 0x56, 0xe9, 0x91, + 0x63, 0xbc, 0x69, 0x2c, 0xb7, 0xac, 0xd0, 0x30, 0x10, 0xd3, 0x08, 0xb5, 0xd0, 0xd1, 0x46, 0x67, + 0xe3, 0x97, 0xbf, 0x7e, 0xad, 0xaf, 0xe8, 0x5a, 0x0b, 0x51, 0x5c, 0xa1, 0x5d, 0x07, 0x92, 0x03, + 0x7c, 0x2b, 0xcd, 0x4a, 0x63, 0x41, 0x47, 0x35, 0xa7, 0x57, 0x8b, 0x10, 0x9d, 0x89, 0x88, 0xc2, + 0xeb, 0x06, 0xac, 0x15, 0x72, 0x68, 0xa2, 0x7a, 0x0b, 0x1d, 0x6d, 0xb6, 0xbf, 0x8c, 0xaf, 0xdf, + 0xa4, 0x78, 0x91, 0x53, 0x7c, 0xa2, 0xa4, 0xec, 0x2a, 0x95, 0x9d, 0x05, 0x77, 0x1d, 0x5c, 0xe5, + 0xb3, 0xfa, 0x3d, 0xaa, 0xed, 0x20, 0x3a, 0x0f, 0x42, 0x8e, 0xf1, 0x6e, 0xc6, 0x2d, 0xc8, 0xf4, + 0x82, 0x09, 0xc9, 0x72, 0x91, 0x6a, 0x65, 0xa2, 0x95, 0x16, 0x3a, 0x5a, 0xa7, 0x8d, 0x00, 0x9c, + 0xca, 0x27, 0x4e, 0x4c, 0x46, 0x78, 0xdb, 0x57, 0xc8, 0xb4, 0x2a, 0x2d, 0x98, 0x68, 0xd5, 0x65, + 0x78, 0xf2, 0x3f, 0x33, 0xf4, 0x0d, 0xa1, 0xce, 0x15, 0xdd, 0x2a, 0x96, 0x5e, 0xe4, 0x5b, 0x1c, + 0xf5, 0xd5, 0x44, 0x1a, 0xab, 0x81, 0xe7, 0x8c, 0x97, 0x76, 0xc4, 0x0a, 0x6e, 0xcc, 0x44, 0xe9, + 0x7e, 0xb4, 0xe6, 0x82, 0xde, 0x0d, 0x41, 0x79, 0x21, 0x2a, 0xb7, 0xd5, 0x3c, 0xc4, 0x0f, 0xb9, + 0xe5, 0x67, 0xaa, 0xd4, 0x29, 0xd0, 0x3b, 0x0b, 0xf3, 0x07, 0xa5, 0x1d, 0x75, 0x83, 0x71, 0xf3, + 0xe7, 0x3a, 0xde, 0xf9, 0x77, 0x67, 0xc8, 0x63, 0x8c, 0x55, 0xc1, 0xac, 0xc8, 0x41, 0x95, 0xd6, + 0xb1, 0xb7, 0xd9, 0xfe, 0x20, 0xf6, 0x13, 0x13, 0xcf, 0x26, 0x26, 0x7e, 0x18, 0x26, 0xaa, 0xf3, + 0xde, 0x8f, 0x7f, 0x7c, 0x88, 0x5c, 0x33, 0x7f, 0x42, 0xb5, 0x75, 0x44, 0x37, 0x54, 0xf1, 0x8d, + 0xb7, 0x25, 0x9f, 0x62, 0x02, 0x92, 0xf7, 0x32, 0x60, 0x23, 0x6e, 0x46, 0x96, 0x0f, 0x87, 0x42, + 0x0e, 0x1d, 0xcf, 0xeb, 0x74, 0xd7, 0x23, 0x8f, 0x17, 0xc0, 0x92, 0x7a, 0xd5, 0x25, 0x0d, 0x69, + 0xe5, 0xdf, 0xf1, 0x3e, 0x57, 0xa7, 0x0b, 0x80, 0x7c, 0x81, 0x0f, 0x72, 0x3e, 0x65, 0xbd, 0x72, + 0x30, 0x00, 0xcd, 0x8c, 0x78, 0x05, 0xac, 0x07, 0x03, 0xa5, 0x81, 0x0d, 0xb2, 0xd2, 0x8c, 0x1c, + 0x6d, 0xdb, 0x34, 0xca, 0xf9, 0xb4, 0xe3, 0x54, 0xce, 0xc4, 0x2b, 0xe8, 0x38, 0x85, 0x47, 0x15, + 0x4e, 0xbe, 0xc6, 0xfb, 0xc1, 0xd6, 0xe9, 0xcf, 0x2b, 0x5e, 0xfd, 0xaf, 0x8a, 0x57, 0xaa, 0x8a, + 0x29, 0xf1, 0xc6, 0xce, 0xd7, 0xac, 0x60, 0xc0, 0xad, 0x2a, 0xa5, 0xb2, 0x08, 0x54, 0x95, 0xf2, + 0x85, 0x54, 0x13, 0xc9, 0x52, 0x25, 0xa5, 0xcf, 0xda, 0x04, 0xc2, 0x0e, 0xde, 0x70, 0x7f, 0x7e, + 0x2a, 0xed, 0xfd, 0xf6, 0x53, 0x9e, 0x95, 0x40, 0xef, 0xe6, 0x7c, 0x7a, 0x1e, 0x9c, 0x9c, 0x7b, + 0x1f, 0x27, 0x0b, 0x17, 0xcd, 0xef, 0xd6, 0xf0, 0xd6, 0xf2, 0xb8, 0x10, 0x8e, 0xd7, 0xc2, 0x0c, + 0xa2, 0x56, 0xfd, 0x68, 0xb3, 0x7d, 0x7a, 0x03, 0x33, 0x18, 0xbb, 0x0f, 0x0d, 0x8e, 0xc9, 0xc7, + 0x78, 0x27, 0xe5, 0x06, 0x98, 0x90, 0x06, 0xa4, 0x11, 0x56, 0x8c, 0x21, 0x30, 0xd9, 0xa8, 0xe4, + 0xa7, 0x0b, 0x31, 0x89, 0xf1, 0x6e, 0xca, 0x6d, 0x3a, 0x62, 0x3c, 0xcb, 0xd8, 0x6c, 0xbb, 0xeb, + 0xf3, 0xed, 0x6e, 0x38, 0xf0, 0x41, 0x96, 0x9d, 0x84, 0x2d, 0x7f, 0x89, 0x1b, 0x0b, 0x7d, 0x17, + 0xce, 0x71, 0x77, 0xa3, 0x65, 0x6c, 0xcf, 0x82, 0xba, 0x67, 0xf3, 0x75, 0x1d, 0xaf, 0xba, 0x3f, + 0x72, 0x07, 0xaf, 0x2d, 0xdf, 0x29, 0x1a, 0x5e, 0xe4, 0x23, 0xbc, 0xad, 0x21, 0x57, 0x63, 0x98, + 0x9d, 0x31, 0x5f, 0xec, 0x96, 0x17, 0x76, 0x67, 0x4a, 0xb7, 0xae, 0xd6, 0xb7, 0x74, 0xe5, 0xe6, + 0x47, 0xec, 0x07, 0x84, 0x6f, 0x6b, 0x78, 0x59, 0x82, 0xb1, 0x2c, 0x17, 0x5a, 0x2b, 0xcd, 0x0a, + 0x95, 0x89, 0xf4, 0x22, 0x5a, 0x71, 0x64, 0x3d, 0xbf, 0xb1, 0x2a, 0x63, 0xea, 0xc3, 0x3c, 0x71, + 0x51, 0xba, 0x2e, 0x08, 0xdd, 0xd3, 0x6f, 0x0a, 0x9b, 0xaf, 0x11, 0xde, 0x7b, 0x8b, 0xf2, 0x72, + 0x41, 0xe8, 0x9d, 0x05, 0x3d, 0xc5, 0x3b, 0xba, 0x94, 0xd5, 0xba, 0xb0, 0x81, 0xe6, 0x7e, 0x4b, + 0x6b, 0x8e, 0xb0, 0x4f, 0xde, 0x72, 0x86, 0xa8, 0x57, 0x7d, 0x14, 0x34, 0x79, 0xd6, 0x05, 0x9d, + 0x82, 0xb4, 0xb4, 0xa1, 0xaf, 0x22, 0xa4, 0x8d, 0x6f, 0xc3, 0x34, 0xcd, 0xca, 0x7e, 0x75, 0x00, + 0x78, 0x9f, 0xa5, 0x2a, 0xcf, 0xb9, 0xec, 0x9b, 0x70, 0x02, 0xf6, 0x02, 0x48, 0x81, 0xf7, 0x4f, + 0x02, 0x74, 0xef, 0x19, 0xde, 0x9f, 0xb5, 0xc4, 0xaa, 0x54, 0x65, 0x5f, 0x15, 0x6e, 0x45, 0x48, + 0x07, 0x6f, 0x5f, 0xbd, 0x93, 0xe8, 0x3a, 0x77, 0x72, 0x8b, 0x2f, 0x5d, 0xc7, 0xce, 0xf3, 0xdf, + 0x2e, 0x0f, 0xd1, 0xef, 0x97, 0x87, 0xe8, 0xcf, 0xcb, 0x43, 0x84, 0x3f, 0x13, 0xca, 0x1b, 0x7b, + 0x2e, 0xae, 0xcf, 0x59, 0xa7, 0xb1, 0x20, 0xcd, 0xa5, 0xd9, 0x45, 0xcf, 0x6a, 0xe3, 0x76, 0x6f, + 0xcd, 0xad, 0xfe, 0xfd, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x77, 0xf2, 0x57, 0x35, 0x08, + 0x00, 0x00, } func (m *RedisProxy) Marshal() (dAtA []byte, err error) { @@ -702,14 +716,16 @@ func (m *RedisProxy) MarshalTo(dAtA []byte) (int, error) { } i++ } - dAtA[i] = 0x2a - i++ - i = encodeVarintRedisProxy(dAtA, i, uint64(m.PrefixRoutes.Size())) - n2, err := m.PrefixRoutes.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.PrefixRoutes != nil { + dAtA[i] = 0x2a + i++ + i = encodeVarintRedisProxy(dAtA, i, uint64(m.PrefixRoutes.Size())) + n2, err := m.PrefixRoutes.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n2 } - i += n2 if m.DownstreamAuthPassword != nil { dAtA[i] = 0x32 i++ @@ -786,6 +802,16 @@ func (m *RedisProxy_ConnPoolSettings) MarshalTo(dAtA []byte) (int, error) { } i += n5 } + if m.MaxUpstreamUnknownConnections != nil { + dAtA[i] = 0x32 + i++ + i = encodeVarintRedisProxy(dAtA, i, uint64(m.MaxUpstreamUnknownConnections.Size())) + n6, err := m.MaxUpstreamUnknownConnections.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n6 + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -839,11 +865,11 @@ func (m *RedisProxy_PrefixRoutes) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x22 i++ i = encodeVarintRedisProxy(dAtA, i, uint64(m.CatchAllRoute.Size())) - n6, err := m.CatchAllRoute.MarshalTo(dAtA[i:]) + n7, err := m.CatchAllRoute.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n6 + i += n7 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -931,11 +957,11 @@ func (m *RedisProxy_PrefixRoutes_Route_RequestMirrorPolicy) MarshalTo(dAtA []byt dAtA[i] = 0x12 i++ i = encodeVarintRedisProxy(dAtA, i, uint64(m.RuntimeFraction.Size())) - n7, err := m.RuntimeFraction.MarshalTo(dAtA[i:]) + n8, err := m.RuntimeFraction.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n7 + i += n8 } if m.ExcludeReadCommands { dAtA[i] = 0x18 @@ -972,11 +998,11 @@ func (m *RedisProtocolOptions) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintRedisProxy(dAtA, i, uint64(m.AuthPassword.Size())) - n8, err := m.AuthPassword.MarshalTo(dAtA[i:]) + n9, err := m.AuthPassword.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n8 + i += n9 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -1014,8 +1040,10 @@ func (m *RedisProxy) Size() (n int) { if m.LatencyInMicros { n += 2 } - l = m.PrefixRoutes.Size() - n += 1 + l + sovRedisProxy(uint64(l)) + if m.PrefixRoutes != nil { + l = m.PrefixRoutes.Size() + n += 1 + l + sovRedisProxy(uint64(l)) + } if m.DownstreamAuthPassword != nil { l = m.DownstreamAuthPassword.Size() n += 1 + l + sovRedisProxy(uint64(l)) @@ -1049,6 +1077,10 @@ func (m *RedisProxy_ConnPoolSettings) Size() (n int) { l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.BufferFlushTimeout) n += 1 + l + sovRedisProxy(uint64(l)) } + if m.MaxUpstreamUnknownConnections != nil { + l = m.MaxUpstreamUnknownConnections.Size() + n += 1 + l + sovRedisProxy(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1343,6 +1375,9 @@ func (m *RedisProxy) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.PrefixRoutes == nil { + m.PrefixRoutes = &RedisProxy_PrefixRoutes{} + } if err := m.PrefixRoutes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1568,6 +1603,42 @@ func (m *RedisProxy_ConnPoolSettings) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxUpstreamUnknownConnections", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRedisProxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRedisProxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRedisProxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.MaxUpstreamUnknownConnections == nil { + m.MaxUpstreamUnknownConnections = &types.UInt32Value{} + } + if err := m.MaxUpstreamUnknownConnections.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRedisProxy(dAtA[iNdEx:]) @@ -1651,7 +1722,7 @@ func (m *RedisProxy_PrefixRoutes) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Routes = append(m.Routes, RedisProxy_PrefixRoutes_Route{}) + m.Routes = append(m.Routes, &RedisProxy_PrefixRoutes_Route{}) if err := m.Routes[len(m.Routes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go index 1245fe37958a..025ed35c1c3a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go @@ -56,49 +56,34 @@ func (m *RedisProxy) Validate() error { } } - { - tmp := m.GetSettings() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxyValidationError{ - field: "Settings", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSettings()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxyValidationError{ + field: "Settings", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for LatencyInMicros - { - tmp := m.GetPrefixRoutes() - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxyValidationError{ - field: "PrefixRoutes", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPrefixRoutes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxyValidationError{ + field: "PrefixRoutes", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetDownstreamAuthPassword() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxyValidationError{ - field: "DownstreamAuthPassword", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDownstreamAuthPassword()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxyValidationError{ + field: "DownstreamAuthPassword", + reason: "embedded message failed validation", + cause: err, } } } @@ -168,17 +153,12 @@ func (m *RedisProtocolOptions) Validate() error { return nil } - { - tmp := m.GetAuthPassword() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProtocolOptionsValidationError{ - field: "AuthPassword", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAuthPassword()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProtocolOptionsValidationError{ + field: "AuthPassword", + reason: "embedded message failed validation", + cause: err, } } } @@ -263,17 +243,22 @@ func (m *RedisProxy_ConnPoolSettings) Validate() error { // no validation rules for MaxBufferSizeBeforeFlush - { - tmp := m.GetBufferFlushTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetBufferFlushTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxy_ConnPoolSettingsValidationError{ + field: "BufferFlushTimeout", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return RedisProxy_ConnPoolSettingsValidationError{ - field: "BufferFlushTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxUpstreamUnknownConnections()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxy_ConnPoolSettingsValidationError{ + field: "MaxUpstreamUnknownConnections", + reason: "embedded message failed validation", + cause: err, } } } @@ -349,17 +334,12 @@ func (m *RedisProxy_PrefixRoutes) Validate() error { for idx, item := range m.GetRoutes() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(&tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxy_PrefixRoutesValidationError{ - field: fmt.Sprintf("Routes[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxy_PrefixRoutesValidationError{ + field: fmt.Sprintf("Routes[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -370,17 +350,12 @@ func (m *RedisProxy_PrefixRoutes) Validate() error { // no validation rules for CatchAllCluster - { - tmp := m.GetCatchAllRoute() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxy_PrefixRoutesValidationError{ - field: "CatchAllRoute", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCatchAllRoute()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxy_PrefixRoutesValidationError{ + field: "CatchAllRoute", + reason: "embedded message failed validation", + cause: err, } } } @@ -466,17 +441,12 @@ func (m *RedisProxy_PrefixRoutes_Route) Validate() error { for idx, item := range m.GetRequestMirrorPolicy() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxy_PrefixRoutes_RouteValidationError{ - field: fmt.Sprintf("RequestMirrorPolicy[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxy_PrefixRoutes_RouteValidationError{ + field: fmt.Sprintf("RequestMirrorPolicy[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -559,17 +529,12 @@ func (m *RedisProxy_PrefixRoutes_Route_RequestMirrorPolicy) Validate() error { } } - { - tmp := m.GetRuntimeFraction() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RedisProxy_PrefixRoutes_Route_RequestMirrorPolicyValidationError{ - field: "RuntimeFraction", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRuntimeFraction()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RedisProxy_PrefixRoutes_Route_RequestMirrorPolicyValidationError{ + field: "RuntimeFraction", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go index 7cf22ed19da7..5ddfe3d02709 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go @@ -5,18 +5,16 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - time "time" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" + io "io" + math "math" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go index aed775ffb0af..55a5bb847de7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go @@ -47,17 +47,12 @@ func (m *TcpProxy) Validate() error { } } - { - tmp := m.GetMetadataMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxyValidationError{ - field: "MetadataMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadataMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxyValidationError{ + field: "MetadataMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -76,32 +71,22 @@ func (m *TcpProxy) Validate() error { } - { - tmp := m.GetDownstreamIdleTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxyValidationError{ - field: "DownstreamIdleTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDownstreamIdleTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxyValidationError{ + field: "DownstreamIdleTimeout", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetUpstreamIdleTimeout() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxyValidationError{ - field: "UpstreamIdleTimeout", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetUpstreamIdleTimeout()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxyValidationError{ + field: "UpstreamIdleTimeout", + reason: "embedded message failed validation", + cause: err, } } } @@ -109,34 +94,24 @@ func (m *TcpProxy) Validate() error { for idx, item := range m.GetAccessLog() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxyValidationError{ - field: fmt.Sprintf("AccessLog[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxyValidationError{ + field: fmt.Sprintf("AccessLog[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetDeprecatedV1() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxyValidationError{ - field: "DeprecatedV1", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDeprecatedV1()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxyValidationError{ + field: "DeprecatedV1", + reason: "embedded message failed validation", + cause: err, } } } @@ -159,17 +134,12 @@ func (m *TcpProxy) Validate() error { case *TcpProxy_WeightedClusters: - { - tmp := m.GetWeightedClusters() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxyValidationError{ - field: "WeightedClusters", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetWeightedClusters()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxyValidationError{ + field: "WeightedClusters", + reason: "embedded message failed validation", + cause: err, } } } @@ -257,17 +227,12 @@ func (m *TcpProxy_DeprecatedV1) Validate() error { for idx, item := range m.GetRoutes() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxy_DeprecatedV1ValidationError{ - field: fmt.Sprintf("Routes[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxy_DeprecatedV1ValidationError{ + field: fmt.Sprintf("Routes[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -351,17 +316,12 @@ func (m *TcpProxy_WeightedCluster) Validate() error { for idx, item := range m.GetClusters() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxy_WeightedClusterValidationError{ - field: fmt.Sprintf("Clusters[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxy_WeightedClusterValidationError{ + field: fmt.Sprintf("Clusters[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -445,17 +405,12 @@ func (m *TcpProxy_DeprecatedV1_TCPRoute) Validate() error { for idx, item := range m.GetDestinationIpList() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxy_DeprecatedV1_TCPRouteValidationError{ - field: fmt.Sprintf("DestinationIpList[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxy_DeprecatedV1_TCPRouteValidationError{ + field: fmt.Sprintf("DestinationIpList[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -467,17 +422,12 @@ func (m *TcpProxy_DeprecatedV1_TCPRoute) Validate() error { for idx, item := range m.GetSourceIpList() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TcpProxy_DeprecatedV1_TCPRouteValidationError{ - field: fmt.Sprintf("SourceIpList[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TcpProxy_DeprecatedV1_TCPRouteValidationError{ + field: fmt.Sprintf("SourceIpList[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.go index e63db21fe86b..3ef14ffb55c7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.go @@ -5,12 +5,10 @@ package v2alpha import ( fmt "fmt" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go index ebe03b796531..2a48986511fd 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go @@ -41,17 +41,12 @@ func (m *FileBasedMetadataConfig) Validate() error { return nil } - { - tmp := m.GetSecretData() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return FileBasedMetadataConfigValidationError{ - field: "SecretData", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSecretData()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FileBasedMetadataConfigValidationError{ + field: "SecretData", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.go index 9419594dc6a6..a3ad1151ba57 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.go @@ -5,13 +5,11 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go index d0f02c96deec..102271f7e880 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/metrics_service.pb.validate.go @@ -48,17 +48,12 @@ func (m *MetricsServiceConfig) Validate() error { } } - { - tmp := m.GetGrpcService() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MetricsServiceConfigValidationError{ - field: "GrpcService", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MetricsServiceConfigValidationError{ + field: "GrpcService", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.go index b8cfb65cd25a..997d81a5ba3a 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.go @@ -5,15 +5,13 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go index 4f5e4253b5d6..9ef81ad4e586 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2/stats.pb.validate.go @@ -46,34 +46,24 @@ func (m *StatsSink) Validate() error { case *StatsSink_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatsSinkValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsSinkValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *StatsSink_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatsSinkValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsSinkValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -148,49 +138,34 @@ func (m *StatsConfig) Validate() error { for idx, item := range m.GetStatsTags() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatsConfigValidationError{ - field: fmt.Sprintf("StatsTags[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetUseAllDefaultTags() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return StatsConfigValidationError{ - field: "UseAllDefaultTags", + field: fmt.Sprintf("StatsTags[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetStatsMatcher() + } - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetUseAllDefaultTags()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsConfigValidationError{ + field: "UseAllDefaultTags", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return StatsConfigValidationError{ - field: "StatsMatcher", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStatsMatcher()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsConfigValidationError{ + field: "StatsMatcher", + reason: "embedded message failed validation", + cause: err, } } } @@ -267,34 +242,24 @@ func (m *StatsMatcher) Validate() error { case *StatsMatcher_ExclusionList: - { - tmp := m.GetExclusionList() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatsMatcherValidationError{ - field: "ExclusionList", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetExclusionList()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsMatcherValidationError{ + field: "ExclusionList", + reason: "embedded message failed validation", + cause: err, } } } case *StatsMatcher_InclusionList: - { - tmp := m.GetInclusionList() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatsMatcherValidationError{ - field: "InclusionList", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetInclusionList()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsMatcherValidationError{ + field: "InclusionList", + reason: "embedded message failed validation", + cause: err, } } } @@ -460,17 +425,12 @@ func (m *StatsdSink) Validate() error { case *StatsdSink_Address: - { - tmp := m.GetAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StatsdSinkValidationError{ - field: "Address", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StatsdSinkValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, } } } @@ -557,17 +517,12 @@ func (m *DogStatsdSink) Validate() error { case *DogStatsdSink_Address: - { - tmp := m.GetAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DogStatsdSinkValidationError{ - field: "Address", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DogStatsdSinkValidationError{ + field: "Address", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.go index ca9f5d74c8cb..b65fe3f70029 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.go @@ -6,12 +6,11 @@ package v2alpha import ( encoding_binary "encoding/binary" fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go index 7ab4f620b73e..f39ff8106ed3 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha/overload.pb.validate.go @@ -52,34 +52,24 @@ func (m *ResourceMonitor) Validate() error { case *ResourceMonitor_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ResourceMonitorValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ResourceMonitorValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *ResourceMonitor_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ResourceMonitorValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ResourceMonitorValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -233,17 +223,12 @@ func (m *Trigger) Validate() error { case *Trigger_Threshold: - { - tmp := m.GetThreshold() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TriggerValidationError{ - field: "Threshold", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetThreshold()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TriggerValidationError{ + field: "Threshold", + reason: "embedded message failed validation", + cause: err, } } } @@ -338,17 +323,12 @@ func (m *OverloadAction) Validate() error { for idx, item := range m.GetTriggers() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OverloadActionValidationError{ - field: fmt.Sprintf("Triggers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OverloadActionValidationError{ + field: fmt.Sprintf("Triggers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -420,17 +400,12 @@ func (m *OverloadManager) Validate() error { return nil } - { - tmp := m.GetRefreshInterval() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OverloadManagerValidationError{ - field: "RefreshInterval", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRefreshInterval()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OverloadManagerValidationError{ + field: "RefreshInterval", + reason: "embedded message failed validation", + cause: err, } } } @@ -445,17 +420,12 @@ func (m *OverloadManager) Validate() error { for idx, item := range m.GetResourceMonitors() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OverloadManagerValidationError{ - field: fmt.Sprintf("ResourceMonitors[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OverloadManagerValidationError{ + field: fmt.Sprintf("ResourceMonitors[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -465,17 +435,12 @@ func (m *OverloadManager) Validate() error { for idx, item := range m.GetActions() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OverloadManagerValidationError{ - field: fmt.Sprintf("Actions[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OverloadManagerValidationError{ + field: fmt.Sprintf("Actions[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.go index dd0cfa254377..23627842a84c 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.go @@ -5,17 +5,15 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" + matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" - matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.validate.go index 0f61c2d9c17c..ca88d093faf5 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2/rbac.pb.validate.go @@ -118,17 +118,12 @@ func (m *Policy) Validate() error { for idx, item := range m.GetPermissions() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PolicyValidationError{ - field: fmt.Sprintf("Permissions[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PolicyValidationError{ + field: fmt.Sprintf("Permissions[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -145,17 +140,12 @@ func (m *Policy) Validate() error { for idx, item := range m.GetPrincipals() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PolicyValidationError{ - field: fmt.Sprintf("Principals[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PolicyValidationError{ + field: fmt.Sprintf("Principals[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -230,34 +220,24 @@ func (m *Permission) Validate() error { case *Permission_AndRules: - { - tmp := m.GetAndRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "AndRules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAndRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "AndRules", + reason: "embedded message failed validation", + cause: err, } } } case *Permission_OrRules: - { - tmp := m.GetOrRules() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "OrRules", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOrRules()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "OrRules", + reason: "embedded message failed validation", + cause: err, } } } @@ -273,34 +253,24 @@ func (m *Permission) Validate() error { case *Permission_Header: - { - tmp := m.GetHeader() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "Header", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "Header", + reason: "embedded message failed validation", + cause: err, } } } case *Permission_DestinationIp: - { - tmp := m.GetDestinationIp() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "DestinationIp", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDestinationIp()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "DestinationIp", + reason: "embedded message failed validation", + cause: err, } } } @@ -316,51 +286,36 @@ func (m *Permission) Validate() error { case *Permission_Metadata: - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } case *Permission_NotRule: - { - tmp := m.GetNotRule() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "NotRule", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNotRule()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "NotRule", + reason: "embedded message failed validation", + cause: err, } } } case *Permission_RequestedServerName: - { - tmp := m.GetRequestedServerName() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PermissionValidationError{ - field: "RequestedServerName", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestedServerName()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PermissionValidationError{ + field: "RequestedServerName", + reason: "embedded message failed validation", + cause: err, } } } @@ -441,34 +396,24 @@ func (m *Principal) Validate() error { case *Principal_AndIds: - { - tmp := m.GetAndIds() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "AndIds", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAndIds()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "AndIds", + reason: "embedded message failed validation", + cause: err, } } } case *Principal_OrIds: - { - tmp := m.GetOrIds() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "OrIds", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOrIds()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "OrIds", + reason: "embedded message failed validation", + cause: err, } } } @@ -484,85 +429,60 @@ func (m *Principal) Validate() error { case *Principal_Authenticated_: - { - tmp := m.GetAuthenticated() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "Authenticated", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAuthenticated()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "Authenticated", + reason: "embedded message failed validation", + cause: err, } } } case *Principal_SourceIp: - { - tmp := m.GetSourceIp() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "SourceIp", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSourceIp()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "SourceIp", + reason: "embedded message failed validation", + cause: err, } } } case *Principal_Header: - { - tmp := m.GetHeader() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "Header", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "Header", + reason: "embedded message failed validation", + cause: err, } } } case *Principal_Metadata: - { - tmp := m.GetMetadata() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "Metadata", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "Metadata", + reason: "embedded message failed validation", + cause: err, } } } case *Principal_NotId: - { - tmp := m.GetNotId() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return PrincipalValidationError{ - field: "NotId", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNotId()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return PrincipalValidationError{ + field: "NotId", + reason: "embedded message failed validation", + cause: err, } } } @@ -650,17 +570,12 @@ func (m *Permission_Set) Validate() error { for idx, item := range m.GetRules() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Permission_SetValidationError{ - field: fmt.Sprintf("Rules[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Permission_SetValidationError{ + field: fmt.Sprintf("Rules[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -742,17 +657,12 @@ func (m *Principal_Set) Validate() error { for idx, item := range m.GetIds() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Principal_SetValidationError{ - field: fmt.Sprintf("Ids[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Principal_SetValidationError{ + field: fmt.Sprintf("Ids[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -824,17 +734,12 @@ func (m *Principal_Authenticated) Validate() error { return nil } - { - tmp := m.GetPrincipalName() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Principal_AuthenticatedValidationError{ - field: "PrincipalName", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetPrincipalName()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Principal_AuthenticatedValidationError{ + field: "PrincipalName", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.go index 1151924aff80..4b838b3014be 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.go @@ -5,15 +5,13 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + io "io" v1 "istio.io/gogo-genproto/opencensus/proto/trace/v1" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -572,8 +570,6 @@ type OpenCensusConfig struct { ZipkinExporterEnabled bool `protobuf:"varint,5,opt,name=zipkin_exporter_enabled,json=zipkinExporterEnabled,proto3" json:"zipkin_exporter_enabled,omitempty"` // The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans" ZipkinUrl string `protobuf:"bytes,6,opt,name=zipkin_url,json=zipkinUrl,proto3" json:"zipkin_url,omitempty"` - // The Zipkin service name. - ZipkinServiceName string `protobuf:"bytes,7,opt,name=zipkin_service_name,json=zipkinServiceName,proto3" json:"zipkin_service_name,omitempty"` // List of incoming trace context headers we will accept. First one found // wins. IncomingTraceContext []OpenCensusConfig_TraceContext `protobuf:"varint,8,rep,packed,name=incoming_trace_context,json=incomingTraceContext,proto3,enum=envoy.config.trace.v2.OpenCensusConfig_TraceContext" json:"incoming_trace_context,omitempty"` @@ -659,13 +655,6 @@ func (m *OpenCensusConfig) GetZipkinUrl() string { return "" } -func (m *OpenCensusConfig) GetZipkinServiceName() string { - if m != nil { - return m.ZipkinServiceName - } - return "" -} - func (m *OpenCensusConfig) GetIncomingTraceContext() []OpenCensusConfig_TraceContext { if m != nil { return m.IncomingTraceContext @@ -744,63 +733,63 @@ func init() { func init() { proto.RegisterFile("envoy/config/trace/v2/trace.proto", fileDescriptor_0785d24fc8ab55c7) } var fileDescriptor_0785d24fc8ab55c7 = []byte{ - // 891 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcb, 0x6e, 0xdb, 0x46, - 0x14, 0x35, 0x6d, 0xf9, 0xa1, 0x2b, 0x39, 0x96, 0xc6, 0x4e, 0xac, 0x0a, 0x89, 0xe0, 0xca, 0x45, - 0x90, 0x45, 0x40, 0xc1, 0x6a, 0x9a, 0xa6, 0xbb, 0x46, 0xb2, 0x1a, 0xbb, 0x48, 0x25, 0x83, 0x56, - 0x8a, 0x20, 0x1b, 0x62, 0x34, 0x1c, 0xd3, 0x13, 0xd3, 0x9c, 0xc1, 0x70, 0xa8, 0x5a, 0x5d, 0x75, - 0xdd, 0xcf, 0xe8, 0x67, 0x74, 0xd5, 0x55, 0xd1, 0x65, 0x3f, 0xa1, 0xf0, 0xa6, 0xe8, 0xbe, 0x1f, - 0x50, 0x70, 0x66, 0x68, 0xc9, 0x52, 0x0a, 0x04, 0xf0, 0x8e, 0xbc, 0xe7, 0x9c, 0xfb, 0xbe, 0x24, - 0x7c, 0x4a, 0xe3, 0x31, 0x9f, 0xb4, 0x08, 0x8f, 0xcf, 0x58, 0xd8, 0x52, 0x12, 0x13, 0xda, 0x1a, - 0xb7, 0xcd, 0x83, 0x2b, 0x24, 0x57, 0x1c, 0xdd, 0xd7, 0x14, 0xd7, 0x50, 0x5c, 0x83, 0x8c, 0xdb, - 0xf5, 0xcf, 0x8c, 0x12, 0x0b, 0x96, 0x09, 0x08, 0x97, 0xb4, 0x15, 0x4a, 0x41, 0xfc, 0x84, 0xca, - 0x31, 0xcb, 0xc5, 0xf5, 0xa7, 0x5c, 0xd0, 0x98, 0xd0, 0x38, 0x49, 0x93, 0x96, 0xb6, 0xe4, 0x31, - 0x0e, 0xcc, 0x83, 0x6f, 0xdd, 0x1a, 0xf6, 0x27, 0x21, 0xe7, 0x61, 0x44, 0x0d, 0x73, 0x94, 0x9e, - 0xb5, 0x70, 0x3c, 0xb1, 0xd0, 0xc3, 0x79, 0x28, 0x51, 0x32, 0x25, 0xca, 0xa2, 0x8d, 0x79, 0xf4, - 0x07, 0x89, 0x85, 0xa0, 0x32, 0xb1, 0xf8, 0xee, 0x18, 0x47, 0x2c, 0xc0, 0x8a, 0xb6, 0xf2, 0x07, - 0x03, 0x34, 0xff, 0x76, 0x60, 0x7d, 0x28, 0x31, 0x61, 0x71, 0x88, 0xbe, 0x84, 0xc2, 0xb9, 0x52, - 0xa2, 0xe6, 0xec, 0x39, 0x4f, 0x4a, 0xed, 0x7d, 0xf7, 0x83, 0x75, 0xbb, 0x96, 0xed, 0x1e, 0x29, - 0x25, 0x3c, 0x2d, 0xa8, 0xff, 0xe2, 0x40, 0x21, 0x7b, 0x45, 0x8f, 0xa0, 0x10, 0xe3, 0x4b, 0xaa, - 0x3d, 0x14, 0x3b, 0xc5, 0x5f, 0xff, 0xf9, 0x6d, 0xa5, 0x20, 0x97, 0xf7, 0x1c, 0x4f, 0x9b, 0xd1, - 0x01, 0xac, 0x19, 0x6f, 0xb5, 0x65, 0x1d, 0x62, 0xd7, 0x35, 0x69, 0xbb, 0x79, 0xda, 0xee, 0xa9, - 0x2e, 0xea, 0x68, 0xc9, 0xb3, 0x44, 0xf4, 0x15, 0x94, 0xd5, 0x44, 0xd0, 0xc0, 0xf6, 0xa9, 0xb6, - 0xa2, 0x85, 0x3b, 0x0b, 0xc2, 0x97, 0xf1, 0xe4, 0x68, 0xc9, 0x2b, 0x69, 0x6e, 0x57, 0x53, 0x3b, - 0x9b, 0x50, 0x32, 0x22, 0x3f, 0xb3, 0x36, 0x7f, 0x72, 0x60, 0xeb, 0x35, 0x0b, 0xcf, 0x55, 0xa2, - 0xa8, 0x30, 0x14, 0xf4, 0x1c, 0xaa, 0x84, 0x47, 0x11, 0x25, 0x8a, 0x4b, 0x9f, 0x44, 0x69, 0xa2, - 0xa8, 0x5c, 0x4c, 0xbe, 0x72, 0xc3, 0xe9, 0x1a, 0x0a, 0xfa, 0x02, 0xaa, 0x98, 0x10, 0x9a, 0x24, - 0xbe, 0xe2, 0x17, 0x34, 0xf6, 0xcf, 0x58, 0x44, 0x75, 0x4d, 0xb7, 0x74, 0x5b, 0x86, 0x33, 0xcc, - 0x28, 0xdf, 0xb0, 0x88, 0x36, 0xff, 0x75, 0xa0, 0xfc, 0x8e, 0x89, 0x0b, 0x16, 0xdf, 0x31, 0xfe, - 0x0b, 0x40, 0x53, 0x1d, 0x8d, 0x03, 0xc1, 0x59, 0xac, 0x16, 0x13, 0x98, 0x3a, 0xef, 0x59, 0x0e, - 0x7a, 0x0c, 0x5b, 0x66, 0xef, 0x58, 0xe0, 0x1f, 0xb4, 0x5f, 0x8c, 0x98, 0xd2, 0x2d, 0xdd, 0xf0, - 0x36, 0xb5, 0xf9, 0x38, 0x30, 0x46, 0xf4, 0x2d, 0x6c, 0x27, 0xe7, 0x58, 0xd2, 0xc0, 0x4f, 0x04, - 0x8e, 0xb3, 0xee, 0x2b, 0x7a, 0xa5, 0x6a, 0x05, 0xdd, 0xfe, 0xfa, 0x42, 0xfb, 0x3b, 0x9c, 0x47, - 0xdf, 0xe3, 0x28, 0xa5, 0x5e, 0xd5, 0xc8, 0x4e, 0x05, 0xce, 0x8a, 0xcc, 0x44, 0xcd, 0x10, 0xb6, - 0x0e, 0x27, 0x31, 0xbe, 0x64, 0x64, 0xa0, 0x6c, 0xe1, 0xfb, 0xb0, 0x1e, 0xb1, 0x91, 0xc4, 0x72, - 0xb2, 0x58, 0x6e, 0x8e, 0xa0, 0xd6, 0x47, 0xae, 0x4b, 0xbe, 0x2c, 0xcd, 0x14, 0x36, 0x0f, 0xb1, - 0xc2, 0x01, 0x0f, 0xef, 0xd8, 0xdf, 0xa7, 0x50, 0xb6, 0x67, 0xec, 0xeb, 0x7d, 0x5e, 0xe8, 0x6c, - 0xc9, 0xc2, 0x7d, 0x7c, 0x49, 0x9b, 0xbf, 0xaf, 0x42, 0x65, 0x20, 0x68, 0xdc, 0xd5, 0x67, 0x6e, - 0x43, 0x1f, 0x43, 0x79, 0xf6, 0xc0, 0xed, 0x51, 0x3d, 0x76, 0xa7, 0xdf, 0x03, 0x53, 0x46, 0x7e, - 0x58, 0x07, 0xfa, 0xb0, 0xa8, 0x51, 0x7b, 0x25, 0x35, 0x7d, 0x41, 0xcf, 0x61, 0x37, 0x51, 0x01, - 0x4f, 0x95, 0x4f, 0xaf, 0x04, 0x97, 0x8a, 0x66, 0x33, 0xc7, 0xa3, 0x88, 0x06, 0x3a, 0xb1, 0x0d, - 0xef, 0xbe, 0x81, 0x7b, 0x16, 0xed, 0x19, 0x10, 0x7d, 0x0d, 0x0f, 0x13, 0x85, 0xc9, 0x45, 0x20, - 0xd9, 0x38, 0xd3, 0xcc, 0x8b, 0xcd, 0xe0, 0xeb, 0x33, 0x9c, 0x79, 0x0f, 0xcf, 0xe0, 0xc1, 0xac, - 0x07, 0x21, 0xf9, 0x7b, 0x4a, 0x94, 0xcf, 0x02, 0xbd, 0x08, 0x45, 0x6f, 0x67, 0x06, 0x3d, 0x31, - 0xe0, 0x71, 0x90, 0xe5, 0xfb, 0xa3, 0xde, 0xf2, 0xc5, 0x90, 0xab, 0x26, 0x5f, 0x03, 0xcf, 0x47, - 0x7b, 0x04, 0x60, 0x75, 0xa9, 0x8c, 0x6a, 0x6b, 0x3a, 0x42, 0xd1, 0x58, 0xde, 0xc8, 0x08, 0xb9, - 0xb0, 0x6d, 0xe1, 0x5b, 0xb3, 0x59, 0xd7, 0xbc, 0xaa, 0x81, 0x4e, 0xa7, 0x63, 0x41, 0xef, 0xe1, - 0x01, 0x8b, 0x09, 0xbf, 0x64, 0x71, 0xe8, 0xdf, 0x8c, 0x42, 0x6f, 0xf1, 0xc6, 0xde, 0xca, 0x93, - 0x7b, 0xed, 0x67, 0xff, 0xf3, 0x81, 0x9b, 0x1f, 0xe5, 0xcd, 0x60, 0x32, 0xad, 0xb7, 0x93, 0xfb, - 0x9c, 0xb5, 0x66, 0xb1, 0x78, 0xaa, 0x42, 0xbe, 0x18, 0xab, 0x78, 0x97, 0x58, 0xb9, 0xcf, 0x59, - 0x6b, 0xf3, 0x2d, 0x94, 0x6f, 0xc5, 0xde, 0x80, 0x42, 0x7f, 0xd0, 0xef, 0x55, 0x96, 0x50, 0x15, - 0x36, 0x87, 0xde, 0xcb, 0x6e, 0xcf, 0xef, 0x0e, 0xfa, 0xc3, 0xde, 0xdb, 0x61, 0xc5, 0x41, 0x08, - 0xee, 0xbd, 0xf2, 0x4e, 0xba, 0xbe, 0xb1, 0x77, 0x8e, 0xfb, 0x95, 0x65, 0xb4, 0x0b, 0xdb, 0xdd, - 0xd7, 0x83, 0x37, 0x87, 0xfe, 0x6d, 0xf2, 0x4a, 0x93, 0x00, 0xd2, 0x9e, 0x6d, 0x17, 0xed, 0xfa, - 0x7d, 0x07, 0xe5, 0xd9, 0x1f, 0x9b, 0xdd, 0xe4, 0x86, 0xad, 0x08, 0x0b, 0x96, 0x15, 0x92, 0xfd, - 0xff, 0xdc, 0x57, 0x52, 0x10, 0xab, 0xed, 0x40, 0x76, 0x2c, 0xab, 0x3f, 0x3b, 0xcb, 0x15, 0xc7, - 0x2b, 0x85, 0x33, 0x40, 0xf7, 0x8f, 0xeb, 0x86, 0xf3, 0xe7, 0x75, 0xc3, 0xf9, 0xeb, 0xba, 0xe1, - 0xc0, 0x3e, 0xe3, 0xc6, 0x91, 0x90, 0xfc, 0x6a, 0xf2, 0xe1, 0x2e, 0x75, 0x40, 0x67, 0x75, 0x92, - 0x9d, 0xcb, 0x89, 0xf3, 0x6e, 0x79, 0xdc, 0x1e, 0xad, 0xe9, 0xdb, 0xf9, 0xfc, 0xbf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xe3, 0x81, 0xea, 0xcb, 0xbf, 0x07, 0x00, 0x00, + // 884 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x4f, 0x1b, 0x47, + 0x14, 0x67, 0x8d, 0x01, 0xfb, 0xd9, 0x04, 0x33, 0x21, 0xc1, 0xb5, 0x12, 0x8b, 0x9a, 0x2a, 0xca, + 0x21, 0x5a, 0x0b, 0x37, 0x4d, 0xd3, 0x5b, 0x63, 0xe3, 0x06, 0xa2, 0xd4, 0x46, 0x8b, 0x53, 0x45, + 0xb9, 0xac, 0xc6, 0xb3, 0xc3, 0x32, 0x61, 0xd9, 0x19, 0xcd, 0xce, 0xba, 0xb8, 0xa7, 0x9e, 0xfb, + 0x19, 0x7a, 0xea, 0xc7, 0xe8, 0xa9, 0xc7, 0x1e, 0xfb, 0x11, 0x2a, 0x2e, 0x55, 0xef, 0xfd, 0x00, + 0xd5, 0xce, 0xcc, 0x82, 0xb1, 0xa9, 0x54, 0x89, 0xdb, 0xec, 0xfb, 0xfd, 0x7e, 0xef, 0xdf, 0xbc, + 0xb7, 0x03, 0x9f, 0xd2, 0x78, 0xc2, 0xa7, 0x6d, 0xc2, 0xe3, 0x13, 0x16, 0xb6, 0x95, 0xc4, 0x84, + 0xb6, 0x27, 0x1d, 0x73, 0x70, 0x85, 0xe4, 0x8a, 0xa3, 0x07, 0x9a, 0xe2, 0x1a, 0x8a, 0x6b, 0x90, + 0x49, 0xa7, 0xf1, 0x99, 0x51, 0x62, 0xc1, 0x32, 0x01, 0xe1, 0x92, 0xb6, 0x43, 0x29, 0x88, 0x9f, + 0x50, 0x39, 0x61, 0xb9, 0xb8, 0xf1, 0x8c, 0x0b, 0x1a, 0x13, 0x1a, 0x27, 0x69, 0xd2, 0xd6, 0x96, + 0x3c, 0xc6, 0x9e, 0x39, 0xf8, 0xd6, 0xad, 0x61, 0x7f, 0x12, 0x72, 0x1e, 0x46, 0xd4, 0x30, 0xc7, + 0xe9, 0x49, 0x1b, 0xc7, 0x53, 0x0b, 0x3d, 0x9a, 0x87, 0x12, 0x25, 0x53, 0xa2, 0x2c, 0xda, 0x9c, + 0x47, 0xbf, 0x97, 0x58, 0x08, 0x2a, 0x13, 0x8b, 0x6f, 0x4f, 0x70, 0xc4, 0x02, 0xac, 0x68, 0x3b, + 0x3f, 0x18, 0xa0, 0xf5, 0x97, 0x03, 0x6b, 0x23, 0x89, 0x09, 0x8b, 0x43, 0xf4, 0x25, 0x14, 0x4f, + 0x95, 0x12, 0x75, 0x67, 0xc7, 0x79, 0x5a, 0xe9, 0xec, 0xba, 0xb7, 0xd6, 0xed, 0x5a, 0xb6, 0x7b, + 0xa0, 0x94, 0xf0, 0xb4, 0xa0, 0xf1, 0x8b, 0x03, 0xc5, 0xec, 0x13, 0x3d, 0x86, 0x62, 0x8c, 0xcf, + 0xa9, 0xf6, 0x50, 0xee, 0x96, 0x7f, 0xfd, 0xfb, 0xb7, 0xe5, 0xa2, 0x2c, 0xec, 0x38, 0x9e, 0x36, + 0xa3, 0x3d, 0x58, 0x35, 0xde, 0xea, 0x05, 0x1d, 0x62, 0xdb, 0x35, 0x69, 0xbb, 0x79, 0xda, 0xee, + 0xb1, 0x2e, 0xea, 0x60, 0xc9, 0xb3, 0x44, 0xf4, 0x15, 0x54, 0xd5, 0x54, 0xd0, 0xc0, 0xf6, 0xa9, + 0xbe, 0xac, 0x85, 0x5b, 0x0b, 0xc2, 0x57, 0xf1, 0xf4, 0x60, 0xc9, 0xab, 0x68, 0x6e, 0x4f, 0x53, + 0xbb, 0xeb, 0x50, 0x31, 0x22, 0x3f, 0xb3, 0xb6, 0x7e, 0x74, 0x60, 0xe3, 0x2d, 0x0b, 0x4f, 0x55, + 0xa2, 0xa8, 0x30, 0x14, 0xf4, 0x02, 0x36, 0x09, 0x8f, 0x22, 0x4a, 0x14, 0x97, 0x3e, 0x89, 0xd2, + 0x44, 0x51, 0xb9, 0x98, 0x7c, 0xed, 0x8a, 0xd3, 0x33, 0x14, 0xf4, 0x05, 0x6c, 0x62, 0x42, 0x68, + 0x92, 0xf8, 0x8a, 0x9f, 0xd1, 0xd8, 0x3f, 0x61, 0x11, 0xd5, 0x35, 0xdd, 0xd0, 0x6d, 0x18, 0xce, + 0x28, 0xa3, 0x7c, 0xc3, 0x22, 0xda, 0xfa, 0xc7, 0x81, 0xea, 0x07, 0x26, 0xce, 0x58, 0x7c, 0xc7, + 0xf8, 0x2f, 0x01, 0x5d, 0xeb, 0x68, 0x1c, 0x08, 0xce, 0x62, 0xb5, 0x98, 0xc0, 0xb5, 0xf3, 0xbe, + 0xe5, 0xa0, 0x27, 0xb0, 0x61, 0xe6, 0x8e, 0x05, 0xfe, 0x5e, 0xe7, 0xe5, 0x98, 0x29, 0xdd, 0xd2, + 0x92, 0xb7, 0xae, 0xcd, 0x87, 0x81, 0x31, 0xa2, 0x37, 0x70, 0x3f, 0x39, 0xc5, 0x92, 0x06, 0x7e, + 0x22, 0x70, 0x9c, 0x75, 0x5f, 0xd1, 0x0b, 0x55, 0x2f, 0xea, 0xf6, 0x37, 0x16, 0xda, 0xdf, 0xe5, + 0x3c, 0xfa, 0x0e, 0x47, 0x29, 0xf5, 0x36, 0x8d, 0xec, 0x58, 0xe0, 0xac, 0xc8, 0x4c, 0xd4, 0x0a, + 0x61, 0x63, 0x7f, 0x1a, 0xe3, 0x73, 0x46, 0x86, 0xca, 0x16, 0xbe, 0x0b, 0x6b, 0x11, 0x1b, 0x4b, + 0x2c, 0xa7, 0x8b, 0xe5, 0xe6, 0x08, 0x6a, 0xff, 0xcf, 0x71, 0xc9, 0x87, 0xa5, 0x95, 0xc2, 0xfa, + 0x3e, 0x56, 0x38, 0xe0, 0xe1, 0x1d, 0xfb, 0xfb, 0x0c, 0xaa, 0x76, 0x8d, 0x7d, 0x3d, 0xcf, 0x0b, + 0x9d, 0xad, 0x58, 0x78, 0x80, 0xcf, 0x69, 0xeb, 0xe7, 0x15, 0xa8, 0x0d, 0x05, 0x8d, 0x7b, 0x7a, + 0xcd, 0x6d, 0xe8, 0x43, 0xa8, 0xce, 0x2e, 0xb8, 0x5d, 0xaa, 0x27, 0xee, 0xf5, 0xff, 0xc0, 0x94, + 0x91, 0x2f, 0xd6, 0x9e, 0x5e, 0x2c, 0x6a, 0xd4, 0x5e, 0x45, 0x5d, 0x7f, 0xa0, 0x17, 0xb0, 0x9d, + 0xa8, 0x80, 0xa7, 0xca, 0xa7, 0x17, 0x82, 0x4b, 0x45, 0xb3, 0x3b, 0xc7, 0xe3, 0x88, 0x06, 0x3a, + 0xb1, 0x92, 0xf7, 0xc0, 0xc0, 0x7d, 0x8b, 0xf6, 0x0d, 0x88, 0xbe, 0x86, 0x47, 0x89, 0xc2, 0xe4, + 0x2c, 0x90, 0x6c, 0x92, 0x69, 0xe6, 0xc5, 0xe6, 0xe2, 0x1b, 0x33, 0x9c, 0x79, 0x0f, 0xcf, 0xe1, + 0xe1, 0xac, 0x07, 0x21, 0xf9, 0x47, 0x4a, 0x94, 0xcf, 0x02, 0x3d, 0x08, 0x65, 0x6f, 0x6b, 0x06, + 0x3d, 0x32, 0xe0, 0x61, 0x90, 0xe5, 0xfb, 0x83, 0x9e, 0xf2, 0xc5, 0x90, 0x2b, 0x26, 0x5f, 0x03, + 0xcf, 0x47, 0x7b, 0x0c, 0x60, 0x75, 0xa9, 0x8c, 0xea, 0xab, 0x3a, 0x42, 0xd9, 0x58, 0xde, 0xc9, + 0x08, 0x7d, 0x84, 0x87, 0x2c, 0x26, 0xfc, 0x9c, 0xc5, 0xa1, 0x7f, 0xd5, 0x5a, 0x3d, 0x95, 0xa5, + 0x9d, 0xe5, 0xa7, 0xf7, 0x3a, 0xcf, 0xff, 0xe3, 0x87, 0x35, 0x7f, 0x35, 0x57, 0x8d, 0xce, 0xb4, + 0xde, 0x56, 0xee, 0x73, 0xd6, 0x9a, 0xc5, 0xe2, 0xa9, 0x0a, 0xf9, 0x62, 0xac, 0xf2, 0x5d, 0x62, + 0xe5, 0x3e, 0x67, 0xad, 0xad, 0xf7, 0x50, 0xbd, 0x11, 0xbb, 0x04, 0xc5, 0xc1, 0x70, 0xd0, 0xaf, + 0x2d, 0xa1, 0x4d, 0x58, 0x1f, 0x79, 0xaf, 0x7a, 0x7d, 0xbf, 0x37, 0x1c, 0x8c, 0xfa, 0xef, 0x47, + 0x35, 0x07, 0x21, 0xb8, 0xf7, 0xda, 0x3b, 0xea, 0xf9, 0xc6, 0xde, 0x3d, 0x1c, 0xd4, 0x0a, 0x68, + 0x1b, 0xee, 0xf7, 0xde, 0x0e, 0xdf, 0xed, 0xfb, 0x37, 0xc9, 0xcb, 0x6f, 0x8a, 0xa5, 0xb5, 0x5a, + 0xa9, 0x45, 0x00, 0x69, 0xff, 0xc7, 0x66, 0x64, 0xed, 0x50, 0x7d, 0x0b, 0xd5, 0xd9, 0xe7, 0xca, + 0xce, 0x67, 0xd3, 0xd6, 0x85, 0x05, 0xcb, 0xca, 0xc9, 0x5e, 0x35, 0xf7, 0xb5, 0x14, 0xc4, 0x6a, + 0xbb, 0x90, 0xad, 0xc0, 0xca, 0x4f, 0x4e, 0xa1, 0xe6, 0x78, 0x95, 0x70, 0x06, 0xe8, 0xfd, 0x7e, + 0xd9, 0x74, 0xfe, 0xb8, 0x6c, 0x3a, 0x7f, 0x5e, 0x36, 0x1d, 0xd8, 0x65, 0xdc, 0x38, 0x12, 0x92, + 0x5f, 0x4c, 0x6f, 0xef, 0x55, 0x17, 0x74, 0x56, 0x47, 0xd9, 0x12, 0x1c, 0x39, 0x1f, 0x0a, 0x93, + 0xce, 0x78, 0x55, 0x6f, 0xc4, 0xe7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x17, 0xbe, 0xc9, 0xad, + 0x95, 0x07, 0x00, 0x00, } func (m *Tracing) Marshal() (dAtA []byte, err error) { @@ -1119,12 +1108,6 @@ func (m *OpenCensusConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintTrace(dAtA, i, uint64(len(m.ZipkinUrl))) i += copy(dAtA[i:], m.ZipkinUrl) } - if len(m.ZipkinServiceName) > 0 { - dAtA[i] = 0x3a - i++ - i = encodeVarintTrace(dAtA, i, uint64(len(m.ZipkinServiceName))) - i += copy(dAtA[i:], m.ZipkinServiceName) - } if len(m.IncomingTraceContext) > 0 { dAtA9 := make([]byte, len(m.IncomingTraceContext)*10) var j8 int @@ -1378,10 +1361,6 @@ func (m *OpenCensusConfig) Size() (n int) { if l > 0 { n += 1 + l + sovTrace(uint64(l)) } - l = len(m.ZipkinServiceName) - if l > 0 { - n += 1 + l + sovTrace(uint64(l)) - } if len(m.IncomingTraceContext) > 0 { l = 0 for _, e := range m.IncomingTraceContext { @@ -2398,38 +2377,6 @@ func (m *OpenCensusConfig) Unmarshal(dAtA []byte) error { } m.ZipkinUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ZipkinServiceName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTrace - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTrace - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTrace - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ZipkinServiceName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 8: if wireType == 0 { var v OpenCensusConfig_TraceContext diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go index 388a1b560bcb..4e789ed51a41 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/trace/v2/trace.pb.validate.go @@ -40,17 +40,12 @@ func (m *Tracing) Validate() error { return nil } - { - tmp := m.GetHttp() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TracingValidationError{ - field: "Http", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttp()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TracingValidationError{ + field: "Http", + reason: "embedded message failed validation", + cause: err, } } } @@ -215,17 +210,12 @@ func (m *ZipkinConfig) Validate() error { // no validation rules for TraceId_128Bit - { - tmp := m.GetSharedSpanContext() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ZipkinConfigValidationError{ - field: "SharedSpanContext", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSharedSpanContext()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ZipkinConfigValidationError{ + field: "SharedSpanContext", + reason: "embedded message failed validation", + cause: err, } } } @@ -302,17 +292,12 @@ func (m *DynamicOtConfig) Validate() error { } } - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DynamicOtConfigValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DynamicOtConfigValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } @@ -461,17 +446,12 @@ func (m *OpenCensusConfig) Validate() error { return nil } - { - tmp := m.GetTraceConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OpenCensusConfigValidationError{ - field: "TraceConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTraceConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OpenCensusConfigValidationError{ + field: "TraceConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -486,8 +466,6 @@ func (m *OpenCensusConfig) Validate() error { // no validation rules for ZipkinUrl - // no validation rules for ZipkinServiceName - return nil } @@ -560,17 +538,12 @@ func (m *TraceServiceConfig) Validate() error { } } - { - tmp := m.GetGrpcService() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TraceServiceConfigValidationError{ - field: "GrpcService", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TraceServiceConfigValidationError{ + field: "GrpcService", + reason: "embedded message failed validation", + cause: err, } } } @@ -653,34 +626,24 @@ func (m *Tracing_Http) Validate() error { case *Tracing_Http_Config: - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Tracing_HttpValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Tracing_HttpValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } case *Tracing_Http_TypedConfig: - { - tmp := m.GetTypedConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return Tracing_HttpValidationError{ - field: "TypedConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTypedConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return Tracing_HttpValidationError{ + field: "TypedConfig", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/common.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/common.pb.go index 33e24ca8892e..af9fdbaf9b6f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/common.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/common.pb.go @@ -5,10 +5,9 @@ package v2 import ( fmt "fmt" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.go index dec476585f39..bc87908d4f5f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.go @@ -5,12 +5,10 @@ package v2 import ( fmt "fmt" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + proto "github.com/gogo/protobuf/proto" io "io" math "math" - - proto "github.com/gogo/protobuf/proto" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.validate.go index dc86ab2a9c8a..456c63074072 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/http.pb.validate.go @@ -41,32 +41,22 @@ func (m *HttpBufferedTrace) Validate() error { return nil } - { - tmp := m.GetRequest() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpBufferedTraceValidationError{ - field: "Request", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequest()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpBufferedTraceValidationError{ + field: "Request", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetResponse() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpBufferedTraceValidationError{ - field: "Response", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResponse()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpBufferedTraceValidationError{ + field: "Response", + reason: "embedded message failed validation", + cause: err, } } } @@ -144,102 +134,72 @@ func (m *HttpStreamedTraceSegment) Validate() error { case *HttpStreamedTraceSegment_RequestHeaders: - { - tmp := m.GetRequestHeaders() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpStreamedTraceSegmentValidationError{ - field: "RequestHeaders", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestHeaders()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpStreamedTraceSegmentValidationError{ + field: "RequestHeaders", + reason: "embedded message failed validation", + cause: err, } } } case *HttpStreamedTraceSegment_RequestBodyChunk: - { - tmp := m.GetRequestBodyChunk() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpStreamedTraceSegmentValidationError{ - field: "RequestBodyChunk", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestBodyChunk()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpStreamedTraceSegmentValidationError{ + field: "RequestBodyChunk", + reason: "embedded message failed validation", + cause: err, } } } case *HttpStreamedTraceSegment_RequestTrailers: - { - tmp := m.GetRequestTrailers() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpStreamedTraceSegmentValidationError{ - field: "RequestTrailers", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRequestTrailers()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpStreamedTraceSegmentValidationError{ + field: "RequestTrailers", + reason: "embedded message failed validation", + cause: err, } } } case *HttpStreamedTraceSegment_ResponseHeaders: - { - tmp := m.GetResponseHeaders() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpStreamedTraceSegmentValidationError{ - field: "ResponseHeaders", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResponseHeaders()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpStreamedTraceSegmentValidationError{ + field: "ResponseHeaders", + reason: "embedded message failed validation", + cause: err, } } } case *HttpStreamedTraceSegment_ResponseBodyChunk: - { - tmp := m.GetResponseBodyChunk() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpStreamedTraceSegmentValidationError{ - field: "ResponseBodyChunk", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResponseBodyChunk()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpStreamedTraceSegmentValidationError{ + field: "ResponseBodyChunk", + reason: "embedded message failed validation", + cause: err, } } } case *HttpStreamedTraceSegment_ResponseTrailers: - { - tmp := m.GetResponseTrailers() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpStreamedTraceSegmentValidationError{ - field: "ResponseTrailers", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetResponseTrailers()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpStreamedTraceSegmentValidationError{ + field: "ResponseTrailers", + reason: "embedded message failed validation", + cause: err, } } } @@ -316,34 +276,24 @@ func (m *HttpBufferedTrace_Message) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpBufferedTrace_MessageValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpBufferedTrace_MessageValidationError{ + field: fmt.Sprintf("Headers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetBody() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpBufferedTrace_MessageValidationError{ - field: "Body", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetBody()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpBufferedTrace_MessageValidationError{ + field: "Body", + reason: "embedded message failed validation", + cause: err, } } } @@ -351,17 +301,12 @@ func (m *HttpBufferedTrace_Message) Validate() error { for idx, item := range m.GetTrailers() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpBufferedTrace_MessageValidationError{ - field: fmt.Sprintf("Trailers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpBufferedTrace_MessageValidationError{ + field: fmt.Sprintf("Trailers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.go index 63b369b0759e..8b4e4e0d460d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.go @@ -5,13 +5,11 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.validate.go index 04d3906d0718..0d45c866b4c7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/transport.pb.validate.go @@ -40,32 +40,22 @@ func (m *Connection) Validate() error { return nil } - { - tmp := m.GetLocalAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ConnectionValidationError{ - field: "LocalAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocalAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ConnectionValidationError{ + field: "LocalAddress", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetRemoteAddress() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ConnectionValidationError{ - field: "RemoteAddress", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRemoteAddress()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ConnectionValidationError{ + field: "RemoteAddress", + reason: "embedded message failed validation", + cause: err, } } } @@ -135,17 +125,12 @@ func (m *SocketEvent) Validate() error { return nil } - { - tmp := m.GetTimestamp() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketEventValidationError{ - field: "Timestamp", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTimestamp()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketEventValidationError{ + field: "Timestamp", + reason: "embedded message failed validation", + cause: err, } } } @@ -154,51 +139,36 @@ func (m *SocketEvent) Validate() error { case *SocketEvent_Read_: - { - tmp := m.GetRead() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketEventValidationError{ - field: "Read", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRead()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketEventValidationError{ + field: "Read", + reason: "embedded message failed validation", + cause: err, } } } case *SocketEvent_Write_: - { - tmp := m.GetWrite() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketEventValidationError{ - field: "Write", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetWrite()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketEventValidationError{ + field: "Write", + reason: "embedded message failed validation", + cause: err, } } } case *SocketEvent_Closed_: - { - tmp := m.GetClosed() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketEventValidationError{ - field: "Closed", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetClosed()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketEventValidationError{ + field: "Closed", + reason: "embedded message failed validation", + cause: err, } } } @@ -272,17 +242,12 @@ func (m *SocketBufferedTrace) Validate() error { // no validation rules for TraceId - { - tmp := m.GetConnection() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketBufferedTraceValidationError{ - field: "Connection", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConnection()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketBufferedTraceValidationError{ + field: "Connection", + reason: "embedded message failed validation", + cause: err, } } } @@ -290,17 +255,12 @@ func (m *SocketBufferedTrace) Validate() error { for idx, item := range m.GetEvents() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketBufferedTraceValidationError{ - field: fmt.Sprintf("Events[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketBufferedTraceValidationError{ + field: fmt.Sprintf("Events[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -384,34 +344,24 @@ func (m *SocketStreamedTraceSegment) Validate() error { case *SocketStreamedTraceSegment_Connection: - { - tmp := m.GetConnection() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketStreamedTraceSegmentValidationError{ - field: "Connection", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConnection()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketStreamedTraceSegmentValidationError{ + field: "Connection", + reason: "embedded message failed validation", + cause: err, } } } case *SocketStreamedTraceSegment_Event: - { - tmp := m.GetEvent() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketStreamedTraceSegmentValidationError{ - field: "Event", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEvent()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketStreamedTraceSegmentValidationError{ + field: "Event", + reason: "embedded message failed validation", + cause: err, } } } @@ -485,17 +435,12 @@ func (m *SocketEvent_Read) Validate() error { return nil } - { - tmp := m.GetData() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketEvent_ReadValidationError{ - field: "Data", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetData()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketEvent_ReadValidationError{ + field: "Data", + reason: "embedded message failed validation", + cause: err, } } } @@ -565,17 +510,12 @@ func (m *SocketEvent_Write) Validate() error { return nil } - { - tmp := m.GetData() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return SocketEvent_WriteValidationError{ - field: "Data", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetData()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return SocketEvent_WriteValidationError{ + field: "Data", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.go index c079b4b11c9e..9f1a6f744cf9 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.go @@ -5,11 +5,10 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.validate.go index fcd5674477d1..a05971c69bc4 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha/wrapper.pb.validate.go @@ -45,68 +45,48 @@ func (m *TraceWrapper) Validate() error { case *TraceWrapper_HttpBufferedTrace: - { - tmp := m.GetHttpBufferedTrace() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TraceWrapperValidationError{ - field: "HttpBufferedTrace", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpBufferedTrace()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TraceWrapperValidationError{ + field: "HttpBufferedTrace", + reason: "embedded message failed validation", + cause: err, } } } case *TraceWrapper_HttpStreamedTraceSegment: - { - tmp := m.GetHttpStreamedTraceSegment() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TraceWrapperValidationError{ - field: "HttpStreamedTraceSegment", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpStreamedTraceSegment()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TraceWrapperValidationError{ + field: "HttpStreamedTraceSegment", + reason: "embedded message failed validation", + cause: err, } } } case *TraceWrapper_SocketBufferedTrace: - { - tmp := m.GetSocketBufferedTrace() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TraceWrapperValidationError{ - field: "SocketBufferedTrace", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSocketBufferedTrace()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TraceWrapperValidationError{ + field: "SocketBufferedTrace", + reason: "embedded message failed validation", + cause: err, } } } case *TraceWrapper_SocketStreamedTraceSegment: - { - tmp := m.GetSocketStreamedTraceSegment() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TraceWrapperValidationError{ - field: "SocketStreamedTraceSegment", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetSocketStreamedTraceSegment()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TraceWrapperValidationError{ + field: "SocketStreamedTraceSegment", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/ads.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/ads.pb.go index 69eac435375f..9a125eed9b04 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/ads.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/ads.pb.go @@ -6,13 +6,11 @@ package v2 import ( context "context" fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" - - v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.go index f81ef063c418..5ac4b0685c41 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.go @@ -6,16 +6,14 @@ package v2 import ( context "context" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" _ "github.com/gogo/googleapis/google/api" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go index cad235e0dcc3..18048758647d 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/hds.pb.validate.go @@ -109,32 +109,22 @@ func (m *HealthCheckRequest) Validate() error { return nil } - { - tmp := m.GetNode() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckRequestValidationError{ - field: "Node", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckRequestValidationError{ + field: "Node", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetCapability() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckRequestValidationError{ - field: "Capability", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetCapability()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckRequestValidationError{ + field: "Capability", + reason: "embedded message failed validation", + cause: err, } } } @@ -206,17 +196,12 @@ func (m *EndpointHealth) Validate() error { return nil } - { - tmp := m.GetEndpoint() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return EndpointHealthValidationError{ - field: "Endpoint", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEndpoint()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return EndpointHealthValidationError{ + field: "Endpoint", + reason: "embedded message failed validation", + cause: err, } } } @@ -291,17 +276,12 @@ func (m *EndpointHealthResponse) Validate() error { for idx, item := range m.GetEndpointsHealth() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return EndpointHealthResponseValidationError{ - field: fmt.Sprintf("EndpointsHealth[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return EndpointHealthResponseValidationError{ + field: fmt.Sprintf("EndpointsHealth[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -379,34 +359,24 @@ func (m *HealthCheckRequestOrEndpointHealthResponse) Validate() error { case *HealthCheckRequestOrEndpointHealthResponse_HealthCheckRequest: - { - tmp := m.GetHealthCheckRequest() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckRequestOrEndpointHealthResponseValidationError{ - field: "HealthCheckRequest", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHealthCheckRequest()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckRequestOrEndpointHealthResponseValidationError{ + field: "HealthCheckRequest", + reason: "embedded message failed validation", + cause: err, } } } case *HealthCheckRequestOrEndpointHealthResponse_EndpointHealthResponse: - { - tmp := m.GetEndpointHealthResponse() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckRequestOrEndpointHealthResponseValidationError{ - field: "EndpointHealthResponse", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetEndpointHealthResponse()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckRequestOrEndpointHealthResponseValidationError{ + field: "EndpointHealthResponse", + reason: "embedded message failed validation", + cause: err, } } } @@ -481,17 +451,12 @@ func (m *LocalityEndpoints) Validate() error { return nil } - { - tmp := m.GetLocality() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LocalityEndpointsValidationError{ - field: "Locality", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLocality()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LocalityEndpointsValidationError{ + field: "Locality", + reason: "embedded message failed validation", + cause: err, } } } @@ -499,17 +464,12 @@ func (m *LocalityEndpoints) Validate() error { for idx, item := range m.GetEndpoints() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return LocalityEndpointsValidationError{ - field: fmt.Sprintf("Endpoints[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return LocalityEndpointsValidationError{ + field: fmt.Sprintf("Endpoints[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -588,17 +548,12 @@ func (m *ClusterHealthCheck) Validate() error { for idx, item := range m.GetHealthChecks() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterHealthCheckValidationError{ - field: fmt.Sprintf("HealthChecks[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterHealthCheckValidationError{ + field: fmt.Sprintf("HealthChecks[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -608,17 +563,12 @@ func (m *ClusterHealthCheck) Validate() error { for idx, item := range m.GetLocalityEndpoints() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ClusterHealthCheckValidationError{ - field: fmt.Sprintf("LocalityEndpoints[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ClusterHealthCheckValidationError{ + field: fmt.Sprintf("LocalityEndpoints[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -695,34 +645,24 @@ func (m *HealthCheckSpecifier) Validate() error { for idx, item := range m.GetClusterHealthChecks() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckSpecifierValidationError{ - field: fmt.Sprintf("ClusterHealthChecks[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckSpecifierValidationError{ + field: fmt.Sprintf("ClusterHealthChecks[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } } - { - tmp := m.GetInterval() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HealthCheckSpecifierValidationError{ - field: "Interval", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetInterval()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HealthCheckSpecifierValidationError{ + field: "Interval", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.go index a3c565f14b44..03b2a439833f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.go @@ -6,16 +6,14 @@ package v2 import ( context "context" fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - - v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.validate.go index a7118ca2edc8..455eb339ad71 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/rtds.pb.validate.go @@ -111,17 +111,12 @@ func (m *Runtime) Validate() error { } } - { - tmp := m.GetLayer() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return RuntimeValidationError{ - field: "Layer", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetLayer()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return RuntimeValidationError{ + field: "Layer", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/sds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/sds.pb.go index 1bf6fb63f1f2..9285facdcb54 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/sds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2/sds.pb.go @@ -6,14 +6,12 @@ package v2 import ( context "context" fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" _ "github.com/gogo/googleapis/google/api" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" - - v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.go index da3ba527342e..9309245bf30f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.go @@ -5,16 +5,13 @@ package envoy_service_tap_v2alpha import ( fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" - _ "github.com/envoyproxy/go-control-plane/envoy/type/matcher" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -1054,72 +1051,71 @@ func init() { } var fileDescriptor_4f6a60461d532a14 = []byte{ - // 1035 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0xcf, 0x72, 0xdb, 0xb6, - 0x13, 0xc7, 0x4d, 0xc9, 0x92, 0xa5, 0x95, 0xe2, 0x9f, 0x7e, 0x68, 0xd3, 0xd8, 0xae, 0xab, 0x3a, - 0x9a, 0xb6, 0x71, 0xff, 0x91, 0x33, 0xca, 0xb1, 0xbd, 0x98, 0xb1, 0x6c, 0xa9, 0xb5, 0x2d, 0x95, - 0x62, 0x5a, 0xfb, 0x84, 0x81, 0x24, 0x48, 0x66, 0x42, 0x11, 0x28, 0x08, 0xa9, 0xd2, 0xa5, 0x87, - 0x1e, 0x3b, 0xd3, 0x4b, 0x6e, 0x7d, 0x93, 0x4e, 0x4f, 0x39, 0xe6, 0xd8, 0x47, 0xe8, 0xf8, 0x96, - 0x47, 0xe8, 0xad, 0x43, 0x02, 0xb4, 0x45, 0x3b, 0x71, 0x1d, 0xe7, 0xa2, 0x11, 0xb1, 0xbb, 0x9f, - 0x2f, 0x76, 0x01, 0x2c, 0x00, 0x9f, 0xd0, 0x60, 0xca, 0xe6, 0x56, 0x48, 0xc5, 0xd4, 0xeb, 0x53, - 0x4b, 0x12, 0x6e, 0x4d, 0xeb, 0xc4, 0xe7, 0xa7, 0xc4, 0xea, 0xb3, 0xf1, 0x98, 0x05, 0x26, 0x17, - 0x4c, 0x32, 0xb4, 0x1e, 0xfb, 0x99, 0xda, 0xcf, 0x94, 0x84, 0x9b, 0xda, 0x6f, 0xa3, 0xaa, 0x10, - 0x84, 0x7b, 0xd6, 0xb4, 0x6e, 0x09, 0x36, 0x91, 0x54, 0xfd, 0xaa, 0xd0, 0x8d, 0xcd, 0x94, 0xbd, - 0xcf, 0x04, 0xb5, 0x7a, 0x24, 0x4c, 0xac, 0x1f, 0x5d, 0xb5, 0x8e, 0x04, 0xef, 0xe3, 0x44, 0x49, - 0x79, 0x7d, 0xa8, 0xbc, 0xe4, 0x9c, 0x53, 0x6b, 0x4c, 0x64, 0xff, 0x94, 0x0a, 0x2b, 0x94, 0xc2, - 0x0b, 0x46, 0xda, 0xa1, 0x3a, 0x62, 0x6c, 0xe4, 0x53, 0x2b, 0xfe, 0xea, 0x4d, 0x86, 0xd6, 0x4f, - 0x82, 0x70, 0x4e, 0x45, 0xa8, 0xed, 0xf7, 0xa6, 0xc4, 0xf7, 0x06, 0x44, 0x52, 0x2b, 0xf9, 0xa3, - 0x0c, 0xb5, 0xdf, 0x32, 0x50, 0x74, 0x09, 0x7f, 0xc4, 0x82, 0xa1, 0x37, 0x42, 0xc7, 0x50, 0x8e, - 0xf1, 0xb8, 0x1f, 0x7f, 0xaf, 0x19, 0x5b, 0xc6, 0x76, 0xa9, 0xfe, 0xa9, 0xf9, 0xda, 0xec, 0xcd, - 0xc3, 0xc8, 0xbd, 0x23, 0xe8, 0xc0, 0xeb, 0x13, 0x49, 0x6d, 0xf8, 0xf3, 0xe5, 0xf3, 0x6c, 0xee, - 0x57, 0x23, 0x53, 0x31, 0x9c, 0x52, 0x8c, 0x3a, 0x27, 0xdf, 0x61, 0x13, 0xc9, 0x27, 0x32, 0x41, - 0x67, 0x62, 0xf4, 0x83, 0x6b, 0xd0, 0xed, 0xd8, 0x5f, 0xc5, 0xa7, 0xc0, 0x65, 0xb6, 0x60, 0x41, - 0x07, 0x50, 0x92, 0x84, 0x63, 0x1a, 0x90, 0x9e, 0x4f, 0x07, 0x6b, 0xd9, 0x98, 0xfb, 0xb9, 0xe6, - 0x12, 0xee, 0x99, 0xd3, 0xba, 0x19, 0xd5, 0xd5, 0x74, 0x26, 0x81, 0xf4, 0xc6, 0x74, 0x4f, 0x90, - 0xbe, 0xf4, 0x58, 0x40, 0xfc, 0x0e, 0x15, 0x7d, 0x1a, 0x48, 0x07, 0x24, 0xe1, 0x0d, 0x15, 0x5e, - 0x7b, 0x91, 0x87, 0xd5, 0x74, 0x4e, 0xa8, 0x0d, 0x05, 0x26, 0x70, 0x9c, 0x8c, 0x2e, 0x48, 0xfd, - 0xc6, 0x05, 0x51, 0x9f, 0x5d, 0x2a, 0x9b, 0x4b, 0xce, 0x0a, 0x13, 0xf1, 0x17, 0xfa, 0x0e, 0x8a, - 0x24, 0x18, 0x68, 0x62, 0xe6, 0x2d, 0x88, 0x05, 0x12, 0x0c, 0x14, 0xb2, 0x09, 0xc5, 0x80, 0x49, - 0x8d, 0xcc, 0xbe, 0xe1, 0xaa, 0x45, 0xa4, 0x80, 0x49, 0x45, 0xda, 0x8e, 0x26, 0x37, 0xd7, 0xa4, - 0xe5, 0x2d, 0x63, 0xbb, 0x60, 0x17, 0xa3, 0xda, 0x2f, 0x3f, 0xc9, 0x14, 0x0c, 0xa5, 0x39, 0x57, - 0x9e, 0x4f, 0x60, 0xe3, 0x54, 0x4a, 0x8e, 0x05, 0xfd, 0x71, 0x42, 0x43, 0x89, 0x4f, 0x29, 0x19, - 0x50, 0x11, 0xea, 0xd0, 0x5c, 0x6a, 0x1d, 0x5e, 0x35, 0x89, 0xa6, 0x94, 0xbc, 0xa9, 0x62, 0x62, - 0x60, 0x73, 0xc9, 0xb9, 0x17, 0x01, 0x1d, 0xc5, 0x5b, 0x34, 0x21, 0x1f, 0xde, 0x4f, 0x69, 0x49, - 0x41, 0x3c, 0xff, 0x42, 0x2c, 0x7f, 0x1b, 0xb1, 0xb5, 0x05, 0x31, 0x57, 0xf3, 0x2e, 0xab, 0x85, - 0x9c, 0x05, 0x21, 0xbd, 0x94, 0xda, 0xca, 0x5b, 0xa8, 0x29, 0x60, 0x2a, 0xb7, 0x00, 0x36, 0xd3, - 0x6a, 0x97, 0x92, 0x2b, 0xdc, 0x46, 0x6e, 0x7d, 0x51, 0x2e, 0x95, 0xdd, 0xc6, 0x0f, 0x50, 0x48, - 0xf6, 0x10, 0xfa, 0x16, 0x72, 0x62, 0xe2, 0xd3, 0x70, 0xcd, 0xd8, 0xca, 0xde, 0xe6, 0xa4, 0x3f, - 0x33, 0x32, 0x85, 0x8c, 0xa3, 0x18, 0xf6, 0x1d, 0x58, 0x8e, 0xfe, 0xa0, 0xdc, 0x1f, 0x2f, 0x9f, - 0x67, 0x8d, 0x5a, 0x1b, 0x2a, 0x97, 0x27, 0x86, 0xbe, 0x82, 0x15, 0x5d, 0x4b, 0xad, 0x78, 0x3f, - 0x7d, 0x50, 0x55, 0xe3, 0x54, 0x21, 0x87, 0xaa, 0xd1, 0x39, 0x49, 0x44, 0xed, 0xf7, 0x0c, 0x94, - 0x17, 0x9b, 0x02, 0x6a, 0x41, 0x2e, 0xf4, 0x82, 0xa7, 0x09, 0xeb, 0xe3, 0xff, 0x6c, 0x26, 0x5d, - 0x2f, 0x78, 0x6a, 0x97, 0xa3, 0x99, 0xaf, 0x3c, 0x33, 0x96, 0x0b, 0x46, 0xc5, 0x70, 0x14, 0x01, - 0xb5, 0xe1, 0xee, 0x98, 0xcc, 0x70, 0x6f, 0x32, 0x1c, 0x52, 0x41, 0x07, 0x58, 0xcc, 0x70, 0x6f, - 0x2e, 0x69, 0xa8, 0xcf, 0xe7, 0xa6, 0xa9, 0x1a, 0xac, 0x99, 0x34, 0x58, 0xf3, 0x71, 0x2b, 0x90, - 0x0f, 0xeb, 0xdf, 0x13, 0x7f, 0x42, 0x1d, 0x34, 0x26, 0x33, 0x5b, 0x47, 0x3a, 0x33, 0x3b, 0x8a, - 0xbb, 0x02, 0x94, 0x09, 0x30, 0xfb, 0x86, 0x40, 0x57, 0x03, 0x37, 0xa1, 0x18, 0x4a, 0x41, 0xc9, - 0xd8, 0x0b, 0x46, 0xea, 0x60, 0x3a, 0x17, 0x03, 0xb5, 0x7f, 0xb2, 0x00, 0x17, 0x39, 0xa2, 0x0e, - 0xe4, 0x87, 0x4c, 0x8c, 0x89, 0x8c, 0x3b, 0xd6, 0x6a, 0xfd, 0x8b, 0x1b, 0x95, 0xc6, 0xdc, 0x8b, - 0x63, 0xf4, 0xda, 0xfe, 0x12, 0x37, 0x5b, 0xcd, 0x41, 0xc7, 0xf0, 0xbf, 0x73, 0x35, 0x4c, 0x06, - 0x63, 0x2f, 0xd0, 0xa5, 0xf9, 0xf2, 0x1a, 0x74, 0x37, 0x89, 0xd8, 0x89, 0x02, 0x22, 0x89, 0xe6, - 0x92, 0xb3, 0x1a, 0xa6, 0x46, 0xd1, 0x21, 0x94, 0x87, 0x9e, 0x4f, 0x31, 0xa7, 0x02, 0x4b, 0xc2, - 0x6f, 0xd0, 0xbe, 0xf6, 0x3c, 0x9f, 0x76, 0xa8, 0x70, 0x09, 0xd7, 0x48, 0x18, 0x9e, 0x8f, 0xa0, - 0xc7, 0x70, 0x21, 0x80, 0xa3, 0xbb, 0x34, 0x2e, 0x56, 0xe9, 0xda, 0x12, 0x9c, 0xcf, 0x73, 0x5f, - 0xf0, 0xbe, 0x66, 0xde, 0x09, 0x17, 0x07, 0x6b, 0x3f, 0x43, 0x5e, 0x55, 0x07, 0xbd, 0x07, 0xe8, - 0x9b, 0x6e, 0xfb, 0x08, 0xdb, 0xed, 0xdd, 0x13, 0xbc, 0xd3, 0xc5, 0xf6, 0x89, 0xdb, 0xe8, 0x56, - 0x96, 0xd0, 0x3d, 0x78, 0x27, 0x35, 0xde, 0x75, 0x9d, 0xd6, 0xd1, 0x7e, 0xc5, 0x40, 0x15, 0x28, - 0x77, 0x9c, 0xb6, 0xdb, 0xc6, 0x76, 0xeb, 0x68, 0xc7, 0x39, 0xa9, 0x64, 0xd0, 0x7d, 0xf8, 0x60, - 0x71, 0x04, 0x1f, 0x34, 0x8e, 0xf6, 0xdd, 0x26, 0xde, 0x6d, 0x1c, 0xb4, 0x0e, 0x5b, 0x6e, 0x63, - 0xb7, 0x92, 0x45, 0xab, 0x00, 0xca, 0xc5, 0x6d, 0x1c, 0xbb, 0x95, 0x65, 0x7b, 0x1d, 0x2a, 0xfa, - 0x02, 0x8d, 0x36, 0x2c, 0x8e, 0x9e, 0x02, 0xc9, 0x41, 0x7b, 0x17, 0xd0, 0xd5, 0x42, 0xd7, 0xbe, - 0x86, 0xd5, 0x74, 0x9d, 0xd0, 0x67, 0x50, 0xe2, 0x44, 0x9e, 0x62, 0x2e, 0xe8, 0xd0, 0x9b, 0xc5, - 0x3b, 0xa3, 0xa8, 0x9b, 0xbb, 0xc8, 0x6c, 0x19, 0x0e, 0x44, 0xd6, 0x4e, 0x6c, 0xac, 0xcd, 0xe1, - 0xff, 0x57, 0x8a, 0x82, 0xee, 0x42, 0x3e, 0xba, 0x6a, 0xbd, 0x81, 0x8a, 0x75, 0x72, 0x92, 0xf0, - 0xd6, 0x20, 0x5a, 0xc0, 0xc5, 0x37, 0x8b, 0xde, 0x17, 0xd5, 0x57, 0x5c, 0xc1, 0x31, 0x49, 0x79, - 0xa5, 0x9f, 0x0a, 0xa3, 0x05, 0xc3, 0xee, 0x8b, 0xb3, 0xaa, 0xf1, 0xd7, 0x59, 0xd5, 0xf8, 0xfb, - 0xac, 0x6a, 0xc0, 0x03, 0x8f, 0x29, 0x10, 0x17, 0x6c, 0x36, 0x7f, 0xfd, 0x1a, 0xda, 0xa5, 0x47, - 0xf1, 0x83, 0xad, 0x13, 0x9d, 0xa7, 0x8e, 0xd1, 0xcb, 0xc7, 0x07, 0xeb, 0xe1, 0xbf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xee, 0x07, 0xb9, 0x88, 0xe2, 0x09, 0x00, 0x00, + // 1016 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0xcf, 0x73, 0x1a, 0x37, + 0x14, 0xc7, 0xbd, 0x60, 0x30, 0x3c, 0xb0, 0x4b, 0xd5, 0xa6, 0xfe, 0x51, 0x97, 0x71, 0x98, 0xb6, + 0x71, 0x7f, 0x2d, 0x33, 0xe4, 0xd8, 0x5e, 0xbc, 0x31, 0x36, 0xb4, 0xb6, 0xa1, 0xcb, 0xa6, 0xb5, + 0x4f, 0x1a, 0x01, 0x02, 0x6f, 0xb2, 0xac, 0x54, 0xad, 0xa0, 0x70, 0xe9, 0xa1, 0xc7, 0xce, 0xf4, + 0x92, 0x5b, 0xff, 0x93, 0x4e, 0x4f, 0x39, 0xe6, 0xd8, 0x3f, 0xa1, 0xe3, 0x5b, 0xfe, 0x84, 0xde, + 0x3a, 0xbb, 0xd2, 0x62, 0xd6, 0x4e, 0x5c, 0xc7, 0xb9, 0x30, 0x48, 0xef, 0xbd, 0xcf, 0x57, 0xef, + 0x49, 0x7a, 0x5a, 0xf8, 0x94, 0xfa, 0x13, 0x36, 0xab, 0x06, 0x54, 0x4c, 0xdc, 0x1e, 0xad, 0x4a, + 0xc2, 0xab, 0x93, 0x1a, 0xf1, 0xf8, 0x39, 0xa9, 0xf6, 0xd8, 0x68, 0xc4, 0x7c, 0x93, 0x0b, 0x26, + 0x19, 0xda, 0x8c, 0xfc, 0x4c, 0xed, 0x67, 0x4a, 0xc2, 0x4d, 0xed, 0xb7, 0x55, 0x56, 0x08, 0xc2, + 0xdd, 0xea, 0xa4, 0x56, 0x15, 0x6c, 0x2c, 0xa9, 0xfa, 0x55, 0xa1, 0x5b, 0xdb, 0x09, 0x7b, 0x8f, + 0x09, 0x5a, 0xed, 0x92, 0x20, 0xb6, 0x7e, 0x7c, 0xdd, 0x3a, 0x14, 0xbc, 0x87, 0x63, 0x25, 0xe5, + 0x55, 0x1e, 0x32, 0x36, 0xf4, 0x68, 0x35, 0x1a, 0x75, 0xc7, 0x83, 0xea, 0xcf, 0x82, 0x70, 0x4e, + 0x45, 0xa0, 0xed, 0xeb, 0x13, 0xe2, 0xb9, 0x7d, 0x22, 0x69, 0x35, 0xfe, 0xa3, 0x0c, 0x95, 0xdf, + 0x53, 0x90, 0x77, 0x08, 0x7f, 0xc4, 0xfc, 0x81, 0x3b, 0x44, 0xa7, 0x50, 0x1c, 0x11, 0xd9, 0x3b, + 0xc7, 0xbd, 0x68, 0xbc, 0x61, 0xec, 0x18, 0xbb, 0x85, 0xda, 0x67, 0xe6, 0x6b, 0x93, 0x33, 0x8f, + 0x43, 0xf7, 0xb6, 0xa0, 0x7d, 0xb7, 0x47, 0x24, 0xb5, 0xe0, 0xaf, 0x97, 0xcf, 0xd3, 0x99, 0xdf, + 0x8c, 0x54, 0xc9, 0xb0, 0x0b, 0x11, 0x6a, 0x4e, 0x5e, 0x65, 0x63, 0xc9, 0xc7, 0x32, 0x46, 0xa7, + 0x22, 0xf4, 0x83, 0x1b, 0xd0, 0xad, 0xc8, 0x5f, 0xc5, 0x27, 0xc0, 0x45, 0xb6, 0x60, 0x41, 0x47, + 0x50, 0x90, 0x84, 0x63, 0xea, 0x93, 0xae, 0x47, 0xfb, 0x1b, 0xe9, 0x88, 0xfb, 0x85, 0xe6, 0x12, + 0xee, 0x9a, 0x93, 0x9a, 0x19, 0x96, 0xcd, 0xb4, 0xc7, 0xbe, 0x74, 0x47, 0xf4, 0x40, 0x90, 0x9e, + 0x74, 0x99, 0x4f, 0xbc, 0x36, 0x15, 0x3d, 0xea, 0x4b, 0x1b, 0x24, 0xe1, 0x75, 0x15, 0x5e, 0x79, + 0x91, 0x85, 0xb5, 0x64, 0x4e, 0xa8, 0x05, 0x39, 0x26, 0x70, 0x94, 0x8c, 0x2e, 0x48, 0xed, 0xd6, + 0x05, 0x51, 0xc3, 0x0e, 0x95, 0x8d, 0x25, 0x7b, 0x85, 0x89, 0x68, 0x84, 0xbe, 0x87, 0x3c, 0xf1, + 0xfb, 0x9a, 0x98, 0x7a, 0x0b, 0x62, 0x8e, 0xf8, 0x7d, 0x85, 0x6c, 0x40, 0xde, 0x67, 0x52, 0x23, + 0xd3, 0x6f, 0xb8, 0x6b, 0x21, 0xc9, 0x67, 0x52, 0x91, 0x76, 0xc3, 0xc5, 0xcd, 0x34, 0x69, 0x79, + 0xc7, 0xd8, 0xcd, 0x59, 0xf9, 0xb0, 0xf6, 0xcb, 0x4f, 0x52, 0x39, 0x43, 0x69, 0xce, 0x94, 0xe7, + 0x13, 0xd8, 0x3a, 0x97, 0x92, 0x63, 0x41, 0x7f, 0x1a, 0xd3, 0x40, 0xe2, 0x73, 0x4a, 0xfa, 0x54, + 0x04, 0x3a, 0x34, 0x93, 0xd8, 0x87, 0x57, 0x2d, 0xa2, 0x21, 0x25, 0x6f, 0xa8, 0x98, 0x08, 0xd8, + 0x58, 0xb2, 0xd7, 0x43, 0xa0, 0xad, 0x78, 0x8b, 0x26, 0xe4, 0xc1, 0x87, 0x09, 0x2d, 0x29, 0x88, + 0xeb, 0x5d, 0x8a, 0x65, 0xef, 0x22, 0xb6, 0xb1, 0x20, 0xe6, 0x68, 0xde, 0x55, 0xb5, 0x80, 0x33, + 0x3f, 0xa0, 0x57, 0x52, 0x5b, 0x79, 0x0b, 0x35, 0x05, 0x4c, 0xe4, 0xe6, 0xc3, 0x76, 0x52, 0xed, + 0x4a, 0x72, 0xb9, 0xbb, 0xc8, 0x6d, 0x2e, 0xca, 0x25, 0xb2, 0xdb, 0xfa, 0x11, 0x72, 0xf1, 0x19, + 0x42, 0xdf, 0x41, 0x46, 0x8c, 0x3d, 0x1a, 0x6c, 0x18, 0x3b, 0xe9, 0xbb, 0xdc, 0xf4, 0x67, 0x46, + 0x2a, 0x97, 0xb2, 0x15, 0xc3, 0x5a, 0x85, 0xe5, 0xf0, 0x0f, 0xca, 0xfc, 0xf9, 0xf2, 0x79, 0xda, + 0xa8, 0xb4, 0xa0, 0x74, 0x75, 0x61, 0xe8, 0x6b, 0x58, 0xd1, 0xb5, 0xd4, 0x8a, 0xf7, 0x93, 0x17, + 0x55, 0xf5, 0x45, 0x15, 0x12, 0x45, 0x50, 0x61, 0xc7, 0x11, 0x95, 0x3f, 0x52, 0x50, 0x5c, 0x6c, + 0x0a, 0xa8, 0x09, 0x99, 0xc0, 0xf5, 0x9f, 0xc6, 0xac, 0x4f, 0xfe, 0xb7, 0x99, 0x74, 0x5c, 0xff, + 0xa9, 0x55, 0x0c, 0x57, 0xbe, 0xf2, 0xcc, 0x58, 0xce, 0x19, 0x25, 0xc3, 0x56, 0x04, 0xd4, 0x82, + 0x7b, 0x23, 0x32, 0xc5, 0xdd, 0xf1, 0x60, 0x40, 0x05, 0xed, 0x63, 0x31, 0xc5, 0xdd, 0x99, 0xa4, + 0x81, 0xbe, 0x9f, 0xdb, 0xa6, 0x6a, 0xb0, 0x66, 0xdc, 0x60, 0xcd, 0xc7, 0x4d, 0x5f, 0x3e, 0xac, + 0xfd, 0x40, 0xbc, 0x31, 0xb5, 0xd1, 0x88, 0x4c, 0x2d, 0x1d, 0x69, 0x4f, 0xad, 0x30, 0xee, 0x1a, + 0x50, 0xc6, 0xc0, 0xf4, 0x1b, 0x02, 0x1d, 0x0d, 0xdc, 0x86, 0x7c, 0x20, 0x05, 0x25, 0x23, 0xd7, + 0x1f, 0xaa, 0x8b, 0x69, 0x5f, 0x4e, 0x54, 0xfe, 0x4d, 0x03, 0x5c, 0xe6, 0x88, 0xda, 0x90, 0x1d, + 0x30, 0x31, 0x22, 0x32, 0xea, 0x58, 0x6b, 0xb5, 0x2f, 0x6f, 0x55, 0x1a, 0xf3, 0x20, 0x8a, 0xd1, + 0x7b, 0xfb, 0x6b, 0xd4, 0x6c, 0x35, 0x07, 0x9d, 0xc2, 0x3b, 0x73, 0x35, 0x4c, 0xfa, 0x23, 0xd7, + 0xd7, 0xa5, 0xf9, 0xea, 0x06, 0x74, 0x27, 0x8e, 0xd8, 0x0b, 0x03, 0x42, 0x89, 0xc6, 0x92, 0xbd, + 0x16, 0x24, 0x66, 0xd1, 0x31, 0x14, 0x07, 0xae, 0x47, 0x31, 0xa7, 0x02, 0x4b, 0xc2, 0x6f, 0xd1, + 0xbe, 0x0e, 0x5c, 0x8f, 0xb6, 0xa9, 0x70, 0x08, 0xd7, 0x48, 0x18, 0xcc, 0x67, 0xd0, 0x63, 0xb8, + 0x14, 0xc0, 0xe1, 0x53, 0x19, 0x15, 0xab, 0x70, 0x63, 0x09, 0xe6, 0xeb, 0x3c, 0x14, 0xbc, 0xa7, + 0x99, 0xab, 0xc1, 0xe2, 0x64, 0xe5, 0x17, 0xc8, 0xaa, 0xea, 0xa0, 0x0f, 0x00, 0x7d, 0xdb, 0x69, + 0x9d, 0x60, 0xab, 0xb5, 0x7f, 0x86, 0xf7, 0x3a, 0xd8, 0x3a, 0x73, 0xea, 0x9d, 0xd2, 0x12, 0x5a, + 0x87, 0xf7, 0x12, 0xf3, 0x1d, 0xc7, 0x6e, 0x9e, 0x1c, 0x96, 0x0c, 0x54, 0x82, 0x62, 0xdb, 0x6e, + 0x39, 0x2d, 0x6c, 0x35, 0x4f, 0xf6, 0xec, 0xb3, 0x52, 0x0a, 0xdd, 0x87, 0x8f, 0x16, 0x67, 0xf0, + 0x51, 0xfd, 0xe4, 0xd0, 0x69, 0xe0, 0xfd, 0xfa, 0x51, 0xf3, 0xb8, 0xe9, 0xd4, 0xf7, 0x4b, 0x69, + 0xb4, 0x06, 0xa0, 0x5c, 0x9c, 0xfa, 0xa9, 0x53, 0x5a, 0xb6, 0x36, 0xa1, 0xa4, 0x1f, 0xd0, 0xf0, + 0xc0, 0x62, 0x39, 0xe3, 0xf3, 0x8b, 0xf6, 0x3e, 0xa0, 0xeb, 0x85, 0xae, 0x7c, 0x03, 0x6b, 0xc9, + 0x3a, 0xa1, 0xcf, 0xa1, 0xc0, 0x89, 0x3c, 0xc7, 0x5c, 0xd0, 0x81, 0x3b, 0x8d, 0x4e, 0x46, 0x5e, + 0x37, 0x77, 0x91, 0xda, 0x31, 0x6c, 0x08, 0xad, 0xed, 0xc8, 0x58, 0x99, 0xc1, 0xbb, 0xd7, 0x8a, + 0x82, 0xee, 0x41, 0x36, 0x7c, 0x6a, 0xdd, 0xbe, 0x8a, 0xb5, 0x33, 0x92, 0xf0, 0x66, 0x3f, 0xdc, + 0xc0, 0xc5, 0x4f, 0x12, 0x7d, 0x2e, 0xca, 0xaf, 0x78, 0x82, 0x23, 0x92, 0xf2, 0x4a, 0x7e, 0x2a, + 0x0c, 0x17, 0x0c, 0xfb, 0x2f, 0x2e, 0xca, 0xc6, 0xdf, 0x17, 0x65, 0xe3, 0x9f, 0x8b, 0xb2, 0x01, + 0x0f, 0x5c, 0xa6, 0x40, 0x5c, 0xb0, 0xe9, 0xec, 0xf5, 0x7b, 0x68, 0x15, 0x1e, 0x45, 0xdf, 0x63, + 0xed, 0xf0, 0x3e, 0xb5, 0x8d, 0x6e, 0x36, 0xba, 0x58, 0x0f, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, + 0x2d, 0xac, 0xef, 0x68, 0xc1, 0x09, 0x00, 0x00, } func (m *TapConfig) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.validate.go index 4aed463d03b4..2b05225502d6 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/common.pb.validate.go @@ -47,17 +47,12 @@ func (m *TapConfig) Validate() error { } } - { - tmp := m.GetMatchConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TapConfigValidationError{ - field: "MatchConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMatchConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TapConfigValidationError{ + field: "MatchConfig", + reason: "embedded message failed validation", + cause: err, } } } @@ -69,32 +64,22 @@ func (m *TapConfig) Validate() error { } } - { - tmp := m.GetOutputConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TapConfigValidationError{ - field: "OutputConfig", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOutputConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TapConfigValidationError{ + field: "OutputConfig", + reason: "embedded message failed validation", + cause: err, } } } - { - tmp := m.GetTapEnabled() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TapConfigValidationError{ - field: "TapEnabled", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTapEnabled()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TapConfigValidationError{ + field: "TapEnabled", + reason: "embedded message failed validation", + cause: err, } } } @@ -168,51 +153,36 @@ func (m *MatchPredicate) Validate() error { case *MatchPredicate_OrMatch: - { - tmp := m.GetOrMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "OrMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOrMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "OrMatch", + reason: "embedded message failed validation", + cause: err, } } } case *MatchPredicate_AndMatch: - { - tmp := m.GetAndMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "AndMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetAndMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "AndMatch", + reason: "embedded message failed validation", + cause: err, } } } case *MatchPredicate_NotMatch: - { - tmp := m.GetNotMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "NotMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNotMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "NotMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -228,68 +198,48 @@ func (m *MatchPredicate) Validate() error { case *MatchPredicate_HttpRequestHeadersMatch: - { - tmp := m.GetHttpRequestHeadersMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "HttpRequestHeadersMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpRequestHeadersMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "HttpRequestHeadersMatch", + reason: "embedded message failed validation", + cause: err, } } } case *MatchPredicate_HttpRequestTrailersMatch: - { - tmp := m.GetHttpRequestTrailersMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "HttpRequestTrailersMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpRequestTrailersMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "HttpRequestTrailersMatch", + reason: "embedded message failed validation", + cause: err, } } } case *MatchPredicate_HttpResponseHeadersMatch: - { - tmp := m.GetHttpResponseHeadersMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "HttpResponseHeadersMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpResponseHeadersMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "HttpResponseHeadersMatch", + reason: "embedded message failed validation", + cause: err, } } } case *MatchPredicate_HttpResponseTrailersMatch: - { - tmp := m.GetHttpResponseTrailersMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicateValidationError{ - field: "HttpResponseTrailersMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetHttpResponseTrailersMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicateValidationError{ + field: "HttpResponseTrailersMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -370,17 +320,12 @@ func (m *HttpHeadersMatch) Validate() error { for idx, item := range m.GetHeaders() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return HttpHeadersMatchValidationError{ - field: fmt.Sprintf("Headers[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HttpHeadersMatchValidationError{ + field: fmt.Sprintf("Headers[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -462,49 +407,34 @@ func (m *OutputConfig) Validate() error { for idx, item := range m.GetSinks() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutputConfigValidationError{ - field: fmt.Sprintf("Sinks[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - } - - } - - { - tmp := m.GetMaxBufferedRxBytes() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - + if v, ok := interface{}(item).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return OutputConfigValidationError{ - field: "MaxBufferedRxBytes", + field: fmt.Sprintf("Sinks[%v]", idx), reason: "embedded message failed validation", cause: err, } } } - } - { - tmp := m.GetMaxBufferedTxBytes() + } - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { + if v, ok := interface{}(m.GetMaxBufferedRxBytes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutputConfigValidationError{ + field: "MaxBufferedRxBytes", + reason: "embedded message failed validation", + cause: err, + } + } + } - if err := v.Validate(); err != nil { - return OutputConfigValidationError{ - field: "MaxBufferedTxBytes", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetMaxBufferedTxBytes()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutputConfigValidationError{ + field: "MaxBufferedTxBytes", + reason: "embedded message failed validation", + cause: err, } } } @@ -586,51 +516,36 @@ func (m *OutputSink) Validate() error { case *OutputSink_StreamingAdmin: - { - tmp := m.GetStreamingAdmin() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutputSinkValidationError{ - field: "StreamingAdmin", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStreamingAdmin()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutputSinkValidationError{ + field: "StreamingAdmin", + reason: "embedded message failed validation", + cause: err, } } } case *OutputSink_FilePerTap: - { - tmp := m.GetFilePerTap() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutputSinkValidationError{ - field: "FilePerTap", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetFilePerTap()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutputSinkValidationError{ + field: "FilePerTap", + reason: "embedded message failed validation", + cause: err, } } } case *OutputSink_StreamingGrpc: - { - tmp := m.GetStreamingGrpc() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return OutputSinkValidationError{ - field: "StreamingGrpc", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStreamingGrpc()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return OutputSinkValidationError{ + field: "StreamingGrpc", + reason: "embedded message failed validation", + cause: err, } } } @@ -856,17 +771,12 @@ func (m *StreamingGrpcSink) Validate() error { } } - { - tmp := m.GetGrpcService() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StreamingGrpcSinkValidationError{ - field: "GrpcService", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetGrpcService()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StreamingGrpcSinkValidationError{ + field: "GrpcService", + reason: "embedded message failed validation", + cause: err, } } } @@ -948,17 +858,12 @@ func (m *MatchPredicate_MatchSet) Validate() error { for idx, item := range m.GetRules() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MatchPredicate_MatchSetValidationError{ - field: fmt.Sprintf("Rules[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MatchPredicate_MatchSetValidationError{ + field: fmt.Sprintf("Rules[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.go index b40d4c6730a2..b4b8b940b541 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.go @@ -6,15 +6,13 @@ package envoy_service_tap_v2alpha import ( context "context" fmt "fmt" - io "io" - math "math" - + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + v2alpha "github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" - - core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - v2alpha "github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.validate.go index c57fa008ea7d..ef34b7b64fef 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tap.pb.validate.go @@ -41,34 +41,24 @@ func (m *StreamTapsRequest) Validate() error { return nil } - { - tmp := m.GetIdentifier() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StreamTapsRequestValidationError{ - field: "Identifier", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetIdentifier()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StreamTapsRequestValidationError{ + field: "Identifier", + reason: "embedded message failed validation", + cause: err, } } } // no validation rules for TraceId - { - tmp := m.GetTrace() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StreamTapsRequestValidationError{ - field: "Trace", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetTrace()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StreamTapsRequestValidationError{ + field: "Trace", + reason: "embedded message failed validation", + cause: err, } } } @@ -214,17 +204,12 @@ func (m *StreamTapsRequest_Identifier) Validate() error { } } - { - tmp := m.GetNode() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return StreamTapsRequest_IdentifierValidationError{ - field: "Node", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNode()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return StreamTapsRequest_IdentifierValidationError{ + field: "Node", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.go index c9d37202ae1f..f53913bc284f 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.go @@ -6,15 +6,13 @@ package envoy_service_tap_v2alpha import ( context "context" fmt "fmt" - io "io" - math "math" - + v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/googleapis/google/api" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" - - v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.validate.go index 0f04185f39d9..a018d6c0feca 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha/tapds.pb.validate.go @@ -48,17 +48,12 @@ func (m *TapResource) Validate() error { } } - { - tmp := m.GetConfig() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return TapResourceValidationError{ - field: "Config", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetConfig()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return TapResourceValidationError{ + field: "Config", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go index 2f8bbdc4d092..e23076892deb 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go @@ -5,11 +5,10 @@ package envoy_type import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go index 61d3727989a3..ea3d0143a398 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.go @@ -5,11 +5,10 @@ package matcher import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go index 84ef2df5ca9c..d2bd91706d13 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/metadata.pb.validate.go @@ -58,17 +58,12 @@ func (m *MetadataMatcher) Validate() error { for idx, item := range m.GetPath() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MetadataMatcherValidationError{ - field: fmt.Sprintf("Path[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MetadataMatcherValidationError{ + field: fmt.Sprintf("Path[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } @@ -82,17 +77,12 @@ func (m *MetadataMatcher) Validate() error { } } - { - tmp := m.GetValue() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return MetadataMatcherValidationError{ - field: "Value", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetValue()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return MetadataMatcherValidationError{ + field: "Value", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go index 62d7f225157d..951a3323b92e 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.go @@ -6,13 +6,11 @@ package matcher import ( encoding_binary "encoding/binary" fmt "fmt" - io "io" - math "math" - + _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" - - _type "github.com/envoyproxy/go-control-plane/envoy/type" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go index 781f2acb8271..91d2ef411aa0 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/number.pb.validate.go @@ -45,17 +45,12 @@ func (m *DoubleMatcher) Validate() error { case *DoubleMatcher_Range: - { - tmp := m.GetRange() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return DoubleMatcherValidationError{ - field: "Range", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetRange()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return DoubleMatcherValidationError{ + field: "Range", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go index 3a72cdece807..84af5e9022da 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.go @@ -5,11 +5,10 @@ package matcher import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.validate.go index 063fce3a6581..99aa27e233f6 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/string.pb.validate.go @@ -156,17 +156,12 @@ func (m *ListStringMatcher) Validate() error { for idx, item := range m.GetPatterns() { _, _ = idx, item - { - tmp := item - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListStringMatcherValidationError{ - field: fmt.Sprintf("Patterns[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(item).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListStringMatcherValidationError{ + field: fmt.Sprintf("Patterns[%v]", idx), + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go index 24f32bcd8566..e31d6cbdc779 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.go @@ -5,11 +5,10 @@ package matcher import ( fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go index adc9484da9b0..6c32508fb959 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/matcher/value.pb.validate.go @@ -45,51 +45,36 @@ func (m *ValueMatcher) Validate() error { case *ValueMatcher_NullMatch_: - { - tmp := m.GetNullMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ValueMatcherValidationError{ - field: "NullMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetNullMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ValueMatcherValidationError{ + field: "NullMatch", + reason: "embedded message failed validation", + cause: err, } } } case *ValueMatcher_DoubleMatch: - { - tmp := m.GetDoubleMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ValueMatcherValidationError{ - field: "DoubleMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetDoubleMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ValueMatcherValidationError{ + field: "DoubleMatch", + reason: "embedded message failed validation", + cause: err, } } } case *ValueMatcher_StringMatch: - { - tmp := m.GetStringMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ValueMatcherValidationError{ - field: "StringMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetStringMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ValueMatcherValidationError{ + field: "StringMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -102,17 +87,12 @@ func (m *ValueMatcher) Validate() error { case *ValueMatcher_ListMatch: - { - tmp := m.GetListMatch() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ValueMatcherValidationError{ - field: "ListMatch", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetListMatch()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ValueMatcherValidationError{ + field: "ListMatch", + reason: "embedded message failed validation", + cause: err, } } } @@ -194,17 +174,12 @@ func (m *ListMatcher) Validate() error { case *ListMatcher_OneOf: - { - tmp := m.GetOneOf() - - if v, ok := interface{}(tmp).(interface{ Validate() error }); ok { - - if err := v.Validate(); err != nil { - return ListMatcherValidationError{ - field: "OneOf", - reason: "embedded message failed validation", - cause: err, - } + if v, ok := interface{}(m.GetOneOf()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return ListMatcherValidationError{ + field: "OneOf", + reason: "embedded message failed validation", + cause: err, } } } diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go index b826ce6a4c83..e233a28f79a7 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/percent.pb.go @@ -7,12 +7,11 @@ import ( bytes "bytes" encoding_binary "encoding/binary" fmt "fmt" - io "io" - math "math" - _ "github.com/envoyproxy/protoc-gen-validate/validate" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go index db764c2166ef..c75c4571b212 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/type/range.pb.go @@ -7,11 +7,10 @@ import ( bytes "bytes" encoding_binary "encoding/binary" fmt "fmt" - io "io" - math "math" - _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + io "io" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/server.go b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/server.go index ff1726f9a3c8..4208c7efda67 100644 --- a/vendor/github.com/envoyproxy/go-control-plane/pkg/server/server.go +++ b/vendor/github.com/envoyproxy/go-control-plane/pkg/server/server.go @@ -129,13 +129,13 @@ func createResponse(resp *cache.Response, typeURL string) (*v2.DiscoveryResponse if resp == nil { return nil, errors.New("missing response") } - resources := make([]types.Any, len(resp.Resources)) + resources := make([]*types.Any, len(resp.Resources)) for i := 0; i < len(resp.Resources); i++ { data, err := proto.Marshal(resp.Resources[i]) if err != nil { return nil, err } - resources[i] = types.Any{ + resources[i] = &types.Any{ TypeUrl: typeURL, Value: data, } diff --git a/vendor/modules.txt b/vendor/modules.txt index 6f527db20eeb..31f903ab8681 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -137,7 +137,7 @@ github.com/docker/spdystream/spdy # github.com/emicklei/go-restful v2.6.0+incompatible github.com/emicklei/go-restful github.com/emicklei/go-restful/log -# github.com/envoyproxy/go-control-plane v0.8.2 +# github.com/envoyproxy/go-control-plane v0.8.3 github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha github.com/envoyproxy/go-control-plane/envoy/api/v2 github.com/envoyproxy/go-control-plane/envoy/api/v2/auth @@ -212,11 +212,11 @@ github.com/gogo/googleapis/google/rpc github.com/gogo/googleapis/google/api # github.com/gogo/protobuf v1.2.1 => github.com/istio/gogo-protobuf v1.2.2 github.com/gogo/protobuf/proto +github.com/gogo/protobuf/jsonpb github.com/gogo/protobuf/types github.com/gogo/protobuf/gogoproto -github.com/gogo/protobuf/protoc-gen-gogo/descriptor github.com/gogo/protobuf/sortkeys -github.com/gogo/protobuf/jsonpb +github.com/gogo/protobuf/protoc-gen-gogo/descriptor # github.com/gogo/status v1.0.3 github.com/gogo/status # github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b => github.com/istio/glog v0.0.0-20190424172949-d7cfb6fa2ccd @@ -672,11 +672,11 @@ google.golang.org/grpc/status google.golang.org/grpc/stats google.golang.org/grpc/balancer/roundrobin google.golang.org/grpc/peer +google.golang.org/grpc/grpclog google.golang.org/grpc/balancer google.golang.org/grpc/connectivity google.golang.org/grpc/encoding google.golang.org/grpc/encoding/proto -google.golang.org/grpc/grpclog google.golang.org/grpc/internal google.golang.org/grpc/internal/backoff google.golang.org/grpc/internal/balancerload @@ -713,18 +713,18 @@ gopkg.in/stack.v1 # gopkg.in/yaml.v2 v2.2.2 gopkg.in/yaml.v2 # istio.io/api v0.0.0-20190730171035-f306601671d2 -istio.io/api/annotation -istio.io/api/authentication/v1alpha1 -istio.io/api/networking/v1alpha3 -istio.io/api/mixer/v1 istio.io/api/mesh/v1alpha1 istio.io/api/mcp/v1alpha1 +istio.io/api/authentication/v1alpha1 istio.io/api/mixer/v1/config/client +istio.io/api/networking/v1alpha3 istio.io/api/policy/v1beta1 istio.io/api/rbac/v1alpha1 +istio.io/api/annotation istio.io/api/envoy/config/filter/http/authn/v2alpha1 istio.io/api/envoy/config/filter/http/jwt_auth/v2alpha1 istio.io/api/mixer/adapter/model/v1beta1 +istio.io/api/mixer/v1 # istio.io/gogo-genproto v0.0.0-20190614210408-e88dc8b0e4db istio.io/gogo-genproto/opencensus/proto/trace/v1 # istio.io/pkg v0.0.0-20190710182420-c26792dead42