From db0b36a50fa8230b3f8edd718f108a64c74d7880 Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:55:12 +0000 Subject: [PATCH] Mirrored from envoyproxy/envoy @ 5f58f9ac917e82fdfadb771b8de3bb466d9e53ee Signed-off-by: update-envoy[bot] <135279899+update-envoy[bot]@users.noreply.github.com> --- .../qatzip/compressor/v3alpha/qatzip.pb.go | 20 +- .../qatzstd/compressor/v3alpha/qatzstd.pb.go | 20 +- .../filters/http/golang/v3alpha/golang.pb.go | 12 +- .../filters/http/squash/v3/squash.pb.go | 26 +- .../filters/http/sxg/v3alpha/sxg.pb.go | 12 +- .../client_ssl_auth/v3/client_ssl_auth.pb.go | 12 +- .../generic_proxy/action/v3/action.pb.go | 8 +- .../generic_proxy/codecs/http1/v3/http1.pb.go | 16 +- .../network/golang/v3alpha/golang.pb.go | 10 +- .../v3alpha/postgres_proxy.pb.go | 12 +- .../rocketmq_proxy/v3/rocketmq_proxy.pb.go | 12 +- .../network/sip_proxy/tra/v3alpha/tra.pb.go | 56 +- .../network/sip_proxy/v3alpha/sip_proxy.pb.go | 16 +- .../cryptomb/v3alpha/cryptomb.pb.go | 8 +- .../qat/v3alpha/qat.pb.go | 8 +- .../golang/v3alpha/golang.pb.go | 10 +- envoy/COMMIT | 2 +- envoy/admin/v2alpha/certs.pb.go | 20 +- envoy/admin/v2alpha/config_dump.pb.go | 104 +- envoy/admin/v2alpha/server_info.pb.go | 24 +- envoy/admin/v3/certs.pb.go | 20 +- envoy/admin/v3/config_dump.pb.go | 32 +- envoy/admin/v3/config_dump_shared.pb.go | 104 +- envoy/admin/v3/server_info.pb.go | 24 +- envoy/api/v2/auth/common.pb.go | 28 +- envoy/api/v2/auth/tls.pb.go | 26 +- envoy/api/v2/cluster.pb.go | 94 +- envoy/api/v2/cluster/circuit_breaker.pb.go | 28 +- envoy/api/v2/cluster/filter.pb.go | 10 +- envoy/api/v2/cluster/outlier_detection.pb.go | 86 +- envoy/api/v2/core/address.pb.go | 42 +- envoy/api/v2/core/backoff.pb.go | 14 +- envoy/api/v2/core/base.pb.go | 46 +- envoy/api/v2/core/config_source.pb.go | 30 +- envoy/api/v2/core/grpc_service.pb.go | 28 +- envoy/api/v2/core/health_check.pb.go | 74 +- envoy/api/v2/core/http_uri.pb.go | 10 +- envoy/api/v2/core/protocol.pb.go | 74 +- envoy/api/v2/discovery.pb.go | 12 +- envoy/api/v2/endpoint.pb.go | 16 +- .../api/v2/endpoint/endpoint_components.pb.go | 16 +- envoy/api/v2/endpoint/load_report.pb.go | 16 +- envoy/api/v2/listener.pb.go | 38 +- .../api/v2/listener/listener_components.pb.go | 42 +- envoy/api/v2/listener/quic_config.pb.go | 22 +- .../api/v2/listener/udp_listener_config.pb.go | 16 +- envoy/api/v2/route.pb.go | 8 +- envoy/api/v2/route/route_components.pb.go | 182 +- envoy/config/accesslog/v2/als.pb.go | 16 +- envoy/config/accesslog/v2/file.pb.go | 14 +- envoy/config/accesslog/v3/accesslog.pb.go | 20 +- envoy/config/bootstrap/v2/bootstrap.pb.go | 44 +- envoy/config/bootstrap/v3/bootstrap.pb.go | 56 +- .../config/cluster/redis/redis_cluster.pb.go | 26 +- envoy/config/cluster/v3/circuit_breaker.pb.go | 28 +- envoy/config/cluster/v3/cluster.pb.go | 118 +- envoy/config/cluster/v3/filter.pb.go | 8 +- .../config/cluster/v3/outlier_detection.pb.go | 98 +- .../v2alpha/dns_cache.pb.go | 20 +- .../mutation_rules/v3/mutation_rules.pb.go | 24 +- envoy/config/core/v3/address.pb.go | 50 +- envoy/config/core/v3/backoff.pb.go | 14 +- envoy/config/core/v3/base.pb.go | 54 +- envoy/config/core/v3/config_source.pb.go | 38 +- envoy/config/core/v3/extension.pb.go | 8 +- envoy/config/core/v3/grpc_service.pb.go | 42 +- envoy/config/core/v3/health_check.pb.go | 84 +- envoy/config/core/v3/http_uri.pb.go | 10 +- envoy/config/core/v3/protocol.pb.go | 142 +- .../core/v3/substitution_format_string.pb.go | 8 +- envoy/config/core/v3/udp_socket_config.pb.go | 16 +- envoy/config/endpoint/v3/endpoint.pb.go | 16 +- .../endpoint/v3/endpoint_components.pb.go | 16 +- envoy/config/endpoint/v3/load_report.pb.go | 16 +- .../filter/accesslog/v2/accesslog.pb.go | 24 +- envoy/config/filter/fault/v2/fault.pb.go | 8 +- .../v2alpha/adaptive_concurrency.pb.go | 28 +- .../config/filter/http/buffer/v2/buffer.pb.go | 12 +- .../filter/http/cache/v2alpha/cache.pb.go | 8 +- .../http/compressor/v2/compressor.pb.go | 8 +- envoy/config/filter/http/fault/v2/fault.pb.go | 8 +- .../http/grpc_stats/v2alpha/config.pb.go | 14 +- envoy/config/filter/http/gzip/v2/gzip.pb.go | 16 +- .../http/health_check/v2/health_check.pb.go | 24 +- .../http/jwt_authn/v2alpha/config.pb.go | 8 +- .../http/rate_limit/v2/rate_limit.pb.go | 8 +- .../config/filter/http/router/v2/router.pb.go | 12 +- .../config/filter/http/squash/v2/squash.pb.go | 26 +- .../client_ssl_auth/v2/client_ssl_auth.pb.go | 12 +- .../dubbo_proxy/v2alpha1/dubbo_proxy.pb.go | 8 +- .../v2/http_connection_manager.pb.go | 82 +- .../network/rate_limit/v2/rate_limit.pb.go | 8 +- .../network/redis_proxy/v2/redis_proxy.pb.go | 20 +- .../network/tcp_proxy/v2/tcp_proxy.pb.go | 24 +- .../network/thrift_proxy/v2alpha1/route.pb.go | 8 +- .../thrift_proxy/v2alpha1/thrift_proxy.pb.go | 16 +- .../v1alpha1/zookeeper_proxy.pb.go | 10 +- .../rate_limit/v2alpha1/rate_limit.pb.go | 8 +- .../udp/udp_proxy/v2alpha/udp_proxy.pb.go | 10 +- envoy/config/listener/v2/api_listener.pb.go | 8 +- envoy/config/listener/v3/api_listener.pb.go | 8 +- envoy/config/listener/v3/listener.pb.go | 54 +- .../listener/v3/listener_components.pb.go | 42 +- envoy/config/listener/v3/quic_config.pb.go | 26 +- envoy/config/metrics/v2/stats.pb.go | 24 +- envoy/config/metrics/v3/metrics_service.pb.go | 8 +- envoy/config/metrics/v3/stats.pb.go | 22 +- envoy/config/overload/v2alpha/overload.pb.go | 34 +- envoy/config/overload/v3/overload.pb.go | 24 +- envoy/config/route/v3/route.pb.go | 22 +- envoy/config/route/v3/route_components.pb.go | 2303 +++++++++-------- .../route/v3/route_components.pb.validate.go | 29 + .../route/v3/route_components_vtproto.pb.go | 14 + envoy/config/tap/v3/common.pb.go | 20 +- envoy/config/trace/v2/dynamic_ot.pb.go | 8 +- envoy/config/trace/v2/http_tracer.pb.go | 20 +- envoy/config/trace/v2/zipkin.pb.go | 8 +- envoy/config/trace/v3/dynamic_ot.pb.go | 8 +- envoy/config/trace/v3/http_tracer.pb.go | 8 +- envoy/config/trace/v3/skywalking.pb.go | 14 +- envoy/config/trace/v3/xray.pb.go | 8 +- envoy/config/trace/v3/zipkin.pb.go | 8 +- envoy/data/accesslog/v2/accesslog.pb.go | 76 +- envoy/data/accesslog/v3/accesslog.pb.go | 80 +- .../v2alpha/outlier_detection_event.pb.go | 16 +- .../cluster/v3/outlier_detection_event.pb.go | 16 +- .../core/v2alpha/health_check_event.pb.go | 8 +- envoy/data/core/v3/health_check_event.pb.go | 8 +- envoy/data/dns/v2alpha/dns_table.pb.go | 8 +- envoy/data/dns/v3/dns_table.pb.go | 12 +- envoy/data/tap/v2alpha/transport.pb.go | 8 +- envoy/data/tap/v3/http.pb.go | 8 +- envoy/data/tap/v3/transport.pb.go | 8 +- .../access_loggers/file/v3/file.pb.go | 12 +- .../access_loggers/fluentd/v3/fluentd.pb.go | 28 +- .../access_loggers/grpc/v3/als.pb.go | 16 +- .../v3/internal_listener.pb.go | 10 +- .../dynamic_forward_proxy/v3/cluster.pb.go | 26 +- .../clusters/redis/v3/redis_cluster.pb.go | 26 +- .../dynamic_forward_proxy/v3/dns_cache.pb.go | 32 +- .../brotli/compressor/v3/brotli.pb.go | 24 +- .../brotli/decompressor/v3/brotli.pb.go | 10 +- .../compression/gzip/compressor/v3/gzip.pb.go | 22 +- .../gzip/decompressor/v3/gzip.pb.go | 18 +- .../compression/zstd/compressor/v3/zstd.pb.go | 18 +- .../zstd/decompressor/v3/zstd.pb.go | 12 +- .../filters/common/fault/v3/fault.pb.go | 8 +- .../v3/adaptive_concurrency.pb.go | 28 +- .../v3/admission_control.pb.go | 8 +- .../v3/aws_request_signing.pb.go | 8 +- .../bandwidth_limit/v3/bandwidth_limit.pb.go | 16 +- .../filters/http/buffer/v3/buffer.pb.go | 12 +- .../filters/http/cache/v3/cache.pb.go | 16 +- .../http/compressor/v3/compressor.pb.go | 18 +- .../filters/http/cors/v3/cors.pb.go | 66 +- .../filters/http/cors/v3/cors.pb.validate.go | 29 + .../filters/http/cors/v3/cors_vtproto.pb.go | 14 + .../http/decompressor/v3/decompressor.pb.go | 8 +- .../v3/dynamic_forward_proxy.pb.go | 16 +- .../filters/http/ext_authz/v3/ext_authz.pb.go | 8 +- .../filters/http/ext_proc/v3/ext_proc.pb.go | 20 +- .../filters/http/fault/v3/fault.pb.go | 16 +- .../v3/file_system_buffer.pb.go | 22 +- .../filters/http/gcp_authn/v3/gcp_authn.pb.go | 20 +- .../grpc_json_transcoder/v3/transcoder.pb.go | 12 +- .../filters/http/grpc_stats/v3/config.pb.go | 14 +- .../filters/http/gzip/v3/gzip.pb.go | 16 +- .../http/health_check/v3/health_check.pb.go | 24 +- .../v3/json_to_metadata.pb.go | 8 +- .../filters/http/jwt_authn/v3/config.pb.go | 16 +- .../local_ratelimit/v3/local_rate_limit.pb.go | 8 +- .../filters/http/oauth2/v3/oauth.pb.go | 20 +- .../filters/http/on_demand/v3/on_demand.pb.go | 16 +- .../v3/rate_limit_quota.pb.go | 20 +- .../http/ratelimit/v3/rate_limit.pb.go | 8 +- .../filters/http/router/v3/router.pb.go | 16 +- .../http/set_metadata/v3/set_metadata.pb.go | 24 +- .../tls_inspector/v3/tls_inspector.pb.go | 16 +- .../v3/connection_limit.pb.go | 20 +- .../network/dubbo_proxy/v3/dubbo_proxy.pb.go | 8 +- .../v3/http_connection_manager.pb.go | 98 +- .../network/ratelimit/v3/rate_limit.pb.go | 8 +- .../network/redis_proxy/v3/redis_proxy.pb.go | 24 +- .../network/tcp_proxy/v3/tcp_proxy.pb.go | 40 +- .../filters/ratelimit/v3/rate_limit.pb.go | 8 +- .../thrift_proxy/router/v3/router.pb.go | 10 +- .../network/thrift_proxy/v3/route.pb.go | 14 +- .../thrift_proxy/v3/thrift_proxy.pb.go | 34 +- .../zookeeper_proxy/v3/zookeeper_proxy.pb.go | 20 +- .../udp/dns_filter/v3/dns_filter.pb.go | 8 +- .../v3/dynamic_forward_proxy.pb.go | 14 +- .../filters/udp/udp_proxy/v3/udp_proxy.pb.go | 42 +- .../v3/file_system_http_cache.pb.go | 28 +- .../v3/local_response_policy.pb.go | 8 +- .../redirect_policy/v3/redirect_policy.pb.go | 8 +- .../key_value/file_based/v3/config.pb.go | 16 +- .../v3/client_side_weighted_round_robin.pb.go | 34 +- .../common/v3/common.pb.go | 22 +- .../least_request/v3/least_request.pb.go | 14 +- .../maglev/v3/maglev.pb.go | 8 +- .../ring_hash/v3/ring_hash.pb.go | 18 +- .../subset/v3/subset.pb.go | 8 +- .../v3/consecutive_errors.pb.go | 16 +- .../extensions/request_id/uuid/v3/uuid.pb.go | 14 +- .../graphite_statsd/v3/graphite_statsd.pb.go | 12 +- .../open_telemetry/v3/open_telemetry.pb.go | 16 +- .../quic/v3/quic_transport.pb.go | 8 +- .../tcp_stats/v3/tcp_stats.pb.go | 12 +- .../transport_sockets/tls/v3/common.pb.go | 22 +- .../transport_sockets/tls/v3/tls.pb.go | 34 +- .../tcp/v3/tcp_protocol_options.pb.go | 10 +- envoy/extensions/wasm/v3/wasm.pb.go | 12 +- .../profile_action/v3/profile_action.pb.go | 8 +- envoy/service/auth/v2/attribute_context.pb.go | 8 +- envoy/service/auth/v3/attribute_context.pb.go | 8 +- envoy/service/auth/v3/external_auth.pb.go | 12 +- envoy/service/discovery/v2/hds.pb.go | 8 +- envoy/service/discovery/v2/rtds.pb.go | 10 +- envoy/service/discovery/v3/discovery.pb.go | 20 +- .../v2alpha/event_reporting_service.pb.go | 8 +- .../v3/event_reporting_service.pb.go | 8 +- .../ext_proc/v3/external_processor.pb.go | 24 +- envoy/service/health/v3/hds.pb.go | 8 +- envoy/service/load_stats/v2/lrs.pb.go | 8 +- envoy/service/load_stats/v3/lrs.pb.go | 16 +- envoy/service/rate_limit_quota/v3/rlqs.pb.go | 12 +- envoy/service/ratelimit/v3/rls.pb.go | 24 +- envoy/service/runtime/v3/rtds.pb.go | 10 +- envoy/service/status/v3/csds.pb.go | 16 +- envoy/service/tap/v2alpha/common.pb.go | 12 +- envoy/type/http/v3/cookie.pb.go | 10 +- envoy/type/matcher/regex.pb.go | 8 +- envoy/type/matcher/v3/regex.pb.go | 8 +- envoy/type/token_bucket.pb.go | 18 +- envoy/type/v3/token_bucket.pb.go | 18 +- envoy/watchdog/v3/abort_action.pb.go | 10 +- 236 files changed, 3898 insertions(+), 3777 deletions(-) diff --git a/contrib/envoy/extensions/compression/qatzip/compressor/v3alpha/qatzip.pb.go b/contrib/envoy/extensions/compression/qatzip/compressor/v3alpha/qatzip.pb.go index 95fd81dbe..626f956a2 100755 --- a/contrib/envoy/extensions/compression/qatzip/compressor/v3alpha/qatzip.pb.go +++ b/contrib/envoy/extensions/compression/qatzip/compressor/v3alpha/qatzip.pb.go @@ -9,9 +9,9 @@ package v3alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -92,18 +92,18 @@ type Qatzip struct { // Value from 1 to 9 that controls the main compression speed-density lever. // The higher quality, the slower compression. The default value is 1. - CompressionLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=compression_level,json=compressionLevel,proto3" json:"compression_level,omitempty"` + CompressionLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=compression_level,json=compressionLevel,proto3" json:"compression_level,omitempty"` // A size of qat hardware buffer. This field will be set to "DEFAULT" if not specified. HardwareBufferSize Qatzip_HardwareBufferSize `protobuf:"varint,2,opt,name=hardware_buffer_size,json=hardwareBufferSize,proto3,enum=envoy.extensions.compression.qatzip.compressor.v3alpha.Qatzip_HardwareBufferSize" json:"hardware_buffer_size,omitempty"` // Threshold of compression service’s input size for software failover. // If the size of input request less than the threshold, qatzip will route the request to software // compressor. The default value is 1024. The maximum value is 512*1024. - InputSizeThreshold *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=input_size_threshold,json=inputSizeThreshold,proto3" json:"input_size_threshold,omitempty"` + InputSizeThreshold *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=input_size_threshold,json=inputSizeThreshold,proto3" json:"input_size_threshold,omitempty"` // A size of stream buffer. The default value is 128 * 1024. The maximum value is 2*1024*1024 - // 5*1024 - StreamBufferSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=stream_buffer_size,json=streamBufferSize,proto3" json:"stream_buffer_size,omitempty"` + StreamBufferSize *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=stream_buffer_size,json=streamBufferSize,proto3" json:"stream_buffer_size,omitempty"` // Value for compressor's next output buffer. If not set, defaults to 4096. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` } func (x *Qatzip) Reset() { @@ -138,7 +138,7 @@ func (*Qatzip) Descriptor() ([]byte, []int) { return file_contrib_envoy_extensions_compression_qatzip_compressor_v3alpha_qatzip_proto_rawDescGZIP(), []int{0} } -func (x *Qatzip) GetCompressionLevel() *wrappers.UInt32Value { +func (x *Qatzip) GetCompressionLevel() *wrapperspb.UInt32Value { if x != nil { return x.CompressionLevel } @@ -152,21 +152,21 @@ func (x *Qatzip) GetHardwareBufferSize() Qatzip_HardwareBufferSize { return Qatzip_DEFAULT } -func (x *Qatzip) GetInputSizeThreshold() *wrappers.UInt32Value { +func (x *Qatzip) GetInputSizeThreshold() *wrapperspb.UInt32Value { if x != nil { return x.InputSizeThreshold } return nil } -func (x *Qatzip) GetStreamBufferSize() *wrappers.UInt32Value { +func (x *Qatzip) GetStreamBufferSize() *wrapperspb.UInt32Value { if x != nil { return x.StreamBufferSize } return nil } -func (x *Qatzip) GetChunkSize() *wrappers.UInt32Value { +func (x *Qatzip) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -260,7 +260,7 @@ var file_contrib_envoy_extensions_compression_qatzip_compressor_v3alpha_qatzip_p var file_contrib_envoy_extensions_compression_qatzip_compressor_v3alpha_qatzip_proto_goTypes = []interface{}{ (Qatzip_HardwareBufferSize)(0), // 0: envoy.extensions.compression.qatzip.compressor.v3alpha.Qatzip.HardwareBufferSize (*Qatzip)(nil), // 1: envoy.extensions.compression.qatzip.compressor.v3alpha.Qatzip - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_contrib_envoy_extensions_compression_qatzip_compressor_v3alpha_qatzip_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.compression.qatzip.compressor.v3alpha.Qatzip.compression_level:type_name -> google.protobuf.UInt32Value diff --git a/contrib/envoy/extensions/compression/qatzstd/compressor/v3alpha/qatzstd.pb.go b/contrib/envoy/extensions/compression/qatzstd/compressor/v3alpha/qatzstd.pb.go index 8b726bf35..c3fe1abaa 100755 --- a/contrib/envoy/extensions/compression/qatzstd/compressor/v3alpha/qatzstd.pb.go +++ b/contrib/envoy/extensions/compression/qatzstd/compressor/v3alpha/qatzstd.pb.go @@ -9,9 +9,9 @@ package v3alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -109,7 +109,7 @@ type Qatzstd struct { // to default. Setting this will however eventually dynamically impact the compression // parameters which have not been manually set. The manually set // ones will 'stick'. - CompressionLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=compression_level,json=compressionLevel,proto3" json:"compression_level,omitempty"` + CompressionLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=compression_level,json=compressionLevel,proto3" json:"compression_level,omitempty"` // A 32-bits checksum of content is written at end of frame. If not set, defaults to false. EnableChecksum bool `protobuf:"varint,2,opt,name=enable_checksum,json=enableChecksum,proto3" json:"enable_checksum,omitempty"` // The higher the value of selected strategy, the more complex it is, @@ -118,7 +118,7 @@ type Qatzstd struct { // Special: value 0 means "use default strategy". Strategy Qatzstd_Strategy `protobuf:"varint,3,opt,name=strategy,proto3,enum=envoy.extensions.compression.qatzstd.compressor.v3alpha.Qatzstd_Strategy" json:"strategy,omitempty"` // Value for compressor's next output buffer. If not set, defaults to 4096. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` // Enable QAT to accelerate Zstd compression or not. If not set, defaults to false. // // This is useful in the case that users want to enable QAT for a period of time and disable QAT for another period of time, @@ -126,7 +126,7 @@ type Qatzstd struct { EnableQatZstd bool `protobuf:"varint,6,opt,name=enable_qat_zstd,json=enableQatZstd,proto3" json:"enable_qat_zstd,omitempty"` // Fallback to software for Qatzstd when input size is less than this value. // Valid only “enable_qat_zstd“ is “true“. 0 means no fallback at all. If not set, defaults to 4000. - QatZstdFallbackThreshold *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=qat_zstd_fallback_threshold,json=qatZstdFallbackThreshold,proto3" json:"qat_zstd_fallback_threshold,omitempty"` + QatZstdFallbackThreshold *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=qat_zstd_fallback_threshold,json=qatZstdFallbackThreshold,proto3" json:"qat_zstd_fallback_threshold,omitempty"` } func (x *Qatzstd) Reset() { @@ -161,7 +161,7 @@ func (*Qatzstd) Descriptor() ([]byte, []int) { return file_contrib_envoy_extensions_compression_qatzstd_compressor_v3alpha_qatzstd_proto_rawDescGZIP(), []int{0} } -func (x *Qatzstd) GetCompressionLevel() *wrappers.UInt32Value { +func (x *Qatzstd) GetCompressionLevel() *wrapperspb.UInt32Value { if x != nil { return x.CompressionLevel } @@ -182,7 +182,7 @@ func (x *Qatzstd) GetStrategy() Qatzstd_Strategy { return Qatzstd_DEFAULT } -func (x *Qatzstd) GetChunkSize() *wrappers.UInt32Value { +func (x *Qatzstd) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -196,7 +196,7 @@ func (x *Qatzstd) GetEnableQatZstd() bool { return false } -func (x *Qatzstd) GetQatZstdFallbackThreshold() *wrappers.UInt32Value { +func (x *Qatzstd) GetQatZstdFallbackThreshold() *wrapperspb.UInt32Value { if x != nil { return x.QatZstdFallbackThreshold } @@ -288,9 +288,9 @@ func file_contrib_envoy_extensions_compression_qatzstd_compressor_v3alpha_qatzst var file_contrib_envoy_extensions_compression_qatzstd_compressor_v3alpha_qatzstd_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_contrib_envoy_extensions_compression_qatzstd_compressor_v3alpha_qatzstd_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_compression_qatzstd_compressor_v3alpha_qatzstd_proto_goTypes = []interface{}{ - (Qatzstd_Strategy)(0), // 0: envoy.extensions.compression.qatzstd.compressor.v3alpha.Qatzstd.Strategy - (*Qatzstd)(nil), // 1: envoy.extensions.compression.qatzstd.compressor.v3alpha.Qatzstd - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (Qatzstd_Strategy)(0), // 0: envoy.extensions.compression.qatzstd.compressor.v3alpha.Qatzstd.Strategy + (*Qatzstd)(nil), // 1: envoy.extensions.compression.qatzstd.compressor.v3alpha.Qatzstd + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_contrib_envoy_extensions_compression_qatzstd_compressor_v3alpha_qatzstd_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.compression.qatzstd.compressor.v3alpha.Qatzstd.compression_level:type_name -> google.protobuf.UInt32Value diff --git a/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.pb.go b/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.pb.go index 739c2fefe..33e942640 100755 --- a/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.pb.go +++ b/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/cncf/xds/go/xds/annotations/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -108,7 +108,7 @@ type Config struct { // // See the :repo:`StreamFilter API ` // for more information about how the plugin's configuration data can be accessed. - PluginConfig *any1.Any `protobuf:"bytes,4,opt,name=plugin_config,json=pluginConfig,proto3" json:"plugin_config,omitempty"` + PluginConfig *anypb.Any `protobuf:"bytes,4,opt,name=plugin_config,json=pluginConfig,proto3" json:"plugin_config,omitempty"` // Merge policy for plugin configuration. // // The Go plugin configuration supports three dimensions: @@ -174,7 +174,7 @@ func (x *Config) GetPluginName() string { return "" } -func (x *Config) GetPluginConfig() *any1.Any { +func (x *Config) GetPluginConfig() *anypb.Any { if x != nil { return x.PluginConfig } @@ -246,7 +246,7 @@ func (x *RouterPlugin) GetDisabled() bool { return false } -func (x *RouterPlugin) GetConfig() *any1.Any { +func (x *RouterPlugin) GetConfig() *anypb.Any { if x, ok := x.GetOverride().(*RouterPlugin_Config); ok { return x.Config } @@ -266,7 +266,7 @@ type RouterPlugin_Disabled struct { type RouterPlugin_Config struct { // The config field is used for setting per-route and per-virtualhost plugin config. - Config *any1.Any `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *anypb.Any `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } func (*RouterPlugin_Disabled) isRouterPlugin_Override() {} @@ -424,7 +424,7 @@ var file_contrib_envoy_extensions_filters_http_golang_v3alpha_golang_proto_goTyp (*RouterPlugin)(nil), // 2: envoy.extensions.filters.http.golang.v3alpha.RouterPlugin (*ConfigsPerRoute)(nil), // 3: envoy.extensions.filters.http.golang.v3alpha.ConfigsPerRoute nil, // 4: envoy.extensions.filters.http.golang.v3alpha.ConfigsPerRoute.PluginsConfigEntry - (*any1.Any)(nil), // 5: google.protobuf.Any + (*anypb.Any)(nil), // 5: google.protobuf.Any } var file_contrib_envoy_extensions_filters_http_golang_v3alpha_golang_proto_depIdxs = []int32{ 5, // 0: envoy.extensions.filters.http.golang.v3alpha.Config.plugin_config:type_name -> google.protobuf.Any diff --git a/contrib/envoy/extensions/filters/http/squash/v3/squash.pb.go b/contrib/envoy/extensions/filters/http/squash/v3/squash.pb.go index 2f941d940..f79dc15f9 100755 --- a/contrib/envoy/extensions/filters/http/squash/v3/squash.pb.go +++ b/contrib/envoy/extensions/filters/http/squash/v3/squash.pb.go @@ -9,10 +9,10 @@ package squashv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -51,15 +51,15 @@ type Squash struct { // } // // (where POD_NAME, POD_NAMESPACE are configured in the pod via the Downward API) - AttachmentTemplate *_struct.Struct `protobuf:"bytes,2,opt,name=attachment_template,json=attachmentTemplate,proto3" json:"attachment_template,omitempty"` + AttachmentTemplate *structpb.Struct `protobuf:"bytes,2,opt,name=attachment_template,json=attachmentTemplate,proto3" json:"attachment_template,omitempty"` // The timeout for individual requests sent to the Squash cluster. Defaults to 1 second. - RequestTimeout *duration.Duration `protobuf:"bytes,3,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // The total timeout Squash will delay a request and wait for it to be attached. Defaults to 60 // seconds. - AttachmentTimeout *duration.Duration `protobuf:"bytes,4,opt,name=attachment_timeout,json=attachmentTimeout,proto3" json:"attachment_timeout,omitempty"` + AttachmentTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=attachment_timeout,json=attachmentTimeout,proto3" json:"attachment_timeout,omitempty"` // Amount of time to poll for the status of the attachment object in the Squash server // (to check if has been attached). Defaults to 1 second. - AttachmentPollPeriod *duration.Duration `protobuf:"bytes,5,opt,name=attachment_poll_period,json=attachmentPollPeriod,proto3" json:"attachment_poll_period,omitempty"` + AttachmentPollPeriod *durationpb.Duration `protobuf:"bytes,5,opt,name=attachment_poll_period,json=attachmentPollPeriod,proto3" json:"attachment_poll_period,omitempty"` } func (x *Squash) Reset() { @@ -101,28 +101,28 @@ func (x *Squash) GetCluster() string { return "" } -func (x *Squash) GetAttachmentTemplate() *_struct.Struct { +func (x *Squash) GetAttachmentTemplate() *structpb.Struct { if x != nil { return x.AttachmentTemplate } return nil } -func (x *Squash) GetRequestTimeout() *duration.Duration { +func (x *Squash) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } return nil } -func (x *Squash) GetAttachmentTimeout() *duration.Duration { +func (x *Squash) GetAttachmentTimeout() *durationpb.Duration { if x != nil { return x.AttachmentTimeout } return nil } -func (x *Squash) GetAttachmentPollPeriod() *duration.Duration { +func (x *Squash) GetAttachmentPollPeriod() *durationpb.Duration { if x != nil { return x.AttachmentPollPeriod } @@ -201,9 +201,9 @@ func file_contrib_envoy_extensions_filters_http_squash_v3_squash_proto_rawDescGZ var file_contrib_envoy_extensions_filters_http_squash_v3_squash_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_http_squash_v3_squash_proto_goTypes = []interface{}{ - (*Squash)(nil), // 0: envoy.extensions.filters.http.squash.v3.Squash - (*_struct.Struct)(nil), // 1: google.protobuf.Struct - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*Squash)(nil), // 0: envoy.extensions.filters.http.squash.v3.Squash + (*structpb.Struct)(nil), // 1: google.protobuf.Struct + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_contrib_envoy_extensions_filters_http_squash_v3_squash_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.http.squash.v3.Squash.attachment_template:type_name -> google.protobuf.Struct diff --git a/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.pb.go b/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.pb.go index 1f0dd050a..890917327 100755 --- a/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.pb.go +++ b/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -41,7 +41,7 @@ type SXG struct { // is set to 7 days, that will be 7 days from 24 hours ago (6 days from now). Also note that while 6/7 days // is appropriate for most content, if the downstream service is serving Javascript, or HTML with inline // Javascript, 1 day (so, with backdated expiry, 2 days, or 172800 seconds) is more appropriate. - Duration *duration.Duration `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"` + Duration *durationpb.Duration `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"` // The SXG response payload is Merkle Integrity Content Encoding (MICE) encoded (specification is [here](https://datatracker.ietf.org/doc/html/draft-thomson-http-mice-03)) // This value indicates the record size in the encoded payload. The default value is 4096. MiRecordSize uint64 `protobuf:"varint,4,opt,name=mi_record_size,json=miRecordSize,proto3" json:"mi_record_size,omitempty"` @@ -107,7 +107,7 @@ func (x *SXG) GetPrivateKey() *v3.SdsSecretConfig { return nil } -func (x *SXG) GetDuration() *duration.Duration { +func (x *SXG) GetDuration() *durationpb.Duration { if x != nil { return x.Duration } @@ -240,9 +240,9 @@ func file_contrib_envoy_extensions_filters_http_sxg_v3alpha_sxg_proto_rawDescGZI var file_contrib_envoy_extensions_filters_http_sxg_v3alpha_sxg_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_http_sxg_v3alpha_sxg_proto_goTypes = []interface{}{ - (*SXG)(nil), // 0: envoy.extensions.filters.http.sxg.v3alpha.SXG - (*v3.SdsSecretConfig)(nil), // 1: envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*SXG)(nil), // 0: envoy.extensions.filters.http.sxg.v3alpha.SXG + (*v3.SdsSecretConfig)(nil), // 1: envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_contrib_envoy_extensions_filters_http_sxg_v3alpha_sxg_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.http.sxg.v3alpha.SXG.certificate:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig diff --git a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.go b/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.go index 13ff4d223..5861d3186 100755 --- a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.go +++ b/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -41,7 +41,7 @@ type ClientSSLAuth struct { // authentication service. Default is 60000 (60s). The actual fetch time // will be this value plus a random jittered value between // 0-refresh_delay_ms milliseconds. - RefreshDelay *duration.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` + RefreshDelay *durationpb.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` // An optional list of IP address and subnet masks that should be white // listed for access by the filter. If no list is provided, there is no // IP allowlist. @@ -94,7 +94,7 @@ func (x *ClientSSLAuth) GetStatPrefix() string { return "" } -func (x *ClientSSLAuth) GetRefreshDelay() *duration.Duration { +func (x *ClientSSLAuth) GetRefreshDelay() *durationpb.Duration { if x != nil { return x.RefreshDelay } @@ -183,9 +183,9 @@ func file_contrib_envoy_extensions_filters_network_client_ssl_auth_v3_client_ssl var file_contrib_envoy_extensions_filters_network_client_ssl_auth_v3_client_ssl_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_network_client_ssl_auth_v3_client_ssl_auth_proto_goTypes = []interface{}{ - (*ClientSSLAuth)(nil), // 0: envoy.extensions.filters.network.client_ssl_auth.v3.ClientSSLAuth - (*duration.Duration)(nil), // 1: google.protobuf.Duration - (*v3.CidrRange)(nil), // 2: envoy.config.core.v3.CidrRange + (*ClientSSLAuth)(nil), // 0: envoy.extensions.filters.network.client_ssl_auth.v3.ClientSSLAuth + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration + (*v3.CidrRange)(nil), // 2: envoy.config.core.v3.CidrRange } var file_contrib_envoy_extensions_filters_network_client_ssl_auth_v3_client_ssl_auth_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.client_ssl_auth.v3.ClientSSLAuth.refresh_delay:type_name -> google.protobuf.Duration diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go b/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go index 47d8f55cc..a9487eefa 100755 --- a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go +++ b/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.go @@ -12,9 +12,9 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -45,7 +45,7 @@ type RouteAction struct { // Route level config for L7 generic filters. The key should be the related :ref:`extension name // ` in the :ref:`generic filters // `. - PerFilterConfig map[string]*any1.Any `protobuf:"bytes,4,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*anypb.Any `protobuf:"bytes,4,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *RouteAction) Reset() { @@ -115,7 +115,7 @@ func (x *RouteAction) GetMetadata() *v3.Metadata { return nil } -func (x *RouteAction) GetPerFilterConfig() map[string]*any1.Any { +func (x *RouteAction) GetPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.PerFilterConfig } @@ -230,7 +230,7 @@ var file_contrib_envoy_extensions_filters_network_generic_proxy_action_v3_action nil, // 1: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.PerFilterConfigEntry (*v31.WeightedCluster)(nil), // 2: envoy.config.route.v3.WeightedCluster (*v3.Metadata)(nil), // 3: envoy.config.core.v3.Metadata - (*any1.Any)(nil), // 4: google.protobuf.Any + (*anypb.Any)(nil), // 4: google.protobuf.Any } var file_contrib_envoy_extensions_filters_network_generic_proxy_action_v3_action_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.network.generic_proxy.action.v3.RouteAction.weighted_clusters:type_name -> envoy.config.route.v3.WeightedCluster diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go index ab607e7e3..a021c9368 100755 --- a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go +++ b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.go @@ -9,9 +9,9 @@ package http1v3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/cncf/xds/go/xds/annotations/v3" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -49,12 +49,12 @@ type Http1CodecConfig struct { // the message body is large. // // Default is true. - SingleFrameMode *wrappers.BoolValue `protobuf:"bytes,1,opt,name=single_frame_mode,json=singleFrameMode,proto3" json:"single_frame_mode,omitempty"` + SingleFrameMode *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=single_frame_mode,json=singleFrameMode,proto3" json:"single_frame_mode,omitempty"` // The maximum size of the HTTP1 message body in bytes. If not set, 8*1024*1024 (8MB) is used. // This only makes sense when single_frame_mode is true. // If the HTTP1 message body size exceeds this value, this will result in a decoding error // and the generic proxy will close the connection. - MaxBufferSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_buffer_size,json=maxBufferSize,proto3" json:"max_buffer_size,omitempty"` + MaxBufferSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_buffer_size,json=maxBufferSize,proto3" json:"max_buffer_size,omitempty"` } func (x *Http1CodecConfig) Reset() { @@ -89,14 +89,14 @@ func (*Http1CodecConfig) Descriptor() ([]byte, []int) { return file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_rawDescGZIP(), []int{0} } -func (x *Http1CodecConfig) GetSingleFrameMode() *wrappers.BoolValue { +func (x *Http1CodecConfig) GetSingleFrameMode() *wrapperspb.BoolValue { if x != nil { return x.SingleFrameMode } return nil } -func (x *Http1CodecConfig) GetMaxBufferSize() *wrappers.UInt32Value { +func (x *Http1CodecConfig) GetMaxBufferSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferSize } @@ -163,9 +163,9 @@ func file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3 var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_goTypes = []interface{}{ - (*Http1CodecConfig)(nil), // 0: envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*Http1CodecConfig)(nil), // 0: envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_contrib_envoy_extensions_filters_network_generic_proxy_codecs_http1_v3_http1_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig.single_frame_mode:type_name -> google.protobuf.BoolValue diff --git a/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.pb.go b/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.pb.go index b98e08bd4..6b072c9b6 100755 --- a/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.pb.go +++ b/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/cncf/xds/go/xds/annotations/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -52,7 +52,7 @@ type Config struct { // // See the :repo:`DownstreamFilter API ` // for more information about how the plugin's configuration data can be accessed. - PluginConfig *any1.Any `protobuf:"bytes,5,opt,name=plugin_config,json=pluginConfig,proto3" json:"plugin_config,omitempty"` + PluginConfig *anypb.Any `protobuf:"bytes,5,opt,name=plugin_config,json=pluginConfig,proto3" json:"plugin_config,omitempty"` } func (x *Config) Reset() { @@ -115,7 +115,7 @@ func (x *Config) GetPluginName() string { return "" } -func (x *Config) GetPluginConfig() *any1.Any { +func (x *Config) GetPluginConfig() *anypb.Any { if x != nil { return x.PluginConfig } @@ -184,8 +184,8 @@ func file_contrib_envoy_extensions_filters_network_golang_v3alpha_golang_proto_r var file_contrib_envoy_extensions_filters_network_golang_v3alpha_golang_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_network_golang_v3alpha_golang_proto_goTypes = []interface{}{ - (*Config)(nil), // 0: envoy.extensions.filters.network.golang.v3alpha.Config - (*any1.Any)(nil), // 1: google.protobuf.Any + (*Config)(nil), // 0: envoy.extensions.filters.network.golang.v3alpha.Config + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_contrib_envoy_extensions_filters_network_golang_v3alpha_golang_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.golang.v3alpha.Config.plugin_config:type_name -> google.protobuf.Any diff --git a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.go b/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.go index 7be651d07..cf7dce1be 100755 --- a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.go +++ b/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.go @@ -9,9 +9,9 @@ package v3alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -84,7 +84,7 @@ type PostgresProxy struct { // Controls whether SQL statements received in Frontend Query messages // are parsed. Parsing is required to produce Postgres proxy filter // metadata. Defaults to true. - EnableSqlParsing *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enable_sql_parsing,json=enableSqlParsing,proto3" json:"enable_sql_parsing,omitempty"` + EnableSqlParsing *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enable_sql_parsing,json=enableSqlParsing,proto3" json:"enable_sql_parsing,omitempty"` // Controls whether to terminate SSL session initiated by a client. // If the value is false, the Postgres proxy filter will not try to // terminate SSL session, but will pass all the packets to the upstream server. @@ -145,7 +145,7 @@ func (x *PostgresProxy) GetStatPrefix() string { return "" } -func (x *PostgresProxy) GetEnableSqlParsing() *wrappers.BoolValue { +func (x *PostgresProxy) GetEnableSqlParsing() *wrapperspb.BoolValue { if x != nil { return x.EnableSqlParsing } @@ -235,9 +235,9 @@ func file_contrib_envoy_extensions_filters_network_postgres_proxy_v3alpha_postgr var file_contrib_envoy_extensions_filters_network_postgres_proxy_v3alpha_postgres_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_contrib_envoy_extensions_filters_network_postgres_proxy_v3alpha_postgres_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_network_postgres_proxy_v3alpha_postgres_proxy_proto_goTypes = []interface{}{ - (PostgresProxy_SSLMode)(0), // 0: envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy.SSLMode - (*PostgresProxy)(nil), // 1: envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (PostgresProxy_SSLMode)(0), // 0: envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy.SSLMode + (*PostgresProxy)(nil), // 1: envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_contrib_envoy_extensions_filters_network_postgres_proxy_v3alpha_postgres_proxy_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy.enable_sql_parsing:type_name -> google.protobuf.BoolValue diff --git a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.go b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.go index 912b9556b..68951a6ba 100755 --- a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.go +++ b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.go @@ -9,9 +9,9 @@ package rocketmq_proxyv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -33,7 +33,7 @@ type RocketmqProxy struct { // The route table for the connection manager is specified in this property. RouteConfig *RouteConfiguration `protobuf:"bytes,2,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` // The largest duration transient object expected to live, more than 10s is recommended. - TransientObjectLifeSpan *duration.Duration `protobuf:"bytes,3,opt,name=transient_object_life_span,json=transientObjectLifeSpan,proto3" json:"transient_object_life_span,omitempty"` + TransientObjectLifeSpan *durationpb.Duration `protobuf:"bytes,3,opt,name=transient_object_life_span,json=transientObjectLifeSpan,proto3" json:"transient_object_life_span,omitempty"` // If develop_mode is enabled, this proxy plugin may work without dedicated traffic intercepting // facility without considering backward compatibility of exiting RocketMQ client SDK. DevelopMode bool `protobuf:"varint,4,opt,name=develop_mode,json=developMode,proto3" json:"develop_mode,omitempty"` @@ -85,7 +85,7 @@ func (x *RocketmqProxy) GetRouteConfig() *RouteConfiguration { return nil } -func (x *RocketmqProxy) GetTransientObjectLifeSpan() *duration.Duration { +func (x *RocketmqProxy) GetTransientObjectLifeSpan() *durationpb.Duration { if x != nil { return x.TransientObjectLifeSpan } @@ -169,9 +169,9 @@ func file_contrib_envoy_extensions_filters_network_rocketmq_proxy_v3_rocketmq_pr var file_contrib_envoy_extensions_filters_network_rocketmq_proxy_v3_rocketmq_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_filters_network_rocketmq_proxy_v3_rocketmq_proxy_proto_goTypes = []interface{}{ - (*RocketmqProxy)(nil), // 0: envoy.extensions.filters.network.rocketmq_proxy.v3.RocketmqProxy - (*RouteConfiguration)(nil), // 1: envoy.extensions.filters.network.rocketmq_proxy.v3.RouteConfiguration - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*RocketmqProxy)(nil), // 0: envoy.extensions.filters.network.rocketmq_proxy.v3.RocketmqProxy + (*RouteConfiguration)(nil), // 1: envoy.extensions.filters.network.rocketmq_proxy.v3.RouteConfiguration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_contrib_envoy_extensions_filters_network_rocketmq_proxy_v3_rocketmq_proxy_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.rocketmq_proxy.v3.RocketmqProxy.route_config:type_name -> envoy.extensions.filters.network.rocketmq_proxy.v3.RouteConfiguration diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.pb.go b/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.pb.go index 4e1686788..3fa7098f5 100755 --- a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.pb.go +++ b/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -39,8 +39,8 @@ type TraServiceConfig struct { GrpcService *v3.GrpcService `protobuf:"bytes,1,opt,name=grpc_service,json=grpcService,proto3" json:"grpc_service,omitempty"` // API version for rate limit transport protocol. This describes the rate limit gRPC endpoint and // version of messages used on the wire. - TransportApiVersion v3.ApiVersion `protobuf:"varint,2,opt,name=transport_api_version,json=transportApiVersion,proto3,enum=envoy.config.core.v3.ApiVersion" json:"transport_api_version,omitempty"` - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + TransportApiVersion v3.ApiVersion `protobuf:"varint,2,opt,name=transport_api_version,json=transportApiVersion,proto3,enum=envoy.config.core.v3.ApiVersion" json:"transport_api_version,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *TraServiceConfig) Reset() { @@ -89,7 +89,7 @@ func (x *TraServiceConfig) GetTransportApiVersion() v3.ApiVersion { return v3.ApiVersion(0) } -func (x *TraServiceConfig) GetTimeout() *duration.Duration { +func (x *TraServiceConfig) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -1140,30 +1140,30 @@ func file_contrib_envoy_extensions_filters_network_sip_proxy_tra_v3alpha_tra_pro var file_contrib_envoy_extensions_filters_network_sip_proxy_tra_v3alpha_tra_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_contrib_envoy_extensions_filters_network_sip_proxy_tra_v3alpha_tra_proto_goTypes = []interface{}{ - (*TraServiceConfig)(nil), // 0: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceConfig - (*TraServiceRequest)(nil), // 1: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceRequest - (*TraServiceResponse)(nil), // 2: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceResponse - (*CreateRequest)(nil), // 3: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateRequest - (*CreateResponse)(nil), // 4: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateResponse - (*UpdateRequest)(nil), // 5: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateRequest - (*UpdateResponse)(nil), // 6: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateResponse - (*RetrieveRequest)(nil), // 7: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveRequest - (*RetrieveResponse)(nil), // 8: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveResponse - (*DeleteRequest)(nil), // 9: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.DeleteRequest - (*DeleteResponse)(nil), // 10: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.DeleteResponse - (*SubscribeRequest)(nil), // 11: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.SubscribeRequest - (*SubscribeResponse)(nil), // 12: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.SubscribeResponse - nil, // 13: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateRequest.DataEntry - nil, // 14: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateRequest.ContextEntry - nil, // 15: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateRequest.DataEntry - nil, // 16: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateRequest.ContextEntry - nil, // 17: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveRequest.ContextEntry - nil, // 18: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveResponse.DataEntry - nil, // 19: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.DeleteRequest.ContextEntry - nil, // 20: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.SubscribeResponse.DataEntry - (*v3.GrpcService)(nil), // 21: envoy.config.core.v3.GrpcService - (v3.ApiVersion)(0), // 22: envoy.config.core.v3.ApiVersion - (*duration.Duration)(nil), // 23: google.protobuf.Duration + (*TraServiceConfig)(nil), // 0: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceConfig + (*TraServiceRequest)(nil), // 1: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceRequest + (*TraServiceResponse)(nil), // 2: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceResponse + (*CreateRequest)(nil), // 3: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateRequest + (*CreateResponse)(nil), // 4: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateResponse + (*UpdateRequest)(nil), // 5: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateRequest + (*UpdateResponse)(nil), // 6: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateResponse + (*RetrieveRequest)(nil), // 7: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveRequest + (*RetrieveResponse)(nil), // 8: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveResponse + (*DeleteRequest)(nil), // 9: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.DeleteRequest + (*DeleteResponse)(nil), // 10: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.DeleteResponse + (*SubscribeRequest)(nil), // 11: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.SubscribeRequest + (*SubscribeResponse)(nil), // 12: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.SubscribeResponse + nil, // 13: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateRequest.DataEntry + nil, // 14: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.CreateRequest.ContextEntry + nil, // 15: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateRequest.DataEntry + nil, // 16: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.UpdateRequest.ContextEntry + nil, // 17: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveRequest.ContextEntry + nil, // 18: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.RetrieveResponse.DataEntry + nil, // 19: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.DeleteRequest.ContextEntry + nil, // 20: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.SubscribeResponse.DataEntry + (*v3.GrpcService)(nil), // 21: envoy.config.core.v3.GrpcService + (v3.ApiVersion)(0), // 22: envoy.config.core.v3.ApiVersion + (*durationpb.Duration)(nil), // 23: google.protobuf.Duration } var file_contrib_envoy_extensions_filters_network_sip_proxy_tra_v3alpha_tra_proto_depIdxs = []int32{ 21, // 0: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceConfig.grpc_service:type_name -> envoy.config.core.v3.GrpcService diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.pb.go b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.pb.go index 1811dee6d..6002ac184 100755 --- a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.pb.go +++ b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3alpha "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -167,7 +167,7 @@ func (m *SipFilter) GetConfigType() isSipFilter_ConfigType { return nil } -func (x *SipFilter) GetTypedConfig() *any1.Any { +func (x *SipFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*SipFilter_TypedConfig); ok { return x.TypedConfig } @@ -179,7 +179,7 @@ type isSipFilter_ConfigType interface { } type SipFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*SipFilter_TypedConfig) isSipFilter_ConfigType() {} @@ -553,7 +553,7 @@ type SipProxy_SipSettings struct { // | Timer K | T4 for UDP | 17.1.2.2 | Wait time for response re-transmissions | // | | 0 sec. for TCP and SCTP | | | // +---------+-------------------------+----------+------------------------------------------------------------------------------+ - TransactionTimeout *duration.Duration `protobuf:"bytes,1,opt,name=transaction_timeout,json=transactionTimeout,proto3" json:"transaction_timeout,omitempty"` + TransactionTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=transaction_timeout,json=transactionTimeout,proto3" json:"transaction_timeout,omitempty"` // The service to match for ep insert LocalServices []*LocalService `protobuf:"bytes,2,rep,name=local_services,json=localServices,proto3" json:"local_services,omitempty"` TraServiceConfig *v3alpha.TraServiceConfig `protobuf:"bytes,3,opt,name=tra_service_config,json=traServiceConfig,proto3" json:"tra_service_config,omitempty"` @@ -595,7 +595,7 @@ func (*SipProxy_SipSettings) Descriptor() ([]byte, []int) { return file_contrib_envoy_extensions_filters_network_sip_proxy_v3alpha_sip_proxy_proto_rawDescGZIP(), []int{0, 0} } -func (x *SipProxy_SipSettings) GetTransactionTimeout() *duration.Duration { +func (x *SipProxy_SipSettings) GetTransactionTimeout() *durationpb.Duration { if x != nil { return x.TransactionTimeout } @@ -789,8 +789,8 @@ var file_contrib_envoy_extensions_filters_network_sip_proxy_v3alpha_sip_proxy_pr (*LocalService)(nil), // 6: envoy.extensions.filters.network.sip_proxy.v3alpha.LocalService (*SipProxy_SipSettings)(nil), // 7: envoy.extensions.filters.network.sip_proxy.v3alpha.SipProxy.SipSettings (*RouteConfiguration)(nil), // 8: envoy.extensions.filters.network.sip_proxy.v3alpha.RouteConfiguration - (*any1.Any)(nil), // 9: google.protobuf.Any - (*duration.Duration)(nil), // 10: google.protobuf.Duration + (*anypb.Any)(nil), // 9: google.protobuf.Any + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration (*v3alpha.TraServiceConfig)(nil), // 11: envoy.extensions.filters.network.sip_proxy.tra.v3alpha.TraServiceConfig } var file_contrib_envoy_extensions_filters_network_sip_proxy_v3alpha_sip_proxy_proto_depIdxs = []int32{ diff --git a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.pb.go b/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.pb.go index be07e03a2..ef605eead 100755 --- a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.pb.go +++ b/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -46,7 +46,7 @@ type CryptoMbPrivateKeyMethodConfig struct { // already in the queue are processed, even if the queue is not full. // In effect, this value controls the balance between latency and // throughput. The duration needs to be set to a value greater than or equal to 1 millisecond. - PollDelay *duration.Duration `protobuf:"bytes,2,opt,name=poll_delay,json=pollDelay,proto3" json:"poll_delay,omitempty"` + PollDelay *durationpb.Duration `protobuf:"bytes,2,opt,name=poll_delay,json=pollDelay,proto3" json:"poll_delay,omitempty"` } func (x *CryptoMbPrivateKeyMethodConfig) Reset() { @@ -88,7 +88,7 @@ func (x *CryptoMbPrivateKeyMethodConfig) GetPrivateKey() *v3.DataSource { return nil } -func (x *CryptoMbPrivateKeyMethodConfig) GetPollDelay() *duration.Duration { +func (x *CryptoMbPrivateKeyMethodConfig) GetPollDelay() *durationpb.Duration { if x != nil { return x.PollDelay } @@ -159,7 +159,7 @@ var file_contrib_envoy_extensions_private_key_providers_cryptomb_v3alpha_cryptom var file_contrib_envoy_extensions_private_key_providers_cryptomb_v3alpha_cryptomb_proto_goTypes = []interface{}{ (*CryptoMbPrivateKeyMethodConfig)(nil), // 0: envoy.extensions.private_key_providers.cryptomb.v3alpha.CryptoMbPrivateKeyMethodConfig (*v3.DataSource)(nil), // 1: envoy.config.core.v3.DataSource - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_contrib_envoy_extensions_private_key_providers_cryptomb_v3alpha_cryptomb_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.private_key_providers.cryptomb.v3alpha.CryptoMbPrivateKeyMethodConfig.private_key:type_name -> envoy.config.core.v3.DataSource diff --git a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.pb.go b/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.pb.go index cafe47aca..37d8a5363 100755 --- a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.pb.go +++ b/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -37,7 +37,7 @@ type QatPrivateKeyMethodConfig struct { // quicker answers from the hardware but causes more polling loop // spins, leading to potentially larger CPU usage. The duration needs // to be set to a value greater than or equal to 1 millisecond. - PollDelay *duration.Duration `protobuf:"bytes,2,opt,name=poll_delay,json=pollDelay,proto3" json:"poll_delay,omitempty"` + PollDelay *durationpb.Duration `protobuf:"bytes,2,opt,name=poll_delay,json=pollDelay,proto3" json:"poll_delay,omitempty"` } func (x *QatPrivateKeyMethodConfig) Reset() { @@ -79,7 +79,7 @@ func (x *QatPrivateKeyMethodConfig) GetPrivateKey() *v3.DataSource { return nil } -func (x *QatPrivateKeyMethodConfig) GetPollDelay() *duration.Duration { +func (x *QatPrivateKeyMethodConfig) GetPollDelay() *durationpb.Duration { if x != nil { return x.PollDelay } @@ -148,7 +148,7 @@ var file_contrib_envoy_extensions_private_key_providers_qat_v3alpha_qat_proto_ms var file_contrib_envoy_extensions_private_key_providers_qat_v3alpha_qat_proto_goTypes = []interface{}{ (*QatPrivateKeyMethodConfig)(nil), // 0: envoy.extensions.private_key_providers.qat.v3alpha.QatPrivateKeyMethodConfig (*v3.DataSource)(nil), // 1: envoy.config.core.v3.DataSource - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_contrib_envoy_extensions_private_key_providers_qat_v3alpha_qat_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.private_key_providers.qat.v3alpha.QatPrivateKeyMethodConfig.private_key:type_name -> envoy.config.core.v3.DataSource diff --git a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.pb.go b/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.pb.go index e8e546ec5..654aa269b 100755 --- a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.pb.go +++ b/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/cncf/xds/go/xds/annotations/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -50,7 +50,7 @@ type Config struct { // // See the :repo:`StreamFilter API ` // for more information about how the plugin's configuration data can be accessed. - Config *any1.Any `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` + Config *anypb.Any `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` } func (x *Config) Reset() { @@ -106,7 +106,7 @@ func (x *Config) GetDefaultCluster() string { return "" } -func (x *Config) GetConfig() *any1.Any { +func (x *Config) GetConfig() *anypb.Any { if x != nil { return x.Config } @@ -174,8 +174,8 @@ func file_contrib_envoy_extensions_router_cluster_specifier_golang_v3alpha_golan var file_contrib_envoy_extensions_router_cluster_specifier_golang_v3alpha_golang_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_contrib_envoy_extensions_router_cluster_specifier_golang_v3alpha_golang_proto_goTypes = []interface{}{ - (*Config)(nil), // 0: envoy.extensions.router.cluster_specifier.golang.v3alpha.Config - (*any1.Any)(nil), // 1: google.protobuf.Any + (*Config)(nil), // 0: envoy.extensions.router.cluster_specifier.golang.v3alpha.Config + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_contrib_envoy_extensions_router_cluster_specifier_golang_v3alpha_golang_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.router.cluster_specifier.golang.v3alpha.Config.config:type_name -> google.protobuf.Any diff --git a/envoy/COMMIT b/envoy/COMMIT index edaa0bdeb..efe3d0140 100644 --- a/envoy/COMMIT +++ b/envoy/COMMIT @@ -1 +1 @@ -12674b94f785036ab6686b2ec84567fb9e1f5d1d +5f58f9ac917e82fdfadb771b8de3bb466d9e53ee diff --git a/envoy/admin/v2alpha/certs.pb.go b/envoy/admin/v2alpha/certs.pb.go index 33d0eb4c5..fd5af1843 100755 --- a/envoy/admin/v2alpha/certs.pb.go +++ b/envoy/admin/v2alpha/certs.pb.go @@ -8,9 +8,9 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -145,9 +145,9 @@ type CertificateDetails struct { // Minimum of days until expiration of certificate and it's chain. DaysUntilExpiration uint64 `protobuf:"varint,4,opt,name=days_until_expiration,json=daysUntilExpiration,proto3" json:"days_until_expiration,omitempty"` // Indicates the time from which the certificate is valid. - ValidFrom *timestamp.Timestamp `protobuf:"bytes,5,opt,name=valid_from,json=validFrom,proto3" json:"valid_from,omitempty"` + ValidFrom *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=valid_from,json=validFrom,proto3" json:"valid_from,omitempty"` // Indicates the time at which the certificate expires. - ExpirationTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` + ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` } func (x *CertificateDetails) Reset() { @@ -210,14 +210,14 @@ func (x *CertificateDetails) GetDaysUntilExpiration() uint64 { return 0 } -func (x *CertificateDetails) GetValidFrom() *timestamp.Timestamp { +func (x *CertificateDetails) GetValidFrom() *timestamppb.Timestamp { if x != nil { return x.ValidFrom } return nil } -func (x *CertificateDetails) GetExpirationTime() *timestamp.Timestamp { +func (x *CertificateDetails) GetExpirationTime() *timestamppb.Timestamp { if x != nil { return x.ExpirationTime } @@ -399,11 +399,11 @@ func file_envoy_admin_v2alpha_certs_proto_rawDescGZIP() []byte { var file_envoy_admin_v2alpha_certs_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_envoy_admin_v2alpha_certs_proto_goTypes = []interface{}{ - (*Certificates)(nil), // 0: envoy.admin.v2alpha.Certificates - (*Certificate)(nil), // 1: envoy.admin.v2alpha.Certificate - (*CertificateDetails)(nil), // 2: envoy.admin.v2alpha.CertificateDetails - (*SubjectAlternateName)(nil), // 3: envoy.admin.v2alpha.SubjectAlternateName - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*Certificates)(nil), // 0: envoy.admin.v2alpha.Certificates + (*Certificate)(nil), // 1: envoy.admin.v2alpha.Certificate + (*CertificateDetails)(nil), // 2: envoy.admin.v2alpha.CertificateDetails + (*SubjectAlternateName)(nil), // 3: envoy.admin.v2alpha.SubjectAlternateName + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp } var file_envoy_admin_v2alpha_certs_proto_depIdxs = []int32{ 1, // 0: envoy.admin.v2alpha.Certificates.certificates:type_name -> envoy.admin.v2alpha.Certificate diff --git a/envoy/admin/v2alpha/config_dump.pb.go b/envoy/admin/v2alpha/config_dump.pb.go index fa7b1870d..bc5650e92 100755 --- a/envoy/admin/v2alpha/config_dump.pb.go +++ b/envoy/admin/v2alpha/config_dump.pb.go @@ -9,10 +9,10 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2" - any1 "github.com/golang/protobuf/ptypes/any" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -47,7 +47,7 @@ type ConfigDump struct { // :ref:`/config_dump?mask={} `, // or :ref:`/config_dump?resource={},mask={} // ` for more information. - Configs []*any1.Any `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"` + Configs []*anypb.Any `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"` } func (x *ConfigDump) Reset() { @@ -82,7 +82,7 @@ func (*ConfigDump) Descriptor() ([]byte, []int) { return file_envoy_admin_v2alpha_config_dump_proto_rawDescGZIP(), []int{0} } -func (x *ConfigDump) GetConfigs() []*any1.Any { +func (x *ConfigDump) GetConfigs() []*anypb.Any { if x != nil { return x.Configs } @@ -95,9 +95,9 @@ type UpdateFailureState struct { unknownFields protoimpl.UnknownFields // What the component configuration would have been if the update had succeeded. - FailedConfiguration *any1.Any `protobuf:"bytes,1,opt,name=failed_configuration,json=failedConfiguration,proto3" json:"failed_configuration,omitempty"` + FailedConfiguration *anypb.Any `protobuf:"bytes,1,opt,name=failed_configuration,json=failedConfiguration,proto3" json:"failed_configuration,omitempty"` // Time of the latest failed update attempt. - LastUpdateAttempt *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_update_attempt,json=lastUpdateAttempt,proto3" json:"last_update_attempt,omitempty"` + LastUpdateAttempt *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_update_attempt,json=lastUpdateAttempt,proto3" json:"last_update_attempt,omitempty"` // Details about the last failed update attempt. Details string `protobuf:"bytes,3,opt,name=details,proto3" json:"details,omitempty"` } @@ -134,14 +134,14 @@ func (*UpdateFailureState) Descriptor() ([]byte, []int) { return file_envoy_admin_v2alpha_config_dump_proto_rawDescGZIP(), []int{1} } -func (x *UpdateFailureState) GetFailedConfiguration() *any1.Any { +func (x *UpdateFailureState) GetFailedConfiguration() *anypb.Any { if x != nil { return x.FailedConfiguration } return nil } -func (x *UpdateFailureState) GetLastUpdateAttempt() *timestamp.Timestamp { +func (x *UpdateFailureState) GetLastUpdateAttempt() *timestamppb.Timestamp { if x != nil { return x.LastUpdateAttempt } @@ -166,7 +166,7 @@ type BootstrapConfigDump struct { Bootstrap *v2.Bootstrap `protobuf:"bytes,1,opt,name=bootstrap,proto3" json:"bootstrap,omitempty"` // The timestamp when the BootstrapConfig was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *BootstrapConfigDump) Reset() { @@ -208,7 +208,7 @@ func (x *BootstrapConfigDump) GetBootstrap() *v2.Bootstrap { return nil } -func (x *BootstrapConfigDump) GetLastUpdated() *timestamp.Timestamp { +func (x *BootstrapConfigDump) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -569,9 +569,9 @@ type ListenersConfigDump_StaticListener struct { unknownFields protoimpl.UnknownFields // The listener config. - Listener *any1.Any `protobuf:"bytes,1,opt,name=listener,proto3" json:"listener,omitempty"` + Listener *anypb.Any `protobuf:"bytes,1,opt,name=listener,proto3" json:"listener,omitempty"` // The timestamp when the Listener was last successfully updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ListenersConfigDump_StaticListener) Reset() { @@ -606,14 +606,14 @@ func (*ListenersConfigDump_StaticListener) Descriptor() ([]byte, []int) { return file_envoy_admin_v2alpha_config_dump_proto_rawDescGZIP(), []int{3, 0} } -func (x *ListenersConfigDump_StaticListener) GetListener() *any1.Any { +func (x *ListenersConfigDump_StaticListener) GetListener() *anypb.Any { if x != nil { return x.Listener } return nil } -func (x *ListenersConfigDump_StaticListener) GetLastUpdated() *timestamp.Timestamp { +func (x *ListenersConfigDump_StaticListener) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -631,9 +631,9 @@ type ListenersConfigDump_DynamicListenerState struct { // by the API. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The listener config. - Listener *any1.Any `protobuf:"bytes,2,opt,name=listener,proto3" json:"listener,omitempty"` + Listener *anypb.Any `protobuf:"bytes,2,opt,name=listener,proto3" json:"listener,omitempty"` // The timestamp when the Listener was last successfully updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ListenersConfigDump_DynamicListenerState) Reset() { @@ -675,14 +675,14 @@ func (x *ListenersConfigDump_DynamicListenerState) GetVersionInfo() string { return "" } -func (x *ListenersConfigDump_DynamicListenerState) GetListener() *any1.Any { +func (x *ListenersConfigDump_DynamicListenerState) GetListener() *anypb.Any { if x != nil { return x.Listener } return nil } -func (x *ListenersConfigDump_DynamicListenerState) GetLastUpdated() *timestamp.Timestamp { +func (x *ListenersConfigDump_DynamicListenerState) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -789,9 +789,9 @@ type ClustersConfigDump_StaticCluster struct { unknownFields protoimpl.UnknownFields // The cluster config. - Cluster *any1.Any `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"` + Cluster *anypb.Any `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"` // The timestamp when the Cluster was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ClustersConfigDump_StaticCluster) Reset() { @@ -826,14 +826,14 @@ func (*ClustersConfigDump_StaticCluster) Descriptor() ([]byte, []int) { return file_envoy_admin_v2alpha_config_dump_proto_rawDescGZIP(), []int{4, 0} } -func (x *ClustersConfigDump_StaticCluster) GetCluster() *any1.Any { +func (x *ClustersConfigDump_StaticCluster) GetCluster() *anypb.Any { if x != nil { return x.Cluster } return nil } -func (x *ClustersConfigDump_StaticCluster) GetLastUpdated() *timestamp.Timestamp { +func (x *ClustersConfigDump_StaticCluster) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -852,9 +852,9 @@ type ClustersConfigDump_DynamicCluster struct { // the API. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The cluster config. - Cluster *any1.Any `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` + Cluster *anypb.Any `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` // The timestamp when the Cluster was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ClustersConfigDump_DynamicCluster) Reset() { @@ -896,14 +896,14 @@ func (x *ClustersConfigDump_DynamicCluster) GetVersionInfo() string { return "" } -func (x *ClustersConfigDump_DynamicCluster) GetCluster() *any1.Any { +func (x *ClustersConfigDump_DynamicCluster) GetCluster() *anypb.Any { if x != nil { return x.Cluster } return nil } -func (x *ClustersConfigDump_DynamicCluster) GetLastUpdated() *timestamp.Timestamp { +func (x *ClustersConfigDump_DynamicCluster) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -916,9 +916,9 @@ type RoutesConfigDump_StaticRouteConfig struct { unknownFields protoimpl.UnknownFields // The route config. - RouteConfig *any1.Any `protobuf:"bytes,1,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` + RouteConfig *anypb.Any `protobuf:"bytes,1,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` // The timestamp when the Route was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *RoutesConfigDump_StaticRouteConfig) Reset() { @@ -953,14 +953,14 @@ func (*RoutesConfigDump_StaticRouteConfig) Descriptor() ([]byte, []int) { return file_envoy_admin_v2alpha_config_dump_proto_rawDescGZIP(), []int{5, 0} } -func (x *RoutesConfigDump_StaticRouteConfig) GetRouteConfig() *any1.Any { +func (x *RoutesConfigDump_StaticRouteConfig) GetRouteConfig() *anypb.Any { if x != nil { return x.RouteConfig } return nil } -func (x *RoutesConfigDump_StaticRouteConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *RoutesConfigDump_StaticRouteConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -977,9 +977,9 @@ type RoutesConfigDump_DynamicRouteConfig struct { // the route configuration was loaded. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The route config. - RouteConfig *any1.Any `protobuf:"bytes,2,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` + RouteConfig *anypb.Any `protobuf:"bytes,2,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` // The timestamp when the Route was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *RoutesConfigDump_DynamicRouteConfig) Reset() { @@ -1021,14 +1021,14 @@ func (x *RoutesConfigDump_DynamicRouteConfig) GetVersionInfo() string { return "" } -func (x *RoutesConfigDump_DynamicRouteConfig) GetRouteConfig() *any1.Any { +func (x *RoutesConfigDump_DynamicRouteConfig) GetRouteConfig() *anypb.Any { if x != nil { return x.RouteConfig } return nil } -func (x *RoutesConfigDump_DynamicRouteConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *RoutesConfigDump_DynamicRouteConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1043,9 +1043,9 @@ type ScopedRoutesConfigDump_InlineScopedRouteConfigs struct { // The name assigned to the scoped route configurations. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The scoped route configurations. - ScopedRouteConfigs []*any1.Any `protobuf:"bytes,2,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` + ScopedRouteConfigs []*anypb.Any `protobuf:"bytes,2,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` // The timestamp when the scoped route config set was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) Reset() { @@ -1087,14 +1087,14 @@ func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetName() string { return "" } -func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetScopedRouteConfigs() []*any1.Any { +func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetScopedRouteConfigs() []*anypb.Any { if x != nil { return x.ScopedRouteConfigs } return nil } -func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetLastUpdated() *timestamp.Timestamp { +func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1113,9 +1113,9 @@ type ScopedRoutesConfigDump_DynamicScopedRouteConfigs struct { // the scoped routes configuration was loaded. VersionInfo string `protobuf:"bytes,2,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The scoped route configurations. - ScopedRouteConfigs []*any1.Any `protobuf:"bytes,3,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` + ScopedRouteConfigs []*anypb.Any `protobuf:"bytes,3,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` // The timestamp when the scoped route config set was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) Reset() { @@ -1164,14 +1164,14 @@ func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetVersionInfo() stri return "" } -func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetScopedRouteConfigs() []*any1.Any { +func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetScopedRouteConfigs() []*anypb.Any { if x != nil { return x.ScopedRouteConfigs } return nil } -func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetLastUpdated() *timestamp.Timestamp { +func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1189,11 +1189,11 @@ type SecretsConfigDump_DynamicSecret struct { // 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 *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.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 *any1.Any `protobuf:"bytes,4,opt,name=secret,proto3" json:"secret,omitempty"` + Secret *anypb.Any `protobuf:"bytes,4,opt,name=secret,proto3" json:"secret,omitempty"` } func (x *SecretsConfigDump_DynamicSecret) Reset() { @@ -1242,14 +1242,14 @@ func (x *SecretsConfigDump_DynamicSecret) GetVersionInfo() string { return "" } -func (x *SecretsConfigDump_DynamicSecret) GetLastUpdated() *timestamp.Timestamp { +func (x *SecretsConfigDump_DynamicSecret) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } return nil } -func (x *SecretsConfigDump_DynamicSecret) GetSecret() *any1.Any { +func (x *SecretsConfigDump_DynamicSecret) GetSecret() *anypb.Any { if x != nil { return x.Secret } @@ -1265,11 +1265,11 @@ 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 *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.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 *any1.Any `protobuf:"bytes,3,opt,name=secret,proto3" json:"secret,omitempty"` + Secret *anypb.Any `protobuf:"bytes,3,opt,name=secret,proto3" json:"secret,omitempty"` } func (x *SecretsConfigDump_StaticSecret) Reset() { @@ -1311,14 +1311,14 @@ func (x *SecretsConfigDump_StaticSecret) GetName() string { return "" } -func (x *SecretsConfigDump_StaticSecret) GetLastUpdated() *timestamp.Timestamp { +func (x *SecretsConfigDump_StaticSecret) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } return nil } -func (x *SecretsConfigDump_StaticSecret) GetSecret() *any1.Any { +func (x *SecretsConfigDump_StaticSecret) GetSecret() *anypb.Any { if x != nil { return x.Secret } @@ -1633,8 +1633,8 @@ var file_envoy_admin_v2alpha_config_dump_proto_goTypes = []interface{}{ (*ScopedRoutesConfigDump_DynamicScopedRouteConfigs)(nil), // 16: envoy.admin.v2alpha.ScopedRoutesConfigDump.DynamicScopedRouteConfigs (*SecretsConfigDump_DynamicSecret)(nil), // 17: envoy.admin.v2alpha.SecretsConfigDump.DynamicSecret (*SecretsConfigDump_StaticSecret)(nil), // 18: envoy.admin.v2alpha.SecretsConfigDump.StaticSecret - (*any1.Any)(nil), // 19: google.protobuf.Any - (*timestamp.Timestamp)(nil), // 20: google.protobuf.Timestamp + (*anypb.Any)(nil), // 19: google.protobuf.Any + (*timestamppb.Timestamp)(nil), // 20: google.protobuf.Timestamp (*v2.Bootstrap)(nil), // 21: envoy.config.bootstrap.v2.Bootstrap } var file_envoy_admin_v2alpha_config_dump_proto_depIdxs = []int32{ diff --git a/envoy/admin/v2alpha/server_info.pb.go b/envoy/admin/v2alpha/server_info.pb.go index b4de4cfdb..0fa540900 100755 --- a/envoy/admin/v2alpha/server_info.pb.go +++ b/envoy/admin/v2alpha/server_info.pb.go @@ -9,9 +9,9 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -190,9 +190,9 @@ type ServerInfo struct { // State of the server. State ServerInfo_State `protobuf:"varint,2,opt,name=state,proto3,enum=envoy.admin.v2alpha.ServerInfo_State" json:"state,omitempty"` // Uptime since current epoch was started. - UptimeCurrentEpoch *duration.Duration `protobuf:"bytes,3,opt,name=uptime_current_epoch,json=uptimeCurrentEpoch,proto3" json:"uptime_current_epoch,omitempty"` + UptimeCurrentEpoch *durationpb.Duration `protobuf:"bytes,3,opt,name=uptime_current_epoch,json=uptimeCurrentEpoch,proto3" json:"uptime_current_epoch,omitempty"` // Uptime since the start of the first epoch. - UptimeAllEpochs *duration.Duration `protobuf:"bytes,4,opt,name=uptime_all_epochs,json=uptimeAllEpochs,proto3" json:"uptime_all_epochs,omitempty"` + UptimeAllEpochs *durationpb.Duration `protobuf:"bytes,4,opt,name=uptime_all_epochs,json=uptimeAllEpochs,proto3" json:"uptime_all_epochs,omitempty"` // Hot restart version. HotRestartVersion string `protobuf:"bytes,5,opt,name=hot_restart_version,json=hotRestartVersion,proto3" json:"hot_restart_version,omitempty"` // Command line options the server is currently running with. @@ -245,14 +245,14 @@ func (x *ServerInfo) GetState() ServerInfo_State { return ServerInfo_LIVE } -func (x *ServerInfo) GetUptimeCurrentEpoch() *duration.Duration { +func (x *ServerInfo) GetUptimeCurrentEpoch() *durationpb.Duration { if x != nil { return x.UptimeCurrentEpoch } return nil } -func (x *ServerInfo) GetUptimeAllEpochs() *duration.Duration { +func (x *ServerInfo) GetUptimeAllEpochs() *durationpb.Duration { if x != nil { return x.UptimeAllEpochs } @@ -312,11 +312,11 @@ type CommandLineOptions struct { // See :option:`--service-zone` for details. ServiceZone string `protobuf:"bytes,15,opt,name=service_zone,json=serviceZone,proto3" json:"service_zone,omitempty"` // See :option:`--file-flush-interval-msec` for details. - FileFlushInterval *duration.Duration `protobuf:"bytes,16,opt,name=file_flush_interval,json=fileFlushInterval,proto3" json:"file_flush_interval,omitempty"` + FileFlushInterval *durationpb.Duration `protobuf:"bytes,16,opt,name=file_flush_interval,json=fileFlushInterval,proto3" json:"file_flush_interval,omitempty"` // See :option:`--drain-time-s` for details. - DrainTime *duration.Duration `protobuf:"bytes,17,opt,name=drain_time,json=drainTime,proto3" json:"drain_time,omitempty"` + DrainTime *durationpb.Duration `protobuf:"bytes,17,opt,name=drain_time,json=drainTime,proto3" json:"drain_time,omitempty"` // See :option:`--parent-shutdown-time-s` for details. - ParentShutdownTime *duration.Duration `protobuf:"bytes,18,opt,name=parent_shutdown_time,json=parentShutdownTime,proto3" json:"parent_shutdown_time,omitempty"` + ParentShutdownTime *durationpb.Duration `protobuf:"bytes,18,opt,name=parent_shutdown_time,json=parentShutdownTime,proto3" json:"parent_shutdown_time,omitempty"` // See :option:`--mode` for details. Mode CommandLineOptions_Mode `protobuf:"varint,19,opt,name=mode,proto3,enum=envoy.admin.v2alpha.CommandLineOptions_Mode" json:"mode,omitempty"` // max_stats and max_obj_name_len are now unused and have no effect. @@ -481,21 +481,21 @@ func (x *CommandLineOptions) GetServiceZone() string { return "" } -func (x *CommandLineOptions) GetFileFlushInterval() *duration.Duration { +func (x *CommandLineOptions) GetFileFlushInterval() *durationpb.Duration { if x != nil { return x.FileFlushInterval } return nil } -func (x *CommandLineOptions) GetDrainTime() *duration.Duration { +func (x *CommandLineOptions) GetDrainTime() *durationpb.Duration { if x != nil { return x.DrainTime } return nil } -func (x *CommandLineOptions) GetParentShutdownTime() *duration.Duration { +func (x *CommandLineOptions) GetParentShutdownTime() *durationpb.Duration { if x != nil { return x.ParentShutdownTime } @@ -720,7 +720,7 @@ var file_envoy_admin_v2alpha_server_info_proto_goTypes = []interface{}{ (CommandLineOptions_Mode)(0), // 2: envoy.admin.v2alpha.CommandLineOptions.Mode (*ServerInfo)(nil), // 3: envoy.admin.v2alpha.ServerInfo (*CommandLineOptions)(nil), // 4: envoy.admin.v2alpha.CommandLineOptions - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration } var file_envoy_admin_v2alpha_server_info_proto_depIdxs = []int32{ 0, // 0: envoy.admin.v2alpha.ServerInfo.state:type_name -> envoy.admin.v2alpha.ServerInfo.State diff --git a/envoy/admin/v3/certs.pb.go b/envoy/admin/v3/certs.pb.go index 8e940b8dc..6f21eda72 100755 --- a/envoy/admin/v3/certs.pb.go +++ b/envoy/admin/v3/certs.pb.go @@ -8,9 +8,9 @@ package adminv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -145,9 +145,9 @@ type CertificateDetails struct { // Minimum of days until expiration of certificate and it's chain. DaysUntilExpiration uint64 `protobuf:"varint,4,opt,name=days_until_expiration,json=daysUntilExpiration,proto3" json:"days_until_expiration,omitempty"` // Indicates the time from which the certificate is valid. - ValidFrom *timestamp.Timestamp `protobuf:"bytes,5,opt,name=valid_from,json=validFrom,proto3" json:"valid_from,omitempty"` + ValidFrom *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=valid_from,json=validFrom,proto3" json:"valid_from,omitempty"` // Indicates the time at which the certificate expires. - ExpirationTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` + ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` // Details related to the OCSP response associated with this certificate, if any. OcspDetails *CertificateDetails_OcspDetails `protobuf:"bytes,7,opt,name=ocsp_details,json=ocspDetails,proto3" json:"ocsp_details,omitempty"` } @@ -212,14 +212,14 @@ func (x *CertificateDetails) GetDaysUntilExpiration() uint64 { return 0 } -func (x *CertificateDetails) GetValidFrom() *timestamp.Timestamp { +func (x *CertificateDetails) GetValidFrom() *timestamppb.Timestamp { if x != nil { return x.ValidFrom } return nil } -func (x *CertificateDetails) GetExpirationTime() *timestamp.Timestamp { +func (x *CertificateDetails) GetExpirationTime() *timestamppb.Timestamp { if x != nil { return x.ExpirationTime } @@ -336,9 +336,9 @@ type CertificateDetails_OcspDetails struct { unknownFields protoimpl.UnknownFields // Indicates the time from which the OCSP response is valid. - ValidFrom *timestamp.Timestamp `protobuf:"bytes,1,opt,name=valid_from,json=validFrom,proto3" json:"valid_from,omitempty"` + ValidFrom *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=valid_from,json=validFrom,proto3" json:"valid_from,omitempty"` // Indicates the time at which the OCSP response expires. - Expiration *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` + Expiration *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` } func (x *CertificateDetails_OcspDetails) Reset() { @@ -373,14 +373,14 @@ func (*CertificateDetails_OcspDetails) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_certs_proto_rawDescGZIP(), []int{2, 0} } -func (x *CertificateDetails_OcspDetails) GetValidFrom() *timestamp.Timestamp { +func (x *CertificateDetails_OcspDetails) GetValidFrom() *timestamppb.Timestamp { if x != nil { return x.ValidFrom } return nil } -func (x *CertificateDetails_OcspDetails) GetExpiration() *timestamp.Timestamp { +func (x *CertificateDetails_OcspDetails) GetExpiration() *timestamppb.Timestamp { if x != nil { return x.Expiration } @@ -495,7 +495,7 @@ var file_envoy_admin_v3_certs_proto_goTypes = []interface{}{ (*CertificateDetails)(nil), // 2: envoy.admin.v3.CertificateDetails (*SubjectAlternateName)(nil), // 3: envoy.admin.v3.SubjectAlternateName (*CertificateDetails_OcspDetails)(nil), // 4: envoy.admin.v3.CertificateDetails.OcspDetails - (*timestamp.Timestamp)(nil), // 5: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp } var file_envoy_admin_v3_certs_proto_depIdxs = []int32{ 1, // 0: envoy.admin.v3.Certificates.certificates:type_name -> envoy.admin.v3.Certificate diff --git a/envoy/admin/v3/config_dump.pb.go b/envoy/admin/v3/config_dump.pb.go index b7a1aba32..3d937ad7c 100755 --- a/envoy/admin/v3/config_dump.pb.go +++ b/envoy/admin/v3/config_dump.pb.go @@ -9,10 +9,10 @@ package adminv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3" - any1 "github.com/golang/protobuf/ptypes/any" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -58,7 +58,7 @@ type ConfigDump struct { // :ref:`/config_dump?mask={} `, // or :ref:`/config_dump?resource={},mask={} // ` for more information. - Configs []*any1.Any `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"` + Configs []*anypb.Any `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"` } func (x *ConfigDump) Reset() { @@ -93,7 +93,7 @@ func (*ConfigDump) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_config_dump_proto_rawDescGZIP(), []int{0} } -func (x *ConfigDump) GetConfigs() []*any1.Any { +func (x *ConfigDump) GetConfigs() []*anypb.Any { if x != nil { return x.Configs } @@ -111,7 +111,7 @@ type BootstrapConfigDump struct { Bootstrap *v3.Bootstrap `protobuf:"bytes,1,opt,name=bootstrap,proto3" json:"bootstrap,omitempty"` // The timestamp when the BootstrapConfig was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *BootstrapConfigDump) Reset() { @@ -153,7 +153,7 @@ func (x *BootstrapConfigDump) GetBootstrap() *v3.Bootstrap { return nil } -func (x *BootstrapConfigDump) GetLastUpdated() *timestamp.Timestamp { +func (x *BootstrapConfigDump) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -241,11 +241,11 @@ type SecretsConfigDump_DynamicSecret struct { // 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 *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.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 *any1.Any `protobuf:"bytes,4,opt,name=secret,proto3" json:"secret,omitempty"` + Secret *anypb.Any `protobuf:"bytes,4,opt,name=secret,proto3" json:"secret,omitempty"` // Set if the last update failed, cleared after the next successful update. // The *error_state* field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or @@ -303,14 +303,14 @@ func (x *SecretsConfigDump_DynamicSecret) GetVersionInfo() string { return "" } -func (x *SecretsConfigDump_DynamicSecret) GetLastUpdated() *timestamp.Timestamp { +func (x *SecretsConfigDump_DynamicSecret) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } return nil } -func (x *SecretsConfigDump_DynamicSecret) GetSecret() *any1.Any { +func (x *SecretsConfigDump_DynamicSecret) GetSecret() *anypb.Any { if x != nil { return x.Secret } @@ -340,11 +340,11 @@ 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 *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.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 *any1.Any `protobuf:"bytes,3,opt,name=secret,proto3" json:"secret,omitempty"` + Secret *anypb.Any `protobuf:"bytes,3,opt,name=secret,proto3" json:"secret,omitempty"` } func (x *SecretsConfigDump_StaticSecret) Reset() { @@ -386,14 +386,14 @@ func (x *SecretsConfigDump_StaticSecret) GetName() string { return "" } -func (x *SecretsConfigDump_StaticSecret) GetLastUpdated() *timestamp.Timestamp { +func (x *SecretsConfigDump_StaticSecret) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } return nil } -func (x *SecretsConfigDump_StaticSecret) GetSecret() *any1.Any { +func (x *SecretsConfigDump_StaticSecret) GetSecret() *anypb.Any { if x != nil { return x.Secret } @@ -527,9 +527,9 @@ var file_envoy_admin_v3_config_dump_proto_goTypes = []interface{}{ (*SecretsConfigDump)(nil), // 2: envoy.admin.v3.SecretsConfigDump (*SecretsConfigDump_DynamicSecret)(nil), // 3: envoy.admin.v3.SecretsConfigDump.DynamicSecret (*SecretsConfigDump_StaticSecret)(nil), // 4: envoy.admin.v3.SecretsConfigDump.StaticSecret - (*any1.Any)(nil), // 5: google.protobuf.Any + (*anypb.Any)(nil), // 5: google.protobuf.Any (*v3.Bootstrap)(nil), // 6: envoy.config.bootstrap.v3.Bootstrap - (*timestamp.Timestamp)(nil), // 7: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp (*UpdateFailureState)(nil), // 8: envoy.admin.v3.UpdateFailureState (ClientResourceStatus)(0), // 9: envoy.admin.v3.ClientResourceStatus } diff --git a/envoy/admin/v3/config_dump_shared.pb.go b/envoy/admin/v3/config_dump_shared.pb.go index 1f6405ae0..458ad3b53 100755 --- a/envoy/admin/v3/config_dump_shared.pb.go +++ b/envoy/admin/v3/config_dump_shared.pb.go @@ -8,10 +8,10 @@ package adminv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - any1 "github.com/golang/protobuf/ptypes/any" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -98,9 +98,9 @@ type UpdateFailureState struct { // What the component configuration would have been if the update had succeeded. // This field may not be populated by xDS clients due to storage overhead. - FailedConfiguration *any1.Any `protobuf:"bytes,1,opt,name=failed_configuration,json=failedConfiguration,proto3" json:"failed_configuration,omitempty"` + FailedConfiguration *anypb.Any `protobuf:"bytes,1,opt,name=failed_configuration,json=failedConfiguration,proto3" json:"failed_configuration,omitempty"` // Time of the latest failed update attempt. - LastUpdateAttempt *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_update_attempt,json=lastUpdateAttempt,proto3" json:"last_update_attempt,omitempty"` + LastUpdateAttempt *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_update_attempt,json=lastUpdateAttempt,proto3" json:"last_update_attempt,omitempty"` // Details about the last failed update attempt. Details string `protobuf:"bytes,3,opt,name=details,proto3" json:"details,omitempty"` // This is the version of the rejected resource. @@ -140,14 +140,14 @@ func (*UpdateFailureState) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_config_dump_shared_proto_rawDescGZIP(), []int{0} } -func (x *UpdateFailureState) GetFailedConfiguration() *any1.Any { +func (x *UpdateFailureState) GetFailedConfiguration() *anypb.Any { if x != nil { return x.FailedConfiguration } return nil } -func (x *UpdateFailureState) GetLastUpdateAttempt() *timestamp.Timestamp { +func (x *UpdateFailureState) GetLastUpdateAttempt() *timestamppb.Timestamp { if x != nil { return x.LastUpdateAttempt } @@ -565,9 +565,9 @@ type ListenersConfigDump_StaticListener struct { unknownFields protoimpl.UnknownFields // The listener config. - Listener *any1.Any `protobuf:"bytes,1,opt,name=listener,proto3" json:"listener,omitempty"` + Listener *anypb.Any `protobuf:"bytes,1,opt,name=listener,proto3" json:"listener,omitempty"` // The timestamp when the Listener was last successfully updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ListenersConfigDump_StaticListener) Reset() { @@ -602,14 +602,14 @@ func (*ListenersConfigDump_StaticListener) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_config_dump_shared_proto_rawDescGZIP(), []int{1, 0} } -func (x *ListenersConfigDump_StaticListener) GetListener() *any1.Any { +func (x *ListenersConfigDump_StaticListener) GetListener() *anypb.Any { if x != nil { return x.Listener } return nil } -func (x *ListenersConfigDump_StaticListener) GetLastUpdated() *timestamp.Timestamp { +func (x *ListenersConfigDump_StaticListener) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -627,9 +627,9 @@ type ListenersConfigDump_DynamicListenerState struct { // by the API. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The listener config. - Listener *any1.Any `protobuf:"bytes,2,opt,name=listener,proto3" json:"listener,omitempty"` + Listener *anypb.Any `protobuf:"bytes,2,opt,name=listener,proto3" json:"listener,omitempty"` // The timestamp when the Listener was last successfully updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ListenersConfigDump_DynamicListenerState) Reset() { @@ -671,14 +671,14 @@ func (x *ListenersConfigDump_DynamicListenerState) GetVersionInfo() string { return "" } -func (x *ListenersConfigDump_DynamicListenerState) GetListener() *any1.Any { +func (x *ListenersConfigDump_DynamicListenerState) GetListener() *anypb.Any { if x != nil { return x.Listener } return nil } -func (x *ListenersConfigDump_DynamicListenerState) GetLastUpdated() *timestamp.Timestamp { +func (x *ListenersConfigDump_DynamicListenerState) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -798,9 +798,9 @@ type ClustersConfigDump_StaticCluster struct { unknownFields protoimpl.UnknownFields // The cluster config. - Cluster *any1.Any `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"` + Cluster *anypb.Any `protobuf:"bytes,1,opt,name=cluster,proto3" json:"cluster,omitempty"` // The timestamp when the Cluster was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ClustersConfigDump_StaticCluster) Reset() { @@ -835,14 +835,14 @@ func (*ClustersConfigDump_StaticCluster) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_config_dump_shared_proto_rawDescGZIP(), []int{2, 0} } -func (x *ClustersConfigDump_StaticCluster) GetCluster() *any1.Any { +func (x *ClustersConfigDump_StaticCluster) GetCluster() *anypb.Any { if x != nil { return x.Cluster } return nil } -func (x *ClustersConfigDump_StaticCluster) GetLastUpdated() *timestamp.Timestamp { +func (x *ClustersConfigDump_StaticCluster) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -862,9 +862,9 @@ type ClustersConfigDump_DynamicCluster struct { // the API. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The cluster config. - Cluster *any1.Any `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` + Cluster *anypb.Any `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` // The timestamp when the Cluster was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` // Set if the last update failed, cleared after the next successful update. // The “error_state“ field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or @@ -915,14 +915,14 @@ func (x *ClustersConfigDump_DynamicCluster) GetVersionInfo() string { return "" } -func (x *ClustersConfigDump_DynamicCluster) GetCluster() *any1.Any { +func (x *ClustersConfigDump_DynamicCluster) GetCluster() *anypb.Any { if x != nil { return x.Cluster } return nil } -func (x *ClustersConfigDump_DynamicCluster) GetLastUpdated() *timestamp.Timestamp { +func (x *ClustersConfigDump_DynamicCluster) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -949,9 +949,9 @@ type RoutesConfigDump_StaticRouteConfig struct { unknownFields protoimpl.UnknownFields // The route config. - RouteConfig *any1.Any `protobuf:"bytes,1,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` + RouteConfig *anypb.Any `protobuf:"bytes,1,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` // The timestamp when the Route was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *RoutesConfigDump_StaticRouteConfig) Reset() { @@ -986,14 +986,14 @@ func (*RoutesConfigDump_StaticRouteConfig) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_config_dump_shared_proto_rawDescGZIP(), []int{3, 0} } -func (x *RoutesConfigDump_StaticRouteConfig) GetRouteConfig() *any1.Any { +func (x *RoutesConfigDump_StaticRouteConfig) GetRouteConfig() *anypb.Any { if x != nil { return x.RouteConfig } return nil } -func (x *RoutesConfigDump_StaticRouteConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *RoutesConfigDump_StaticRouteConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1011,9 +1011,9 @@ type RoutesConfigDump_DynamicRouteConfig struct { // the route configuration was loaded. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The route config. - RouteConfig *any1.Any `protobuf:"bytes,2,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` + RouteConfig *anypb.Any `protobuf:"bytes,2,opt,name=route_config,json=routeConfig,proto3" json:"route_config,omitempty"` // The timestamp when the Route was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` // Set if the last update failed, cleared after the next successful update. // The “error_state“ field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or @@ -1064,14 +1064,14 @@ func (x *RoutesConfigDump_DynamicRouteConfig) GetVersionInfo() string { return "" } -func (x *RoutesConfigDump_DynamicRouteConfig) GetRouteConfig() *any1.Any { +func (x *RoutesConfigDump_DynamicRouteConfig) GetRouteConfig() *anypb.Any { if x != nil { return x.RouteConfig } return nil } -func (x *RoutesConfigDump_DynamicRouteConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *RoutesConfigDump_DynamicRouteConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1100,9 +1100,9 @@ type ScopedRoutesConfigDump_InlineScopedRouteConfigs struct { // The name assigned to the scoped route configurations. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The scoped route configurations. - ScopedRouteConfigs []*any1.Any `protobuf:"bytes,2,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` + ScopedRouteConfigs []*anypb.Any `protobuf:"bytes,2,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` // The timestamp when the scoped route config set was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) Reset() { @@ -1144,14 +1144,14 @@ func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetName() string { return "" } -func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetScopedRouteConfigs() []*any1.Any { +func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetScopedRouteConfigs() []*anypb.Any { if x != nil { return x.ScopedRouteConfigs } return nil } -func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetLastUpdated() *timestamp.Timestamp { +func (x *ScopedRoutesConfigDump_InlineScopedRouteConfigs) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1171,9 +1171,9 @@ type ScopedRoutesConfigDump_DynamicScopedRouteConfigs struct { // the scoped routes configuration was loaded. VersionInfo string `protobuf:"bytes,2,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The scoped route configurations. - ScopedRouteConfigs []*any1.Any `protobuf:"bytes,3,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` + ScopedRouteConfigs []*anypb.Any `protobuf:"bytes,3,rep,name=scoped_route_configs,json=scopedRouteConfigs,proto3" json:"scoped_route_configs,omitempty"` // The timestamp when the scoped route config set was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` // Set if the last update failed, cleared after the next successful update. // The “error_state“ field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or @@ -1231,14 +1231,14 @@ func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetVersionInfo() stri return "" } -func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetScopedRouteConfigs() []*any1.Any { +func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetScopedRouteConfigs() []*anypb.Any { if x != nil { return x.ScopedRouteConfigs } return nil } -func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetLastUpdated() *timestamp.Timestamp { +func (x *ScopedRoutesConfigDump_DynamicScopedRouteConfigs) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1265,9 +1265,9 @@ type EndpointsConfigDump_StaticEndpointConfig struct { unknownFields protoimpl.UnknownFields // The endpoint config. - EndpointConfig *any1.Any `protobuf:"bytes,1,opt,name=endpoint_config,json=endpointConfig,proto3" json:"endpoint_config,omitempty"` + EndpointConfig *anypb.Any `protobuf:"bytes,1,opt,name=endpoint_config,json=endpointConfig,proto3" json:"endpoint_config,omitempty"` // [#not-implemented-hide:] The timestamp when the Endpoint was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` } func (x *EndpointsConfigDump_StaticEndpointConfig) Reset() { @@ -1302,14 +1302,14 @@ func (*EndpointsConfigDump_StaticEndpointConfig) Descriptor() ([]byte, []int) { return file_envoy_admin_v3_config_dump_shared_proto_rawDescGZIP(), []int{5, 0} } -func (x *EndpointsConfigDump_StaticEndpointConfig) GetEndpointConfig() *any1.Any { +func (x *EndpointsConfigDump_StaticEndpointConfig) GetEndpointConfig() *anypb.Any { if x != nil { return x.EndpointConfig } return nil } -func (x *EndpointsConfigDump_StaticEndpointConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *EndpointsConfigDump_StaticEndpointConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1327,9 +1327,9 @@ type EndpointsConfigDump_DynamicEndpointConfig struct { // the endpoint configuration was loaded. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The endpoint config. - EndpointConfig *any1.Any `protobuf:"bytes,2,opt,name=endpoint_config,json=endpointConfig,proto3" json:"endpoint_config,omitempty"` + EndpointConfig *anypb.Any `protobuf:"bytes,2,opt,name=endpoint_config,json=endpointConfig,proto3" json:"endpoint_config,omitempty"` // [#not-implemented-hide:] The timestamp when the Endpoint was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` // Set if the last update failed, cleared after the next successful update. // The “error_state“ field contains the rejected version of this particular // resource along with the reason and timestamp. For successfully updated or @@ -1380,14 +1380,14 @@ func (x *EndpointsConfigDump_DynamicEndpointConfig) GetVersionInfo() string { return "" } -func (x *EndpointsConfigDump_DynamicEndpointConfig) GetEndpointConfig() *any1.Any { +func (x *EndpointsConfigDump_DynamicEndpointConfig) GetEndpointConfig() *anypb.Any { if x != nil { return x.EndpointConfig } return nil } -func (x *EndpointsConfigDump_DynamicEndpointConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *EndpointsConfigDump_DynamicEndpointConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1420,9 +1420,9 @@ type EcdsConfigDump_EcdsFilterConfig struct { // field at the time that the ECDS filter was loaded. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The ECDS filter config. - EcdsFilter *any1.Any `protobuf:"bytes,2,opt,name=ecds_filter,json=ecdsFilter,proto3" json:"ecds_filter,omitempty"` + EcdsFilter *anypb.Any `protobuf:"bytes,2,opt,name=ecds_filter,json=ecdsFilter,proto3" json:"ecds_filter,omitempty"` // The timestamp when the ECDS filter was last updated. - LastUpdated *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` // Set if the last update failed, cleared after the next successful update. // The “error_state“ field contains the rejected version of this // particular resource along with the reason and timestamp. For successfully @@ -1473,14 +1473,14 @@ func (x *EcdsConfigDump_EcdsFilterConfig) GetVersionInfo() string { return "" } -func (x *EcdsConfigDump_EcdsFilterConfig) GetEcdsFilter() *any1.Any { +func (x *EcdsConfigDump_EcdsFilterConfig) GetEcdsFilter() *anypb.Any { if x != nil { return x.EcdsFilter } return nil } -func (x *EcdsConfigDump_EcdsFilterConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *EcdsConfigDump_EcdsFilterConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -1923,8 +1923,8 @@ var file_envoy_admin_v3_config_dump_shared_proto_goTypes = []interface{}{ (*EndpointsConfigDump_StaticEndpointConfig)(nil), // 17: envoy.admin.v3.EndpointsConfigDump.StaticEndpointConfig (*EndpointsConfigDump_DynamicEndpointConfig)(nil), // 18: envoy.admin.v3.EndpointsConfigDump.DynamicEndpointConfig (*EcdsConfigDump_EcdsFilterConfig)(nil), // 19: envoy.admin.v3.EcdsConfigDump.EcdsFilterConfig - (*any1.Any)(nil), // 20: google.protobuf.Any - (*timestamp.Timestamp)(nil), // 21: google.protobuf.Timestamp + (*anypb.Any)(nil), // 20: google.protobuf.Any + (*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp } var file_envoy_admin_v3_config_dump_shared_proto_depIdxs = []int32{ 20, // 0: envoy.admin.v3.UpdateFailureState.failed_configuration:type_name -> google.protobuf.Any diff --git a/envoy/admin/v3/server_info.pb.go b/envoy/admin/v3/server_info.pb.go index 5a3214938..cc03301f7 100755 --- a/envoy/admin/v3/server_info.pb.go +++ b/envoy/admin/v3/server_info.pb.go @@ -9,9 +9,9 @@ package adminv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -238,9 +238,9 @@ type ServerInfo struct { // State of the server. State ServerInfo_State `protobuf:"varint,2,opt,name=state,proto3,enum=envoy.admin.v3.ServerInfo_State" json:"state,omitempty"` // Uptime since current epoch was started. - UptimeCurrentEpoch *duration.Duration `protobuf:"bytes,3,opt,name=uptime_current_epoch,json=uptimeCurrentEpoch,proto3" json:"uptime_current_epoch,omitempty"` + UptimeCurrentEpoch *durationpb.Duration `protobuf:"bytes,3,opt,name=uptime_current_epoch,json=uptimeCurrentEpoch,proto3" json:"uptime_current_epoch,omitempty"` // Uptime since the start of the first epoch. - UptimeAllEpochs *duration.Duration `protobuf:"bytes,4,opt,name=uptime_all_epochs,json=uptimeAllEpochs,proto3" json:"uptime_all_epochs,omitempty"` + UptimeAllEpochs *durationpb.Duration `protobuf:"bytes,4,opt,name=uptime_all_epochs,json=uptimeAllEpochs,proto3" json:"uptime_all_epochs,omitempty"` // Hot restart version. HotRestartVersion string `protobuf:"bytes,5,opt,name=hot_restart_version,json=hotRestartVersion,proto3" json:"hot_restart_version,omitempty"` // Command line options the server is currently running with. @@ -295,14 +295,14 @@ func (x *ServerInfo) GetState() ServerInfo_State { return ServerInfo_LIVE } -func (x *ServerInfo) GetUptimeCurrentEpoch() *duration.Duration { +func (x *ServerInfo) GetUptimeCurrentEpoch() *durationpb.Duration { if x != nil { return x.UptimeCurrentEpoch } return nil } -func (x *ServerInfo) GetUptimeAllEpochs() *duration.Duration { +func (x *ServerInfo) GetUptimeAllEpochs() *durationpb.Duration { if x != nil { return x.UptimeAllEpochs } @@ -375,13 +375,13 @@ type CommandLineOptions struct { // See :option:`--service-zone` for details. ServiceZone string `protobuf:"bytes,15,opt,name=service_zone,json=serviceZone,proto3" json:"service_zone,omitempty"` // See :option:`--file-flush-interval-msec` for details. - FileFlushInterval *duration.Duration `protobuf:"bytes,16,opt,name=file_flush_interval,json=fileFlushInterval,proto3" json:"file_flush_interval,omitempty"` + FileFlushInterval *durationpb.Duration `protobuf:"bytes,16,opt,name=file_flush_interval,json=fileFlushInterval,proto3" json:"file_flush_interval,omitempty"` // See :option:`--drain-time-s` for details. - DrainTime *duration.Duration `protobuf:"bytes,17,opt,name=drain_time,json=drainTime,proto3" json:"drain_time,omitempty"` + DrainTime *durationpb.Duration `protobuf:"bytes,17,opt,name=drain_time,json=drainTime,proto3" json:"drain_time,omitempty"` // See :option:`--drain-strategy` for details. DrainStrategy CommandLineOptions_DrainStrategy `protobuf:"varint,33,opt,name=drain_strategy,json=drainStrategy,proto3,enum=envoy.admin.v3.CommandLineOptions_DrainStrategy" json:"drain_strategy,omitempty"` // See :option:`--parent-shutdown-time-s` for details. - ParentShutdownTime *duration.Duration `protobuf:"bytes,18,opt,name=parent_shutdown_time,json=parentShutdownTime,proto3" json:"parent_shutdown_time,omitempty"` + ParentShutdownTime *durationpb.Duration `protobuf:"bytes,18,opt,name=parent_shutdown_time,json=parentShutdownTime,proto3" json:"parent_shutdown_time,omitempty"` // See :option:`--mode` for details. Mode CommandLineOptions_Mode `protobuf:"varint,19,opt,name=mode,proto3,enum=envoy.admin.v3.CommandLineOptions_Mode" json:"mode,omitempty"` // See :option:`--disable-hot-restart` for details. @@ -571,14 +571,14 @@ func (x *CommandLineOptions) GetServiceZone() string { return "" } -func (x *CommandLineOptions) GetFileFlushInterval() *duration.Duration { +func (x *CommandLineOptions) GetFileFlushInterval() *durationpb.Duration { if x != nil { return x.FileFlushInterval } return nil } -func (x *CommandLineOptions) GetDrainTime() *duration.Duration { +func (x *CommandLineOptions) GetDrainTime() *durationpb.Duration { if x != nil { return x.DrainTime } @@ -592,7 +592,7 @@ func (x *CommandLineOptions) GetDrainStrategy() CommandLineOptions_DrainStrategy return CommandLineOptions_Gradual } -func (x *CommandLineOptions) GetParentShutdownTime() *duration.Duration { +func (x *CommandLineOptions) GetParentShutdownTime() *durationpb.Duration { if x != nil { return x.ParentShutdownTime } @@ -873,7 +873,7 @@ var file_envoy_admin_v3_server_info_proto_goTypes = []interface{}{ (CommandLineOptions_DrainStrategy)(0), // 3: envoy.admin.v3.CommandLineOptions.DrainStrategy (*ServerInfo)(nil), // 4: envoy.admin.v3.ServerInfo (*CommandLineOptions)(nil), // 5: envoy.admin.v3.CommandLineOptions - (*duration.Duration)(nil), // 6: google.protobuf.Duration + (*durationpb.Duration)(nil), // 6: google.protobuf.Duration (*v3.Node)(nil), // 7: envoy.config.core.v3.Node } var file_envoy_admin_v3_server_info_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/auth/common.pb.go b/envoy/api/v2/auth/common.pb.go index 8fa9d7f71..65322fd9b 100755 --- a/envoy/api/v2/auth/common.pb.go +++ b/envoy/api/v2/auth/common.pb.go @@ -11,11 +11,11 @@ import ( 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" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -332,14 +332,14 @@ func (m *PrivateKeyProvider) GetConfigType() isPrivateKeyProvider_ConfigType { } // Deprecated: Marked as deprecated in envoy/api/v2/auth/common.proto. -func (x *PrivateKeyProvider) GetConfig() *_struct.Struct { +func (x *PrivateKeyProvider) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*PrivateKeyProvider_Config); ok { return x.Config } return nil } -func (x *PrivateKeyProvider) GetTypedConfig() *any1.Any { +func (x *PrivateKeyProvider) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*PrivateKeyProvider_TypedConfig); ok { return x.TypedConfig } @@ -352,11 +352,11 @@ type isPrivateKeyProvider_ConfigType interface { type PrivateKeyProvider_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/auth/common.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type PrivateKeyProvider_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*PrivateKeyProvider_Config) isPrivateKeyProvider_ConfigType() {} @@ -649,9 +649,9 @@ type CertificateValidationContext struct { // `. MatchSubjectAltNames []*matcher.StringMatcher `protobuf:"bytes,9,rep,name=match_subject_alt_names,json=matchSubjectAltNames,proto3" json:"match_subject_alt_names,omitempty"` // [#not-implemented-hide:] Must present a signed time-stamped OCSP response. - RequireOcspStaple *wrappers.BoolValue `protobuf:"bytes,5,opt,name=require_ocsp_staple,json=requireOcspStaple,proto3" json:"require_ocsp_staple,omitempty"` + RequireOcspStaple *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=require_ocsp_staple,json=requireOcspStaple,proto3" json:"require_ocsp_staple,omitempty"` // [#not-implemented-hide:] Must present signed certificate time-stamp. - RequireSignedCertificateTimestamp *wrappers.BoolValue `protobuf:"bytes,6,opt,name=require_signed_certificate_timestamp,json=requireSignedCertificateTimestamp,proto3" json:"require_signed_certificate_timestamp,omitempty"` + RequireSignedCertificateTimestamp *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=require_signed_certificate_timestamp,json=requireSignedCertificateTimestamp,proto3" json:"require_signed_certificate_timestamp,omitempty"` // An optional `certificate revocation list // `_ // (in PEM format). If specified, Envoy will verify that the presented peer @@ -732,14 +732,14 @@ func (x *CertificateValidationContext) GetMatchSubjectAltNames() []*matcher.Stri return nil } -func (x *CertificateValidationContext) GetRequireOcspStaple() *wrappers.BoolValue { +func (x *CertificateValidationContext) GetRequireOcspStaple() *wrapperspb.BoolValue { if x != nil { return x.RequireOcspStaple } return nil } -func (x *CertificateValidationContext) GetRequireSignedCertificateTimestamp() *wrappers.BoolValue { +func (x *CertificateValidationContext) GetRequireSignedCertificateTimestamp() *wrapperspb.BoolValue { if x != nil { return x.RequireSignedCertificateTimestamp } @@ -956,11 +956,11 @@ var file_envoy_api_v2_auth_common_proto_goTypes = []interface{}{ (*TlsCertificate)(nil), // 4: envoy.api.v2.auth.TlsCertificate (*TlsSessionTicketKeys)(nil), // 5: envoy.api.v2.auth.TlsSessionTicketKeys (*CertificateValidationContext)(nil), // 6: envoy.api.v2.auth.CertificateValidationContext - (*_struct.Struct)(nil), // 7: google.protobuf.Struct - (*any1.Any)(nil), // 8: google.protobuf.Any + (*structpb.Struct)(nil), // 7: google.protobuf.Struct + (*anypb.Any)(nil), // 8: google.protobuf.Any (*core.DataSource)(nil), // 9: envoy.api.v2.core.DataSource (*matcher.StringMatcher)(nil), // 10: envoy.type.matcher.StringMatcher - (*wrappers.BoolValue)(nil), // 11: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 11: google.protobuf.BoolValue } var file_envoy_api_v2_auth_common_proto_depIdxs = []int32{ 0, // 0: envoy.api.v2.auth.TlsParameters.tls_minimum_protocol_version:type_name -> envoy.api.v2.auth.TlsParameters.TlsProtocol diff --git a/envoy/api/v2/auth/tls.pb.go b/envoy/api/v2/auth/tls.pb.go index f86fbcedd..aed7ae9ed 100755 --- a/envoy/api/v2/auth/tls.pb.go +++ b/envoy/api/v2/auth/tls.pb.go @@ -9,10 +9,10 @@ package auth import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -49,7 +49,7 @@ type UpstreamTlsContext struct { // for TLSv1.2 and older) to store for the purpose of session resumption. // // Defaults to 1, setting this to 0 disables session resumption. - MaxSessionKeys *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_session_keys,json=maxSessionKeys,proto3" json:"max_session_keys,omitempty"` + MaxSessionKeys *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_session_keys,json=maxSessionKeys,proto3" json:"max_session_keys,omitempty"` } func (x *UpstreamTlsContext) Reset() { @@ -105,7 +105,7 @@ func (x *UpstreamTlsContext) GetAllowRenegotiation() bool { return false } -func (x *UpstreamTlsContext) GetMaxSessionKeys() *wrappers.UInt32Value { +func (x *UpstreamTlsContext) GetMaxSessionKeys() *wrapperspb.UInt32Value { if x != nil { return x.MaxSessionKeys } @@ -122,10 +122,10 @@ type DownstreamTlsContext struct { CommonTlsContext *CommonTlsContext `protobuf:"bytes,1,opt,name=common_tls_context,json=commonTlsContext,proto3" json:"common_tls_context,omitempty"` // If specified, Envoy will reject connections without a valid client // certificate. - RequireClientCertificate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=require_client_certificate,json=requireClientCertificate,proto3" json:"require_client_certificate,omitempty"` + RequireClientCertificate *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=require_client_certificate,json=requireClientCertificate,proto3" json:"require_client_certificate,omitempty"` // If specified, Envoy will reject connections without a valid and matching SNI. // [#not-implemented-hide:] - RequireSni *wrappers.BoolValue `protobuf:"bytes,3,opt,name=require_sni,json=requireSni,proto3" json:"require_sni,omitempty"` + RequireSni *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=require_sni,json=requireSni,proto3" json:"require_sni,omitempty"` // Types that are assignable to SessionTicketKeysType: // // *DownstreamTlsContext_SessionTicketKeys @@ -135,7 +135,7 @@ type DownstreamTlsContext struct { // If specified, “session_timeout“ will change the maximum lifetime (in seconds) of the TLS session. // Currently this value is used as a hint for the `TLS session ticket lifetime (for TLSv1.2) `_. // Only seconds can be specified (fractional seconds are ignored). - SessionTimeout *duration.Duration `protobuf:"bytes,6,opt,name=session_timeout,json=sessionTimeout,proto3" json:"session_timeout,omitempty"` + SessionTimeout *durationpb.Duration `protobuf:"bytes,6,opt,name=session_timeout,json=sessionTimeout,proto3" json:"session_timeout,omitempty"` } func (x *DownstreamTlsContext) Reset() { @@ -177,14 +177,14 @@ func (x *DownstreamTlsContext) GetCommonTlsContext() *CommonTlsContext { return nil } -func (x *DownstreamTlsContext) GetRequireClientCertificate() *wrappers.BoolValue { +func (x *DownstreamTlsContext) GetRequireClientCertificate() *wrapperspb.BoolValue { if x != nil { return x.RequireClientCertificate } return nil } -func (x *DownstreamTlsContext) GetRequireSni() *wrappers.BoolValue { +func (x *DownstreamTlsContext) GetRequireSni() *wrapperspb.BoolValue { if x != nil { return x.RequireSni } @@ -219,7 +219,7 @@ func (x *DownstreamTlsContext) GetDisableStatelessSessionResumption() bool { return false } -func (x *DownstreamTlsContext) GetSessionTimeout() *duration.Duration { +func (x *DownstreamTlsContext) GetSessionTimeout() *durationpb.Duration { if x != nil { return x.SessionTimeout } @@ -645,11 +645,11 @@ var file_envoy_api_v2_auth_tls_proto_goTypes = []interface{}{ (*DownstreamTlsContext)(nil), // 1: envoy.api.v2.auth.DownstreamTlsContext (*CommonTlsContext)(nil), // 2: envoy.api.v2.auth.CommonTlsContext (*CommonTlsContext_CombinedCertificateValidationContext)(nil), // 3: envoy.api.v2.auth.CommonTlsContext.CombinedCertificateValidationContext - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 5: google.protobuf.BoolValue (*TlsSessionTicketKeys)(nil), // 6: envoy.api.v2.auth.TlsSessionTicketKeys (*SdsSecretConfig)(nil), // 7: envoy.api.v2.auth.SdsSecretConfig - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration (*TlsParameters)(nil), // 9: envoy.api.v2.auth.TlsParameters (*TlsCertificate)(nil), // 10: envoy.api.v2.auth.TlsCertificate (*CertificateValidationContext)(nil), // 11: envoy.api.v2.auth.CertificateValidationContext diff --git a/envoy/api/v2/cluster.pb.go b/envoy/api/v2/cluster.pb.go index 96a7b04aa..54426ae85 100755 --- a/envoy/api/v2/cluster.pb.go +++ b/envoy/api/v2/cluster.pb.go @@ -14,12 +14,12 @@ import ( 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" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -551,10 +551,10 @@ 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 *duration.Duration `protobuf:"bytes,4,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` + ConnectTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=connect_timeout,json=connectTimeout,proto3" 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 *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` + PerConnectionBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` // The :ref:`load balancer type ` to use // when picking a host in the cluster. LbPolicy Cluster_LbPolicy `protobuf:"varint,6,opt,name=lb_policy,json=lbPolicy,proto3,enum=envoy.api.v2.Cluster_LbPolicy" json:"lb_policy,omitempty"` @@ -591,7 +591,7 @@ type Cluster struct { // is respected by both the HTTP/1.1 and HTTP/2 connection pool // implementations. If not specified, there is no limit. Setting this // parameter to 1 will effectively disable keep alive. - MaxRequestsPerConnection *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` + MaxRequestsPerConnection *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` // Optional :ref:`circuit breaking ` for the cluster. CircuitBreakers *cluster.CircuitBreakers `protobuf:"bytes,10,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"` // The TLS configuration for connections to the upstream cluster. @@ -624,12 +624,12 @@ type Cluster struct { // specific options. // // Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto. - ExtensionProtocolOptions map[string]*_struct.Struct `protobuf:"bytes,35,rep,name=extension_protocol_options,json=extensionProtocolOptions,proto3" json:"extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ExtensionProtocolOptions map[string]*structpb.Struct `protobuf:"bytes,35,rep,name=extension_protocol_options,json=extensionProtocolOptions,proto3" json:"extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The extension_protocol_options field is used to provide extension-specific protocol options // for upstream connections. The key should match the extension filter name, such as // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on // specific options. - TypedExtensionProtocolOptions map[string]*any1.Any `protobuf:"bytes,36,rep,name=typed_extension_protocol_options,json=typedExtensionProtocolOptions,proto3" json:"typed_extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedExtensionProtocolOptions map[string]*anypb.Any `protobuf:"bytes,36,rep,name=typed_extension_protocol_options,json=typedExtensionProtocolOptions,proto3" json:"typed_extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // If the DNS refresh rate is specified and the cluster type is either // :ref:`STRICT_DNS`, // or :ref:`LOGICAL_DNS`, @@ -639,7 +639,7 @@ type Cluster struct { // :ref:`STRICT_DNS` // and :ref:`LOGICAL_DNS` // this setting is ignored. - DnsRefreshRate *duration.Duration `protobuf:"bytes,16,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + DnsRefreshRate *durationpb.Duration `protobuf:"bytes,16,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` // If the DNS failure refresh rate is specified and the cluster type is either // :ref:`STRICT_DNS`, // or :ref:`LOGICAL_DNS`, @@ -694,7 +694,7 @@ type Cluster struct { // value defaults to 5000ms. For cluster types other than // :ref:`ORIGINAL_DST` // this setting is ignored. - CleanupInterval *duration.Duration `protobuf:"bytes,20,opt,name=cleanup_interval,json=cleanupInterval,proto3" json:"cleanup_interval,omitempty"` + CleanupInterval *durationpb.Duration `protobuf:"bytes,20,opt,name=cleanup_interval,json=cleanupInterval,proto3" json:"cleanup_interval,omitempty"` // Optional configuration used to bind newly established upstream connections. // This overrides any bind_config specified in the bootstrap proto. // If the address and port are empty, no bind will be performed. @@ -863,14 +863,14 @@ func (x *Cluster) GetEdsClusterConfig() *Cluster_EdsClusterConfig { return nil } -func (x *Cluster) GetConnectTimeout() *duration.Duration { +func (x *Cluster) GetConnectTimeout() *durationpb.Duration { if x != nil { return x.ConnectTimeout } return nil } -func (x *Cluster) GetPerConnectionBufferLimitBytes() *wrappers.UInt32Value { +func (x *Cluster) GetPerConnectionBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerConnectionBufferLimitBytes } @@ -906,7 +906,7 @@ func (x *Cluster) GetHealthChecks() []*core.HealthCheck { return nil } -func (x *Cluster) GetMaxRequestsPerConnection() *wrappers.UInt32Value { +func (x *Cluster) GetMaxRequestsPerConnection() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestsPerConnection } @@ -957,21 +957,21 @@ func (x *Cluster) GetHttp2ProtocolOptions() *core.Http2ProtocolOptions { } // Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto. -func (x *Cluster) GetExtensionProtocolOptions() map[string]*_struct.Struct { +func (x *Cluster) GetExtensionProtocolOptions() map[string]*structpb.Struct { if x != nil { return x.ExtensionProtocolOptions } return nil } -func (x *Cluster) GetTypedExtensionProtocolOptions() map[string]*any1.Any { +func (x *Cluster) GetTypedExtensionProtocolOptions() map[string]*anypb.Any { if x != nil { return x.TypedExtensionProtocolOptions } return nil } -func (x *Cluster) GetDnsRefreshRate() *duration.Duration { +func (x *Cluster) GetDnsRefreshRate() *durationpb.Duration { if x != nil { return x.DnsRefreshRate } @@ -1020,7 +1020,7 @@ func (x *Cluster) GetOutlierDetection() *cluster.OutlierDetection { return nil } -func (x *Cluster) GetCleanupInterval() *duration.Duration { +func (x *Cluster) GetCleanupInterval() *durationpb.Duration { if x != nil { return x.CleanupInterval } @@ -1371,7 +1371,7 @@ type Cluster_TransportSocketMatch struct { // will use the transport socket configuration specified here. // The endpoint's metadata entry in *envoy.transport_socket_match* is used to match // against the values specified in this field. - Match *_struct.Struct `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"` + Match *structpb.Struct `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"` // The configuration of the transport socket. TransportSocket *core.TransportSocket `protobuf:"bytes,3,opt,name=transport_socket,json=transportSocket,proto3" json:"transport_socket,omitempty"` } @@ -1415,7 +1415,7 @@ func (x *Cluster_TransportSocketMatch) GetName() string { return "" } -func (x *Cluster_TransportSocketMatch) GetMatch() *_struct.Struct { +func (x *Cluster_TransportSocketMatch) GetMatch() *structpb.Struct { if x != nil { return x.Match } @@ -1439,7 +1439,7 @@ type Cluster_CustomClusterType struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Cluster specific configuration which depends on the cluster being instantiated. // See the supported cluster for further documentation. - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *Cluster_CustomClusterType) Reset() { @@ -1481,7 +1481,7 @@ func (x *Cluster_CustomClusterType) GetName() string { return "" } -func (x *Cluster_CustomClusterType) GetTypedConfig() *any1.Any { +func (x *Cluster_CustomClusterType) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -1568,7 +1568,7 @@ type Cluster_LbSubsetConfig struct { // namespace. It is valid for no hosts to match, in which case the behavior // is the same as a fallback_policy of // :ref:`NO_FALLBACK`. - DefaultSubset *_struct.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"` + DefaultSubset *structpb.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"` // For each entry, LbEndpoint.Metadata's // *envoy.lb* namespace is traversed and a subset is created for each unique // combination of key and value. For example: @@ -1652,7 +1652,7 @@ func (x *Cluster_LbSubsetConfig) GetFallbackPolicy() Cluster_LbSubsetConfig_LbSu return Cluster_LbSubsetConfig_NO_FALLBACK } -func (x *Cluster_LbSubsetConfig) GetDefaultSubset() *_struct.Struct { +func (x *Cluster_LbSubsetConfig) GetDefaultSubset() *structpb.Struct { if x != nil { return x.DefaultSubset } @@ -1702,7 +1702,7 @@ type Cluster_LeastRequestLbConfig struct { // The number of random healthy hosts from which the host with the fewest active requests will // be chosen. Defaults to 2 so that we perform two-choice selection if the field is not set. - ChoiceCount *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"` + ChoiceCount *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"` } func (x *Cluster_LeastRequestLbConfig) Reset() { @@ -1737,7 +1737,7 @@ func (*Cluster_LeastRequestLbConfig) Descriptor() ([]byte, []int) { return file_envoy_api_v2_cluster_proto_rawDescGZIP(), []int{0, 4} } -func (x *Cluster_LeastRequestLbConfig) GetChoiceCount() *wrappers.UInt32Value { +func (x *Cluster_LeastRequestLbConfig) GetChoiceCount() *wrapperspb.UInt32Value { if x != nil { return x.ChoiceCount } @@ -1755,14 +1755,14 @@ type Cluster_RingHashLbConfig struct { // provided host) the better the request distribution will reflect the desired weights. Defaults // to 1024 entries, and limited to 8M entries. See also // :ref:`maximum_ring_size`. - MinimumRingSize *wrappers.UInt64Value `protobuf:"bytes,1,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` + MinimumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` // The hash function used to hash hosts onto the ketama ring. The value defaults to // :ref:`XX_HASH`. HashFunction Cluster_RingHashLbConfig_HashFunction `protobuf:"varint,3,opt,name=hash_function,json=hashFunction,proto3,enum=envoy.api.v2.Cluster_RingHashLbConfig_HashFunction" json:"hash_function,omitempty"` // Maximum hash ring size. Defaults to 8M entries, and limited to 8M entries, but can be lowered // to further constrain resource use. See also // :ref:`minimum_ring_size`. - MaximumRingSize *wrappers.UInt64Value `protobuf:"bytes,4,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"` + MaximumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,4,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"` } func (x *Cluster_RingHashLbConfig) Reset() { @@ -1797,7 +1797,7 @@ func (*Cluster_RingHashLbConfig) Descriptor() ([]byte, []int) { return file_envoy_api_v2_cluster_proto_rawDescGZIP(), []int{0, 5} } -func (x *Cluster_RingHashLbConfig) GetMinimumRingSize() *wrappers.UInt64Value { +func (x *Cluster_RingHashLbConfig) GetMinimumRingSize() *wrapperspb.UInt64Value { if x != nil { return x.MinimumRingSize } @@ -1811,7 +1811,7 @@ func (x *Cluster_RingHashLbConfig) GetHashFunction() Cluster_RingHashLbConfig_Ha return Cluster_RingHashLbConfig_XX_HASH } -func (x *Cluster_RingHashLbConfig) GetMaximumRingSize() *wrappers.UInt64Value { +func (x *Cluster_RingHashLbConfig) GetMaximumRingSize() *wrapperspb.UInt64Value { if x != nil { return x.MaximumRingSize } @@ -1915,7 +1915,7 @@ type Cluster_CommonLbConfig struct { // Note: merging does not apply to cluster membership changes (e.g.: adds/removes); this is // because merging those updates isn't currently safe. See // https://github.com/envoyproxy/envoy/pull/3941. - UpdateMergeWindow *duration.Duration `protobuf:"bytes,4,opt,name=update_merge_window,json=updateMergeWindow,proto3" json:"update_merge_window,omitempty"` + UpdateMergeWindow *durationpb.Duration `protobuf:"bytes,4,opt,name=update_merge_window,json=updateMergeWindow,proto3" json:"update_merge_window,omitempty"` // If set to true, Envoy will not consider new hosts when computing load balancing weights until // they have been health checked for the first time. This will have no effect unless // active health checking is also configured. @@ -2003,7 +2003,7 @@ func (x *Cluster_CommonLbConfig) GetLocalityWeightedLbConfig() *Cluster_CommonLb return nil } -func (x *Cluster_CommonLbConfig) GetUpdateMergeWindow() *duration.Duration { +func (x *Cluster_CommonLbConfig) GetUpdateMergeWindow() *durationpb.Duration { if x != nil { return x.UpdateMergeWindow } @@ -2057,12 +2057,12 @@ type Cluster_RefreshRate struct { // Specifies the base interval between refreshes. This parameter is required and must be greater // than zero and less than // :ref:`max_interval `. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between refreshes. This parameter is optional, but must be // greater than or equal to the // :ref:`base_interval ` if set. The default // is 10 times the :ref:`base_interval `. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *Cluster_RefreshRate) Reset() { @@ -2097,14 +2097,14 @@ func (*Cluster_RefreshRate) Descriptor() ([]byte, []int) { return file_envoy_api_v2_cluster_proto_rawDescGZIP(), []int{0, 8} } -func (x *Cluster_RefreshRate) GetBaseInterval() *duration.Duration { +func (x *Cluster_RefreshRate) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *Cluster_RefreshRate) GetMaxInterval() *duration.Duration { +func (x *Cluster_RefreshRate) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -2204,7 +2204,7 @@ type Cluster_CommonLbConfig_ZoneAwareLbConfig struct { // even if zone aware routing is configured. If not specified, the default is 6. // * :ref:`runtime values `. // * :ref:`Zone aware routing support `. - MinClusterSize *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=min_cluster_size,json=minClusterSize,proto3" json:"min_cluster_size,omitempty"` + MinClusterSize *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=min_cluster_size,json=minClusterSize,proto3" json:"min_cluster_size,omitempty"` // If set to true, Envoy will not consider any hosts when the cluster is in :ref:`panic // mode`. Instead, the cluster will fail all // requests as if all hosts are unhealthy. This can help avoid potentially overwhelming a @@ -2251,7 +2251,7 @@ func (x *Cluster_CommonLbConfig_ZoneAwareLbConfig) GetRoutingEnabled() *_type.Pe return nil } -func (x *Cluster_CommonLbConfig_ZoneAwareLbConfig) GetMinClusterSize() *wrappers.UInt64Value { +func (x *Cluster_CommonLbConfig_ZoneAwareLbConfig) GetMinClusterSize() *wrapperspb.UInt64Value { if x != nil { return x.MinClusterSize } @@ -2366,8 +2366,8 @@ type LoadBalancingPolicy_Policy struct { // No more than one of these two fields may be populated. // // Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *LoadBalancingPolicy_Policy) Reset() { @@ -2410,14 +2410,14 @@ func (x *LoadBalancingPolicy_Policy) GetName() string { } // Deprecated: Marked as deprecated in envoy/api/v2/cluster.proto. -func (x *LoadBalancingPolicy_Policy) GetConfig() *_struct.Struct { +func (x *LoadBalancingPolicy_Policy) GetConfig() *structpb.Struct { if x != nil { return x.Config } return nil } -func (x *LoadBalancingPolicy_Policy) GetTypedConfig() *any1.Any { +func (x *LoadBalancingPolicy_Policy) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -3011,8 +3011,8 @@ var file_envoy_api_v2_cluster_proto_goTypes = []interface{}{ (*Cluster_CommonLbConfig_LocalityWeightedLbConfig)(nil), // 24: envoy.api.v2.Cluster.CommonLbConfig.LocalityWeightedLbConfig (*Cluster_CommonLbConfig_ConsistentHashingLbConfig)(nil), // 25: envoy.api.v2.Cluster.CommonLbConfig.ConsistentHashingLbConfig (*LoadBalancingPolicy_Policy)(nil), // 26: envoy.api.v2.LoadBalancingPolicy.Policy - (*duration.Duration)(nil), // 27: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 28: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 27: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 28: google.protobuf.UInt32Value (*core.Address)(nil), // 29: envoy.api.v2.core.Address (*ClusterLoadAssignment)(nil), // 30: envoy.api.v2.ClusterLoadAssignment (*core.HealthCheck)(nil), // 31: envoy.api.v2.core.HealthCheck @@ -3029,9 +3029,9 @@ var file_envoy_api_v2_cluster_proto_goTypes = []interface{}{ (*cluster.Filter)(nil), // 42: envoy.api.v2.cluster.Filter (*core.ConfigSource)(nil), // 43: envoy.api.v2.core.ConfigSource (*core.TcpKeepalive)(nil), // 44: envoy.api.v2.core.TcpKeepalive - (*_struct.Struct)(nil), // 45: google.protobuf.Struct - (*any1.Any)(nil), // 46: google.protobuf.Any - (*wrappers.UInt64Value)(nil), // 47: google.protobuf.UInt64Value + (*structpb.Struct)(nil), // 45: google.protobuf.Struct + (*anypb.Any)(nil), // 46: google.protobuf.Any + (*wrapperspb.UInt64Value)(nil), // 47: google.protobuf.UInt64Value (*_type.Percent)(nil), // 48: envoy.type.Percent } var file_envoy_api_v2_cluster_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/cluster/circuit_breaker.pb.go b/envoy/api/v2/cluster/circuit_breaker.pb.go index 1cc3d1332..b11f5df64 100755 --- a/envoy/api/v2/cluster/circuit_breaker.pb.go +++ b/envoy/api/v2/cluster/circuit_breaker.pb.go @@ -11,9 +11,9 @@ import ( 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" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -92,16 +92,16 @@ type CircuitBreakers_Thresholds struct { Priority core.RoutingPriority `protobuf:"varint,1,opt,name=priority,proto3,enum=envoy.api.v2.core.RoutingPriority" json:"priority,omitempty"` // The maximum number of connections that Envoy will make to the upstream // cluster. If not specified, the default is 1024. - MaxConnections *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` + MaxConnections *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` // The maximum number of pending requests that Envoy will allow to the // upstream cluster. If not specified, the default is 1024. - MaxPendingRequests *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` + MaxPendingRequests *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` // The maximum number of parallel requests that Envoy will make to the // upstream cluster. If not specified, the default is 1024. - MaxRequests *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` + MaxRequests *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` // The maximum number of parallel retries that Envoy will allow to the // upstream cluster. If not specified, the default is 3. - MaxRetries *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxRetries *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` // Specifies a limit on concurrent retries in relation to the number of active requests. This // parameter is optional. // @@ -124,7 +124,7 @@ type CircuitBreakers_Thresholds struct { // large number of connection pools. See // :ref:`Circuit Breaking ` for // more details. - MaxConnectionPools *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_connection_pools,json=maxConnectionPools,proto3" json:"max_connection_pools,omitempty"` + MaxConnectionPools *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_connection_pools,json=maxConnectionPools,proto3" json:"max_connection_pools,omitempty"` } func (x *CircuitBreakers_Thresholds) Reset() { @@ -166,28 +166,28 @@ func (x *CircuitBreakers_Thresholds) GetPriority() core.RoutingPriority { return core.RoutingPriority(0) } -func (x *CircuitBreakers_Thresholds) GetMaxConnections() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxConnections() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnections } return nil } -func (x *CircuitBreakers_Thresholds) GetMaxPendingRequests() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxPendingRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxPendingRequests } return nil } -func (x *CircuitBreakers_Thresholds) GetMaxRequests() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequests } return nil } -func (x *CircuitBreakers_Thresholds) GetMaxRetries() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxRetries() *wrapperspb.UInt32Value { if x != nil { return x.MaxRetries } @@ -208,7 +208,7 @@ func (x *CircuitBreakers_Thresholds) GetTrackRemaining() bool { return false } -func (x *CircuitBreakers_Thresholds) GetMaxConnectionPools() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxConnectionPools() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectionPools } @@ -230,7 +230,7 @@ type CircuitBreakers_Thresholds_RetryBudget struct { // number of active retries may never go below this number. // // This parameter is optional. Defaults to 3. - MinRetryConcurrency *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=min_retry_concurrency,json=minRetryConcurrency,proto3" json:"min_retry_concurrency,omitempty"` + MinRetryConcurrency *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=min_retry_concurrency,json=minRetryConcurrency,proto3" json:"min_retry_concurrency,omitempty"` } func (x *CircuitBreakers_Thresholds_RetryBudget) Reset() { @@ -272,7 +272,7 @@ func (x *CircuitBreakers_Thresholds_RetryBudget) GetBudgetPercent() *_type.Perce return nil } -func (x *CircuitBreakers_Thresholds_RetryBudget) GetMinRetryConcurrency() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds_RetryBudget) GetMinRetryConcurrency() *wrapperspb.UInt32Value { if x != nil { return x.MinRetryConcurrency } @@ -384,7 +384,7 @@ var file_envoy_api_v2_cluster_circuit_breaker_proto_goTypes = []interface{}{ (*CircuitBreakers_Thresholds)(nil), // 1: envoy.api.v2.cluster.CircuitBreakers.Thresholds (*CircuitBreakers_Thresholds_RetryBudget)(nil), // 2: envoy.api.v2.cluster.CircuitBreakers.Thresholds.RetryBudget (core.RoutingPriority)(0), // 3: envoy.api.v2.core.RoutingPriority - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value (*_type.Percent)(nil), // 5: envoy.type.Percent } var file_envoy_api_v2_cluster_circuit_breaker_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/cluster/filter.pb.go b/envoy/api/v2/cluster/filter.pb.go index 8d68c7bed..7443af104 100755 --- a/envoy/api/v2/cluster/filter.pb.go +++ b/envoy/api/v2/cluster/filter.pb.go @@ -9,9 +9,9 @@ package cluster import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -33,7 +33,7 @@ type Filter struct { 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 *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *Filter) Reset() { @@ -75,7 +75,7 @@ func (x *Filter) GetName() string { return "" } -func (x *Filter) GetTypedConfig() *any1.Any { +func (x *Filter) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -132,8 +132,8 @@ func file_envoy_api_v2_cluster_filter_proto_rawDescGZIP() []byte { var file_envoy_api_v2_cluster_filter_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_api_v2_cluster_filter_proto_goTypes = []interface{}{ - (*Filter)(nil), // 0: envoy.api.v2.cluster.Filter - (*any1.Any)(nil), // 1: google.protobuf.Any + (*Filter)(nil), // 0: envoy.api.v2.cluster.Filter + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_envoy_api_v2_cluster_filter_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.cluster.Filter.typed_config:type_name -> google.protobuf.Any diff --git a/envoy/api/v2/cluster/outlier_detection.pb.go b/envoy/api/v2/cluster/outlier_detection.pb.go index c5df8f4ad..791681fbd 100755 --- a/envoy/api/v2/cluster/outlier_detection.pb.go +++ b/envoy/api/v2/cluster/outlier_detection.pb.go @@ -9,10 +9,10 @@ package cluster import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -35,37 +35,37 @@ type OutlierDetection struct { // The number of consecutive server-side error responses (for HTTP traffic, // 5xx responses; for TCP traffic, connection failures; for Redis, failure to // respond PONG; etc.) before a consecutive 5xx ejection occurs. Defaults to 5. - Consecutive_5Xx *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"` + Consecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"` // The time interval between ejection analysis sweeps. This can result in // both new ejections as well as hosts being returned to service. Defaults // to 10000ms or 10s. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // The base time that a host is ejected for. The real time is equal to the // base time multiplied by the number of times the host has been ejected. // Defaults to 30000ms or 30s. - BaseEjectionTime *duration.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` + BaseEjectionTime *durationpb.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` // The maximum % of an upstream cluster that can be ejected due to outlier // detection. Defaults to 10% but will eject at least one host regardless of the value. - MaxEjectionPercent *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` + MaxEjectionPercent *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive 5xx. This setting can be used to disable // ejection or to ramp it up slowly. Defaults to 100. - EnforcingConsecutive_5Xx *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"` + EnforcingConsecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through success rate statistics. This setting can be used to // disable ejection or to ramp it up slowly. Defaults to 100. - EnforcingSuccessRate *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=enforcing_success_rate,json=enforcingSuccessRate,proto3" json:"enforcing_success_rate,omitempty"` + EnforcingSuccessRate *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=enforcing_success_rate,json=enforcingSuccessRate,proto3" json:"enforcing_success_rate,omitempty"` // The number of hosts in a cluster that must have enough request volume to // detect success rate outliers. If the number of hosts is less than this // setting, outlier detection via success rate statistics is not performed // for any host in the cluster. Defaults to 5. - SuccessRateMinimumHosts *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=success_rate_minimum_hosts,json=successRateMinimumHosts,proto3" json:"success_rate_minimum_hosts,omitempty"` + SuccessRateMinimumHosts *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=success_rate_minimum_hosts,json=successRateMinimumHosts,proto3" json:"success_rate_minimum_hosts,omitempty"` // The minimum number of total requests that must be collected in one // interval (as defined by the interval duration above) to include this host // in success rate based outlier detection. If the volume is lower than this // setting, outlier detection via success rate statistics is not performed // for that host. Defaults to 100. - SuccessRateRequestVolume *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=success_rate_request_volume,json=successRateRequestVolume,proto3" json:"success_rate_request_volume,omitempty"` + SuccessRateRequestVolume *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=success_rate_request_volume,json=successRateRequestVolume,proto3" json:"success_rate_request_volume,omitempty"` // This factor is used to determine the ejection threshold for success rate // outlier ejection. The ejection threshold is the difference between the // mean success rate, and the product of this factor and the standard @@ -73,14 +73,14 @@ type OutlierDetection struct { // success_rate_stdev_factor). This factor is divided by a thousand to get a // double. That is, if the desired factor is 1.9, the runtime value should // be 1900. Defaults to 1900. - SuccessRateStdevFactor *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=success_rate_stdev_factor,json=successRateStdevFactor,proto3" json:"success_rate_stdev_factor,omitempty"` + SuccessRateStdevFactor *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=success_rate_stdev_factor,json=successRateStdevFactor,proto3" json:"success_rate_stdev_factor,omitempty"` // The number of consecutive gateway failures (502, 503, 504 status codes) // before a consecutive gateway failure ejection occurs. Defaults to 5. - ConsecutiveGatewayFailure *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=consecutive_gateway_failure,json=consecutiveGatewayFailure,proto3" json:"consecutive_gateway_failure,omitempty"` + ConsecutiveGatewayFailure *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=consecutive_gateway_failure,json=consecutiveGatewayFailure,proto3" json:"consecutive_gateway_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive gateway failures. This setting can be // used to disable ejection or to ramp it up slowly. Defaults to 0. - EnforcingConsecutiveGatewayFailure *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=enforcing_consecutive_gateway_failure,json=enforcingConsecutiveGatewayFailure,proto3" json:"enforcing_consecutive_gateway_failure,omitempty"` + EnforcingConsecutiveGatewayFailure *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=enforcing_consecutive_gateway_failure,json=enforcingConsecutiveGatewayFailure,proto3" json:"enforcing_consecutive_gateway_failure,omitempty"` // Determines whether to distinguish local origin failures from external errors. If set to true // the following configuration parameters are taken into account: // :ref:`consecutive_local_origin_failure`, @@ -93,45 +93,45 @@ type OutlierDetection struct { // occurs. Defaults to 5. Parameter takes effect only when // :ref:`split_external_local_origin_errors` // is set to true. - ConsecutiveLocalOriginFailure *wrappers.UInt32Value `protobuf:"bytes,13,opt,name=consecutive_local_origin_failure,json=consecutiveLocalOriginFailure,proto3" json:"consecutive_local_origin_failure,omitempty"` + ConsecutiveLocalOriginFailure *wrapperspb.UInt32Value `protobuf:"bytes,13,opt,name=consecutive_local_origin_failure,json=consecutiveLocalOriginFailure,proto3" json:"consecutive_local_origin_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive locally originated failures. This setting can be // used to disable ejection or to ramp it up slowly. Defaults to 100. // Parameter takes effect only when // :ref:`split_external_local_origin_errors` // is set to true. - EnforcingConsecutiveLocalOriginFailure *wrappers.UInt32Value `protobuf:"bytes,14,opt,name=enforcing_consecutive_local_origin_failure,json=enforcingConsecutiveLocalOriginFailure,proto3" json:"enforcing_consecutive_local_origin_failure,omitempty"` + EnforcingConsecutiveLocalOriginFailure *wrapperspb.UInt32Value `protobuf:"bytes,14,opt,name=enforcing_consecutive_local_origin_failure,json=enforcingConsecutiveLocalOriginFailure,proto3" json:"enforcing_consecutive_local_origin_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through success rate statistics for locally originated errors. // This setting can be used to disable ejection or to ramp it up slowly. Defaults to 100. // Parameter takes effect only when // :ref:`split_external_local_origin_errors` // is set to true. - EnforcingLocalOriginSuccessRate *wrappers.UInt32Value `protobuf:"bytes,15,opt,name=enforcing_local_origin_success_rate,json=enforcingLocalOriginSuccessRate,proto3" json:"enforcing_local_origin_success_rate,omitempty"` + EnforcingLocalOriginSuccessRate *wrapperspb.UInt32Value `protobuf:"bytes,15,opt,name=enforcing_local_origin_success_rate,json=enforcingLocalOriginSuccessRate,proto3" json:"enforcing_local_origin_success_rate,omitempty"` // The failure percentage to use when determining failure percentage-based outlier detection. If // the failure percentage of a given host is greater than or equal to this value, it will be // ejected. Defaults to 85. - FailurePercentageThreshold *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=failure_percentage_threshold,json=failurePercentageThreshold,proto3" json:"failure_percentage_threshold,omitempty"` + FailurePercentageThreshold *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=failure_percentage_threshold,json=failurePercentageThreshold,proto3" json:"failure_percentage_threshold,omitempty"` // The % chance that a host will be actually ejected when an outlier status is detected through // failure percentage statistics. This setting can be used to disable ejection or to ramp it up // slowly. Defaults to 0. // // [#next-major-version: setting this without setting failure_percentage_threshold should be // invalid in v4.] - EnforcingFailurePercentage *wrappers.UInt32Value `protobuf:"bytes,17,opt,name=enforcing_failure_percentage,json=enforcingFailurePercentage,proto3" json:"enforcing_failure_percentage,omitempty"` + EnforcingFailurePercentage *wrapperspb.UInt32Value `protobuf:"bytes,17,opt,name=enforcing_failure_percentage,json=enforcingFailurePercentage,proto3" json:"enforcing_failure_percentage,omitempty"` // The % chance that a host will be actually ejected when an outlier status is detected through // local-origin failure percentage statistics. This setting can be used to disable ejection or to // ramp it up slowly. Defaults to 0. - EnforcingFailurePercentageLocalOrigin *wrappers.UInt32Value `protobuf:"bytes,18,opt,name=enforcing_failure_percentage_local_origin,json=enforcingFailurePercentageLocalOrigin,proto3" json:"enforcing_failure_percentage_local_origin,omitempty"` + EnforcingFailurePercentageLocalOrigin *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=enforcing_failure_percentage_local_origin,json=enforcingFailurePercentageLocalOrigin,proto3" json:"enforcing_failure_percentage_local_origin,omitempty"` // The minimum number of hosts in a cluster in order to perform failure percentage-based ejection. // If the total number of hosts in the cluster is less than this value, failure percentage-based // ejection will not be performed. Defaults to 5. - FailurePercentageMinimumHosts *wrappers.UInt32Value `protobuf:"bytes,19,opt,name=failure_percentage_minimum_hosts,json=failurePercentageMinimumHosts,proto3" json:"failure_percentage_minimum_hosts,omitempty"` + FailurePercentageMinimumHosts *wrapperspb.UInt32Value `protobuf:"bytes,19,opt,name=failure_percentage_minimum_hosts,json=failurePercentageMinimumHosts,proto3" json:"failure_percentage_minimum_hosts,omitempty"` // The minimum number of total requests that must be collected in one interval (as defined by the // interval duration above) to perform failure percentage-based ejection for this host. If the // volume is lower than this setting, failure percentage-based ejection will not be performed for // this host. Defaults to 50. - FailurePercentageRequestVolume *wrappers.UInt32Value `protobuf:"bytes,20,opt,name=failure_percentage_request_volume,json=failurePercentageRequestVolume,proto3" json:"failure_percentage_request_volume,omitempty"` + FailurePercentageRequestVolume *wrapperspb.UInt32Value `protobuf:"bytes,20,opt,name=failure_percentage_request_volume,json=failurePercentageRequestVolume,proto3" json:"failure_percentage_request_volume,omitempty"` } func (x *OutlierDetection) Reset() { @@ -166,77 +166,77 @@ func (*OutlierDetection) Descriptor() ([]byte, []int) { return file_envoy_api_v2_cluster_outlier_detection_proto_rawDescGZIP(), []int{0} } -func (x *OutlierDetection) GetConsecutive_5Xx() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutive_5Xx() *wrapperspb.UInt32Value { if x != nil { return x.Consecutive_5Xx } return nil } -func (x *OutlierDetection) GetInterval() *duration.Duration { +func (x *OutlierDetection) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *OutlierDetection) GetBaseEjectionTime() *duration.Duration { +func (x *OutlierDetection) GetBaseEjectionTime() *durationpb.Duration { if x != nil { return x.BaseEjectionTime } return nil } -func (x *OutlierDetection) GetMaxEjectionPercent() *wrappers.UInt32Value { +func (x *OutlierDetection) GetMaxEjectionPercent() *wrapperspb.UInt32Value { if x != nil { return x.MaxEjectionPercent } return nil } -func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutive_5Xx } return nil } -func (x *OutlierDetection) GetEnforcingSuccessRate() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingSuccessRate() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingSuccessRate } return nil } -func (x *OutlierDetection) GetSuccessRateMinimumHosts() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateMinimumHosts() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateMinimumHosts } return nil } -func (x *OutlierDetection) GetSuccessRateRequestVolume() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateRequestVolume() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateRequestVolume } return nil } -func (x *OutlierDetection) GetSuccessRateStdevFactor() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateStdevFactor() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateStdevFactor } return nil } -func (x *OutlierDetection) GetConsecutiveGatewayFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutiveGatewayFailure() *wrapperspb.UInt32Value { if x != nil { return x.ConsecutiveGatewayFailure } return nil } -func (x *OutlierDetection) GetEnforcingConsecutiveGatewayFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutiveGatewayFailure() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutiveGatewayFailure } @@ -250,56 +250,56 @@ func (x *OutlierDetection) GetSplitExternalLocalOriginErrors() bool { return false } -func (x *OutlierDetection) GetConsecutiveLocalOriginFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutiveLocalOriginFailure() *wrapperspb.UInt32Value { if x != nil { return x.ConsecutiveLocalOriginFailure } return nil } -func (x *OutlierDetection) GetEnforcingConsecutiveLocalOriginFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutiveLocalOriginFailure() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutiveLocalOriginFailure } return nil } -func (x *OutlierDetection) GetEnforcingLocalOriginSuccessRate() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingLocalOriginSuccessRate() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingLocalOriginSuccessRate } return nil } -func (x *OutlierDetection) GetFailurePercentageThreshold() *wrappers.UInt32Value { +func (x *OutlierDetection) GetFailurePercentageThreshold() *wrapperspb.UInt32Value { if x != nil { return x.FailurePercentageThreshold } return nil } -func (x *OutlierDetection) GetEnforcingFailurePercentage() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingFailurePercentage() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingFailurePercentage } return nil } -func (x *OutlierDetection) GetEnforcingFailurePercentageLocalOrigin() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingFailurePercentageLocalOrigin() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingFailurePercentageLocalOrigin } return nil } -func (x *OutlierDetection) GetFailurePercentageMinimumHosts() *wrappers.UInt32Value { +func (x *OutlierDetection) GetFailurePercentageMinimumHosts() *wrapperspb.UInt32Value { if x != nil { return x.FailurePercentageMinimumHosts } return nil } -func (x *OutlierDetection) GetFailurePercentageRequestVolume() *wrappers.UInt32Value { +func (x *OutlierDetection) GetFailurePercentageRequestVolume() *wrapperspb.UInt32Value { if x != nil { return x.FailurePercentageRequestVolume } @@ -477,9 +477,9 @@ func file_envoy_api_v2_cluster_outlier_detection_proto_rawDescGZIP() []byte { var file_envoy_api_v2_cluster_outlier_detection_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_api_v2_cluster_outlier_detection_proto_goTypes = []interface{}{ - (*OutlierDetection)(nil), // 0: envoy.api.v2.cluster.OutlierDetection - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*OutlierDetection)(nil), // 0: envoy.api.v2.cluster.OutlierDetection + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_envoy_api_v2_cluster_outlier_detection_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.cluster.OutlierDetection.consecutive_5xx:type_name -> google.protobuf.UInt32Value diff --git a/envoy/api/v2/core/address.pb.go b/envoy/api/v2/core/address.pb.go index 587b7bcc8..bd9c9bb49 100755 --- a/envoy/api/v2/core/address.pb.go +++ b/envoy/api/v2/core/address.pb.go @@ -9,9 +9,9 @@ package core import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -274,14 +274,14 @@ type TcpKeepalive struct { // Maximum number of keepalive probes to send without response before deciding // the connection is dead. Default is to use the OS level configuration (unless // overridden, Linux defaults to 9.) - KeepaliveProbes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` + KeepaliveProbes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` // The number of seconds a connection needs to be idle before keep-alive probes // start being sent. Default is to use the OS level configuration (unless // overridden, Linux defaults to 7200s (i.e., 2 hours.) - KeepaliveTime *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` + KeepaliveTime *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` // The number of seconds between keep-alive probes. Default is to use the OS // level configuration (unless overridden, Linux defaults to 75s.) - KeepaliveInterval *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` + KeepaliveInterval *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` } func (x *TcpKeepalive) Reset() { @@ -316,21 +316,21 @@ func (*TcpKeepalive) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_address_proto_rawDescGZIP(), []int{2} } -func (x *TcpKeepalive) GetKeepaliveProbes() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveProbes() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveProbes } return nil } -func (x *TcpKeepalive) GetKeepaliveTime() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveTime() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveTime } return nil } -func (x *TcpKeepalive) GetKeepaliveInterval() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveInterval() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveInterval } @@ -351,7 +351,7 @@ type BindConfig struct { // to false, the option *IP_FREEBIND* is disabled on the socket. When this // flag is not set (default), the socket is not modified, i.e. the option is // neither enabled nor disabled. - Freebind *wrappers.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` + Freebind *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. SocketOptions []*SocketOption `protobuf:"bytes,3,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` @@ -396,7 +396,7 @@ func (x *BindConfig) GetSourceAddress() *SocketAddress { return nil } -func (x *BindConfig) GetFreebind() *wrappers.BoolValue { +func (x *BindConfig) GetFreebind() *wrapperspb.BoolValue { if x != nil { return x.Freebind } @@ -504,7 +504,7 @@ type CidrRange struct { // IPv4 or IPv6 address, e.g. “192.0.0.0“ or “2001:db8::“. AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"` // Length of prefix, e.g. 0, 32. Defaults to 0 when unset. - PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` + PrefixLen *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` } func (x *CidrRange) Reset() { @@ -546,7 +546,7 @@ func (x *CidrRange) GetAddressPrefix() string { return "" } -func (x *CidrRange) GetPrefixLen() *wrappers.UInt32Value { +func (x *CidrRange) GetPrefixLen() *wrapperspb.UInt32Value { if x != nil { return x.PrefixLen } @@ -668,16 +668,16 @@ func file_envoy_api_v2_core_address_proto_rawDescGZIP() []byte { var file_envoy_api_v2_core_address_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_envoy_api_v2_core_address_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_envoy_api_v2_core_address_proto_goTypes = []interface{}{ - (SocketAddress_Protocol)(0), // 0: envoy.api.v2.core.SocketAddress.Protocol - (*Pipe)(nil), // 1: envoy.api.v2.core.Pipe - (*SocketAddress)(nil), // 2: envoy.api.v2.core.SocketAddress - (*TcpKeepalive)(nil), // 3: envoy.api.v2.core.TcpKeepalive - (*BindConfig)(nil), // 4: envoy.api.v2.core.BindConfig - (*Address)(nil), // 5: envoy.api.v2.core.Address - (*CidrRange)(nil), // 6: envoy.api.v2.core.CidrRange - (*wrappers.UInt32Value)(nil), // 7: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 8: google.protobuf.BoolValue - (*SocketOption)(nil), // 9: envoy.api.v2.core.SocketOption + (SocketAddress_Protocol)(0), // 0: envoy.api.v2.core.SocketAddress.Protocol + (*Pipe)(nil), // 1: envoy.api.v2.core.Pipe + (*SocketAddress)(nil), // 2: envoy.api.v2.core.SocketAddress + (*TcpKeepalive)(nil), // 3: envoy.api.v2.core.TcpKeepalive + (*BindConfig)(nil), // 4: envoy.api.v2.core.BindConfig + (*Address)(nil), // 5: envoy.api.v2.core.Address + (*CidrRange)(nil), // 6: envoy.api.v2.core.CidrRange + (*wrapperspb.UInt32Value)(nil), // 7: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 8: google.protobuf.BoolValue + (*SocketOption)(nil), // 9: envoy.api.v2.core.SocketOption } var file_envoy_api_v2_core_address_proto_depIdxs = []int32{ 0, // 0: envoy.api.v2.core.SocketAddress.protocol:type_name -> envoy.api.v2.core.SocketAddress.Protocol diff --git a/envoy/api/v2/core/backoff.pb.go b/envoy/api/v2/core/backoff.pb.go index 7c8897ab5..26dc4be9c 100755 --- a/envoy/api/v2/core/backoff.pb.go +++ b/envoy/api/v2/core/backoff.pb.go @@ -9,9 +9,9 @@ package core import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -32,13 +32,13 @@ type BackoffStrategy struct { // The base interval to be used for the next back off computation. It should // be greater than zero and less than or equal to :ref:`max_interval // `. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, // but must be greater than or equal to the :ref:`base_interval // ` if set. The default // is 10 times the :ref:`base_interval // `. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *BackoffStrategy) Reset() { @@ -73,14 +73,14 @@ func (*BackoffStrategy) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_backoff_proto_rawDescGZIP(), []int{0} } -func (x *BackoffStrategy) GetBaseInterval() *duration.Duration { +func (x *BackoffStrategy) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *BackoffStrategy) GetMaxInterval() *duration.Duration { +func (x *BackoffStrategy) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -138,8 +138,8 @@ func file_envoy_api_v2_core_backoff_proto_rawDescGZIP() []byte { var file_envoy_api_v2_core_backoff_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_api_v2_core_backoff_proto_goTypes = []interface{}{ - (*BackoffStrategy)(nil), // 0: envoy.api.v2.core.BackoffStrategy - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*BackoffStrategy)(nil), // 0: envoy.api.v2.core.BackoffStrategy + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_api_v2_core_backoff_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.core.BackoffStrategy.base_interval:type_name -> google.protobuf.Duration diff --git a/envoy/api/v2/core/base.pb.go b/envoy/api/v2/core/base.pb.go index 1dbed0083..3208fa6f6 100755 --- a/envoy/api/v2/core/base.pb.go +++ b/envoy/api/v2/core/base.pb.go @@ -10,11 +10,11 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -290,7 +290,7 @@ type BuildVersion struct { Version *_type.SemanticVersion `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // Free-form build information. // Envoy defines several well known keys in the source/common/version/version.h file - Metadata *_struct.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (x *BuildVersion) Reset() { @@ -332,7 +332,7 @@ func (x *BuildVersion) GetVersion() *_type.SemanticVersion { return nil } -func (x *BuildVersion) GetMetadata() *_struct.Struct { +func (x *BuildVersion) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -465,7 +465,7 @@ type Node struct { Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` // Opaque metadata extending the node identifier. Envoy will pass this // directly to the management server. - Metadata *_struct.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // Locality specifying where the Envoy instance is running. Locality *Locality `protobuf:"bytes,4,opt,name=locality,proto3" json:"locality,omitempty"` // This is motivated by informing a management server during canary which @@ -544,7 +544,7 @@ func (x *Node) GetCluster() string { return "" } -func (x *Node) GetMetadata() *_struct.Struct { +func (x *Node) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -664,7 +664,7 @@ type Metadata struct { // Key is the reverse DNS filter name, e.g. com.acme.widget. The envoy.* // namespace is reserved for Envoy's built-in filters. - FilterMetadata map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FilterMetadata map[string]*structpb.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Metadata) Reset() { @@ -699,7 +699,7 @@ func (*Metadata) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_base_proto_rawDescGZIP(), []int{4} } -func (x *Metadata) GetFilterMetadata() map[string]*_struct.Struct { +func (x *Metadata) GetFilterMetadata() map[string]*structpb.Struct { if x != nil { return x.FilterMetadata } @@ -829,7 +829,7 @@ type RuntimeFeatureFlag struct { unknownFields protoimpl.UnknownFields // Default value if runtime value is not available. - DefaultValue *wrappers.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + DefaultValue *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` // Runtime key to get value for comparison. This value is used if defined. The boolean value must // be represented via its // `canonical JSON encoding `_. @@ -868,7 +868,7 @@ func (*RuntimeFeatureFlag) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_base_proto_rawDescGZIP(), []int{7} } -func (x *RuntimeFeatureFlag) GetDefaultValue() *wrappers.BoolValue { +func (x *RuntimeFeatureFlag) GetDefaultValue() *wrapperspb.BoolValue { if x != nil { return x.DefaultValue } @@ -954,7 +954,7 @@ type HeaderValueOption struct { Header *HeaderValue `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` // Should the value be appended? If true (default), the value is appended to // existing values. - Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` + Append *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` } func (x *HeaderValueOption) Reset() { @@ -996,7 +996,7 @@ func (x *HeaderValueOption) GetHeader() *HeaderValue { return nil } -func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue { +func (x *HeaderValueOption) GetAppend() *wrapperspb.BoolValue { if x != nil { return x.Append } @@ -1162,7 +1162,7 @@ type RetryPolicy struct { RetryBackOff *BackoffStrategy `protobuf:"bytes,1,opt,name=retry_back_off,json=retryBackOff,proto3" json:"retry_back_off,omitempty"` // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` } func (x *RetryPolicy) Reset() { @@ -1204,7 +1204,7 @@ func (x *RetryPolicy) GetRetryBackOff() *BackoffStrategy { return nil } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } @@ -1431,14 +1431,14 @@ func (m *TransportSocket) GetConfigType() isTransportSocket_ConfigType { } // Deprecated: Marked as deprecated in envoy/api/v2/core/base.proto. -func (x *TransportSocket) GetConfig() *_struct.Struct { +func (x *TransportSocket) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*TransportSocket_Config); ok { return x.Config } return nil } -func (x *TransportSocket) GetTypedConfig() *any1.Any { +func (x *TransportSocket) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*TransportSocket_TypedConfig); ok { return x.TypedConfig } @@ -1451,11 +1451,11 @@ type isTransportSocket_ConfigType interface { type TransportSocket_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/core/base.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type TransportSocket_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*TransportSocket_Config) isTransportSocket_ConfigType() {} @@ -1853,13 +1853,13 @@ var file_envoy_api_v2_core_base_proto_goTypes = []interface{}{ (*ControlPlane)(nil), // 20: envoy.api.v2.core.ControlPlane nil, // 21: envoy.api.v2.core.Metadata.FilterMetadataEntry (*_type.SemanticVersion)(nil), // 22: envoy.type.SemanticVersion - (*_struct.Struct)(nil), // 23: google.protobuf.Struct + (*structpb.Struct)(nil), // 23: google.protobuf.Struct (*Address)(nil), // 24: envoy.api.v2.core.Address - (*wrappers.BoolValue)(nil), // 25: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 25: google.protobuf.BoolValue (*BackoffStrategy)(nil), // 26: envoy.api.v2.core.BackoffStrategy - (*wrappers.UInt32Value)(nil), // 27: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 27: google.protobuf.UInt32Value (*HttpUri)(nil), // 28: envoy.api.v2.core.HttpUri - (*any1.Any)(nil), // 29: google.protobuf.Any + (*anypb.Any)(nil), // 29: google.protobuf.Any (*_type.FractionalPercent)(nil), // 30: envoy.type.FractionalPercent } var file_envoy_api_v2_core_base_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/core/config_source.pb.go b/envoy/api/v2/core/config_source.pb.go index 31c589f7c..93b10812f 100755 --- a/envoy/api/v2/core/config_source.pb.go +++ b/envoy/api/v2/core/config_source.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -175,9 +175,9 @@ type ApiConfigSource struct { // services will be cycled through if any kind of failure occurs. GrpcServices []*GrpcService `protobuf:"bytes,4,rep,name=grpc_services,json=grpcServices,proto3" json:"grpc_services,omitempty"` // For REST APIs, the delay between successive polls. - RefreshDelay *duration.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` + RefreshDelay *durationpb.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` // For REST APIs, the request timeout. If not set, a default value of 1s will be used. - RequestTimeout *duration.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // For GRPC APIs, the rate limit settings. If present, discovery requests made by Envoy will be // rate limited. RateLimitSettings *RateLimitSettings `protobuf:"bytes,6,opt,name=rate_limit_settings,json=rateLimitSettings,proto3" json:"rate_limit_settings,omitempty"` @@ -245,14 +245,14 @@ func (x *ApiConfigSource) GetGrpcServices() []*GrpcService { return nil } -func (x *ApiConfigSource) GetRefreshDelay() *duration.Duration { +func (x *ApiConfigSource) GetRefreshDelay() *durationpb.Duration { if x != nil { return x.RefreshDelay } return nil } -func (x *ApiConfigSource) GetRequestTimeout() *duration.Duration { +func (x *ApiConfigSource) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } @@ -375,10 +375,10 @@ type RateLimitSettings struct { // Maximum number of tokens to be used for rate limiting discovery request calls. If not set, a // default value of 100 will be used. - MaxTokens *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` + MaxTokens *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` // Rate at which tokens will be filled per second. If not set, a default fill rate of 10 tokens // per second will be used. - FillRate *wrappers.DoubleValue `protobuf:"bytes,2,opt,name=fill_rate,json=fillRate,proto3" json:"fill_rate,omitempty"` + FillRate *wrapperspb.DoubleValue `protobuf:"bytes,2,opt,name=fill_rate,json=fillRate,proto3" json:"fill_rate,omitempty"` } func (x *RateLimitSettings) Reset() { @@ -413,14 +413,14 @@ func (*RateLimitSettings) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_config_source_proto_rawDescGZIP(), []int{3} } -func (x *RateLimitSettings) GetMaxTokens() *wrappers.UInt32Value { +func (x *RateLimitSettings) GetMaxTokens() *wrapperspb.UInt32Value { if x != nil { return x.MaxTokens } return nil } -func (x *RateLimitSettings) GetFillRate() *wrappers.DoubleValue { +func (x *RateLimitSettings) GetFillRate() *wrapperspb.DoubleValue { if x != nil { return x.FillRate } @@ -453,7 +453,7 @@ type ConfigSource struct { // 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). The default is 15s. - InitialFetchTimeout *duration.Duration `protobuf:"bytes,4,opt,name=initial_fetch_timeout,json=initialFetchTimeout,proto3" json:"initial_fetch_timeout,omitempty"` + InitialFetchTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=initial_fetch_timeout,json=initialFetchTimeout,proto3" json:"initial_fetch_timeout,omitempty"` // API version for xDS resources. This implies the type URLs that the client // will request for resources and the resource type that the client will in // turn expect to be delivered. @@ -527,7 +527,7 @@ func (x *ConfigSource) GetSelf() *SelfConfigSource { return nil } -func (x *ConfigSource) GetInitialFetchTimeout() *duration.Duration { +func (x *ConfigSource) GetInitialFetchTimeout() *durationpb.Duration { if x != nil { return x.InitialFetchTimeout } @@ -744,9 +744,9 @@ var file_envoy_api_v2_core_config_source_proto_goTypes = []interface{}{ (*RateLimitSettings)(nil), // 5: envoy.api.v2.core.RateLimitSettings (*ConfigSource)(nil), // 6: envoy.api.v2.core.ConfigSource (*GrpcService)(nil), // 7: envoy.api.v2.core.GrpcService - (*duration.Duration)(nil), // 8: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value - (*wrappers.DoubleValue)(nil), // 10: google.protobuf.DoubleValue + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrapperspb.DoubleValue)(nil), // 10: google.protobuf.DoubleValue } var file_envoy_api_v2_core_config_source_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.core.ApiConfigSource.api_type:type_name -> envoy.api.v2.core.ApiConfigSource.ApiType diff --git a/envoy/api/v2/core/grpc_service.pb.go b/envoy/api/v2/core/grpc_service.pb.go index 767b3c041..9766a51f9 100755 --- a/envoy/api/v2/core/grpc_service.pb.go +++ b/envoy/api/v2/core/grpc_service.pb.go @@ -9,12 +9,12 @@ package core import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" emptypb "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -41,7 +41,7 @@ type GrpcService struct { TargetSpecifier isGrpcService_TargetSpecifier `protobuf_oneof:"target_specifier"` // The timeout for the gRPC request. This is the timeout for a specific // request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // Additional metadata to include in streams initiated to the GrpcService. // This can be used for scenarios in which additional ad hoc authorization // headers (e.g. “x-foo-bar: baz-key“) are to be injected. @@ -101,7 +101,7 @@ func (x *GrpcService) GetGoogleGrpc() *GrpcService_GoogleGrpc { return nil } -func (x *GrpcService) GetTimeout() *duration.Duration { +func (x *GrpcService) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -218,7 +218,7 @@ type GrpcService_GoogleGrpc struct { CredentialsFactoryName string `protobuf:"bytes,5,opt,name=credentials_factory_name,json=credentialsFactoryName,proto3" json:"credentials_factory_name,omitempty"` // Additional configuration for site-specific customizations of the Google // gRPC library. - Config *_struct.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"` } func (x *GrpcService_GoogleGrpc) Reset() { @@ -288,7 +288,7 @@ func (x *GrpcService_GoogleGrpc) GetCredentialsFactoryName() string { return "" } -func (x *GrpcService_GoogleGrpc) GetConfig() *_struct.Struct { +func (x *GrpcService_GoogleGrpc) GetConfig() *structpb.Struct { if x != nil { return x.Config } @@ -848,14 +848,14 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) G } // Deprecated: Marked as deprecated in envoy/api/v2/core/grpc_service.proto. -func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetConfig() *_struct.Struct { +func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config); ok { return x.Config } return nil } -func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetTypedConfig() *any1.Any { +func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig); ok { return x.TypedConfig } @@ -868,11 +868,11 @@ type isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Conf type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/core/grpc_service.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Config) isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_ConfigType() { @@ -1257,12 +1257,12 @@ var file_envoy_api_v2_core_grpc_service_proto_goTypes = []interface{}{ (*GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials)(nil), // 8: envoy.api.v2.core.GrpcService.GoogleGrpc.CallCredentials.GoogleIAMCredentials (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin)(nil), // 9: envoy.api.v2.core.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin (*GrpcService_GoogleGrpc_CallCredentials_StsService)(nil), // 10: envoy.api.v2.core.GrpcService.GoogleGrpc.CallCredentials.StsService - (*duration.Duration)(nil), // 11: google.protobuf.Duration + (*durationpb.Duration)(nil), // 11: google.protobuf.Duration (*HeaderValue)(nil), // 12: envoy.api.v2.core.HeaderValue - (*_struct.Struct)(nil), // 13: google.protobuf.Struct + (*structpb.Struct)(nil), // 13: google.protobuf.Struct (*DataSource)(nil), // 14: envoy.api.v2.core.DataSource (*emptypb.Empty)(nil), // 15: google.protobuf.Empty - (*any1.Any)(nil), // 16: google.protobuf.Any + (*anypb.Any)(nil), // 16: google.protobuf.Any } var file_envoy_api_v2_core_grpc_service_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.core.GrpcService.envoy_grpc:type_name -> envoy.api.v2.core.GrpcService.EnvoyGrpc diff --git a/envoy/api/v2/core/health_check.pb.go b/envoy/api/v2/core/health_check.pb.go index c34c7d2a2..d26fe6a54 100755 --- a/envoy/api/v2/core/health_check.pb.go +++ b/envoy/api/v2/core/health_check.pb.go @@ -12,12 +12,12 @@ import ( _type "github.com/envoyproxy/go-control-plane/envoy/type" matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -107,16 +107,16 @@ type HealthCheck struct { // The time to wait for a health check response. If the timeout is reached the // health check attempt will be considered a failure. - Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // The interval between health checks. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // An optional jitter amount in milliseconds. If specified, Envoy will start health // checking after for a random time in ms between 0 and initial_jitter. This only // applies to the first health check. - InitialJitter *duration.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` + InitialJitter *durationpb.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` // An optional jitter amount in milliseconds. If specified, during every // interval Envoy will add interval_jitter to the wait time. - IntervalJitter *duration.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` + IntervalJitter *durationpb.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` // An optional jitter amount as a percentage of interval_ms. If specified, // during every interval Envoy will add interval_ms * // interval_jitter_percent / 100 to the wait time. @@ -127,15 +127,15 @@ type HealthCheck struct { // The number of unhealthy health checks required before a host is marked // unhealthy. Note that for *http* health checking if a host responds with 503 // this threshold is ignored and the host is considered unhealthy immediately. - UnhealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` + UnhealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` // The number of healthy health checks required before a host is marked // healthy. Note that during startup, only a single successful health check is // required to mark a host healthy. - HealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` + HealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` // [#not-implemented-hide:] Non-serving port for health checking. - AltPort *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=alt_port,json=altPort,proto3" json:"alt_port,omitempty"` + AltPort *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=alt_port,json=altPort,proto3" json:"alt_port,omitempty"` // Reuse health check connection between health checks. Default is true. - ReuseConnection *wrappers.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` + ReuseConnection *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` // Types that are assignable to HealthChecker: // // *HealthCheck_HttpHealthCheck_ @@ -151,26 +151,26 @@ type HealthCheck struct { // any other. // // The default value for "no traffic interval" is 60 seconds. - NoTrafficInterval *duration.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` + NoTrafficInterval *durationpb.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` // The "unhealthy interval" is a health check interval that is used for hosts that are marked as // unhealthy. As soon as the host is marked as healthy, Envoy will shift back to using the // standard health check interval that is defined. // // The default value for "unhealthy interval" is the same as "interval". - UnhealthyInterval *duration.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` + UnhealthyInterval *durationpb.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` // The "unhealthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as unhealthy. For subsequent health checks // Envoy will shift back to using either "unhealthy interval" if present or the standard health // check interval that is defined. // // The default value for "unhealthy edge interval" is the same as "unhealthy interval". - UnhealthyEdgeInterval *duration.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` + UnhealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` // The "healthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as healthy. For subsequent health checks // Envoy will shift back to using the standard health check interval that is defined. // // The default value for "healthy edge interval" is the same as the default interval. - HealthyEdgeInterval *duration.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` + HealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` // Specifies the path to the :ref:`health check event log `. // If empty, no event log will be written. EventLogPath string `protobuf:"bytes,17,opt,name=event_log_path,json=eventLogPath,proto3" json:"event_log_path,omitempty"` @@ -218,28 +218,28 @@ func (*HealthCheck) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_health_check_proto_rawDescGZIP(), []int{0} } -func (x *HealthCheck) GetTimeout() *duration.Duration { +func (x *HealthCheck) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *HealthCheck) GetInterval() *duration.Duration { +func (x *HealthCheck) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *HealthCheck) GetInitialJitter() *duration.Duration { +func (x *HealthCheck) GetInitialJitter() *durationpb.Duration { if x != nil { return x.InitialJitter } return nil } -func (x *HealthCheck) GetIntervalJitter() *duration.Duration { +func (x *HealthCheck) GetIntervalJitter() *durationpb.Duration { if x != nil { return x.IntervalJitter } @@ -253,28 +253,28 @@ func (x *HealthCheck) GetIntervalJitterPercent() uint32 { return 0 } -func (x *HealthCheck) GetUnhealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetUnhealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.UnhealthyThreshold } return nil } -func (x *HealthCheck) GetHealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetHealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.HealthyThreshold } return nil } -func (x *HealthCheck) GetAltPort() *wrappers.UInt32Value { +func (x *HealthCheck) GetAltPort() *wrapperspb.UInt32Value { if x != nil { return x.AltPort } return nil } -func (x *HealthCheck) GetReuseConnection() *wrappers.BoolValue { +func (x *HealthCheck) GetReuseConnection() *wrapperspb.BoolValue { if x != nil { return x.ReuseConnection } @@ -316,28 +316,28 @@ func (x *HealthCheck) GetCustomHealthCheck() *HealthCheck_CustomHealthCheck { return nil } -func (x *HealthCheck) GetNoTrafficInterval() *duration.Duration { +func (x *HealthCheck) GetNoTrafficInterval() *durationpb.Duration { if x != nil { return x.NoTrafficInterval } return nil } -func (x *HealthCheck) GetUnhealthyInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyInterval() *durationpb.Duration { if x != nil { return x.UnhealthyInterval } return nil } -func (x *HealthCheck) GetUnhealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.UnhealthyEdgeInterval } return nil } -func (x *HealthCheck) GetHealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetHealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.HealthyEdgeInterval } @@ -899,14 +899,14 @@ func (m *HealthCheck_CustomHealthCheck) GetConfigType() isHealthCheck_CustomHeal } // Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto. -func (x *HealthCheck_CustomHealthCheck) GetConfig() *_struct.Struct { +func (x *HealthCheck_CustomHealthCheck) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_Config); ok { return x.Config } return nil } -func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *any1.Any { +func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_TypedConfig); ok { return x.TypedConfig } @@ -919,11 +919,11 @@ type isHealthCheck_CustomHealthCheck_ConfigType interface { type HealthCheck_CustomHealthCheck_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/core/health_check.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type HealthCheck_CustomHealthCheck_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*HealthCheck_CustomHealthCheck_Config) isHealthCheck_CustomHealthCheck_ConfigType() {} @@ -1241,16 +1241,16 @@ var file_envoy_api_v2_core_health_check_proto_goTypes = []interface{}{ (*HealthCheck_GrpcHealthCheck)(nil), // 6: envoy.api.v2.core.HealthCheck.GrpcHealthCheck (*HealthCheck_CustomHealthCheck)(nil), // 7: envoy.api.v2.core.HealthCheck.CustomHealthCheck (*HealthCheck_TlsOptions)(nil), // 8: envoy.api.v2.core.HealthCheck.TlsOptions - (*duration.Duration)(nil), // 9: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 11: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 9: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 11: google.protobuf.BoolValue (*EventServiceConfig)(nil), // 12: envoy.api.v2.core.EventServiceConfig (*HeaderValueOption)(nil), // 13: envoy.api.v2.core.HeaderValueOption (*_type.Int64Range)(nil), // 14: envoy.type.Int64Range (_type.CodecClientType)(0), // 15: envoy.type.CodecClientType (*matcher.StringMatcher)(nil), // 16: envoy.type.matcher.StringMatcher - (*_struct.Struct)(nil), // 17: google.protobuf.Struct - (*any1.Any)(nil), // 18: google.protobuf.Any + (*structpb.Struct)(nil), // 17: google.protobuf.Struct + (*anypb.Any)(nil), // 18: google.protobuf.Any } var file_envoy_api_v2_core_health_check_proto_depIdxs = []int32{ 9, // 0: envoy.api.v2.core.HealthCheck.timeout:type_name -> google.protobuf.Duration diff --git a/envoy/api/v2/core/http_uri.pb.go b/envoy/api/v2/core/http_uri.pb.go index 7a3527149..23dbb8233 100755 --- a/envoy/api/v2/core/http_uri.pb.go +++ b/envoy/api/v2/core/http_uri.pb.go @@ -9,9 +9,9 @@ package core import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -47,7 +47,7 @@ type HttpUri struct { // *HttpUri_Cluster HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"` // Sets the maximum duration in milliseconds that a response can take to arrive upon request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *HttpUri) Reset() { @@ -103,7 +103,7 @@ func (x *HttpUri) GetCluster() string { return "" } -func (x *HttpUri) GetTimeout() *duration.Duration { +func (x *HttpUri) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -178,8 +178,8 @@ func file_envoy_api_v2_core_http_uri_proto_rawDescGZIP() []byte { var file_envoy_api_v2_core_http_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_api_v2_core_http_uri_proto_goTypes = []interface{}{ - (*HttpUri)(nil), // 0: envoy.api.v2.core.HttpUri - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*HttpUri)(nil), // 0: envoy.api.v2.core.HttpUri + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_api_v2_core_http_uri_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.core.HttpUri.timeout:type_name -> google.protobuf.Duration diff --git a/envoy/api/v2/core/protocol.pb.go b/envoy/api/v2/core/protocol.pb.go index 6017d62e1..3ae9056c4 100755 --- a/envoy/api/v2/core/protocol.pb.go +++ b/envoy/api/v2/core/protocol.pb.go @@ -9,10 +9,10 @@ package core import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -205,21 +205,21 @@ type HttpProtocolOptions struct { // // Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP // FIN packets, etc. - IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // The maximum duration of a connection. The duration is defined as a period since a connection // was established. If not set, there is no max duration. When max_connection_duration is reached // the connection will be closed. Drain sequence will occur prior to closing the connection if // if's applicable. See :ref:`drain_timeout // `. // Note: not implemented for upstream connections. - MaxConnectionDuration *duration.Duration `protobuf:"bytes,3,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` + MaxConnectionDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` // The maximum number of headers. If unconfigured, the default // maximum number of request headers allowed is 100. Requests that exceed this limit will receive // a 431 response for HTTP/1.x and cause a stream reset for HTTP/2. - MaxHeadersCount *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` + MaxHeadersCount *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` // Total duration to keep alive an HTTP request/response stream. If the time limit is reached the stream will be // reset independent of any other timeouts. If not specified, this value is not set. - MaxStreamDuration *duration.Duration `protobuf:"bytes,4,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` + MaxStreamDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` // Action to take when a client request with a header name containing underscore characters is received. // If this setting is not specified, the value defaults to ALLOW. // Note: upstream responses are not affected by this setting. @@ -258,28 +258,28 @@ func (*HttpProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_protocol_proto_rawDescGZIP(), []int{2} } -func (x *HttpProtocolOptions) GetIdleTimeout() *duration.Duration { +func (x *HttpProtocolOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *HttpProtocolOptions) GetMaxConnectionDuration() *duration.Duration { +func (x *HttpProtocolOptions) GetMaxConnectionDuration() *durationpb.Duration { if x != nil { return x.MaxConnectionDuration } return nil } -func (x *HttpProtocolOptions) GetMaxHeadersCount() *wrappers.UInt32Value { +func (x *HttpProtocolOptions) GetMaxHeadersCount() *wrapperspb.UInt32Value { if x != nil { return x.MaxHeadersCount } return nil } -func (x *HttpProtocolOptions) GetMaxStreamDuration() *duration.Duration { +func (x *HttpProtocolOptions) GetMaxStreamDuration() *durationpb.Duration { if x != nil { return x.MaxStreamDuration } @@ -303,7 +303,7 @@ type Http1ProtocolOptions struct { // are generally sent by clients to forward/explicit proxies. This allows clients to configure // envoy as their HTTP proxy. In Unix, for example, this is typically done by setting the // *http_proxy* environment variable. - AllowAbsoluteUrl *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_absolute_url,json=allowAbsoluteUrl,proto3" json:"allow_absolute_url,omitempty"` + AllowAbsoluteUrl *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=allow_absolute_url,json=allowAbsoluteUrl,proto3" json:"allow_absolute_url,omitempty"` // Handle incoming HTTP/1.0 and HTTP 0.9 requests. // This is off by default, and not fully standards compliant. There is support for pre-HTTP/1.1 // style connect logic, dechunking, and handling lack of client host iff @@ -360,7 +360,7 @@ func (*Http1ProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_protocol_proto_rawDescGZIP(), []int{3} } -func (x *Http1ProtocolOptions) GetAllowAbsoluteUrl() *wrappers.BoolValue { +func (x *Http1ProtocolOptions) GetAllowAbsoluteUrl() *wrapperspb.BoolValue { if x != nil { return x.AllowAbsoluteUrl } @@ -405,7 +405,7 @@ type Http2ProtocolOptions struct { // (in octets) that the encoder is permitted to use for the dynamic HPACK table. Valid values // range from 0 to 4294967295 (2^32 - 1) and defaults to 4096. 0 effectively disables header // compression. - HpackTableSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=hpack_table_size,json=hpackTableSize,proto3" json:"hpack_table_size,omitempty"` + HpackTableSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=hpack_table_size,json=hpackTableSize,proto3" json:"hpack_table_size,omitempty"` // `Maximum concurrent streams `_ // allowed for peer on one HTTP/2 connection. Valid values range from 1 to 2147483647 (2^31 - 1) // and defaults to 2147483647. @@ -413,7 +413,7 @@ type Http2ProtocolOptions struct { // For upstream connections, this also limits how many streams Envoy will initiate concurrently // on a single connection. If the limit is reached, Envoy may queue requests or establish // additional connections (as allowed per circuit breaker limits). - MaxConcurrentStreams *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` + MaxConcurrentStreams *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` // `Initial stream-level flow-control window // `_ size. Valid values range from 65535 // (2^16 - 1, HTTP/2 default) to 2147483647 (2^31 - 1, HTTP/2 maximum) and defaults to 268435456 @@ -425,10 +425,10 @@ type Http2ProtocolOptions struct { // This field also acts as a soft limit on the number of bytes Envoy will buffer per-stream in the // HTTP/2 codec buffers. Once the buffer reaches this pointer, watermark callbacks will fire to // stop the flow of data to the codec buffers. - InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` + InitialStreamWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` // Similar to *initial_stream_window_size*, but for connection-level flow-control // window. Currently, this has the same minimum/maximum/default as *initial_stream_window_size*. - InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` + InitialConnectionWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` // Allows proxying Websocket and other upgrades over H2 connect. AllowConnect bool `protobuf:"varint,5,opt,name=allow_connect,json=allowConnect,proto3" json:"allow_connect,omitempty"` // [#not-implemented-hide:] Hiding until envoy has full metadata support. @@ -443,14 +443,14 @@ type Http2ProtocolOptions struct { // terminated. The “http2.outbound_flood“ stat tracks the number of terminated connections due // to flood mitigation. The default limit is 10000. // [#comment:TODO: implement same limits for upstream outbound frames as well.] - MaxOutboundFrames *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_outbound_frames,json=maxOutboundFrames,proto3" json:"max_outbound_frames,omitempty"` + MaxOutboundFrames *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_outbound_frames,json=maxOutboundFrames,proto3" json:"max_outbound_frames,omitempty"` // Limit the number of pending outbound downstream frames of types PING, SETTINGS and RST_STREAM, // preventing high memory utilization when receiving continuous stream of these frames. Exceeding // this limit triggers flood mitigation and connection is terminated. The // “http2.outbound_control_flood“ stat tracks the number of terminated connections due to flood // mitigation. The default limit is 1000. // [#comment:TODO: implement same limits for upstream outbound frames as well.] - MaxOutboundControlFrames *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=max_outbound_control_frames,json=maxOutboundControlFrames,proto3" json:"max_outbound_control_frames,omitempty"` + MaxOutboundControlFrames *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=max_outbound_control_frames,json=maxOutboundControlFrames,proto3" json:"max_outbound_control_frames,omitempty"` // Limit the number of consecutive inbound frames of types HEADERS, CONTINUATION and DATA with an // empty payload and no end stream flag. Those frames have no legitimate use and are abusive, but // might be a result of a broken HTTP/2 implementation. The `http2.inbound_empty_frames_flood“ @@ -458,7 +458,7 @@ type Http2ProtocolOptions struct { // Setting this to 0 will terminate connection upon receiving first frame with an empty payload // and no end stream flag. The default limit is 1. // [#comment:TODO: implement same limits for upstream inbound frames as well.] - MaxConsecutiveInboundFramesWithEmptyPayload *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=max_consecutive_inbound_frames_with_empty_payload,json=maxConsecutiveInboundFramesWithEmptyPayload,proto3" json:"max_consecutive_inbound_frames_with_empty_payload,omitempty"` + MaxConsecutiveInboundFramesWithEmptyPayload *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=max_consecutive_inbound_frames_with_empty_payload,json=maxConsecutiveInboundFramesWithEmptyPayload,proto3" json:"max_consecutive_inbound_frames_with_empty_payload,omitempty"` // Limit the number of inbound PRIORITY frames allowed per each opened stream. If the number // of PRIORITY frames received over the lifetime of connection exceeds the value calculated // using this formula:: @@ -468,7 +468,7 @@ type Http2ProtocolOptions struct { // the connection is terminated. The “http2.inbound_priority_frames_flood“ stat tracks // the number of connections terminated due to flood mitigation. The default limit is 100. // [#comment:TODO: implement same limits for upstream inbound frames as well.] - MaxInboundPriorityFramesPerStream *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=max_inbound_priority_frames_per_stream,json=maxInboundPriorityFramesPerStream,proto3" json:"max_inbound_priority_frames_per_stream,omitempty"` + MaxInboundPriorityFramesPerStream *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=max_inbound_priority_frames_per_stream,json=maxInboundPriorityFramesPerStream,proto3" json:"max_inbound_priority_frames_per_stream,omitempty"` // Limit the number of inbound WINDOW_UPDATE frames allowed per DATA frame sent. If the number // of WINDOW_UPDATE frames received over the lifetime of connection exceeds the value calculated // using this formula:: @@ -481,7 +481,7 @@ type Http2ProtocolOptions struct { // Setting this to 1 should be enough to support HTTP/2 implementations with basic flow control, // but more complex implementations that try to estimate available bandwidth require at least 2. // [#comment:TODO: implement same limits for upstream inbound frames as well.] - MaxInboundWindowUpdateFramesPerDataFrameSent *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=max_inbound_window_update_frames_per_data_frame_sent,json=maxInboundWindowUpdateFramesPerDataFrameSent,proto3" json:"max_inbound_window_update_frames_per_data_frame_sent,omitempty"` + MaxInboundWindowUpdateFramesPerDataFrameSent *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=max_inbound_window_update_frames_per_data_frame_sent,json=maxInboundWindowUpdateFramesPerDataFrameSent,proto3" json:"max_inbound_window_update_frames_per_data_frame_sent,omitempty"` // Allows invalid HTTP messaging and headers. When this option is disabled (default), then // the whole HTTP/2 connection is terminated upon receiving invalid HEADERS frame. However, // when this option is enabled, only the offending stream is terminated. @@ -549,28 +549,28 @@ func (*Http2ProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_protocol_proto_rawDescGZIP(), []int{4} } -func (x *Http2ProtocolOptions) GetHpackTableSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetHpackTableSize() *wrapperspb.UInt32Value { if x != nil { return x.HpackTableSize } return nil } -func (x *Http2ProtocolOptions) GetMaxConcurrentStreams() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxConcurrentStreams() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrentStreams } return nil } -func (x *Http2ProtocolOptions) GetInitialStreamWindowSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetInitialStreamWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialStreamWindowSize } return nil } -func (x *Http2ProtocolOptions) GetInitialConnectionWindowSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetInitialConnectionWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialConnectionWindowSize } @@ -591,35 +591,35 @@ func (x *Http2ProtocolOptions) GetAllowMetadata() bool { return false } -func (x *Http2ProtocolOptions) GetMaxOutboundFrames() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxOutboundFrames() *wrapperspb.UInt32Value { if x != nil { return x.MaxOutboundFrames } return nil } -func (x *Http2ProtocolOptions) GetMaxOutboundControlFrames() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxOutboundControlFrames() *wrapperspb.UInt32Value { if x != nil { return x.MaxOutboundControlFrames } return nil } -func (x *Http2ProtocolOptions) GetMaxConsecutiveInboundFramesWithEmptyPayload() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxConsecutiveInboundFramesWithEmptyPayload() *wrapperspb.UInt32Value { if x != nil { return x.MaxConsecutiveInboundFramesWithEmptyPayload } return nil } -func (x *Http2ProtocolOptions) GetMaxInboundPriorityFramesPerStream() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxInboundPriorityFramesPerStream() *wrapperspb.UInt32Value { if x != nil { return x.MaxInboundPriorityFramesPerStream } return nil } -func (x *Http2ProtocolOptions) GetMaxInboundWindowUpdateFramesPerDataFrameSent() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxInboundWindowUpdateFramesPerDataFrameSent() *wrapperspb.UInt32Value { if x != nil { return x.MaxInboundWindowUpdateFramesPerDataFrameSent } @@ -807,9 +807,9 @@ type Http2ProtocolOptions_SettingsParameter struct { unknownFields protoimpl.UnknownFields // The 16 bit parameter identifier. - Identifier *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` + Identifier *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` // The 32 bit parameter value. - Value *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (x *Http2ProtocolOptions_SettingsParameter) Reset() { @@ -844,14 +844,14 @@ func (*Http2ProtocolOptions_SettingsParameter) Descriptor() ([]byte, []int) { return file_envoy_api_v2_core_protocol_proto_rawDescGZIP(), []int{4, 0} } -func (x *Http2ProtocolOptions_SettingsParameter) GetIdentifier() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions_SettingsParameter) GetIdentifier() *wrapperspb.UInt32Value { if x != nil { return x.Identifier } return nil } -func (x *Http2ProtocolOptions_SettingsParameter) GetValue() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions_SettingsParameter) GetValue() *wrapperspb.UInt32Value { if x != nil { return x.Value } @@ -1083,9 +1083,9 @@ var file_envoy_api_v2_core_protocol_proto_goTypes = []interface{}{ (*Http1ProtocolOptions_HeaderKeyFormat)(nil), // 7: envoy.api.v2.core.Http1ProtocolOptions.HeaderKeyFormat (*Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords)(nil), // 8: envoy.api.v2.core.Http1ProtocolOptions.HeaderKeyFormat.ProperCaseWords (*Http2ProtocolOptions_SettingsParameter)(nil), // 9: envoy.api.v2.core.Http2ProtocolOptions.SettingsParameter - (*duration.Duration)(nil), // 10: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 11: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 12: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 11: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 12: google.protobuf.BoolValue } var file_envoy_api_v2_core_protocol_proto_depIdxs = []int32{ 10, // 0: envoy.api.v2.core.HttpProtocolOptions.idle_timeout:type_name -> google.protobuf.Duration diff --git a/envoy/api/v2/discovery.pb.go b/envoy/api/v2/discovery.pb.go index 51f91bac0..cc1b1d13b 100755 --- a/envoy/api/v2/discovery.pb.go +++ b/envoy/api/v2/discovery.pb.go @@ -9,10 +9,10 @@ package apiv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - any1 "github.com/golang/protobuf/ptypes/any" status "google.golang.org/genproto/googleapis/rpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -150,7 +150,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 []*any1.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` + Resources []*anypb.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` // [#not-implemented-hide:] // Canary is used to support two Envoy command line flags: // @@ -222,7 +222,7 @@ func (x *DiscoveryResponse) GetVersionInfo() string { return "" } -func (x *DiscoveryResponse) GetResources() []*any1.Any { +func (x *DiscoveryResponse) GetResources() []*anypb.Any { if x != nil { return x.Resources } @@ -527,7 +527,7 @@ type Resource struct { // resources. Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // The resource being tracked. - Resource *any1.Any `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` + Resource *anypb.Any `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` } func (x *Resource) Reset() { @@ -583,7 +583,7 @@ func (x *Resource) GetVersion() string { return "" } -func (x *Resource) GetResource() *any1.Any { +func (x *Resource) GetResource() *anypb.Any { if x != nil { return x.Resource } @@ -726,7 +726,7 @@ var file_envoy_api_v2_discovery_proto_goTypes = []interface{}{ nil, // 5: envoy.api.v2.DeltaDiscoveryRequest.InitialResourceVersionsEntry (*core.Node)(nil), // 6: envoy.api.v2.core.Node (*status.Status)(nil), // 7: google.rpc.Status - (*any1.Any)(nil), // 8: google.protobuf.Any + (*anypb.Any)(nil), // 8: google.protobuf.Any (*core.ControlPlane)(nil), // 9: envoy.api.v2.core.ControlPlane } var file_envoy_api_v2_discovery_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/endpoint.pb.go b/envoy/api/v2/endpoint.pb.go index 3a95688af..d2332a749 100755 --- a/envoy/api/v2/endpoint.pb.go +++ b/envoy/api/v2/endpoint.pb.go @@ -11,10 +11,10 @@ import ( 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" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -159,12 +159,12 @@ type ClusterLoadAssignment_Policy struct { // // Read more at :ref:`priority levels ` and // :ref:`localities `. - OverprovisioningFactor *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=overprovisioning_factor,json=overprovisioningFactor,proto3" json:"overprovisioning_factor,omitempty"` + OverprovisioningFactor *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=overprovisioning_factor,json=overprovisioningFactor,proto3" json:"overprovisioning_factor,omitempty"` // The max time until which the endpoints from this assignment can be used. // If no new assignments are received before this time expires the endpoints // are considered stale and should be marked unhealthy. // Defaults to 0 which means endpoints never go stale. - EndpointStaleAfter *duration.Duration `protobuf:"bytes,4,opt,name=endpoint_stale_after,json=endpointStaleAfter,proto3" json:"endpoint_stale_after,omitempty"` + EndpointStaleAfter *durationpb.Duration `protobuf:"bytes,4,opt,name=endpoint_stale_after,json=endpointStaleAfter,proto3" json:"endpoint_stale_after,omitempty"` // The flag to disable overprovisioning. If it is set to true, // :ref:`overprovisioning factor // ` will be ignored @@ -217,14 +217,14 @@ func (x *ClusterLoadAssignment_Policy) GetDropOverloads() []*ClusterLoadAssignme return nil } -func (x *ClusterLoadAssignment_Policy) GetOverprovisioningFactor() *wrappers.UInt32Value { +func (x *ClusterLoadAssignment_Policy) GetOverprovisioningFactor() *wrapperspb.UInt32Value { if x != nil { return x.OverprovisioningFactor } return nil } -func (x *ClusterLoadAssignment_Policy) GetEndpointStaleAfter() *duration.Duration { +func (x *ClusterLoadAssignment_Policy) GetEndpointStaleAfter() *durationpb.Duration { if x != nil { return x.EndpointStaleAfter } @@ -404,8 +404,8 @@ var file_envoy_api_v2_endpoint_proto_goTypes = []interface{}{ nil, // 2: envoy.api.v2.ClusterLoadAssignment.NamedEndpointsEntry (*ClusterLoadAssignment_Policy_DropOverload)(nil), // 3: envoy.api.v2.ClusterLoadAssignment.Policy.DropOverload (*endpoint.LocalityLbEndpoints)(nil), // 4: envoy.api.v2.endpoint.LocalityLbEndpoints - (*wrappers.UInt32Value)(nil), // 5: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 6: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 5: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 6: google.protobuf.Duration (*endpoint.Endpoint)(nil), // 7: envoy.api.v2.endpoint.Endpoint (*_type.FractionalPercent)(nil), // 8: envoy.type.FractionalPercent } diff --git a/envoy/api/v2/endpoint/endpoint_components.pb.go b/envoy/api/v2/endpoint/endpoint_components.pb.go index 19872e6f9..f9b19ce66 100755 --- a/envoy/api/v2/endpoint/endpoint_components.pb.go +++ b/envoy/api/v2/endpoint/endpoint_components.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -141,7 +141,7 @@ type LbEndpoint struct { // LocalityLbEndpoints. If unspecified, each host is presumed to have equal // weight in a locality. The sum of the weights of all endpoints in the // endpoint's locality must not exceed uint32_t maximal value (4294967295). - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` } func (x *LbEndpoint) Reset() { @@ -211,7 +211,7 @@ func (x *LbEndpoint) GetMetadata() *core.Metadata { return nil } -func (x *LbEndpoint) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *LbEndpoint) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } @@ -260,7 +260,7 @@ type LocalityLbEndpoints struct { // configured. These weights are ignored otherwise. If no weights are // specified when locality weighted load balancing is enabled, the locality is // assigned no load. - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` // Optional: the priority for this LocalityLbEndpoints. If unspecified this will // default to the highest priority (0). // @@ -277,7 +277,7 @@ type LocalityLbEndpoints struct { // This will be consumed by load balancing schemes that need proximity order // to determine where to route the requests. // [#not-implemented-hide:] - Proximity *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=proximity,proto3" json:"proximity,omitempty"` + Proximity *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=proximity,proto3" json:"proximity,omitempty"` } func (x *LocalityLbEndpoints) Reset() { @@ -326,7 +326,7 @@ func (x *LocalityLbEndpoints) GetLbEndpoints() []*LbEndpoint { return nil } -func (x *LocalityLbEndpoints) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *LocalityLbEndpoints) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } @@ -340,7 +340,7 @@ func (x *LocalityLbEndpoints) GetPriority() uint32 { return 0 } -func (x *LocalityLbEndpoints) GetProximity() *wrappers.UInt32Value { +func (x *LocalityLbEndpoints) GetProximity() *wrapperspb.UInt32Value { if x != nil { return x.Proximity } @@ -531,7 +531,7 @@ var file_envoy_api_v2_endpoint_endpoint_components_proto_goTypes = []interface{} (*core.Address)(nil), // 4: envoy.api.v2.core.Address (core.HealthStatus)(0), // 5: envoy.api.v2.core.HealthStatus (*core.Metadata)(nil), // 6: envoy.api.v2.core.Metadata - (*wrappers.UInt32Value)(nil), // 7: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 7: google.protobuf.UInt32Value (*core.Locality)(nil), // 8: envoy.api.v2.core.Locality } var file_envoy_api_v2_endpoint_endpoint_components_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/endpoint/load_report.pb.go b/envoy/api/v2/endpoint/load_report.pb.go index f375e2ee8..be090bfe0 100755 --- a/envoy/api/v2/endpoint/load_report.pb.go +++ b/envoy/api/v2/endpoint/load_report.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -161,7 +161,7 @@ type UpstreamEndpointStats struct { Address *core.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Opaque and implementation dependent metadata of the // endpoint. Envoy will pass this directly to the management server. - Metadata *_struct.Struct `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` // The total number of requests successfully completed by the endpoints in the // locality. These include non-5xx responses for HTTP, where errors // originate at the client and the endpoint responded successfully. For gRPC, @@ -227,7 +227,7 @@ func (x *UpstreamEndpointStats) GetAddress() *core.Address { return nil } -func (x *UpstreamEndpointStats) GetMetadata() *_struct.Struct { +func (x *UpstreamEndpointStats) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -369,7 +369,7 @@ type ClusterStats struct { // request reported. Due to system load and delays between the *LoadStatsRequest* sent from Envoy // and the *LoadStatsResponse* message sent from the management server, this may be longer than // the requested load reporting interval in the *LoadStatsResponse*. - LoadReportInterval *duration.Duration `protobuf:"bytes,4,opt,name=load_report_interval,json=loadReportInterval,proto3" json:"load_report_interval,omitempty"` + LoadReportInterval *durationpb.Duration `protobuf:"bytes,4,opt,name=load_report_interval,json=loadReportInterval,proto3" json:"load_report_interval,omitempty"` } func (x *ClusterStats) Reset() { @@ -439,7 +439,7 @@ func (x *ClusterStats) GetDroppedRequests() []*ClusterStats_DroppedRequests { return nil } -func (x *ClusterStats) GetLoadReportInterval() *duration.Duration { +func (x *ClusterStats) GetLoadReportInterval() *durationpb.Duration { if x != nil { return x.LoadReportInterval } @@ -664,8 +664,8 @@ var file_envoy_api_v2_endpoint_load_report_proto_goTypes = []interface{}{ (*ClusterStats_DroppedRequests)(nil), // 4: envoy.api.v2.endpoint.ClusterStats.DroppedRequests (*core.Locality)(nil), // 5: envoy.api.v2.core.Locality (*core.Address)(nil), // 6: envoy.api.v2.core.Address - (*_struct.Struct)(nil), // 7: google.protobuf.Struct - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*structpb.Struct)(nil), // 7: google.protobuf.Struct + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration } var file_envoy_api_v2_endpoint_load_report_proto_depIdxs = []int32{ 5, // 0: envoy.api.v2.endpoint.UpstreamLocalityStats.locality:type_name -> envoy.api.v2.core.Locality diff --git a/envoy/api/v2/listener.pb.go b/envoy/api/v2/listener.pb.go index 6541d782d..2819f748e 100755 --- a/envoy/api/v2/listener.pb.go +++ b/envoy/api/v2/listener.pb.go @@ -13,10 +13,10 @@ import ( v21 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" v2 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -118,10 +118,10 @@ type Listener struct { // restored destination address. // // Deprecated: Marked as deprecated in envoy/api/v2/listener.proto. - UseOriginalDst *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_original_dst,json=useOriginalDst,proto3" json:"use_original_dst,omitempty"` + UseOriginalDst *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=use_original_dst,json=useOriginalDst,proto3" json:"use_original_dst,omitempty"` // Soft limit on size of the listener’s new connection read and write buffers. // If unspecified, an implementation defined default is applied (1MiB). - PerConnectionBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` + PerConnectionBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` // Listener metadata. Metadata *core.Metadata `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` // [#not-implemented-hide:] @@ -142,7 +142,7 @@ type Listener struct { // the accepted socket is closed without a connection being created unless // `continue_on_listener_filters_timeout` is set to true. Specify 0 to disable the // timeout. If not specified, a default timeout of 15s is used. - ListenerFiltersTimeout *duration.Duration `protobuf:"bytes,15,opt,name=listener_filters_timeout,json=listenerFiltersTimeout,proto3" json:"listener_filters_timeout,omitempty"` + ListenerFiltersTimeout *durationpb.Duration `protobuf:"bytes,15,opt,name=listener_filters_timeout,json=listenerFiltersTimeout,proto3" json:"listener_filters_timeout,omitempty"` // Whether a connection should be created when listener filters timeout. Default is false. // // .. attention:: @@ -165,14 +165,14 @@ type Listener struct { // Setting this flag requires Envoy to run with the *CAP_NET_ADMIN* capability. // When this flag is not set (default), the socket is not modified, i.e. the transparent option // is neither set nor reset. - Transparent *wrappers.BoolValue `protobuf:"bytes,10,opt,name=transparent,proto3" json:"transparent,omitempty"` + Transparent *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=transparent,proto3" json:"transparent,omitempty"` // Whether the listener should set the *IP_FREEBIND* socket option. When this // flag is set to true, listeners can be bound to an IP address that is not // configured on the system running Envoy. When this flag is set to false, the // option *IP_FREEBIND* is disabled on the socket. When this flag is not set // (default), the socket is not modified, i.e. the option is neither enabled // nor disabled. - Freebind *wrappers.BoolValue `protobuf:"bytes,11,opt,name=freebind,proto3" json:"freebind,omitempty"` + Freebind *wrapperspb.BoolValue `protobuf:"bytes,11,opt,name=freebind,proto3" json:"freebind,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. SocketOptions []*core.SocketOption `protobuf:"bytes,13,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` @@ -190,7 +190,7 @@ type Listener struct { // // On macOS, only values of 0, 1, and unset are valid; other values may result in an error. // To set the queue length on macOS, set the net.inet.tcp.fastopen_backlog kernel parameter. - TcpFastOpenQueueLength *wrappers.UInt32Value `protobuf:"bytes,12,opt,name=tcp_fast_open_queue_length,json=tcpFastOpenQueueLength,proto3" json:"tcp_fast_open_queue_length,omitempty"` + TcpFastOpenQueueLength *wrapperspb.UInt32Value `protobuf:"bytes,12,opt,name=tcp_fast_open_queue_length,json=tcpFastOpenQueueLength,proto3" json:"tcp_fast_open_queue_length,omitempty"` // Specifies the intended direction of the traffic relative to the local Envoy. // This property is required on Windows for listeners using the original destination filter, // see :ref:`Original Destination `. @@ -293,14 +293,14 @@ func (x *Listener) GetFilterChains() []*listener.FilterChain { } // Deprecated: Marked as deprecated in envoy/api/v2/listener.proto. -func (x *Listener) GetUseOriginalDst() *wrappers.BoolValue { +func (x *Listener) GetUseOriginalDst() *wrapperspb.BoolValue { if x != nil { return x.UseOriginalDst } return nil } -func (x *Listener) GetPerConnectionBufferLimitBytes() *wrappers.UInt32Value { +func (x *Listener) GetPerConnectionBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerConnectionBufferLimitBytes } @@ -335,7 +335,7 @@ func (x *Listener) GetListenerFilters() []*listener.ListenerFilter { return nil } -func (x *Listener) GetListenerFiltersTimeout() *duration.Duration { +func (x *Listener) GetListenerFiltersTimeout() *durationpb.Duration { if x != nil { return x.ListenerFiltersTimeout } @@ -349,14 +349,14 @@ func (x *Listener) GetContinueOnListenerFiltersTimeout() bool { return false } -func (x *Listener) GetTransparent() *wrappers.BoolValue { +func (x *Listener) GetTransparent() *wrapperspb.BoolValue { if x != nil { return x.Transparent } return nil } -func (x *Listener) GetFreebind() *wrappers.BoolValue { +func (x *Listener) GetFreebind() *wrapperspb.BoolValue { if x != nil { return x.Freebind } @@ -370,7 +370,7 @@ func (x *Listener) GetSocketOptions() []*core.SocketOption { return nil } -func (x *Listener) GetTcpFastOpenQueueLength() *wrappers.UInt32Value { +func (x *Listener) GetTcpFastOpenQueueLength() *wrapperspb.UInt32Value { if x != nil { return x.TcpFastOpenQueueLength } @@ -435,7 +435,7 @@ type Listener_DeprecatedV1 struct { // specified in the FilterChainMatch destination_port field. // // [#comment:TODO(PiotrSikora): Remove this once verified that we no longer need it.] - BindToPort *wrappers.BoolValue `protobuf:"bytes,1,opt,name=bind_to_port,json=bindToPort,proto3" json:"bind_to_port,omitempty"` + BindToPort *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=bind_to_port,json=bindToPort,proto3" json:"bind_to_port,omitempty"` } func (x *Listener_DeprecatedV1) Reset() { @@ -470,7 +470,7 @@ func (*Listener_DeprecatedV1) Descriptor() ([]byte, []int) { return file_envoy_api_v2_listener_proto_rawDescGZIP(), []int{0, 0} } -func (x *Listener_DeprecatedV1) GetBindToPort() *wrappers.BoolValue { +func (x *Listener_DeprecatedV1) GetBindToPort() *wrapperspb.BoolValue { if x != nil { return x.BindToPort } @@ -773,11 +773,11 @@ var file_envoy_api_v2_listener_proto_goTypes = []interface{}{ (*Listener_ConnectionBalanceConfig_ExactBalance)(nil), // 4: envoy.api.v2.Listener.ConnectionBalanceConfig.ExactBalance (*core.Address)(nil), // 5: envoy.api.v2.core.Address (*listener.FilterChain)(nil), // 6: envoy.api.v2.listener.FilterChain - (*wrappers.BoolValue)(nil), // 7: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 8: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 7: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 8: google.protobuf.UInt32Value (*core.Metadata)(nil), // 9: envoy.api.v2.core.Metadata (*listener.ListenerFilter)(nil), // 10: envoy.api.v2.listener.ListenerFilter - (*duration.Duration)(nil), // 11: google.protobuf.Duration + (*durationpb.Duration)(nil), // 11: google.protobuf.Duration (*core.SocketOption)(nil), // 12: envoy.api.v2.core.SocketOption (core.TrafficDirection)(0), // 13: envoy.api.v2.core.TrafficDirection (*listener.UdpListenerConfig)(nil), // 14: envoy.api.v2.listener.UdpListenerConfig diff --git a/envoy/api/v2/listener/listener_components.pb.go b/envoy/api/v2/listener/listener_components.pb.go index e4a44097c..86a2d7eb5 100755 --- a/envoy/api/v2/listener/listener_components.pb.go +++ b/envoy/api/v2/listener/listener_components.pb.go @@ -12,11 +12,11 @@ import ( 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" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -145,14 +145,14 @@ func (m *Filter) GetConfigType() isFilter_ConfigType { } // Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto. -func (x *Filter) GetConfig() *_struct.Struct { +func (x *Filter) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*Filter_Config); ok { return x.Config } return nil } -func (x *Filter) GetTypedConfig() *any1.Any { +func (x *Filter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*Filter_TypedConfig); ok { return x.TypedConfig } @@ -165,11 +165,11 @@ type isFilter_ConfigType interface { type Filter_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type Filter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*Filter_Config) isFilter_ConfigType() {} @@ -212,7 +212,7 @@ type FilterChainMatch struct { // Optional destination port to consider when use_original_dst is set on the // listener in determining a filter chain match. - DestinationPort *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` + DestinationPort *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` // If non-empty, an IP address and prefix length to match addresses when the // listener is bound to 0.0.0.0/:: or when use_original_dst is specified. PrefixRanges []*core.CidrRange `protobuf:"bytes,3,rep,name=prefix_ranges,json=prefixRanges,proto3" json:"prefix_ranges,omitempty"` @@ -221,7 +221,7 @@ type FilterChainMatch struct { // [#not-implemented-hide:] AddressSuffix string `protobuf:"bytes,4,opt,name=address_suffix,json=addressSuffix,proto3" json:"address_suffix,omitempty"` // [#not-implemented-hide:] - SuffixLen *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=suffix_len,json=suffixLen,proto3" json:"suffix_len,omitempty"` + SuffixLen *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=suffix_len,json=suffixLen,proto3" json:"suffix_len,omitempty"` // Specifies the connection source IP match type. Can be any, local or external network. SourceType FilterChainMatch_ConnectionSourceType `protobuf:"varint,12,opt,name=source_type,json=sourceType,proto3,enum=envoy.api.v2.listener.FilterChainMatch_ConnectionSourceType" json:"source_type,omitempty"` // The criteria is satisfied if the source IP address of the downstream @@ -311,7 +311,7 @@ func (*FilterChainMatch) Descriptor() ([]byte, []int) { return file_envoy_api_v2_listener_listener_components_proto_rawDescGZIP(), []int{1} } -func (x *FilterChainMatch) GetDestinationPort() *wrappers.UInt32Value { +func (x *FilterChainMatch) GetDestinationPort() *wrapperspb.UInt32Value { if x != nil { return x.DestinationPort } @@ -332,7 +332,7 @@ func (x *FilterChainMatch) GetAddressSuffix() string { return "" } -func (x *FilterChainMatch) GetSuffixLen() *wrappers.UInt32Value { +func (x *FilterChainMatch) GetSuffixLen() *wrapperspb.UInt32Value { if x != nil { return x.SuffixLen } @@ -411,7 +411,7 @@ type FilterChain struct { // load balancers including the AWS ELB support this option. If the option is // absent or set to false, Envoy will use the physical peer address of the // connection as the remote address. - UseProxyProto *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` + UseProxyProto *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` // [#not-implemented-hide:] filter chain metadata. Metadata *core.Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` // Optional custom transport socket implementation to use for downstream connections. @@ -480,7 +480,7 @@ func (x *FilterChain) GetFilters() []*Filter { return nil } -func (x *FilterChain) GetUseProxyProto() *wrappers.BoolValue { +func (x *FilterChain) GetUseProxyProto() *wrapperspb.BoolValue { if x != nil { return x.UseProxyProto } @@ -736,14 +736,14 @@ func (m *ListenerFilter) GetConfigType() isListenerFilter_ConfigType { } // Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto. -func (x *ListenerFilter) GetConfig() *_struct.Struct { +func (x *ListenerFilter) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*ListenerFilter_Config); ok { return x.Config } return nil } -func (x *ListenerFilter) GetTypedConfig() *any1.Any { +func (x *ListenerFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ListenerFilter_TypedConfig); ok { return x.TypedConfig } @@ -763,11 +763,11 @@ type isListenerFilter_ConfigType interface { type ListenerFilter_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/listener/listener_components.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type ListenerFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ListenerFilter_Config) isListenerFilter_ConfigType() {} @@ -1026,12 +1026,12 @@ var file_envoy_api_v2_listener_listener_components_proto_goTypes = []interface{} (*ListenerFilterChainMatchPredicate)(nil), // 4: envoy.api.v2.listener.ListenerFilterChainMatchPredicate (*ListenerFilter)(nil), // 5: envoy.api.v2.listener.ListenerFilter (*ListenerFilterChainMatchPredicate_MatchSet)(nil), // 6: envoy.api.v2.listener.ListenerFilterChainMatchPredicate.MatchSet - (*_struct.Struct)(nil), // 7: google.protobuf.Struct - (*any1.Any)(nil), // 8: google.protobuf.Any - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*structpb.Struct)(nil), // 7: google.protobuf.Struct + (*anypb.Any)(nil), // 8: google.protobuf.Any + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value (*core.CidrRange)(nil), // 10: envoy.api.v2.core.CidrRange (*auth.DownstreamTlsContext)(nil), // 11: envoy.api.v2.auth.DownstreamTlsContext - (*wrappers.BoolValue)(nil), // 12: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 12: google.protobuf.BoolValue (*core.Metadata)(nil), // 13: envoy.api.v2.core.Metadata (*core.TransportSocket)(nil), // 14: envoy.api.v2.core.TransportSocket (*_type.Int32Range)(nil), // 15: envoy.type.Int32Range diff --git a/envoy/api/v2/listener/quic_config.pb.go b/envoy/api/v2/listener/quic_config.pb.go index d53862cf1..ee477b5a1 100755 --- a/envoy/api/v2/listener/quic_config.pb.go +++ b/envoy/api/v2/listener/quic_config.pb.go @@ -8,10 +8,10 @@ package listener import ( _ "github.com/cncf/xds/go/udpa/annotations" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -32,13 +32,13 @@ type QuicProtocolOptions struct { // Maximum number of streams that the client can negotiate per connection. 100 // if not specified. - MaxConcurrentStreams *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` + MaxConcurrentStreams *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` // Maximum number of milliseconds that connection will be alive when there is // no network activity. 300000ms if not specified. - IdleTimeout *duration.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Connection timeout in milliseconds before the crypto handshake is finished. // 20000ms if not specified. - CryptoHandshakeTimeout *duration.Duration `protobuf:"bytes,3,opt,name=crypto_handshake_timeout,json=cryptoHandshakeTimeout,proto3" json:"crypto_handshake_timeout,omitempty"` + CryptoHandshakeTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=crypto_handshake_timeout,json=cryptoHandshakeTimeout,proto3" json:"crypto_handshake_timeout,omitempty"` } func (x *QuicProtocolOptions) Reset() { @@ -73,21 +73,21 @@ func (*QuicProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_api_v2_listener_quic_config_proto_rawDescGZIP(), []int{0} } -func (x *QuicProtocolOptions) GetMaxConcurrentStreams() *wrappers.UInt32Value { +func (x *QuicProtocolOptions) GetMaxConcurrentStreams() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrentStreams } return nil } -func (x *QuicProtocolOptions) GetIdleTimeout() *duration.Duration { +func (x *QuicProtocolOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *QuicProtocolOptions) GetCryptoHandshakeTimeout() *duration.Duration { +func (x *QuicProtocolOptions) GetCryptoHandshakeTimeout() *durationpb.Duration { if x != nil { return x.CryptoHandshakeTimeout } @@ -155,9 +155,9 @@ func file_envoy_api_v2_listener_quic_config_proto_rawDescGZIP() []byte { var file_envoy_api_v2_listener_quic_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_api_v2_listener_quic_config_proto_goTypes = []interface{}{ - (*QuicProtocolOptions)(nil), // 0: envoy.api.v2.listener.QuicProtocolOptions - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*QuicProtocolOptions)(nil), // 0: envoy.api.v2.listener.QuicProtocolOptions + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_envoy_api_v2_listener_quic_config_proto_depIdxs = []int32{ 1, // 0: envoy.api.v2.listener.QuicProtocolOptions.max_concurrent_streams:type_name -> google.protobuf.UInt32Value diff --git a/envoy/api/v2/listener/udp_listener_config.pb.go b/envoy/api/v2/listener/udp_listener_config.pb.go index ca9e59cc1..a49acbe6e 100755 --- a/envoy/api/v2/listener/udp_listener_config.pb.go +++ b/envoy/api/v2/listener/udp_listener_config.pb.go @@ -8,10 +8,10 @@ package listener import ( _ "github.com/cncf/xds/go/udpa/annotations" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -89,14 +89,14 @@ func (m *UdpListenerConfig) GetConfigType() isUdpListenerConfig_ConfigType { } // Deprecated: Marked as deprecated in envoy/api/v2/listener/udp_listener_config.proto. -func (x *UdpListenerConfig) GetConfig() *_struct.Struct { +func (x *UdpListenerConfig) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*UdpListenerConfig_Config); ok { return x.Config } return nil } -func (x *UdpListenerConfig) GetTypedConfig() *any1.Any { +func (x *UdpListenerConfig) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*UdpListenerConfig_TypedConfig); ok { return x.TypedConfig } @@ -109,11 +109,11 @@ type isUdpListenerConfig_ConfigType interface { type UdpListenerConfig_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/listener/udp_listener_config.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type UdpListenerConfig_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*UdpListenerConfig_Config) isUdpListenerConfig_ConfigType() {} @@ -220,8 +220,8 @@ var file_envoy_api_v2_listener_udp_listener_config_proto_msgTypes = make([]proto var file_envoy_api_v2_listener_udp_listener_config_proto_goTypes = []interface{}{ (*UdpListenerConfig)(nil), // 0: envoy.api.v2.listener.UdpListenerConfig (*ActiveRawUdpListenerConfig)(nil), // 1: envoy.api.v2.listener.ActiveRawUdpListenerConfig - (*_struct.Struct)(nil), // 2: google.protobuf.Struct - (*any1.Any)(nil), // 3: google.protobuf.Any + (*structpb.Struct)(nil), // 2: google.protobuf.Struct + (*anypb.Any)(nil), // 3: google.protobuf.Any } var file_envoy_api_v2_listener_udp_listener_config_proto_depIdxs = []int32{ 2, // 0: envoy.api.v2.listener.UdpListenerConfig.config:type_name -> google.protobuf.Struct diff --git a/envoy/api/v2/route.pb.go b/envoy/api/v2/route.pb.go index f4f8f8c86..8184f130a 100755 --- a/envoy/api/v2/route.pb.go +++ b/envoy/api/v2/route.pb.go @@ -11,9 +11,9 @@ import ( 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" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -94,7 +94,7 @@ type RouteConfiguration struct { // ` // option. Users may wish to override the default behavior in certain cases (for example when // using CDS with a static route table). - ValidateClusters *wrappers.BoolValue `protobuf:"bytes,7,opt,name=validate_clusters,json=validateClusters,proto3" json:"validate_clusters,omitempty"` + ValidateClusters *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=validate_clusters,json=validateClusters,proto3" json:"validate_clusters,omitempty"` } func (x *RouteConfiguration) Reset() { @@ -192,7 +192,7 @@ func (x *RouteConfiguration) GetMostSpecificHeaderMutationsWins() bool { return false } -func (x *RouteConfiguration) GetValidateClusters() *wrappers.BoolValue { +func (x *RouteConfiguration) GetValidateClusters() *wrapperspb.BoolValue { if x != nil { return x.ValidateClusters } @@ -348,7 +348,7 @@ var file_envoy_api_v2_route_proto_goTypes = []interface{}{ (*Vhds)(nil), // 1: envoy.api.v2.Vhds (*route.VirtualHost)(nil), // 2: envoy.api.v2.route.VirtualHost (*core.HeaderValueOption)(nil), // 3: envoy.api.v2.core.HeaderValueOption - (*wrappers.BoolValue)(nil), // 4: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue (*core.ConfigSource)(nil), // 5: envoy.api.v2.core.ConfigSource } var file_envoy_api_v2_route_proto_depIdxs = []int32{ diff --git a/envoy/api/v2/route/route_components.pb.go b/envoy/api/v2/route/route_components.pb.go index b32c8315d..0313d9d56 100755 --- a/envoy/api/v2/route/route_components.pb.go +++ b/envoy/api/v2/route/route_components.pb.go @@ -14,12 +14,12 @@ import ( matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" v2 "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -314,13 +314,13 @@ type VirtualHost struct { // for if and how it is utilized. // // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,12,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*structpb.Struct `protobuf:"bytes,12,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The per_filter_config field can be used to provide virtual host-specific // configurations for filters. The key should match the filter name, such as // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the :ref:`HTTP filter documentation ` // for if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Decides whether the :ref:`x-envoy-attempt-count // ` header should be included // in the upstream request. Setting this option will cause it to override any existing header @@ -350,7 +350,7 @@ type VirtualHost struct { // will take precedence over this config and it'll be treated independently (e.g.: values are not // inherited). :ref:`Retry policy ` should not be // set if this field is used. - RetryPolicyTypedConfig *any1.Any `protobuf:"bytes,20,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` + RetryPolicyTypedConfig *anypb.Any `protobuf:"bytes,20,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` // Indicates the hedge policy for all routes in this virtual host. Note that setting a // route level entry will take precedence over this config and it'll be treated // independently (e.g.: values are not inherited). @@ -358,7 +358,7 @@ type VirtualHost struct { // The maximum bytes which will be buffered for retries and shadowing. // If set and a route-specific limit is not set, the bytes actually buffered will be the minimum // value of this and the listener per_connection_buffer_limit_bytes. - PerRequestBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,18,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` + PerRequestBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` } func (x *VirtualHost) Reset() { @@ -471,14 +471,14 @@ func (x *VirtualHost) GetCors() *CorsPolicy { } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *VirtualHost) GetPerFilterConfig() map[string]*_struct.Struct { +func (x *VirtualHost) GetPerFilterConfig() map[string]*structpb.Struct { if x != nil { return x.PerFilterConfig } return nil } -func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -506,7 +506,7 @@ func (x *VirtualHost) GetRetryPolicy() *RetryPolicy { return nil } -func (x *VirtualHost) GetRetryPolicyTypedConfig() *any1.Any { +func (x *VirtualHost) GetRetryPolicyTypedConfig() *anypb.Any { if x != nil { return x.RetryPolicyTypedConfig } @@ -520,7 +520,7 @@ func (x *VirtualHost) GetHedgePolicy() *HedgePolicy { return nil } -func (x *VirtualHost) GetPerRequestBufferLimitBytes() *wrappers.UInt32Value { +func (x *VirtualHost) GetPerRequestBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerRequestBufferLimitBytes } @@ -533,7 +533,7 @@ type FilterAction struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Action *any1.Any `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + Action *anypb.Any `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` } func (x *FilterAction) Reset() { @@ -568,7 +568,7 @@ func (*FilterAction) Descriptor() ([]byte, []int) { return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{1} } -func (x *FilterAction) GetAction() *any1.Any { +func (x *FilterAction) GetAction() *anypb.Any { if x != nil { return x.Action } @@ -615,13 +615,13 @@ type Route struct { // if and how it is utilized. // // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*structpb.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The typed_per_filter_config field can be used to provide route-specific // configurations for filters. The key should match the filter name, such as // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the :ref:`HTTP filter documentation ` for // if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specifies a set of headers that will be added to requests matching this // route. Headers specified at this level are applied before headers from the // enclosing :ref:`envoy_api_msg_route.VirtualHost` and @@ -648,7 +648,7 @@ type Route struct { // The maximum bytes which will be buffered for retries and shadowing. // If set, the bytes actually buffered will be the minimum value of this and the // listener per_connection_buffer_limit_bytes. - PerRequestBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` + PerRequestBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` } func (x *Route) Reset() { @@ -747,14 +747,14 @@ func (x *Route) GetDecorator() *Decorator { } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *Route) GetPerFilterConfig() map[string]*_struct.Struct { +func (x *Route) GetPerFilterConfig() map[string]*structpb.Struct { if x != nil { return x.PerFilterConfig } return nil } -func (x *Route) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *Route) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -796,7 +796,7 @@ func (x *Route) GetTracing() *Tracing { return nil } -func (x *Route) GetPerRequestBufferLimitBytes() *wrappers.UInt32Value { +func (x *Route) GetPerRequestBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerRequestBufferLimitBytes } @@ -852,7 +852,7 @@ type WeightedCluster struct { Clusters []*WeightedCluster_ClusterWeight `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"` // Specifies the total weight across all clusters. The sum of all cluster weights must equal this // value, which must be greater than 0. Defaults to 100. - TotalWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` + TotalWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` // Specifies the runtime key prefix that should be used to construct the // runtime keys associated with each cluster. When the *runtime_key_prefix* is // specified, the router will look for weights associated with each upstream @@ -903,7 +903,7 @@ func (x *WeightedCluster) GetClusters() []*WeightedCluster_ClusterWeight { return nil } -func (x *WeightedCluster) GetTotalWeight() *wrappers.UInt32Value { +func (x *WeightedCluster) GetTotalWeight() *wrapperspb.UInt32Value { if x != nil { return x.TotalWeight } @@ -932,7 +932,7 @@ type RouteMatch struct { PathSpecifier isRouteMatch_PathSpecifier `protobuf_oneof:"path_specifier"` // Indicates that prefix/path matching should be case sensitive. The default // is true. - CaseSensitive *wrappers.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` + CaseSensitive *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` // Indicates that the route should additionally match on a runtime key. Every time the route // is considered for a match, it must also fall under the percentage of matches indicated by // this field. For some fraction N/D, a random number in the range [0,D) is selected. If the @@ -1041,7 +1041,7 @@ func (x *RouteMatch) GetSafeRegex() *matcher.RegexMatcher { return nil } -func (x *RouteMatch) GetCaseSensitive() *wrappers.BoolValue { +func (x *RouteMatch) GetCaseSensitive() *wrapperspb.BoolValue { if x != nil { return x.CaseSensitive } @@ -1185,7 +1185,7 @@ type CorsPolicy struct { // Specifies the content for the *access-control-max-age* header. MaxAge string `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Specifies whether the resource allows credentials. - AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` + AllowCredentials *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` // Types that are assignable to EnabledSpecifier: // // *CorsPolicy_Enabled @@ -1286,7 +1286,7 @@ func (x *CorsPolicy) GetMaxAge() string { return "" } -func (x *CorsPolicy) GetAllowCredentials() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowCredentials() *wrapperspb.BoolValue { if x != nil { return x.AllowCredentials } @@ -1301,7 +1301,7 @@ func (m *CorsPolicy) GetEnabledSpecifier() isCorsPolicy_EnabledSpecifier { } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *CorsPolicy) GetEnabled() *wrappers.BoolValue { +func (x *CorsPolicy) GetEnabled() *wrapperspb.BoolValue { if x, ok := x.GetEnabledSpecifier().(*CorsPolicy_Enabled); ok { return x.Enabled } @@ -1335,7 +1335,7 @@ type CorsPolicy_Enabled struct { // :ref:`filter_enabled` field instead. // // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - Enabled *wrappers.BoolValue `protobuf:"bytes,7,opt,name=enabled,proto3,oneof"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=enabled,proto3,oneof"` } type CorsPolicy_FilterEnabled struct { @@ -1452,7 +1452,7 @@ type RouteAction struct { // :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // :ref:`retry overview `. - Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` // Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout, // although the connection manager wide :ref:`stream_idle_timeout // ` @@ -1471,7 +1471,7 @@ type RouteAction struct { // fires, the stream is terminated with a 408 Request Timeout error code if no // upstream response header has been received, otherwise a stream reset // occurs. - IdleTimeout *duration.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Indicates that the route has a retry policy. Note that if this is set, // it'll take precedence over the virtual host level retry policy entirely // (e.g.: policies are not merged, most internal one becomes the enforced policy). @@ -1481,7 +1481,7 @@ type RouteAction struct { // precedence over the virtual host level retry policy entirely (e.g.: policies are not merged, // most internal one becomes the enforced policy). :ref:`Retry policy ` // should not be set if this field is used. - RetryPolicyTypedConfig *any1.Any `protobuf:"bytes,33,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` + RetryPolicyTypedConfig *anypb.Any `protobuf:"bytes,33,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` // Indicates that the route has a request mirroring policy. // // .. attention:: @@ -1502,7 +1502,7 @@ type RouteAction struct { // limits. By default, if the route configured rate limits, the virtual host // :ref:`rate_limits ` are not applied to the // request. - IncludeVhRateLimits *wrappers.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` + IncludeVhRateLimits *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` // Specifies a list of hash policies to use for ring hash load balancing. Each // hash policy is evaluated individually and the combined result is used to // route the request. The method of combination is deterministic such that @@ -1537,7 +1537,7 @@ type RouteAction struct { // :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // :ref:`retry overview `. - MaxGrpcTimeout *duration.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` + MaxGrpcTimeout *durationpb.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` // If present, Envoy will adjust the timeout provided by the `grpc-timeout` header by subtracting // the provided duration from the header. This is useful in allowing Envoy to set its global // timeout to be less than that of the deadline imposed by the calling client, which makes it more @@ -1545,7 +1545,7 @@ type RouteAction struct { // The offset will only be applied if the provided grpc_timeout is greater than the offset. This // ensures that the offset will only ever decrease the timeout and never set it to 0 (meaning // infinity). - GrpcTimeoutOffset *duration.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` + GrpcTimeoutOffset *durationpb.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` UpgradeConfigs []*RouteAction_UpgradeConfig `protobuf:"bytes,25,rep,name=upgrade_configs,json=upgradeConfigs,proto3" json:"upgrade_configs,omitempty"` InternalRedirectAction RouteAction_InternalRedirectAction `protobuf:"varint,26,opt,name=internal_redirect_action,json=internalRedirectAction,proto3,enum=envoy.api.v2.route.RouteAction_InternalRedirectAction" json:"internal_redirect_action,omitempty"` // An internal redirect is handled, iff the number of previous internal redirects that a @@ -1562,7 +1562,7 @@ type RouteAction struct { // will pass the redirect back to downstream. // // If not specified, at most one redirect will be followed. - MaxInternalRedirects *wrappers.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` + MaxInternalRedirects *wrapperspb.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` // Indicates that the route has a hedge policy. Note that if this is set, // it'll take precedence over the virtual host level hedge policy entirely // (e.g.: policies are not merged, most internal one becomes the enforced policy). @@ -1671,7 +1671,7 @@ func (x *RouteAction) GetHostRewrite() string { return "" } -func (x *RouteAction) GetAutoHostRewrite() *wrappers.BoolValue { +func (x *RouteAction) GetAutoHostRewrite() *wrapperspb.BoolValue { if x, ok := x.GetHostRewriteSpecifier().(*RouteAction_AutoHostRewrite); ok { return x.AutoHostRewrite } @@ -1685,14 +1685,14 @@ func (x *RouteAction) GetAutoHostRewriteHeader() string { return "" } -func (x *RouteAction) GetTimeout() *duration.Duration { +func (x *RouteAction) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *RouteAction) GetIdleTimeout() *duration.Duration { +func (x *RouteAction) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -1706,7 +1706,7 @@ func (x *RouteAction) GetRetryPolicy() *RetryPolicy { return nil } -func (x *RouteAction) GetRetryPolicyTypedConfig() *any1.Any { +func (x *RouteAction) GetRetryPolicyTypedConfig() *anypb.Any { if x != nil { return x.RetryPolicyTypedConfig } @@ -1742,7 +1742,7 @@ func (x *RouteAction) GetRateLimits() []*RateLimit { return nil } -func (x *RouteAction) GetIncludeVhRateLimits() *wrappers.BoolValue { +func (x *RouteAction) GetIncludeVhRateLimits() *wrapperspb.BoolValue { if x != nil { return x.IncludeVhRateLimits } @@ -1763,14 +1763,14 @@ func (x *RouteAction) GetCors() *CorsPolicy { return nil } -func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration { +func (x *RouteAction) GetMaxGrpcTimeout() *durationpb.Duration { if x != nil { return x.MaxGrpcTimeout } return nil } -func (x *RouteAction) GetGrpcTimeoutOffset() *duration.Duration { +func (x *RouteAction) GetGrpcTimeoutOffset() *durationpb.Duration { if x != nil { return x.GrpcTimeoutOffset } @@ -1791,7 +1791,7 @@ func (x *RouteAction) GetInternalRedirectAction() RouteAction_InternalRedirectAc return RouteAction_PASS_THROUGH_INTERNAL_REDIRECT } -func (x *RouteAction) GetMaxInternalRedirects() *wrappers.UInt32Value { +func (x *RouteAction) GetMaxInternalRedirects() *wrapperspb.UInt32Value { if x != nil { return x.MaxInternalRedirects } @@ -1864,7 +1864,7 @@ type RouteAction_AutoHostRewrite struct { // type “STRICT_DNS“, “LOGICAL_DNS“ or “STATIC“. For “STATIC“ clusters, the // hostname attribute of the endpoint must be configured. Setting this to true // with other cluster types has no effect. - AutoHostRewrite *wrappers.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` + AutoHostRewrite *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` } type RouteAction_AutoHostRewriteHeader struct { @@ -1903,7 +1903,7 @@ type RetryPolicy struct { // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. These are the same conditions documented for // :ref:`config_http_filters_router_x-envoy-max-retries`. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // Specifies a non-zero upstream timeout per retry attempt. This parameter is optional. The // same conditions documented for // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` apply. @@ -1915,7 +1915,7 @@ type RetryPolicy struct { // Consequently, when using a :ref:`5xx ` based // retry policy, a request that times out will not be retried as the total timeout budget // would have been exhausted. - PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` + PerTryTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` // Specifies an implementation of a RetryPriority which is used to determine the // distribution of load across priorities used for retries. Refer to // :ref:`retry plugin configuration ` for more details. @@ -1984,14 +1984,14 @@ func (x *RetryPolicy) GetRetryOn() string { return "" } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } return nil } -func (x *RetryPolicy) GetPerTryTimeout() *duration.Duration { +func (x *RetryPolicy) GetPerTryTimeout() *durationpb.Duration { if x != nil { return x.PerTryTimeout } @@ -2057,7 +2057,7 @@ type HedgePolicy struct { // Must be at least 1. // Defaults to 1. // [#not-implemented-hide:] - InitialRequests *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` + InitialRequests *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` // Specifies a probability that an additional upstream request should be sent // on top of what is specified by initial_requests. // Defaults to 0. @@ -2111,7 +2111,7 @@ func (*HedgePolicy) Descriptor() ([]byte, []int) { return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{8} } -func (x *HedgePolicy) GetInitialRequests() *wrappers.UInt32Value { +func (x *HedgePolicy) GetInitialRequests() *wrapperspb.UInt32Value { if x != nil { return x.InitialRequests } @@ -2405,7 +2405,7 @@ type Decorator struct { // ` header. Operation string `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"` // Whether the decorated details should be propagated to the other party. The default is true. - Propagate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"` + Propagate *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"` } func (x *Decorator) Reset() { @@ -2447,7 +2447,7 @@ func (x *Decorator) GetOperation() string { return "" } -func (x *Decorator) GetPropagate() *wrappers.BoolValue { +func (x *Decorator) GetPropagate() *wrapperspb.BoolValue { if x != nil { return x.Propagate } @@ -2683,7 +2683,7 @@ type RateLimit struct { // .. note:: // // The filter supports a range of 0 - 10 inclusively for stage numbers. - Stage *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` + Stage *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` // The key to be set in runtime to disable this rate limit configuration. DisableKey string `protobuf:"bytes,2,opt,name=disable_key,json=disableKey,proto3" json:"disable_key,omitempty"` // A list of actions that are to be applied for this rate limit configuration. @@ -2727,7 +2727,7 @@ func (*RateLimit) Descriptor() ([]byte, []int) { return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{14} } -func (x *RateLimit) GetStage() *wrappers.UInt32Value { +func (x *RateLimit) GetStage() *wrapperspb.UInt32Value { if x != nil { return x.Stage } @@ -3029,7 +3029,7 @@ type QueryParameterMatcher struct { // This field is deprecated. Use a `safe_regex` match inside the `string_match` field. // // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - Regex *wrappers.BoolValue `protobuf:"bytes,4,opt,name=regex,proto3" json:"regex,omitempty"` + Regex *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=regex,proto3" json:"regex,omitempty"` // Types that are assignable to QueryParameterMatchSpecifier: // // *QueryParameterMatcher_StringMatch @@ -3085,7 +3085,7 @@ func (x *QueryParameterMatcher) GetValue() string { } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *QueryParameterMatcher) GetRegex() *wrappers.BoolValue { +func (x *QueryParameterMatcher) GetRegex() *wrapperspb.BoolValue { if x != nil { return x.Regex } @@ -3144,7 +3144,7 @@ type WeightedCluster_ClusterWeight struct { // `. When a request matches the route, // the choice of an upstream cluster is determined by its weight. The sum of weights across all // entries in the clusters array must add up to the total_weight, if total_weight is greater than 0. - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Optional endpoint metadata match criteria used by the subset load balancer. Only endpoints in // the upstream cluster with metadata matching what is set in this field will be considered for // load balancing. Note that this will be merged with what's provided in @@ -3180,13 +3180,13 @@ type WeightedCluster_ClusterWeight struct { // for if and how it is utilized. // // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*structpb.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The per_filter_config field can be used to provide weighted cluster-specific // configurations for filters. The key should match the filter name, such as // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the :ref:`HTTP filter documentation ` // for if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *WeightedCluster_ClusterWeight) Reset() { @@ -3228,7 +3228,7 @@ func (x *WeightedCluster_ClusterWeight) GetName() string { return "" } -func (x *WeightedCluster_ClusterWeight) GetWeight() *wrappers.UInt32Value { +func (x *WeightedCluster_ClusterWeight) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -3271,14 +3271,14 @@ func (x *WeightedCluster_ClusterWeight) GetResponseHeadersToRemove() []string { } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *WeightedCluster_ClusterWeight) GetPerFilterConfig() map[string]*_struct.Struct { +func (x *WeightedCluster_ClusterWeight) GetPerFilterConfig() map[string]*structpb.Struct { if x != nil { return x.PerFilterConfig } return nil } -func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -3330,10 +3330,10 @@ type RouteMatch_TlsContextMatchOptions struct { // If specified, the route will match against whether or not a certificate is presented. // If not specified, certificate presentation status (true or false) will not be considered when route matching. - Presented *wrappers.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"` + Presented *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"` // If specified, the route will match against whether or not a certificate is validated. // If not specified, certificate validation status (true or false) will not be considered when route matching. - Validated *wrappers.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"` + Validated *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"` } func (x *RouteMatch_TlsContextMatchOptions) Reset() { @@ -3368,14 +3368,14 @@ func (*RouteMatch_TlsContextMatchOptions) Descriptor() ([]byte, []int) { return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{4, 1} } -func (x *RouteMatch_TlsContextMatchOptions) GetPresented() *wrappers.BoolValue { +func (x *RouteMatch_TlsContextMatchOptions) GetPresented() *wrapperspb.BoolValue { if x != nil { return x.Presented } return nil } -func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrappers.BoolValue { +func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrapperspb.BoolValue { if x != nil { return x.Validated } @@ -3429,7 +3429,7 @@ type RouteAction_RequestMirrorPolicy struct { // value, the request will be mirrored. RuntimeFraction *core.RuntimeFractionalPercent `protobuf:"bytes,3,opt,name=runtime_fraction,json=runtimeFraction,proto3" json:"runtime_fraction,omitempty"` // Determines if the trace span should be sampled. Defaults to true. - TraceSampled *wrappers.BoolValue `protobuf:"bytes,4,opt,name=trace_sampled,json=traceSampled,proto3" json:"trace_sampled,omitempty"` + TraceSampled *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=trace_sampled,json=traceSampled,proto3" json:"trace_sampled,omitempty"` } func (x *RouteAction_RequestMirrorPolicy) Reset() { @@ -3486,7 +3486,7 @@ func (x *RouteAction_RequestMirrorPolicy) GetRuntimeFraction() *core.RuntimeFrac return nil } -func (x *RouteAction_RequestMirrorPolicy) GetTraceSampled() *wrappers.BoolValue { +func (x *RouteAction_RequestMirrorPolicy) GetTraceSampled() *wrapperspb.BoolValue { if x != nil { return x.TraceSampled } @@ -3667,7 +3667,7 @@ type RouteAction_UpgradeConfig struct { // Upgrade: [upgrade_type] will be proxied upstream. UpgradeType string `protobuf:"bytes,1,opt,name=upgrade_type,json=upgradeType,proto3" json:"upgrade_type,omitempty"` // Determines if upgrades are available on this route. Defaults to true. - Enabled *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` } func (x *RouteAction_UpgradeConfig) Reset() { @@ -3709,7 +3709,7 @@ func (x *RouteAction_UpgradeConfig) GetUpgradeType() string { return "" } -func (x *RouteAction_UpgradeConfig) GetEnabled() *wrappers.BoolValue { +func (x *RouteAction_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -3791,7 +3791,7 @@ type RouteAction_HashPolicy_Cookie struct { // If specified, a cookie with the TTL will be generated if the cookie is // not present. If the TTL is present and zero, the generated cookie will // be a session cookie. - Ttl *duration.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` // The name of the path for the cookie. If no path is specified here, no path // will be set for the cookie. Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` @@ -3836,7 +3836,7 @@ func (x *RouteAction_HashPolicy_Cookie) GetName() string { return "" } -func (x *RouteAction_HashPolicy_Cookie) GetTtl() *duration.Duration { +func (x *RouteAction_HashPolicy_Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -4058,14 +4058,14 @@ func (m *RetryPolicy_RetryPriority) GetConfigType() isRetryPolicy_RetryPriority_ } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *RetryPolicy_RetryPriority) GetConfig() *_struct.Struct { +func (x *RetryPolicy_RetryPriority) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_Config); ok { return x.Config } return nil } -func (x *RetryPolicy_RetryPriority) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryPriority) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_TypedConfig); ok { return x.TypedConfig } @@ -4078,11 +4078,11 @@ type isRetryPolicy_RetryPriority_ConfigType interface { type RetryPolicy_RetryPriority_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type RetryPolicy_RetryPriority_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryPriority_Config) isRetryPolicy_RetryPriority_ConfigType() {} @@ -4149,14 +4149,14 @@ func (m *RetryPolicy_RetryHostPredicate) GetConfigType() isRetryPolicy_RetryHost } // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. -func (x *RetryPolicy_RetryHostPredicate) GetConfig() *_struct.Struct { +func (x *RetryPolicy_RetryHostPredicate) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_Config); ok { return x.Config } return nil } -func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_TypedConfig); ok { return x.TypedConfig } @@ -4169,11 +4169,11 @@ type isRetryPolicy_RetryHostPredicate_ConfigType interface { type RetryPolicy_RetryHostPredicate_Config struct { // Deprecated: Marked as deprecated in envoy/api/v2/route/route_components.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type RetryPolicy_RetryHostPredicate_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryHostPredicate_Config) isRetryPolicy_RetryHostPredicate_ConfigType() {} @@ -4189,12 +4189,12 @@ type RetryPolicy_RetryBackOff struct { // than zero. Values less than 1 ms are rounded up to 1 ms. // See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion of Envoy's // back-off algorithm. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, but must be // greater than or equal to the `base_interval` if set. The default is 10 times the // `base_interval`. See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion // of Envoy's back-off algorithm. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RetryPolicy_RetryBackOff) Reset() { @@ -4229,14 +4229,14 @@ func (*RetryPolicy_RetryBackOff) Descriptor() ([]byte, []int) { return file_envoy_api_v2_route_route_components_proto_rawDescGZIP(), []int{7, 2} } -func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -4664,7 +4664,7 @@ type RateLimit_Action_HeaderValueMatch struct { // request matches the headers. If set to false, the action will append a // descriptor entry when the request does not match the headers. The // default value is true. - ExpectMatch *wrappers.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` + ExpectMatch *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` // Specifies a set of headers that the rate limit action should match // on. The action will check the request’s headers against all the // specified headers in the config. A match will happen if all the @@ -4712,7 +4712,7 @@ func (x *RateLimit_Action_HeaderValueMatch) GetDescriptorValue() string { return "" } -func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrappers.BoolValue { +func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrapperspb.BoolValue { if x != nil { return x.ExpectMatch } @@ -5730,22 +5730,22 @@ var file_envoy_api_v2_route_route_components_proto_goTypes = []interface{}{ (*RateLimit_Action_GenericKey)(nil), // 46: envoy.api.v2.route.RateLimit.Action.GenericKey (*RateLimit_Action_HeaderValueMatch)(nil), // 47: envoy.api.v2.route.RateLimit.Action.HeaderValueMatch (*core.HeaderValueOption)(nil), // 48: envoy.api.v2.core.HeaderValueOption - (*any1.Any)(nil), // 49: google.protobuf.Any - (*wrappers.UInt32Value)(nil), // 50: google.protobuf.UInt32Value + (*anypb.Any)(nil), // 49: google.protobuf.Any + (*wrapperspb.UInt32Value)(nil), // 50: google.protobuf.UInt32Value (*core.Metadata)(nil), // 51: envoy.api.v2.core.Metadata (*matcher.RegexMatcher)(nil), // 52: envoy.type.matcher.RegexMatcher - (*wrappers.BoolValue)(nil), // 53: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 53: google.protobuf.BoolValue (*core.RuntimeFractionalPercent)(nil), // 54: envoy.api.v2.core.RuntimeFractionalPercent (*matcher.StringMatcher)(nil), // 55: envoy.type.matcher.StringMatcher (*matcher.RegexMatchAndSubstitute)(nil), // 56: envoy.type.matcher.RegexMatchAndSubstitute - (*duration.Duration)(nil), // 57: google.protobuf.Duration + (*durationpb.Duration)(nil), // 57: google.protobuf.Duration (core.RoutingPriority)(0), // 58: envoy.api.v2.core.RoutingPriority (*_type.FractionalPercent)(nil), // 59: envoy.type.FractionalPercent (*core.DataSource)(nil), // 60: envoy.api.v2.core.DataSource (*v2.CustomTag)(nil), // 61: envoy.type.tracing.v2.CustomTag (core.RequestMethod)(0), // 62: envoy.api.v2.core.RequestMethod (*_type.Int64Range)(nil), // 63: envoy.type.Int64Range - (*_struct.Struct)(nil), // 64: google.protobuf.Struct + (*structpb.Struct)(nil), // 64: google.protobuf.Struct } var file_envoy_api_v2_route_route_components_proto_depIdxs = []int32{ 6, // 0: envoy.api.v2.route.VirtualHost.routes:type_name -> envoy.api.v2.route.Route diff --git a/envoy/config/accesslog/v2/als.pb.go b/envoy/config/accesslog/v2/als.pb.go index 13c0db88a..db01c5a88 100755 --- a/envoy/config/accesslog/v2/als.pb.go +++ b/envoy/config/accesslog/v2/als.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -173,11 +173,11 @@ type CommonGrpcAccessLogConfig struct { // Interval for flushing access logs to the gRPC stream. Logger will flush requests every time // this interval is elapsed, or when batch size limit is hit, whichever comes first. Defaults to // 1 second. - BufferFlushInterval *duration.Duration `protobuf:"bytes,3,opt,name=buffer_flush_interval,json=bufferFlushInterval,proto3" json:"buffer_flush_interval,omitempty"` + BufferFlushInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=buffer_flush_interval,json=bufferFlushInterval,proto3" json:"buffer_flush_interval,omitempty"` // Soft size limit in bytes for access log entries buffer. Logger will buffer requests until // this limit it hit, or every time flush interval is elapsed, whichever comes first. Setting it // to zero effectively disables the batching. Defaults to 16384. - BufferSizeBytes *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=buffer_size_bytes,json=bufferSizeBytes,proto3" json:"buffer_size_bytes,omitempty"` + BufferSizeBytes *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=buffer_size_bytes,json=bufferSizeBytes,proto3" json:"buffer_size_bytes,omitempty"` // Additional filter state objects to log in :ref:`filter_state_objects // `. // Logger will call `FilterState::Object::serializeAsProto` to serialize the filter state object. @@ -230,14 +230,14 @@ func (x *CommonGrpcAccessLogConfig) GetGrpcService() *core.GrpcService { return nil } -func (x *CommonGrpcAccessLogConfig) GetBufferFlushInterval() *duration.Duration { +func (x *CommonGrpcAccessLogConfig) GetBufferFlushInterval() *durationpb.Duration { if x != nil { return x.BufferFlushInterval } return nil } -func (x *CommonGrpcAccessLogConfig) GetBufferSizeBytes() *wrappers.UInt32Value { +func (x *CommonGrpcAccessLogConfig) GetBufferSizeBytes() *wrapperspb.UInt32Value { if x != nil { return x.BufferSizeBytes } @@ -356,8 +356,8 @@ var file_envoy_config_accesslog_v2_als_proto_goTypes = []interface{}{ (*TcpGrpcAccessLogConfig)(nil), // 1: envoy.config.accesslog.v2.TcpGrpcAccessLogConfig (*CommonGrpcAccessLogConfig)(nil), // 2: envoy.config.accesslog.v2.CommonGrpcAccessLogConfig (*core.GrpcService)(nil), // 3: envoy.api.v2.core.GrpcService - (*duration.Duration)(nil), // 4: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 5: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 5: google.protobuf.UInt32Value } var file_envoy_config_accesslog_v2_als_proto_depIdxs = []int32{ 2, // 0: envoy.config.accesslog.v2.HttpGrpcAccessLogConfig.common_config:type_name -> envoy.config.accesslog.v2.CommonGrpcAccessLogConfig diff --git a/envoy/config/accesslog/v2/file.pb.go b/envoy/config/accesslog/v2/file.pb.go index c456d00bc..e659529e4 100755 --- a/envoy/config/accesslog/v2/file.pb.go +++ b/envoy/config/accesslog/v2/file.pb.go @@ -9,9 +9,9 @@ package accesslogv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -94,14 +94,14 @@ func (x *FileAccessLog) GetFormat() string { return "" } -func (x *FileAccessLog) GetJsonFormat() *_struct.Struct { +func (x *FileAccessLog) GetJsonFormat() *structpb.Struct { if x, ok := x.GetAccessLogFormat().(*FileAccessLog_JsonFormat); ok { return x.JsonFormat } return nil } -func (x *FileAccessLog) GetTypedJsonFormat() *_struct.Struct { +func (x *FileAccessLog) GetTypedJsonFormat() *structpb.Struct { if x, ok := x.GetAccessLogFormat().(*FileAccessLog_TypedJsonFormat); ok { return x.TypedJsonFormat } @@ -122,7 +122,7 @@ type FileAccessLog_Format struct { type FileAccessLog_JsonFormat struct { // Access log :ref:`format dictionary`. All values // are rendered as strings. - JsonFormat *_struct.Struct `protobuf:"bytes,3,opt,name=json_format,json=jsonFormat,proto3,oneof"` + JsonFormat *structpb.Struct `protobuf:"bytes,3,opt,name=json_format,json=jsonFormat,proto3,oneof"` } type FileAccessLog_TypedJsonFormat struct { @@ -130,7 +130,7 @@ type FileAccessLog_TypedJsonFormat struct { // rendered as strings, numbers, or boolean values as appropriate. Nested JSON objects may // be produced by some command operators (e.g.FILTER_STATE or DYNAMIC_METADATA). See the // documentation for a specific command operator for details. - TypedJsonFormat *_struct.Struct `protobuf:"bytes,4,opt,name=typed_json_format,json=typedJsonFormat,proto3,oneof"` + TypedJsonFormat *structpb.Struct `protobuf:"bytes,4,opt,name=typed_json_format,json=typedJsonFormat,proto3,oneof"` } func (*FileAccessLog_Format) isFileAccessLog_AccessLogFormat() {} @@ -196,8 +196,8 @@ func file_envoy_config_accesslog_v2_file_proto_rawDescGZIP() []byte { var file_envoy_config_accesslog_v2_file_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_accesslog_v2_file_proto_goTypes = []interface{}{ - (*FileAccessLog)(nil), // 0: envoy.config.accesslog.v2.FileAccessLog - (*_struct.Struct)(nil), // 1: google.protobuf.Struct + (*FileAccessLog)(nil), // 0: envoy.config.accesslog.v2.FileAccessLog + (*structpb.Struct)(nil), // 1: google.protobuf.Struct } var file_envoy_config_accesslog_v2_file_proto_depIdxs = []int32{ 1, // 0: envoy.config.accesslog.v2.FileAccessLog.json_format:type_name -> google.protobuf.Struct diff --git a/envoy/config/accesslog/v3/accesslog.pb.go b/envoy/config/accesslog/v3/accesslog.pb.go index b9197f42c..fb18b98fe 100755 --- a/envoy/config/accesslog/v3/accesslog.pb.go +++ b/envoy/config/accesslog/v3/accesslog.pb.go @@ -14,10 +14,10 @@ import ( v33 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -243,7 +243,7 @@ func (m *AccessLog) GetConfigType() isAccessLog_ConfigType { return nil } -func (x *AccessLog) GetTypedConfig() *any1.Any { +func (x *AccessLog) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*AccessLog_TypedConfig); ok { return x.TypedConfig } @@ -255,7 +255,7 @@ type isAccessLog_ConfigType interface { } type AccessLog_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*AccessLog_TypedConfig) isAccessLog_ConfigType() {} @@ -1115,7 +1115,7 @@ type MetadataFilter struct { Matcher *v33.MetadataMatcher `protobuf:"bytes,1,opt,name=matcher,proto3" json:"matcher,omitempty"` // Default result if the key does not exist in dynamic metadata: if unset or // true, then log; if false, then don't log. - MatchIfKeyNotFound *wrappers.BoolValue `protobuf:"bytes,2,opt,name=match_if_key_not_found,json=matchIfKeyNotFound,proto3" json:"match_if_key_not_found,omitempty"` + MatchIfKeyNotFound *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=match_if_key_not_found,json=matchIfKeyNotFound,proto3" json:"match_if_key_not_found,omitempty"` } func (x *MetadataFilter) Reset() { @@ -1157,7 +1157,7 @@ func (x *MetadataFilter) GetMatcher() *v33.MetadataMatcher { return nil } -func (x *MetadataFilter) GetMatchIfKeyNotFound() *wrappers.BoolValue { +func (x *MetadataFilter) GetMatchIfKeyNotFound() *wrapperspb.BoolValue { if x != nil { return x.MatchIfKeyNotFound } @@ -1286,7 +1286,7 @@ func (m *ExtensionFilter) GetConfigType() isExtensionFilter_ConfigType { return nil } -func (x *ExtensionFilter) GetTypedConfig() *any1.Any { +func (x *ExtensionFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ExtensionFilter_TypedConfig); ok { return x.TypedConfig } @@ -1298,7 +1298,7 @@ type isExtensionFilter_ConfigType interface { } type ExtensionFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ExtensionFilter_TypedConfig) isExtensionFilter_ConfigType() {} @@ -1638,12 +1638,12 @@ var file_envoy_config_accesslog_v3_accesslog_proto_goTypes = []interface{}{ (*MetadataFilter)(nil), // 15: envoy.config.accesslog.v3.MetadataFilter (*LogTypeFilter)(nil), // 16: envoy.config.accesslog.v3.LogTypeFilter (*ExtensionFilter)(nil), // 17: envoy.config.accesslog.v3.ExtensionFilter - (*any1.Any)(nil), // 18: google.protobuf.Any + (*anypb.Any)(nil), // 18: google.protobuf.Any (*v3.RuntimeUInt32)(nil), // 19: envoy.config.core.v3.RuntimeUInt32 (*v31.FractionalPercent)(nil), // 20: envoy.type.v3.FractionalPercent (*v32.HeaderMatcher)(nil), // 21: envoy.config.route.v3.HeaderMatcher (*v33.MetadataMatcher)(nil), // 22: envoy.type.matcher.v3.MetadataMatcher - (*wrappers.BoolValue)(nil), // 23: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 23: google.protobuf.BoolValue (v34.AccessLogType)(0), // 24: envoy.data.accesslog.v3.AccessLogType } var file_envoy_config_accesslog_v3_accesslog_proto_depIdxs = []int32{ diff --git a/envoy/config/bootstrap/v2/bootstrap.pb.go b/envoy/config/bootstrap/v2/bootstrap.pb.go index 4b2b6aa58..640ea02be 100755 --- a/envoy/config/bootstrap/v2/bootstrap.pb.go +++ b/envoy/config/bootstrap/v2/bootstrap.pb.go @@ -16,11 +16,11 @@ import ( 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" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -63,7 +63,7 @@ type Bootstrap struct { // gauges at a periodic interval. If not specified the default is 5000ms (5 // seconds). // Duration must be at least 1ms and at most 5 min. - StatsFlushInterval *duration.Duration `protobuf:"bytes,7,opt,name=stats_flush_interval,json=statsFlushInterval,proto3" json:"stats_flush_interval,omitempty"` + StatsFlushInterval *durationpb.Duration `protobuf:"bytes,7,opt,name=stats_flush_interval,json=statsFlushInterval,proto3" json:"stats_flush_interval,omitempty"` // Optional watchdog configuration. Watchdog *Watchdog `protobuf:"bytes,8,opt,name=watchdog,proto3" json:"watchdog,omitempty"` // Configuration for an external tracing provider. @@ -107,7 +107,7 @@ type Bootstrap struct { // Optional proxy version which will be used to set the value of :ref:`server.version statistic // ` if specified. Envoy will not process this value, it will be sent as is to // :ref:`stats sinks `. - StatsServerVersionOverride *wrappers.UInt64Value `protobuf:"bytes,19,opt,name=stats_server_version_override,json=statsServerVersionOverride,proto3" json:"stats_server_version_override,omitempty"` + StatsServerVersionOverride *wrapperspb.UInt64Value `protobuf:"bytes,19,opt,name=stats_server_version_override,json=statsServerVersionOverride,proto3" json:"stats_server_version_override,omitempty"` // Always use TCP queries instead of UDP queries for DNS lookups. // This may be overridden on a per-cluster basis in cds_config, // when :ref:`dns_resolvers ` and @@ -207,7 +207,7 @@ func (x *Bootstrap) GetStatsConfig() *v2.StatsConfig { return nil } -func (x *Bootstrap) GetStatsFlushInterval() *duration.Duration { +func (x *Bootstrap) GetStatsFlushInterval() *durationpb.Duration { if x != nil { return x.StatsFlushInterval } @@ -271,7 +271,7 @@ func (x *Bootstrap) GetHeaderPrefix() string { return "" } -func (x *Bootstrap) GetStatsServerVersionOverride() *wrappers.UInt64Value { +func (x *Bootstrap) GetStatsServerVersionOverride() *wrapperspb.UInt64Value { if x != nil { return x.StatsServerVersionOverride } @@ -465,19 +465,19 @@ type Watchdog struct { // The duration after which Envoy counts a nonresponsive thread in the // *watchdog_miss* statistic. If not specified the default is 200ms. - MissTimeout *duration.Duration `protobuf:"bytes,1,opt,name=miss_timeout,json=missTimeout,proto3" json:"miss_timeout,omitempty"` + MissTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=miss_timeout,json=missTimeout,proto3" json:"miss_timeout,omitempty"` // The duration after which Envoy counts a nonresponsive thread in the // *watchdog_mega_miss* statistic. If not specified the default is // 1000ms. - MegamissTimeout *duration.Duration `protobuf:"bytes,2,opt,name=megamiss_timeout,json=megamissTimeout,proto3" json:"megamiss_timeout,omitempty"` + MegamissTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=megamiss_timeout,json=megamissTimeout,proto3" json:"megamiss_timeout,omitempty"` // If a watched thread has been nonresponsive for this duration, assume a // programming error and kill the entire Envoy process. Set to 0 to disable // kill behavior. If not specified the default is 0 (disabled). - KillTimeout *duration.Duration `protobuf:"bytes,3,opt,name=kill_timeout,json=killTimeout,proto3" json:"kill_timeout,omitempty"` + KillTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=kill_timeout,json=killTimeout,proto3" json:"kill_timeout,omitempty"` // If at least two watched threads have been nonresponsive for at least this // duration assume a true deadlock and kill the entire Envoy process. Set to 0 // to disable this behavior. If not specified the default is 0 (disabled). - MultikillTimeout *duration.Duration `protobuf:"bytes,4,opt,name=multikill_timeout,json=multikillTimeout,proto3" json:"multikill_timeout,omitempty"` + MultikillTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=multikill_timeout,json=multikillTimeout,proto3" json:"multikill_timeout,omitempty"` } func (x *Watchdog) Reset() { @@ -512,28 +512,28 @@ func (*Watchdog) Descriptor() ([]byte, []int) { return file_envoy_config_bootstrap_v2_bootstrap_proto_rawDescGZIP(), []int{3} } -func (x *Watchdog) GetMissTimeout() *duration.Duration { +func (x *Watchdog) GetMissTimeout() *durationpb.Duration { if x != nil { return x.MissTimeout } return nil } -func (x *Watchdog) GetMegamissTimeout() *duration.Duration { +func (x *Watchdog) GetMegamissTimeout() *durationpb.Duration { if x != nil { return x.MegamissTimeout } return nil } -func (x *Watchdog) GetKillTimeout() *duration.Duration { +func (x *Watchdog) GetKillTimeout() *durationpb.Duration { if x != nil { return x.KillTimeout } return nil } -func (x *Watchdog) GetMultikillTimeout() *duration.Duration { +func (x *Watchdog) GetMultikillTimeout() *durationpb.Duration { if x != nil { return x.MultikillTimeout } @@ -568,7 +568,7 @@ type Runtime struct { // ` by other runtime layers, e.g. // disk or admin. This follows the :ref:`runtime protobuf JSON representation // encoding `. - Base *_struct.Struct `protobuf:"bytes,4,opt,name=base,proto3" json:"base,omitempty"` + Base *structpb.Struct `protobuf:"bytes,4,opt,name=base,proto3" json:"base,omitempty"` } func (x *Runtime) Reset() { @@ -624,7 +624,7 @@ func (x *Runtime) GetOverrideSubdirectory() string { return "" } -func (x *Runtime) GetBase() *_struct.Struct { +func (x *Runtime) GetBase() *structpb.Struct { if x != nil { return x.Base } @@ -695,7 +695,7 @@ func (m *RuntimeLayer) GetLayerSpecifier() isRuntimeLayer_LayerSpecifier { return nil } -func (x *RuntimeLayer) GetStaticLayer() *_struct.Struct { +func (x *RuntimeLayer) GetStaticLayer() *structpb.Struct { if x, ok := x.GetLayerSpecifier().(*RuntimeLayer_StaticLayer); ok { return x.StaticLayer } @@ -732,7 +732,7 @@ type RuntimeLayer_StaticLayer struct { // This follows the :ref:`runtime protobuf JSON representation encoding // `. Unlike static xDS resources, this static // layer is overridable by later layers in the runtime virtual filesystem. - StaticLayer *_struct.Struct `protobuf:"bytes,2,opt,name=static_layer,json=staticLayer,proto3,oneof"` + StaticLayer *structpb.Struct `protobuf:"bytes,2,opt,name=static_layer,json=staticLayer,proto3,oneof"` } type RuntimeLayer_DiskLayer_ struct { @@ -1498,14 +1498,14 @@ var file_envoy_config_bootstrap_v2_bootstrap_proto_goTypes = []interface{}{ (*core.ApiConfigSource)(nil), // 14: envoy.api.v2.core.ApiConfigSource (*v2.StatsSink)(nil), // 15: envoy.config.metrics.v2.StatsSink (*v2.StatsConfig)(nil), // 16: envoy.config.metrics.v2.StatsConfig - (*duration.Duration)(nil), // 17: google.protobuf.Duration + (*durationpb.Duration)(nil), // 17: google.protobuf.Duration (*v21.Tracing)(nil), // 18: envoy.config.trace.v2.Tracing (*v2alpha.OverloadManager)(nil), // 19: envoy.config.overload.v2alpha.OverloadManager - (*wrappers.UInt64Value)(nil), // 20: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 20: google.protobuf.UInt64Value (*core.Address)(nil), // 21: envoy.api.v2.core.Address (*core.SocketOption)(nil), // 22: envoy.api.v2.core.SocketOption (*core.BindConfig)(nil), // 23: envoy.api.v2.core.BindConfig - (*_struct.Struct)(nil), // 24: google.protobuf.Struct + (*structpb.Struct)(nil), // 24: google.protobuf.Struct (*v22.Listener)(nil), // 25: envoy.api.v2.Listener (*v22.Cluster)(nil), // 26: envoy.api.v2.Cluster (*auth.Secret)(nil), // 27: envoy.api.v2.auth.Secret diff --git a/envoy/config/bootstrap/v3/bootstrap.pb.go b/envoy/config/bootstrap/v3/bootstrap.pb.go index 1d50e2625..4f03428a1 100755 --- a/envoy/config/bootstrap/v3/bootstrap.pb.go +++ b/envoy/config/bootstrap/v3/bootstrap.pb.go @@ -19,11 +19,11 @@ import ( v38 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" v35 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -215,7 +215,7 @@ type Bootstrap struct { // seconds). Only one of “stats_flush_interval“ or “stats_flush_on_admin“ // can be set. // Duration must be at least 1ms and at most 5 min. - StatsFlushInterval *duration.Duration `protobuf:"bytes,7,opt,name=stats_flush_interval,json=statsFlushInterval,proto3" json:"stats_flush_interval,omitempty"` + StatsFlushInterval *durationpb.Duration `protobuf:"bytes,7,opt,name=stats_flush_interval,json=statsFlushInterval,proto3" json:"stats_flush_interval,omitempty"` // Types that are assignable to StatsFlush: // // *Bootstrap_StatsFlushOnAdmin @@ -267,7 +267,7 @@ type Bootstrap struct { // Optional proxy version which will be used to set the value of :ref:`server.version statistic // ` if specified. Envoy will not process this value, it will be sent as is to // :ref:`stats sinks `. - StatsServerVersionOverride *wrappers.UInt64Value `protobuf:"bytes,19,opt,name=stats_server_version_override,json=statsServerVersionOverride,proto3" json:"stats_server_version_override,omitempty"` + StatsServerVersionOverride *wrapperspb.UInt64Value `protobuf:"bytes,19,opt,name=stats_server_version_override,json=statsServerVersionOverride,proto3" json:"stats_server_version_override,omitempty"` // Always use TCP queries instead of UDP queries for DNS lookups. // This may be overridden on a per-cluster basis in cds_config, // when :ref:`dns_resolvers ` and @@ -481,7 +481,7 @@ func (x *Bootstrap) GetStatsConfig() *v31.StatsConfig { return nil } -func (x *Bootstrap) GetStatsFlushInterval() *duration.Duration { +func (x *Bootstrap) GetStatsFlushInterval() *durationpb.Duration { if x != nil { return x.StatsFlushInterval } @@ -560,7 +560,7 @@ func (x *Bootstrap) GetHeaderPrefix() string { return "" } -func (x *Bootstrap) GetStatsServerVersionOverride() *wrappers.UInt64Value { +func (x *Bootstrap) GetStatsServerVersionOverride() *wrapperspb.UInt64Value { if x != nil { return x.StatsServerVersionOverride } @@ -982,25 +982,25 @@ type Watchdog struct { Actions []*Watchdog_WatchdogAction `protobuf:"bytes,7,rep,name=actions,proto3" json:"actions,omitempty"` // The duration after which Envoy counts a nonresponsive thread in the // “watchdog_miss“ statistic. If not specified the default is 200ms. - MissTimeout *duration.Duration `protobuf:"bytes,1,opt,name=miss_timeout,json=missTimeout,proto3" json:"miss_timeout,omitempty"` + MissTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=miss_timeout,json=missTimeout,proto3" json:"miss_timeout,omitempty"` // The duration after which Envoy counts a nonresponsive thread in the // “watchdog_mega_miss“ statistic. If not specified the default is // 1000ms. - MegamissTimeout *duration.Duration `protobuf:"bytes,2,opt,name=megamiss_timeout,json=megamissTimeout,proto3" json:"megamiss_timeout,omitempty"` + MegamissTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=megamiss_timeout,json=megamissTimeout,proto3" json:"megamiss_timeout,omitempty"` // If a watched thread has been nonresponsive for this duration, assume a // programming error and kill the entire Envoy process. Set to 0 to disable // kill behavior. If not specified the default is 0 (disabled). - KillTimeout *duration.Duration `protobuf:"bytes,3,opt,name=kill_timeout,json=killTimeout,proto3" json:"kill_timeout,omitempty"` + KillTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=kill_timeout,json=killTimeout,proto3" json:"kill_timeout,omitempty"` // Defines the maximum jitter used to adjust the “kill_timeout“ if “kill_timeout“ is // enabled. Enabling this feature would help to reduce risk of synchronized // watchdog kill events across proxies due to external triggers. Set to 0 to // disable. If not specified the default is 0 (disabled). - MaxKillTimeoutJitter *duration.Duration `protobuf:"bytes,6,opt,name=max_kill_timeout_jitter,json=maxKillTimeoutJitter,proto3" json:"max_kill_timeout_jitter,omitempty"` + MaxKillTimeoutJitter *durationpb.Duration `protobuf:"bytes,6,opt,name=max_kill_timeout_jitter,json=maxKillTimeoutJitter,proto3" json:"max_kill_timeout_jitter,omitempty"` // If “max(2, ceil(registered_threads * Fraction(*multikill_threshold*)))“ // threads have been nonresponsive for at least this duration kill the entire // Envoy process. Set to 0 to disable this behavior. If not specified the // default is 0 (disabled). - MultikillTimeout *duration.Duration `protobuf:"bytes,4,opt,name=multikill_timeout,json=multikillTimeout,proto3" json:"multikill_timeout,omitempty"` + MultikillTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=multikill_timeout,json=multikillTimeout,proto3" json:"multikill_timeout,omitempty"` // Sets the threshold for “multikill_timeout“ in terms of the percentage of // nonresponsive threads required for the “multikill_timeout“. // If not specified the default is 0. @@ -1046,35 +1046,35 @@ func (x *Watchdog) GetActions() []*Watchdog_WatchdogAction { return nil } -func (x *Watchdog) GetMissTimeout() *duration.Duration { +func (x *Watchdog) GetMissTimeout() *durationpb.Duration { if x != nil { return x.MissTimeout } return nil } -func (x *Watchdog) GetMegamissTimeout() *duration.Duration { +func (x *Watchdog) GetMegamissTimeout() *durationpb.Duration { if x != nil { return x.MegamissTimeout } return nil } -func (x *Watchdog) GetKillTimeout() *duration.Duration { +func (x *Watchdog) GetKillTimeout() *durationpb.Duration { if x != nil { return x.KillTimeout } return nil } -func (x *Watchdog) GetMaxKillTimeoutJitter() *duration.Duration { +func (x *Watchdog) GetMaxKillTimeoutJitter() *durationpb.Duration { if x != nil { return x.MaxKillTimeoutJitter } return nil } -func (x *Watchdog) GetMultikillTimeout() *duration.Duration { +func (x *Watchdog) GetMultikillTimeout() *durationpb.Duration { if x != nil { return x.MultikillTimeout } @@ -1173,7 +1173,7 @@ type Runtime struct { // ` by other runtime layers, e.g. // disk or admin. This follows the :ref:`runtime protobuf JSON representation // encoding `. - Base *_struct.Struct `protobuf:"bytes,4,opt,name=base,proto3" json:"base,omitempty"` + Base *structpb.Struct `protobuf:"bytes,4,opt,name=base,proto3" json:"base,omitempty"` } func (x *Runtime) Reset() { @@ -1229,7 +1229,7 @@ func (x *Runtime) GetOverrideSubdirectory() string { return "" } -func (x *Runtime) GetBase() *_struct.Struct { +func (x *Runtime) GetBase() *structpb.Struct { if x != nil { return x.Base } @@ -1300,7 +1300,7 @@ func (m *RuntimeLayer) GetLayerSpecifier() isRuntimeLayer_LayerSpecifier { return nil } -func (x *RuntimeLayer) GetStaticLayer() *_struct.Struct { +func (x *RuntimeLayer) GetStaticLayer() *structpb.Struct { if x, ok := x.GetLayerSpecifier().(*RuntimeLayer_StaticLayer); ok { return x.StaticLayer } @@ -1337,7 +1337,7 @@ type RuntimeLayer_StaticLayer struct { // This follows the :ref:`runtime protobuf JSON representation encoding // `. Unlike static xDS resources, this static // layer is overridable by later layers in the runtime virtual filesystem. - StaticLayer *_struct.Struct `protobuf:"bytes,2,opt,name=static_layer,json=staticLayer,proto3,oneof"` + StaticLayer *structpb.Struct `protobuf:"bytes,2,opt,name=static_layer,json=staticLayer,proto3,oneof"` } type RuntimeLayer_DiskLayer_ struct { @@ -1772,7 +1772,7 @@ type Bootstrap_GrpcAsyncClientManagerConfig struct { // Optional field to set the expiration time for the cached gRPC client object. // The minimal value is 5s and the default is 50s. - MaxCachedEntryIdleDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_cached_entry_idle_duration,json=maxCachedEntryIdleDuration,proto3" json:"max_cached_entry_idle_duration,omitempty"` + MaxCachedEntryIdleDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=max_cached_entry_idle_duration,json=maxCachedEntryIdleDuration,proto3" json:"max_cached_entry_idle_duration,omitempty"` } func (x *Bootstrap_GrpcAsyncClientManagerConfig) Reset() { @@ -1807,7 +1807,7 @@ func (*Bootstrap_GrpcAsyncClientManagerConfig) Descriptor() ([]byte, []int) { return file_envoy_config_bootstrap_v3_bootstrap_proto_rawDescGZIP(), []int{0, 4} } -func (x *Bootstrap_GrpcAsyncClientManagerConfig) GetMaxCachedEntryIdleDuration() *duration.Duration { +func (x *Bootstrap_GrpcAsyncClientManagerConfig) GetMaxCachedEntryIdleDuration() *durationpb.Duration { if x != nil { return x.MaxCachedEntryIdleDuration } @@ -1865,7 +1865,7 @@ func (m *Bootstrap_ApplicationLogConfig_LogFormat) GetLogFormat() isBootstrap_Ap return nil } -func (x *Bootstrap_ApplicationLogConfig_LogFormat) GetJsonFormat() *_struct.Struct { +func (x *Bootstrap_ApplicationLogConfig_LogFormat) GetJsonFormat() *structpb.Struct { if x, ok := x.GetLogFormat().(*Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat); ok { return x.JsonFormat } @@ -1887,7 +1887,7 @@ type Bootstrap_ApplicationLogConfig_LogFormat_JsonFormat struct { // Flush application logs in JSON format. The configured JSON struct can // support all the format flags specified in the :option:`--log-format` // command line options section, except for the “%v“ and “%_“ flags. - JsonFormat *_struct.Struct `protobuf:"bytes,1,opt,name=json_format,json=jsonFormat,proto3,oneof"` + JsonFormat *structpb.Struct `protobuf:"bytes,1,opt,name=json_format,json=jsonFormat,proto3,oneof"` } type Bootstrap_ApplicationLogConfig_LogFormat_TextFormat struct { @@ -2822,10 +2822,10 @@ var file_envoy_config_bootstrap_v3_bootstrap_proto_goTypes = []interface{}{ (*v3.ApiConfigSource)(nil), // 25: envoy.config.core.v3.ApiConfigSource (*v31.StatsSink)(nil), // 26: envoy.config.metrics.v3.StatsSink (*v31.StatsConfig)(nil), // 27: envoy.config.metrics.v3.StatsConfig - (*duration.Duration)(nil), // 28: google.protobuf.Duration + (*durationpb.Duration)(nil), // 28: google.protobuf.Duration (*v32.Tracing)(nil), // 29: envoy.config.trace.v3.Tracing (*v33.OverloadManager)(nil), // 30: envoy.config.overload.v3.OverloadManager - (*wrappers.UInt64Value)(nil), // 31: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 31: google.protobuf.UInt64Value (*v3.DnsResolutionConfig)(nil), // 32: envoy.config.core.v3.DnsResolutionConfig (*v3.TypedExtensionConfig)(nil), // 33: envoy.config.core.v3.TypedExtensionConfig (*v3.ConfigSource)(nil), // 34: envoy.config.core.v3.ConfigSource @@ -2834,7 +2834,7 @@ var file_envoy_config_bootstrap_v3_bootstrap_proto_goTypes = []interface{}{ (*v3.SocketOption)(nil), // 37: envoy.config.core.v3.SocketOption (*v3.BindConfig)(nil), // 38: envoy.config.core.v3.BindConfig (*v35.Percent)(nil), // 39: envoy.type.v3.Percent - (*_struct.Struct)(nil), // 40: google.protobuf.Struct + (*structpb.Struct)(nil), // 40: google.protobuf.Struct (*v36.Listener)(nil), // 41: envoy.config.listener.v3.Listener (*v37.Cluster)(nil), // 42: envoy.config.cluster.v3.Cluster (*v38.Secret)(nil), // 43: envoy.extensions.transport_sockets.tls.v3.Secret diff --git a/envoy/config/cluster/redis/redis_cluster.pb.go b/envoy/config/cluster/redis/redis_cluster.pb.go index e916980c9..c9e1c77ef 100755 --- a/envoy/config/cluster/redis/redis_cluster.pb.go +++ b/envoy/config/cluster/redis/redis_cluster.pb.go @@ -9,10 +9,10 @@ package redis import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -31,17 +31,17 @@ type RedisClusterConfig struct { unknownFields protoimpl.UnknownFields // Interval between successive topology refresh requests. If not set, this defaults to 5s. - ClusterRefreshRate *duration.Duration `protobuf:"bytes,1,opt,name=cluster_refresh_rate,json=clusterRefreshRate,proto3" json:"cluster_refresh_rate,omitempty"` + ClusterRefreshRate *durationpb.Duration `protobuf:"bytes,1,opt,name=cluster_refresh_rate,json=clusterRefreshRate,proto3" json:"cluster_refresh_rate,omitempty"` // Timeout for topology refresh request. If not set, this defaults to 3s. - ClusterRefreshTimeout *duration.Duration `protobuf:"bytes,2,opt,name=cluster_refresh_timeout,json=clusterRefreshTimeout,proto3" json:"cluster_refresh_timeout,omitempty"` + ClusterRefreshTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=cluster_refresh_timeout,json=clusterRefreshTimeout,proto3" json:"cluster_refresh_timeout,omitempty"` // The minimum interval that must pass after triggering a topology refresh request before a new // request can possibly be triggered again. Any errors received during one of these // time intervals are ignored. If not set, this defaults to 5s. - RedirectRefreshInterval *duration.Duration `protobuf:"bytes,3,opt,name=redirect_refresh_interval,json=redirectRefreshInterval,proto3" json:"redirect_refresh_interval,omitempty"` + RedirectRefreshInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=redirect_refresh_interval,json=redirectRefreshInterval,proto3" json:"redirect_refresh_interval,omitempty"` // The number of redirection errors that must be received before // triggering a topology refresh request. If not set, this defaults to 5. // If this is set to 0, topology refresh after redirect is disabled. - RedirectRefreshThreshold *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=redirect_refresh_threshold,json=redirectRefreshThreshold,proto3" json:"redirect_refresh_threshold,omitempty"` + RedirectRefreshThreshold *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=redirect_refresh_threshold,json=redirectRefreshThreshold,proto3" json:"redirect_refresh_threshold,omitempty"` // The number of failures that must be received before triggering a topology refresh request. // If not set, this defaults to 0, which disables the topology refresh due to failure. FailureRefreshThreshold uint32 `protobuf:"varint,5,opt,name=failure_refresh_threshold,json=failureRefreshThreshold,proto3" json:"failure_refresh_threshold,omitempty"` @@ -83,28 +83,28 @@ func (*RedisClusterConfig) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_redis_redis_cluster_proto_rawDescGZIP(), []int{0} } -func (x *RedisClusterConfig) GetClusterRefreshRate() *duration.Duration { +func (x *RedisClusterConfig) GetClusterRefreshRate() *durationpb.Duration { if x != nil { return x.ClusterRefreshRate } return nil } -func (x *RedisClusterConfig) GetClusterRefreshTimeout() *duration.Duration { +func (x *RedisClusterConfig) GetClusterRefreshTimeout() *durationpb.Duration { if x != nil { return x.ClusterRefreshTimeout } return nil } -func (x *RedisClusterConfig) GetRedirectRefreshInterval() *duration.Duration { +func (x *RedisClusterConfig) GetRedirectRefreshInterval() *durationpb.Duration { if x != nil { return x.RedirectRefreshInterval } return nil } -func (x *RedisClusterConfig) GetRedirectRefreshThreshold() *wrappers.UInt32Value { +func (x *RedisClusterConfig) GetRedirectRefreshThreshold() *wrapperspb.UInt32Value { if x != nil { return x.RedirectRefreshThreshold } @@ -198,9 +198,9 @@ func file_envoy_config_cluster_redis_redis_cluster_proto_rawDescGZIP() []byte { var file_envoy_config_cluster_redis_redis_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_cluster_redis_redis_cluster_proto_goTypes = []interface{}{ - (*RedisClusterConfig)(nil), // 0: envoy.config.cluster.redis.RedisClusterConfig - (*duration.Duration)(nil), // 1: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*RedisClusterConfig)(nil), // 0: envoy.config.cluster.redis.RedisClusterConfig + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_config_cluster_redis_redis_cluster_proto_depIdxs = []int32{ 1, // 0: envoy.config.cluster.redis.RedisClusterConfig.cluster_refresh_rate:type_name -> google.protobuf.Duration diff --git a/envoy/config/cluster/v3/circuit_breaker.pb.go b/envoy/config/cluster/v3/circuit_breaker.pb.go index 81c9a4bf9..4b4982c36 100755 --- a/envoy/config/cluster/v3/circuit_breaker.pb.go +++ b/envoy/config/cluster/v3/circuit_breaker.pb.go @@ -11,9 +11,9 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -112,18 +112,18 @@ type CircuitBreakers_Thresholds struct { Priority v3.RoutingPriority `protobuf:"varint,1,opt,name=priority,proto3,enum=envoy.config.core.v3.RoutingPriority" json:"priority,omitempty"` // The maximum number of connections that Envoy will make to the upstream // cluster. If not specified, the default is 1024. - MaxConnections *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` + MaxConnections *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` // The maximum number of pending requests that Envoy will allow to the // upstream cluster. If not specified, the default is 1024. // This limit is applied as a connection limit for non-HTTP traffic. - MaxPendingRequests *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` + MaxPendingRequests *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` // The maximum number of parallel requests that Envoy will make to the // upstream cluster. If not specified, the default is 1024. // This limit does not apply to non-HTTP traffic. - MaxRequests *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` + MaxRequests *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` // The maximum number of parallel retries that Envoy will allow to the // upstream cluster. If not specified, the default is 3. - MaxRetries *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxRetries *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` // Specifies a limit on concurrent retries in relation to the number of active requests. This // parameter is optional. // @@ -146,7 +146,7 @@ type CircuitBreakers_Thresholds struct { // large number of connection pools. See // :ref:`Circuit Breaking ` for // more details. - MaxConnectionPools *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_connection_pools,json=maxConnectionPools,proto3" json:"max_connection_pools,omitempty"` + MaxConnectionPools *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_connection_pools,json=maxConnectionPools,proto3" json:"max_connection_pools,omitempty"` } func (x *CircuitBreakers_Thresholds) Reset() { @@ -188,28 +188,28 @@ func (x *CircuitBreakers_Thresholds) GetPriority() v3.RoutingPriority { return v3.RoutingPriority(0) } -func (x *CircuitBreakers_Thresholds) GetMaxConnections() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxConnections() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnections } return nil } -func (x *CircuitBreakers_Thresholds) GetMaxPendingRequests() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxPendingRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxPendingRequests } return nil } -func (x *CircuitBreakers_Thresholds) GetMaxRequests() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequests } return nil } -func (x *CircuitBreakers_Thresholds) GetMaxRetries() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxRetries() *wrapperspb.UInt32Value { if x != nil { return x.MaxRetries } @@ -230,7 +230,7 @@ func (x *CircuitBreakers_Thresholds) GetTrackRemaining() bool { return false } -func (x *CircuitBreakers_Thresholds) GetMaxConnectionPools() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds) GetMaxConnectionPools() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectionPools } @@ -252,7 +252,7 @@ type CircuitBreakers_Thresholds_RetryBudget struct { // number of active retries may never go below this number. // // This parameter is optional. Defaults to 3. - MinRetryConcurrency *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=min_retry_concurrency,json=minRetryConcurrency,proto3" json:"min_retry_concurrency,omitempty"` + MinRetryConcurrency *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=min_retry_concurrency,json=minRetryConcurrency,proto3" json:"min_retry_concurrency,omitempty"` } func (x *CircuitBreakers_Thresholds_RetryBudget) Reset() { @@ -294,7 +294,7 @@ func (x *CircuitBreakers_Thresholds_RetryBudget) GetBudgetPercent() *v31.Percent return nil } -func (x *CircuitBreakers_Thresholds_RetryBudget) GetMinRetryConcurrency() *wrappers.UInt32Value { +func (x *CircuitBreakers_Thresholds_RetryBudget) GetMinRetryConcurrency() *wrapperspb.UInt32Value { if x != nil { return x.MinRetryConcurrency } @@ -421,7 +421,7 @@ var file_envoy_config_cluster_v3_circuit_breaker_proto_goTypes = []interface{}{ (*CircuitBreakers_Thresholds)(nil), // 1: envoy.config.cluster.v3.CircuitBreakers.Thresholds (*CircuitBreakers_Thresholds_RetryBudget)(nil), // 2: envoy.config.cluster.v3.CircuitBreakers.Thresholds.RetryBudget (v3.RoutingPriority)(0), // 3: envoy.config.core.v3.RoutingPriority - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value (*v31.Percent)(nil), // 5: envoy.type.v3.Percent } var file_envoy_config_cluster_v3_circuit_breaker_proto_depIdxs = []int32{ diff --git a/envoy/config/cluster/v3/cluster.pb.go b/envoy/config/cluster/v3/cluster.pb.go index 0e4b0765f..1967ddfb2 100755 --- a/envoy/config/cluster/v3/cluster.pb.go +++ b/envoy/config/cluster/v3/cluster.pb.go @@ -15,12 +15,12 @@ import ( v34 "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3" v33 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -751,10 +751,10 @@ type Cluster struct { 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. // If not set, a default value of 5s will be used. - ConnectTimeout *duration.Duration `protobuf:"bytes,4,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` + ConnectTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=connect_timeout,json=connectTimeout,proto3" 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 *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` + PerConnectionBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` // The :ref:`load balancer type ` to use // when picking a host in the cluster. LbPolicy Cluster_LbPolicy `protobuf:"varint,6,opt,name=lb_policy,json=lbPolicy,proto3,enum=envoy.config.cluster.v3.Cluster_LbPolicy" json:"lb_policy,omitempty"` @@ -784,7 +784,7 @@ type Cluster struct { // This field has been deprecated in favor of the :ref:`max_requests_per_connection ` field. // // Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto. - MaxRequestsPerConnection *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` + MaxRequestsPerConnection *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` // Optional :ref:`circuit breaking ` for the cluster. CircuitBreakers *CircuitBreakers `protobuf:"bytes,10,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"` // HTTP protocol options that are applied only to upstream HTTP connections. @@ -845,7 +845,7 @@ type Cluster struct { // "envoy.filters.network.thrift_proxy". See the extension's documentation for details on // specific options. // [#next-major-version: make this a list of typed extensions.] - TypedExtensionProtocolOptions map[string]*any1.Any `protobuf:"bytes,36,rep,name=typed_extension_protocol_options,json=typedExtensionProtocolOptions,proto3" json:"typed_extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedExtensionProtocolOptions map[string]*anypb.Any `protobuf:"bytes,36,rep,name=typed_extension_protocol_options,json=typedExtensionProtocolOptions,proto3" json:"typed_extension_protocol_options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // If the DNS refresh rate is specified and the cluster type is either // :ref:`STRICT_DNS`, // or :ref:`LOGICAL_DNS`, @@ -855,7 +855,7 @@ type Cluster struct { // :ref:`STRICT_DNS` // and :ref:`LOGICAL_DNS` // this setting is ignored. - DnsRefreshRate *duration.Duration `protobuf:"bytes,16,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + DnsRefreshRate *durationpb.Duration `protobuf:"bytes,16,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` // If the DNS failure refresh rate is specified and the cluster type is either // :ref:`STRICT_DNS`, // or :ref:`LOGICAL_DNS`, @@ -918,7 +918,7 @@ type Cluster struct { // or :ref:`Redis Cluster`. // If true, cluster readiness blocks on warm-up. If false, the cluster will complete // initialization whether or not warm-up has completed. Defaults to true. - WaitForWarmOnInit *wrappers.BoolValue `protobuf:"bytes,54,opt,name=wait_for_warm_on_init,json=waitForWarmOnInit,proto3" json:"wait_for_warm_on_init,omitempty"` + WaitForWarmOnInit *wrapperspb.BoolValue `protobuf:"bytes,54,opt,name=wait_for_warm_on_init,json=waitForWarmOnInit,proto3" json:"wait_for_warm_on_init,omitempty"` // If specified, outlier detection will be enabled for this upstream cluster. // Each of the configuration values can be overridden via // :ref:`runtime values `. @@ -936,7 +936,7 @@ type Cluster struct { // value defaults to 5000ms. For cluster types other than // :ref:`ORIGINAL_DST` // this setting is ignored. - CleanupInterval *duration.Duration `protobuf:"bytes,20,opt,name=cleanup_interval,json=cleanupInterval,proto3" json:"cleanup_interval,omitempty"` + CleanupInterval *durationpb.Duration `protobuf:"bytes,20,opt,name=cleanup_interval,json=cleanupInterval,proto3" json:"cleanup_interval,omitempty"` // Optional configuration used to bind newly established upstream connections. // This overrides any bind_config specified in the bootstrap proto. // If the address and port are empty, no bind will be performed. @@ -1147,14 +1147,14 @@ func (x *Cluster) GetEdsClusterConfig() *Cluster_EdsClusterConfig { return nil } -func (x *Cluster) GetConnectTimeout() *duration.Duration { +func (x *Cluster) GetConnectTimeout() *durationpb.Duration { if x != nil { return x.ConnectTimeout } return nil } -func (x *Cluster) GetPerConnectionBufferLimitBytes() *wrappers.UInt32Value { +func (x *Cluster) GetPerConnectionBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerConnectionBufferLimitBytes } @@ -1183,7 +1183,7 @@ func (x *Cluster) GetHealthChecks() []*v32.HealthCheck { } // Deprecated: Marked as deprecated in envoy/config/cluster/v3/cluster.proto. -func (x *Cluster) GetMaxRequestsPerConnection() *wrappers.UInt32Value { +func (x *Cluster) GetMaxRequestsPerConnection() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestsPerConnection } @@ -1229,14 +1229,14 @@ func (x *Cluster) GetHttp2ProtocolOptions() *v32.Http2ProtocolOptions { return nil } -func (x *Cluster) GetTypedExtensionProtocolOptions() map[string]*any1.Any { +func (x *Cluster) GetTypedExtensionProtocolOptions() map[string]*anypb.Any { if x != nil { return x.TypedExtensionProtocolOptions } return nil } -func (x *Cluster) GetDnsRefreshRate() *duration.Duration { +func (x *Cluster) GetDnsRefreshRate() *durationpb.Duration { if x != nil { return x.DnsRefreshRate } @@ -1295,7 +1295,7 @@ func (x *Cluster) GetTypedDnsResolverConfig() *v32.TypedExtensionConfig { return nil } -func (x *Cluster) GetWaitForWarmOnInit() *wrappers.BoolValue { +func (x *Cluster) GetWaitForWarmOnInit() *wrapperspb.BoolValue { if x != nil { return x.WaitForWarmOnInit } @@ -1309,7 +1309,7 @@ func (x *Cluster) GetOutlierDetection() *OutlierDetection { return nil } -func (x *Cluster) GetCleanupInterval() *duration.Duration { +func (x *Cluster) GetCleanupInterval() *durationpb.Duration { if x != nil { return x.CleanupInterval } @@ -1774,7 +1774,7 @@ type Cluster_TransportSocketMatch struct { // will use the transport socket configuration specified here. // The endpoint's metadata entry in “envoy.transport_socket_match“ is used to match // against the values specified in this field. - Match *_struct.Struct `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"` + Match *structpb.Struct `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"` // The configuration of the transport socket. // [#extension-category: envoy.transport_sockets.upstream] TransportSocket *v32.TransportSocket `protobuf:"bytes,3,opt,name=transport_socket,json=transportSocket,proto3" json:"transport_socket,omitempty"` @@ -1819,7 +1819,7 @@ func (x *Cluster_TransportSocketMatch) GetName() string { return "" } -func (x *Cluster_TransportSocketMatch) GetMatch() *_struct.Struct { +func (x *Cluster_TransportSocketMatch) GetMatch() *structpb.Struct { if x != nil { return x.Match } @@ -1844,7 +1844,7 @@ type Cluster_CustomClusterType struct { // Cluster specific configuration which depends on the cluster being instantiated. // See the supported cluster for further documentation. // [#extension-category: envoy.clusters] - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *Cluster_CustomClusterType) Reset() { @@ -1886,7 +1886,7 @@ func (x *Cluster_CustomClusterType) GetName() string { return "" } -func (x *Cluster_CustomClusterType) GetTypedConfig() *any1.Any { +func (x *Cluster_CustomClusterType) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -1973,7 +1973,7 @@ type Cluster_LbSubsetConfig struct { // namespace. It is valid for no hosts to match, in which case the behavior // is the same as a fallback_policy of // :ref:`NO_FALLBACK`. - DefaultSubset *_struct.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"` + DefaultSubset *structpb.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"` // For each entry, LbEndpoint.Metadata's // “envoy.lb“ namespace is traversed and a subset is created for each unique // combination of key and value. For example: @@ -2065,7 +2065,7 @@ func (x *Cluster_LbSubsetConfig) GetFallbackPolicy() Cluster_LbSubsetConfig_LbSu return Cluster_LbSubsetConfig_NO_FALLBACK } -func (x *Cluster_LbSubsetConfig) GetDefaultSubset() *_struct.Struct { +func (x *Cluster_LbSubsetConfig) GetDefaultSubset() *structpb.Struct { if x != nil { return x.DefaultSubset } @@ -2123,7 +2123,7 @@ type Cluster_SlowStartConfig struct { // Represents the size of slow start window. // If set, the newly created host remains in slow start mode starting from its creation time // for the duration of slow start window. - SlowStartWindow *duration.Duration `protobuf:"bytes,1,opt,name=slow_start_window,json=slowStartWindow,proto3" json:"slow_start_window,omitempty"` + SlowStartWindow *durationpb.Duration `protobuf:"bytes,1,opt,name=slow_start_window,json=slowStartWindow,proto3" json:"slow_start_window,omitempty"` // This parameter controls the speed of traffic increase over the slow start window. Defaults to 1.0, // so that endpoint would get linearly increasing amount of traffic. // When increasing the value for this parameter, the speed of traffic ramp-up increases non-linearly. @@ -2175,7 +2175,7 @@ func (*Cluster_SlowStartConfig) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 4} } -func (x *Cluster_SlowStartConfig) GetSlowStartWindow() *duration.Duration { +func (x *Cluster_SlowStartConfig) GetSlowStartWindow() *durationpb.Duration { if x != nil { return x.SlowStartWindow } @@ -2254,7 +2254,7 @@ type Cluster_LeastRequestLbConfig struct { // The number of random healthy hosts from which the host with the fewest active requests will // be chosen. Defaults to 2 so that we perform two-choice selection if the field is not set. - ChoiceCount *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"` + ChoiceCount *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"` // The following formula is used to calculate the dynamic weights when hosts have different load // balancing weights: // @@ -2317,7 +2317,7 @@ func (*Cluster_LeastRequestLbConfig) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 6} } -func (x *Cluster_LeastRequestLbConfig) GetChoiceCount() *wrappers.UInt32Value { +func (x *Cluster_LeastRequestLbConfig) GetChoiceCount() *wrapperspb.UInt32Value { if x != nil { return x.ChoiceCount } @@ -2349,14 +2349,14 @@ type Cluster_RingHashLbConfig struct { // provided host) the better the request distribution will reflect the desired weights. Defaults // to 1024 entries, and limited to 8M entries. See also // :ref:`maximum_ring_size`. - MinimumRingSize *wrappers.UInt64Value `protobuf:"bytes,1,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` + MinimumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` // The hash function used to hash hosts onto the ketama ring. The value defaults to // :ref:`XX_HASH`. HashFunction Cluster_RingHashLbConfig_HashFunction `protobuf:"varint,3,opt,name=hash_function,json=hashFunction,proto3,enum=envoy.config.cluster.v3.Cluster_RingHashLbConfig_HashFunction" json:"hash_function,omitempty"` // Maximum hash ring size. Defaults to 8M entries, and limited to 8M entries, but can be lowered // to further constrain resource use. See also // :ref:`minimum_ring_size`. - MaximumRingSize *wrappers.UInt64Value `protobuf:"bytes,4,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"` + MaximumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,4,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"` } func (x *Cluster_RingHashLbConfig) Reset() { @@ -2391,7 +2391,7 @@ func (*Cluster_RingHashLbConfig) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 7} } -func (x *Cluster_RingHashLbConfig) GetMinimumRingSize() *wrappers.UInt64Value { +func (x *Cluster_RingHashLbConfig) GetMinimumRingSize() *wrapperspb.UInt64Value { if x != nil { return x.MinimumRingSize } @@ -2405,7 +2405,7 @@ func (x *Cluster_RingHashLbConfig) GetHashFunction() Cluster_RingHashLbConfig_Ha return Cluster_RingHashLbConfig_XX_HASH } -func (x *Cluster_RingHashLbConfig) GetMaximumRingSize() *wrappers.UInt64Value { +func (x *Cluster_RingHashLbConfig) GetMaximumRingSize() *wrapperspb.UInt64Value { if x != nil { return x.MaximumRingSize } @@ -2423,7 +2423,7 @@ type Cluster_MaglevLbConfig struct { // Minimal disruption means that when the set of upstream hosts change, a connection will likely be sent to the same // upstream as it was before. Increasing the table size reduces the amount of disruption. // The table size must be prime number limited to 5000011. If it is not specified, the default is 65537. - TableSize *wrappers.UInt64Value `protobuf:"bytes,1,opt,name=table_size,json=tableSize,proto3" json:"table_size,omitempty"` + TableSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=table_size,json=tableSize,proto3" json:"table_size,omitempty"` } func (x *Cluster_MaglevLbConfig) Reset() { @@ -2458,7 +2458,7 @@ func (*Cluster_MaglevLbConfig) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 8} } -func (x *Cluster_MaglevLbConfig) GetTableSize() *wrappers.UInt64Value { +func (x *Cluster_MaglevLbConfig) GetTableSize() *wrapperspb.UInt64Value { if x != nil { return x.TableSize } @@ -2492,7 +2492,7 @@ type Cluster_OriginalDstLbConfig struct { HttpHeaderName string `protobuf:"bytes,2,opt,name=http_header_name,json=httpHeaderName,proto3" json:"http_header_name,omitempty"` // The port to override for the original dst address. This port // will take precedence over filter state and header override ports - UpstreamPortOverride *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=upstream_port_override,json=upstreamPortOverride,proto3" json:"upstream_port_override,omitempty"` + UpstreamPortOverride *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=upstream_port_override,json=upstreamPortOverride,proto3" json:"upstream_port_override,omitempty"` // The dynamic metadata key to override destination address. // First the request metadata is considered, then the connection one. MetadataKey *v34.MetadataKey `protobuf:"bytes,4,opt,name=metadata_key,json=metadataKey,proto3" json:"metadata_key,omitempty"` @@ -2544,7 +2544,7 @@ func (x *Cluster_OriginalDstLbConfig) GetHttpHeaderName() string { return "" } -func (x *Cluster_OriginalDstLbConfig) GetUpstreamPortOverride() *wrappers.UInt32Value { +func (x *Cluster_OriginalDstLbConfig) GetUpstreamPortOverride() *wrapperspb.UInt32Value { if x != nil { return x.UpstreamPortOverride } @@ -2592,7 +2592,7 @@ type Cluster_CommonLbConfig struct { // Note: merging does not apply to cluster membership changes (e.g.: adds/removes); this is // because merging those updates isn't currently safe. See // https://github.com/envoyproxy/envoy/pull/3941. - UpdateMergeWindow *duration.Duration `protobuf:"bytes,4,opt,name=update_merge_window,json=updateMergeWindow,proto3" json:"update_merge_window,omitempty"` + UpdateMergeWindow *durationpb.Duration `protobuf:"bytes,4,opt,name=update_merge_window,json=updateMergeWindow,proto3" json:"update_merge_window,omitempty"` // If set to true, Envoy will :ref:`exclude ` new hosts // when computing load balancing weights until they have been health checked for the first time. // This will have no effect unless active health checking is also configured. @@ -2671,7 +2671,7 @@ func (x *Cluster_CommonLbConfig) GetLocalityWeightedLbConfig() *Cluster_CommonLb return nil } -func (x *Cluster_CommonLbConfig) GetUpdateMergeWindow() *duration.Duration { +func (x *Cluster_CommonLbConfig) GetUpdateMergeWindow() *durationpb.Duration { if x != nil { return x.UpdateMergeWindow } @@ -2732,12 +2732,12 @@ type Cluster_RefreshRate struct { // Specifies the base interval between refreshes. This parameter is required and must be greater // than zero and less than // :ref:`max_interval `. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between refreshes. This parameter is optional, but must be // greater than or equal to the // :ref:`base_interval ` if set. The default // is 10 times the :ref:`base_interval `. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *Cluster_RefreshRate) Reset() { @@ -2772,14 +2772,14 @@ func (*Cluster_RefreshRate) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 11} } -func (x *Cluster_RefreshRate) GetBaseInterval() *duration.Duration { +func (x *Cluster_RefreshRate) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *Cluster_RefreshRate) GetMaxInterval() *duration.Duration { +func (x *Cluster_RefreshRate) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -2815,7 +2815,7 @@ type Cluster_PreconnectPolicy struct { // // This is limited somewhat arbitrarily to 3 because preconnecting too aggressively can // harm latency more than the preconnecting helps. - PerUpstreamPreconnectRatio *wrappers.DoubleValue `protobuf:"bytes,1,opt,name=per_upstream_preconnect_ratio,json=perUpstreamPreconnectRatio,proto3" json:"per_upstream_preconnect_ratio,omitempty"` + PerUpstreamPreconnectRatio *wrapperspb.DoubleValue `protobuf:"bytes,1,opt,name=per_upstream_preconnect_ratio,json=perUpstreamPreconnectRatio,proto3" json:"per_upstream_preconnect_ratio,omitempty"` // Indicates how many streams (rounded up) can be anticipated across a cluster for each // stream, useful for low QPS services. This is currently supported for a subset of // deterministic non-hash-based load-balancing algorithms (weighted round robin, random). @@ -2838,7 +2838,7 @@ type Cluster_PreconnectPolicy struct { // If both this and preconnect_ratio are set, Envoy will make sure both predicted needs are met, // basically preconnecting max(predictive-preconnect, per-upstream-preconnect), for each // upstream. - PredictivePreconnectRatio *wrappers.DoubleValue `protobuf:"bytes,2,opt,name=predictive_preconnect_ratio,json=predictivePreconnectRatio,proto3" json:"predictive_preconnect_ratio,omitempty"` + PredictivePreconnectRatio *wrapperspb.DoubleValue `protobuf:"bytes,2,opt,name=predictive_preconnect_ratio,json=predictivePreconnectRatio,proto3" json:"predictive_preconnect_ratio,omitempty"` } func (x *Cluster_PreconnectPolicy) Reset() { @@ -2873,14 +2873,14 @@ func (*Cluster_PreconnectPolicy) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_cluster_proto_rawDescGZIP(), []int{1, 12} } -func (x *Cluster_PreconnectPolicy) GetPerUpstreamPreconnectRatio() *wrappers.DoubleValue { +func (x *Cluster_PreconnectPolicy) GetPerUpstreamPreconnectRatio() *wrapperspb.DoubleValue { if x != nil { return x.PerUpstreamPreconnectRatio } return nil } -func (x *Cluster_PreconnectPolicy) GetPredictivePreconnectRatio() *wrappers.DoubleValue { +func (x *Cluster_PreconnectPolicy) GetPredictivePreconnectRatio() *wrapperspb.DoubleValue { if x != nil { return x.PredictivePreconnectRatio } @@ -2997,7 +2997,7 @@ type Cluster_CommonLbConfig_ZoneAwareLbConfig struct { // even if zone aware routing is configured. If not specified, the default is 6. // * :ref:`runtime values `. // * :ref:`Zone aware routing support `. - MinClusterSize *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=min_cluster_size,json=minClusterSize,proto3" json:"min_cluster_size,omitempty"` + MinClusterSize *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=min_cluster_size,json=minClusterSize,proto3" json:"min_cluster_size,omitempty"` // If set to true, Envoy will not consider any hosts when the cluster is in :ref:`panic // mode`. Instead, the cluster will fail all // requests as if all hosts are unhealthy. This can help avoid potentially overwhelming a @@ -3044,7 +3044,7 @@ func (x *Cluster_CommonLbConfig_ZoneAwareLbConfig) GetRoutingEnabled() *v33.Perc return nil } -func (x *Cluster_CommonLbConfig_ZoneAwareLbConfig) GetMinClusterSize() *wrappers.UInt64Value { +func (x *Cluster_CommonLbConfig_ZoneAwareLbConfig) GetMinClusterSize() *wrapperspb.UInt64Value { if x != nil { return x.MinClusterSize } @@ -3125,7 +3125,7 @@ type Cluster_CommonLbConfig_ConsistentHashingLbConfig struct { // // This is an O(N) algorithm, unlike other load balancers. Using a lower “hash_balance_factor“ results in more hosts // being probed, so use a higher value if you require better performance. - HashBalanceFactor *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"` + HashBalanceFactor *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"` } func (x *Cluster_CommonLbConfig_ConsistentHashingLbConfig) Reset() { @@ -3167,7 +3167,7 @@ func (x *Cluster_CommonLbConfig_ConsistentHashingLbConfig) GetUseHostnameForHash return false } -func (x *Cluster_CommonLbConfig_ConsistentHashingLbConfig) GetHashBalanceFactor() *wrappers.UInt32Value { +func (x *Cluster_CommonLbConfig_ConsistentHashingLbConfig) GetHashBalanceFactor() *wrapperspb.UInt32Value { if x != nil { return x.HashBalanceFactor } @@ -3232,7 +3232,7 @@ type UpstreamConnectionOptions_HappyEyeballsConfig struct { FirstAddressFamilyVersion UpstreamConnectionOptions_FirstAddressFamilyVersion `protobuf:"varint,1,opt,name=first_address_family_version,json=firstAddressFamilyVersion,proto3,enum=envoy.config.cluster.v3.UpstreamConnectionOptions_FirstAddressFamilyVersion" json:"first_address_family_version,omitempty"` // Specify the number of addresses of the first_address_family_version being // attempted for connection before the other address family. - FirstAddressFamilyCount *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=first_address_family_count,json=firstAddressFamilyCount,proto3" json:"first_address_family_count,omitempty"` + FirstAddressFamilyCount *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=first_address_family_count,json=firstAddressFamilyCount,proto3" json:"first_address_family_count,omitempty"` } func (x *UpstreamConnectionOptions_HappyEyeballsConfig) Reset() { @@ -3274,7 +3274,7 @@ func (x *UpstreamConnectionOptions_HappyEyeballsConfig) GetFirstAddressFamilyVer return UpstreamConnectionOptions_DEFAULT } -func (x *UpstreamConnectionOptions_HappyEyeballsConfig) GetFirstAddressFamilyCount() *wrappers.UInt32Value { +func (x *UpstreamConnectionOptions_HappyEyeballsConfig) GetFirstAddressFamilyCount() *wrapperspb.UInt32Value { if x != nil { return x.FirstAddressFamilyCount } @@ -4150,8 +4150,8 @@ var file_envoy_config_cluster_v3_cluster_proto_goTypes = []interface{}{ (*LoadBalancingPolicy_Policy)(nil), // 32: envoy.config.cluster.v3.LoadBalancingPolicy.Policy (*UpstreamConnectionOptions_HappyEyeballsConfig)(nil), // 33: envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig (*v3.CollectionEntry)(nil), // 34: xds.core.v3.CollectionEntry - (*duration.Duration)(nil), // 35: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 36: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 35: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 36: google.protobuf.UInt32Value (*v31.ClusterLoadAssignment)(nil), // 37: envoy.config.endpoint.v3.ClusterLoadAssignment (*v32.HealthCheck)(nil), // 38: envoy.config.core.v3.HealthCheck (*CircuitBreakers)(nil), // 39: envoy.config.cluster.v3.CircuitBreakers @@ -4162,7 +4162,7 @@ var file_envoy_config_cluster_v3_cluster_proto_goTypes = []interface{}{ (*v32.Address)(nil), // 44: envoy.config.core.v3.Address (*v32.DnsResolutionConfig)(nil), // 45: envoy.config.core.v3.DnsResolutionConfig (*v32.TypedExtensionConfig)(nil), // 46: envoy.config.core.v3.TypedExtensionConfig - (*wrappers.BoolValue)(nil), // 47: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 47: google.protobuf.BoolValue (*OutlierDetection)(nil), // 48: envoy.config.cluster.v3.OutlierDetection (*v32.BindConfig)(nil), // 49: envoy.config.core.v3.BindConfig (*v32.TransportSocket)(nil), // 50: envoy.config.core.v3.TransportSocket @@ -4170,14 +4170,14 @@ var file_envoy_config_cluster_v3_cluster_proto_goTypes = []interface{}{ (*Filter)(nil), // 52: envoy.config.cluster.v3.Filter (*v32.ConfigSource)(nil), // 53: envoy.config.core.v3.ConfigSource (*v32.TcpKeepalive)(nil), // 54: envoy.config.core.v3.TcpKeepalive - (*_struct.Struct)(nil), // 55: google.protobuf.Struct - (*any1.Any)(nil), // 56: google.protobuf.Any + (*structpb.Struct)(nil), // 55: google.protobuf.Struct + (*anypb.Any)(nil), // 56: google.protobuf.Any (*v32.RuntimeDouble)(nil), // 57: envoy.config.core.v3.RuntimeDouble (*v33.Percent)(nil), // 58: envoy.type.v3.Percent - (*wrappers.UInt64Value)(nil), // 59: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 59: google.protobuf.UInt64Value (*v34.MetadataKey)(nil), // 60: envoy.type.metadata.v3.MetadataKey (*v32.HealthStatusSet)(nil), // 61: envoy.config.core.v3.HealthStatusSet - (*wrappers.DoubleValue)(nil), // 62: google.protobuf.DoubleValue + (*wrapperspb.DoubleValue)(nil), // 62: google.protobuf.DoubleValue } var file_envoy_config_cluster_v3_cluster_proto_depIdxs = []int32{ 34, // 0: envoy.config.cluster.v3.ClusterCollection.entries:type_name -> xds.core.v3.CollectionEntry diff --git a/envoy/config/cluster/v3/filter.pb.go b/envoy/config/cluster/v3/filter.pb.go index 2f871698f..cbef276ce 100755 --- a/envoy/config/cluster/v3/filter.pb.go +++ b/envoy/config/cluster/v3/filter.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -36,7 +36,7 @@ type Filter struct { // Note that Envoy's :ref:`downstream network // filters ` are not valid upstream network filters. // Only one of typed_config or config_discovery can be used. - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` // Configuration source specifier for an extension configuration discovery // service. In case of a failure and without the default configuration, the // listener closes the connections. @@ -83,7 +83,7 @@ func (x *Filter) GetName() string { return "" } -func (x *Filter) GetTypedConfig() *any1.Any { +func (x *Filter) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -154,7 +154,7 @@ func file_envoy_config_cluster_v3_filter_proto_rawDescGZIP() []byte { var file_envoy_config_cluster_v3_filter_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_cluster_v3_filter_proto_goTypes = []interface{}{ (*Filter)(nil), // 0: envoy.config.cluster.v3.Filter - (*any1.Any)(nil), // 1: google.protobuf.Any + (*anypb.Any)(nil), // 1: google.protobuf.Any (*v3.ExtensionConfigSource)(nil), // 2: envoy.config.core.v3.ExtensionConfigSource } var file_envoy_config_cluster_v3_filter_proto_depIdxs = []int32{ diff --git a/envoy/config/cluster/v3/outlier_detection.pb.go b/envoy/config/cluster/v3/outlier_detection.pb.go index 8f5d16b5e..35cc7964e 100755 --- a/envoy/config/cluster/v3/outlier_detection.pb.go +++ b/envoy/config/cluster/v3/outlier_detection.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,38 +36,38 @@ type OutlierDetection struct { // The number of consecutive server-side error responses (for HTTP traffic, // 5xx responses; for TCP traffic, connection failures; for Redis, failure to // respond PONG; etc.) before a consecutive 5xx ejection occurs. Defaults to 5. - Consecutive_5Xx *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"` + Consecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"` // The time interval between ejection analysis sweeps. This can result in // both new ejections as well as hosts being returned to service. Defaults // to 10000ms or 10s. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // The base time that a host is ejected for. The real time is equal to the // base time multiplied by the number of times the host has been ejected and is // capped by :ref:`max_ejection_time`. // Defaults to 30000ms or 30s. - BaseEjectionTime *duration.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` + BaseEjectionTime *durationpb.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` // The maximum % of an upstream cluster that can be ejected due to outlier // detection. Defaults to 10% but will eject at least one host regardless of the value. - MaxEjectionPercent *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` + MaxEjectionPercent *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive 5xx. This setting can be used to disable // ejection or to ramp it up slowly. Defaults to 100. - EnforcingConsecutive_5Xx *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"` + EnforcingConsecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through success rate statistics. This setting can be used to // disable ejection or to ramp it up slowly. Defaults to 100. - EnforcingSuccessRate *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=enforcing_success_rate,json=enforcingSuccessRate,proto3" json:"enforcing_success_rate,omitempty"` + EnforcingSuccessRate *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=enforcing_success_rate,json=enforcingSuccessRate,proto3" json:"enforcing_success_rate,omitempty"` // The number of hosts in a cluster that must have enough request volume to // detect success rate outliers. If the number of hosts is less than this // setting, outlier detection via success rate statistics is not performed // for any host in the cluster. Defaults to 5. - SuccessRateMinimumHosts *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=success_rate_minimum_hosts,json=successRateMinimumHosts,proto3" json:"success_rate_minimum_hosts,omitempty"` + SuccessRateMinimumHosts *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=success_rate_minimum_hosts,json=successRateMinimumHosts,proto3" json:"success_rate_minimum_hosts,omitempty"` // The minimum number of total requests that must be collected in one // interval (as defined by the interval duration above) to include this host // in success rate based outlier detection. If the volume is lower than this // setting, outlier detection via success rate statistics is not performed // for that host. Defaults to 100. - SuccessRateRequestVolume *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=success_rate_request_volume,json=successRateRequestVolume,proto3" json:"success_rate_request_volume,omitempty"` + SuccessRateRequestVolume *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=success_rate_request_volume,json=successRateRequestVolume,proto3" json:"success_rate_request_volume,omitempty"` // This factor is used to determine the ejection threshold for success rate // outlier ejection. The ejection threshold is the difference between the // mean success rate, and the product of this factor and the standard @@ -75,14 +75,14 @@ type OutlierDetection struct { // success_rate_stdev_factor). This factor is divided by a thousand to get a // double. That is, if the desired factor is 1.9, the runtime value should // be 1900. Defaults to 1900. - SuccessRateStdevFactor *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=success_rate_stdev_factor,json=successRateStdevFactor,proto3" json:"success_rate_stdev_factor,omitempty"` + SuccessRateStdevFactor *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=success_rate_stdev_factor,json=successRateStdevFactor,proto3" json:"success_rate_stdev_factor,omitempty"` // The number of consecutive gateway failures (502, 503, 504 status codes) // before a consecutive gateway failure ejection occurs. Defaults to 5. - ConsecutiveGatewayFailure *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=consecutive_gateway_failure,json=consecutiveGatewayFailure,proto3" json:"consecutive_gateway_failure,omitempty"` + ConsecutiveGatewayFailure *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=consecutive_gateway_failure,json=consecutiveGatewayFailure,proto3" json:"consecutive_gateway_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive gateway failures. This setting can be // used to disable ejection or to ramp it up slowly. Defaults to 0. - EnforcingConsecutiveGatewayFailure *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=enforcing_consecutive_gateway_failure,json=enforcingConsecutiveGatewayFailure,proto3" json:"enforcing_consecutive_gateway_failure,omitempty"` + EnforcingConsecutiveGatewayFailure *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=enforcing_consecutive_gateway_failure,json=enforcingConsecutiveGatewayFailure,proto3" json:"enforcing_consecutive_gateway_failure,omitempty"` // Determines whether to distinguish local origin failures from external errors. If set to true // the following configuration parameters are taken into account: // :ref:`consecutive_local_origin_failure`, @@ -95,59 +95,59 @@ type OutlierDetection struct { // occurs. Defaults to 5. Parameter takes effect only when // :ref:`split_external_local_origin_errors` // is set to true. - ConsecutiveLocalOriginFailure *wrappers.UInt32Value `protobuf:"bytes,13,opt,name=consecutive_local_origin_failure,json=consecutiveLocalOriginFailure,proto3" json:"consecutive_local_origin_failure,omitempty"` + ConsecutiveLocalOriginFailure *wrapperspb.UInt32Value `protobuf:"bytes,13,opt,name=consecutive_local_origin_failure,json=consecutiveLocalOriginFailure,proto3" json:"consecutive_local_origin_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive locally originated failures. This setting can be // used to disable ejection or to ramp it up slowly. Defaults to 100. // Parameter takes effect only when // :ref:`split_external_local_origin_errors` // is set to true. - EnforcingConsecutiveLocalOriginFailure *wrappers.UInt32Value `protobuf:"bytes,14,opt,name=enforcing_consecutive_local_origin_failure,json=enforcingConsecutiveLocalOriginFailure,proto3" json:"enforcing_consecutive_local_origin_failure,omitempty"` + EnforcingConsecutiveLocalOriginFailure *wrapperspb.UInt32Value `protobuf:"bytes,14,opt,name=enforcing_consecutive_local_origin_failure,json=enforcingConsecutiveLocalOriginFailure,proto3" json:"enforcing_consecutive_local_origin_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through success rate statistics for locally originated errors. // This setting can be used to disable ejection or to ramp it up slowly. Defaults to 100. // Parameter takes effect only when // :ref:`split_external_local_origin_errors` // is set to true. - EnforcingLocalOriginSuccessRate *wrappers.UInt32Value `protobuf:"bytes,15,opt,name=enforcing_local_origin_success_rate,json=enforcingLocalOriginSuccessRate,proto3" json:"enforcing_local_origin_success_rate,omitempty"` + EnforcingLocalOriginSuccessRate *wrapperspb.UInt32Value `protobuf:"bytes,15,opt,name=enforcing_local_origin_success_rate,json=enforcingLocalOriginSuccessRate,proto3" json:"enforcing_local_origin_success_rate,omitempty"` // The failure percentage to use when determining failure percentage-based outlier detection. If // the failure percentage of a given host is greater than or equal to this value, it will be // ejected. Defaults to 85. - FailurePercentageThreshold *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=failure_percentage_threshold,json=failurePercentageThreshold,proto3" json:"failure_percentage_threshold,omitempty"` + FailurePercentageThreshold *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=failure_percentage_threshold,json=failurePercentageThreshold,proto3" json:"failure_percentage_threshold,omitempty"` // The % chance that a host will be actually ejected when an outlier status is detected through // failure percentage statistics. This setting can be used to disable ejection or to ramp it up // slowly. Defaults to 0. // // [#next-major-version: setting this without setting failure_percentage_threshold should be // invalid in v4.] - EnforcingFailurePercentage *wrappers.UInt32Value `protobuf:"bytes,17,opt,name=enforcing_failure_percentage,json=enforcingFailurePercentage,proto3" json:"enforcing_failure_percentage,omitempty"` + EnforcingFailurePercentage *wrapperspb.UInt32Value `protobuf:"bytes,17,opt,name=enforcing_failure_percentage,json=enforcingFailurePercentage,proto3" json:"enforcing_failure_percentage,omitempty"` // The % chance that a host will be actually ejected when an outlier status is detected through // local-origin failure percentage statistics. This setting can be used to disable ejection or to // ramp it up slowly. Defaults to 0. - EnforcingFailurePercentageLocalOrigin *wrappers.UInt32Value `protobuf:"bytes,18,opt,name=enforcing_failure_percentage_local_origin,json=enforcingFailurePercentageLocalOrigin,proto3" json:"enforcing_failure_percentage_local_origin,omitempty"` + EnforcingFailurePercentageLocalOrigin *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=enforcing_failure_percentage_local_origin,json=enforcingFailurePercentageLocalOrigin,proto3" json:"enforcing_failure_percentage_local_origin,omitempty"` // The minimum number of hosts in a cluster in order to perform failure percentage-based ejection. // If the total number of hosts in the cluster is less than this value, failure percentage-based // ejection will not be performed. Defaults to 5. - FailurePercentageMinimumHosts *wrappers.UInt32Value `protobuf:"bytes,19,opt,name=failure_percentage_minimum_hosts,json=failurePercentageMinimumHosts,proto3" json:"failure_percentage_minimum_hosts,omitempty"` + FailurePercentageMinimumHosts *wrapperspb.UInt32Value `protobuf:"bytes,19,opt,name=failure_percentage_minimum_hosts,json=failurePercentageMinimumHosts,proto3" json:"failure_percentage_minimum_hosts,omitempty"` // The minimum number of total requests that must be collected in one interval (as defined by the // interval duration above) to perform failure percentage-based ejection for this host. If the // volume is lower than this setting, failure percentage-based ejection will not be performed for // this host. Defaults to 50. - FailurePercentageRequestVolume *wrappers.UInt32Value `protobuf:"bytes,20,opt,name=failure_percentage_request_volume,json=failurePercentageRequestVolume,proto3" json:"failure_percentage_request_volume,omitempty"` + FailurePercentageRequestVolume *wrapperspb.UInt32Value `protobuf:"bytes,20,opt,name=failure_percentage_request_volume,json=failurePercentageRequestVolume,proto3" json:"failure_percentage_request_volume,omitempty"` // The maximum time that a host is ejected for. See :ref:`base_ejection_time` // for more information. If not specified, the default value (300000ms or 300s) or // :ref:`base_ejection_time` value is applied, whatever is larger. - MaxEjectionTime *duration.Duration `protobuf:"bytes,21,opt,name=max_ejection_time,json=maxEjectionTime,proto3" json:"max_ejection_time,omitempty"` + MaxEjectionTime *durationpb.Duration `protobuf:"bytes,21,opt,name=max_ejection_time,json=maxEjectionTime,proto3" json:"max_ejection_time,omitempty"` // The maximum amount of jitter to add to the ejection time, in order to prevent // a 'thundering herd' effect where all proxies try to reconnect to host at the same time. // See :ref:`max_ejection_time_jitter` // Defaults to 0s. - MaxEjectionTimeJitter *duration.Duration `protobuf:"bytes,22,opt,name=max_ejection_time_jitter,json=maxEjectionTimeJitter,proto3" json:"max_ejection_time_jitter,omitempty"` + MaxEjectionTimeJitter *durationpb.Duration `protobuf:"bytes,22,opt,name=max_ejection_time_jitter,json=maxEjectionTimeJitter,proto3" json:"max_ejection_time_jitter,omitempty"` // If active health checking is enabled and a host is ejected by outlier detection, a successful active health check // unejects the host by default and considers it as healthy. Unejection also clears all the outlier detection counters. // To change this default behavior set this config to “false“ where active health checking will not uneject the host. // Defaults to true. - SuccessfulActiveHealthCheckUnejectHost *wrappers.BoolValue `protobuf:"bytes,23,opt,name=successful_active_health_check_uneject_host,json=successfulActiveHealthCheckUnejectHost,proto3" json:"successful_active_health_check_uneject_host,omitempty"` + SuccessfulActiveHealthCheckUnejectHost *wrapperspb.BoolValue `protobuf:"bytes,23,opt,name=successful_active_health_check_uneject_host,json=successfulActiveHealthCheckUnejectHost,proto3" json:"successful_active_health_check_uneject_host,omitempty"` // Set of host's passive monitors. // [#not-implemented-hide:] Monitors []*v3.TypedExtensionConfig `protobuf:"bytes,24,rep,name=monitors,proto3" json:"monitors,omitempty"` @@ -185,77 +185,77 @@ func (*OutlierDetection) Descriptor() ([]byte, []int) { return file_envoy_config_cluster_v3_outlier_detection_proto_rawDescGZIP(), []int{0} } -func (x *OutlierDetection) GetConsecutive_5Xx() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutive_5Xx() *wrapperspb.UInt32Value { if x != nil { return x.Consecutive_5Xx } return nil } -func (x *OutlierDetection) GetInterval() *duration.Duration { +func (x *OutlierDetection) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *OutlierDetection) GetBaseEjectionTime() *duration.Duration { +func (x *OutlierDetection) GetBaseEjectionTime() *durationpb.Duration { if x != nil { return x.BaseEjectionTime } return nil } -func (x *OutlierDetection) GetMaxEjectionPercent() *wrappers.UInt32Value { +func (x *OutlierDetection) GetMaxEjectionPercent() *wrapperspb.UInt32Value { if x != nil { return x.MaxEjectionPercent } return nil } -func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutive_5Xx } return nil } -func (x *OutlierDetection) GetEnforcingSuccessRate() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingSuccessRate() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingSuccessRate } return nil } -func (x *OutlierDetection) GetSuccessRateMinimumHosts() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateMinimumHosts() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateMinimumHosts } return nil } -func (x *OutlierDetection) GetSuccessRateRequestVolume() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateRequestVolume() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateRequestVolume } return nil } -func (x *OutlierDetection) GetSuccessRateStdevFactor() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateStdevFactor() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateStdevFactor } return nil } -func (x *OutlierDetection) GetConsecutiveGatewayFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutiveGatewayFailure() *wrapperspb.UInt32Value { if x != nil { return x.ConsecutiveGatewayFailure } return nil } -func (x *OutlierDetection) GetEnforcingConsecutiveGatewayFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutiveGatewayFailure() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutiveGatewayFailure } @@ -269,77 +269,77 @@ func (x *OutlierDetection) GetSplitExternalLocalOriginErrors() bool { return false } -func (x *OutlierDetection) GetConsecutiveLocalOriginFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutiveLocalOriginFailure() *wrapperspb.UInt32Value { if x != nil { return x.ConsecutiveLocalOriginFailure } return nil } -func (x *OutlierDetection) GetEnforcingConsecutiveLocalOriginFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutiveLocalOriginFailure() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutiveLocalOriginFailure } return nil } -func (x *OutlierDetection) GetEnforcingLocalOriginSuccessRate() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingLocalOriginSuccessRate() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingLocalOriginSuccessRate } return nil } -func (x *OutlierDetection) GetFailurePercentageThreshold() *wrappers.UInt32Value { +func (x *OutlierDetection) GetFailurePercentageThreshold() *wrapperspb.UInt32Value { if x != nil { return x.FailurePercentageThreshold } return nil } -func (x *OutlierDetection) GetEnforcingFailurePercentage() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingFailurePercentage() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingFailurePercentage } return nil } -func (x *OutlierDetection) GetEnforcingFailurePercentageLocalOrigin() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingFailurePercentageLocalOrigin() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingFailurePercentageLocalOrigin } return nil } -func (x *OutlierDetection) GetFailurePercentageMinimumHosts() *wrappers.UInt32Value { +func (x *OutlierDetection) GetFailurePercentageMinimumHosts() *wrapperspb.UInt32Value { if x != nil { return x.FailurePercentageMinimumHosts } return nil } -func (x *OutlierDetection) GetFailurePercentageRequestVolume() *wrappers.UInt32Value { +func (x *OutlierDetection) GetFailurePercentageRequestVolume() *wrapperspb.UInt32Value { if x != nil { return x.FailurePercentageRequestVolume } return nil } -func (x *OutlierDetection) GetMaxEjectionTime() *duration.Duration { +func (x *OutlierDetection) GetMaxEjectionTime() *durationpb.Duration { if x != nil { return x.MaxEjectionTime } return nil } -func (x *OutlierDetection) GetMaxEjectionTimeJitter() *duration.Duration { +func (x *OutlierDetection) GetMaxEjectionTimeJitter() *durationpb.Duration { if x != nil { return x.MaxEjectionTimeJitter } return nil } -func (x *OutlierDetection) GetSuccessfulActiveHealthCheckUnejectHost() *wrappers.BoolValue { +func (x *OutlierDetection) GetSuccessfulActiveHealthCheckUnejectHost() *wrapperspb.BoolValue { if x != nil { return x.SuccessfulActiveHealthCheckUnejectHost } @@ -549,9 +549,9 @@ func file_envoy_config_cluster_v3_outlier_detection_proto_rawDescGZIP() []byte { var file_envoy_config_cluster_v3_outlier_detection_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_cluster_v3_outlier_detection_proto_goTypes = []interface{}{ (*OutlierDetection)(nil), // 0: envoy.config.cluster.v3.OutlierDetection - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue (*v3.TypedExtensionConfig)(nil), // 4: envoy.config.core.v3.TypedExtensionConfig } var file_envoy_config_cluster_v3_outlier_detection_proto_depIdxs = []int32{ diff --git a/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.go b/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.go index ce73235b1..37ff8dcae 100755 --- a/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.go +++ b/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -58,7 +58,7 @@ type DnsCacheConfig struct { // .. note: // // The refresh rate is rounded to the closest millisecond, and must be at least 1ms. - DnsRefreshRate *duration.Duration `protobuf:"bytes,3,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + DnsRefreshRate *durationpb.Duration `protobuf:"bytes,3,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` // The TTL for hosts that are unused. Hosts that have not been used in the configured time // interval will be purged. If not specified defaults to 5m. // @@ -71,7 +71,7 @@ type DnsCacheConfig struct { // .. note: // // The TTL has no relation to DNS TTL and is only used to control Envoy's resource usage. - HostTtl *duration.Duration `protobuf:"bytes,4,opt,name=host_ttl,json=hostTtl,proto3" json:"host_ttl,omitempty"` + HostTtl *durationpb.Duration `protobuf:"bytes,4,opt,name=host_ttl,json=hostTtl,proto3" json:"host_ttl,omitempty"` // The maximum number of hosts that the cache will hold. If not specified defaults to 1024. // // .. note: @@ -79,7 +79,7 @@ type DnsCacheConfig struct { // The implementation is approximate and enforced independently on each worker thread, thus // it is possible for the maximum hosts in the cache to go slightly above the configured // value depending on timing. This is similar to how other circuit breakers work. - MaxHosts *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=max_hosts,json=maxHosts,proto3" json:"max_hosts,omitempty"` + MaxHosts *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=max_hosts,json=maxHosts,proto3" json:"max_hosts,omitempty"` // If the DNS failure refresh rate is specified, // this is used as the cache's DNS refresh rate when DNS requests are failing. If this setting is // not specified, the failure refresh rate defaults to the dns_refresh_rate. @@ -132,21 +132,21 @@ func (x *DnsCacheConfig) GetDnsLookupFamily() v2.Cluster_DnsLookupFamily { return v2.Cluster_DnsLookupFamily(0) } -func (x *DnsCacheConfig) GetDnsRefreshRate() *duration.Duration { +func (x *DnsCacheConfig) GetDnsRefreshRate() *durationpb.Duration { if x != nil { return x.DnsRefreshRate } return nil } -func (x *DnsCacheConfig) GetHostTtl() *duration.Duration { +func (x *DnsCacheConfig) GetHostTtl() *durationpb.Duration { if x != nil { return x.HostTtl } return nil } -func (x *DnsCacheConfig) GetMaxHosts() *wrappers.UInt32Value { +func (x *DnsCacheConfig) GetMaxHosts() *wrapperspb.UInt32Value { if x != nil { return x.MaxHosts } @@ -244,8 +244,8 @@ var file_envoy_config_common_dynamic_forward_proxy_v2alpha_dns_cache_proto_msgTy var file_envoy_config_common_dynamic_forward_proxy_v2alpha_dns_cache_proto_goTypes = []interface{}{ (*DnsCacheConfig)(nil), // 0: envoy.config.common.dynamic_forward_proxy.v2alpha.DnsCacheConfig (v2.Cluster_DnsLookupFamily)(0), // 1: envoy.api.v2.Cluster.DnsLookupFamily - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value (*v2.Cluster_RefreshRate)(nil), // 4: envoy.api.v2.Cluster.RefreshRate } var file_envoy_config_common_dynamic_forward_proxy_v2alpha_dns_cache_proto_depIdxs = []int32{ diff --git a/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go b/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go index b802fa845..31f5c4bba 100755 --- a/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go +++ b/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go @@ -11,9 +11,9 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -60,22 +60,22 @@ type HeaderMutationRules struct { // filters or request routing cannot be modified. These headers are // “host“, “:authority“, “:scheme“, and “:method“. Setting this parameter // to true allows these headers to be modified as well. - AllowAllRouting *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_all_routing,json=allowAllRouting,proto3" json:"allow_all_routing,omitempty"` + AllowAllRouting *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=allow_all_routing,json=allowAllRouting,proto3" json:"allow_all_routing,omitempty"` // If true, allow modification of envoy internal headers. By default, these // start with “x-envoy“ but this may be overridden in the “Bootstrap“ // configuration using the // :ref:`header_prefix ` // field. Default is false. - AllowEnvoy *wrappers.BoolValue `protobuf:"bytes,2,opt,name=allow_envoy,json=allowEnvoy,proto3" json:"allow_envoy,omitempty"` + AllowEnvoy *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=allow_envoy,json=allowEnvoy,proto3" json:"allow_envoy,omitempty"` // If true, prevent modification of any system header, defined as a header // that starts with a “:“ character, regardless of any other settings. // A processing server may still override the “:status“ of an HTTP response // using an “ImmediateResponse“ message. Default is false. - DisallowSystem *wrappers.BoolValue `protobuf:"bytes,3,opt,name=disallow_system,json=disallowSystem,proto3" json:"disallow_system,omitempty"` + DisallowSystem *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=disallow_system,json=disallowSystem,proto3" json:"disallow_system,omitempty"` // If true, prevent modifications of all header values, regardless of any // other settings. A processing server may still override the “:status“ // of an HTTP response using an “ImmediateResponse“ message. Default is false. - DisallowAll *wrappers.BoolValue `protobuf:"bytes,4,opt,name=disallow_all,json=disallowAll,proto3" json:"disallow_all,omitempty"` + DisallowAll *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=disallow_all,json=disallowAll,proto3" json:"disallow_all,omitempty"` // If set, specifically allow any header that matches this regular // expression. This overrides all other settings except for // “disallow_expression“. @@ -89,7 +89,7 @@ type HeaderMutationRules struct { // parameter, any attempt to set, add, or modify a disallowed header will // cause the “rejected_header_mutations“ counter to be incremented. // Default is false. - DisallowIsError *wrappers.BoolValue `protobuf:"bytes,7,opt,name=disallow_is_error,json=disallowIsError,proto3" json:"disallow_is_error,omitempty"` + DisallowIsError *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=disallow_is_error,json=disallowIsError,proto3" json:"disallow_is_error,omitempty"` } func (x *HeaderMutationRules) Reset() { @@ -124,28 +124,28 @@ func (*HeaderMutationRules) Descriptor() ([]byte, []int) { return file_envoy_config_common_mutation_rules_v3_mutation_rules_proto_rawDescGZIP(), []int{0} } -func (x *HeaderMutationRules) GetAllowAllRouting() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetAllowAllRouting() *wrapperspb.BoolValue { if x != nil { return x.AllowAllRouting } return nil } -func (x *HeaderMutationRules) GetAllowEnvoy() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetAllowEnvoy() *wrapperspb.BoolValue { if x != nil { return x.AllowEnvoy } return nil } -func (x *HeaderMutationRules) GetDisallowSystem() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetDisallowSystem() *wrapperspb.BoolValue { if x != nil { return x.DisallowSystem } return nil } -func (x *HeaderMutationRules) GetDisallowAll() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetDisallowAll() *wrapperspb.BoolValue { if x != nil { return x.DisallowAll } @@ -166,7 +166,7 @@ func (x *HeaderMutationRules) GetDisallowExpression() *v3.RegexMatcher { return nil } -func (x *HeaderMutationRules) GetDisallowIsError() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetDisallowIsError() *wrapperspb.BoolValue { if x != nil { return x.DisallowIsError } @@ -349,7 +349,7 @@ var file_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes = m var file_envoy_config_common_mutation_rules_v3_mutation_rules_proto_goTypes = []interface{}{ (*HeaderMutationRules)(nil), // 0: envoy.config.common.mutation_rules.v3.HeaderMutationRules (*HeaderMutation)(nil), // 1: envoy.config.common.mutation_rules.v3.HeaderMutation - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue (*v3.RegexMatcher)(nil), // 3: envoy.type.matcher.v3.RegexMatcher (*v31.HeaderValueOption)(nil), // 4: envoy.config.core.v3.HeaderValueOption } diff --git a/envoy/config/core/v3/address.pb.go b/envoy/config/core/v3/address.pb.go index 711e9d3fe..ee7cc8308 100755 --- a/envoy/config/core/v3/address.pb.go +++ b/envoy/config/core/v3/address.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -357,14 +357,14 @@ type TcpKeepalive struct { // Maximum number of keepalive probes to send without response before deciding // the connection is dead. Default is to use the OS level configuration (unless // overridden, Linux defaults to 9.) - KeepaliveProbes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` + KeepaliveProbes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` // The number of seconds a connection needs to be idle before keep-alive probes // start being sent. Default is to use the OS level configuration (unless // overridden, Linux defaults to 7200s (i.e., 2 hours.) - KeepaliveTime *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` + KeepaliveTime *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` // The number of seconds between keep-alive probes. Default is to use the OS // level configuration (unless overridden, Linux defaults to 75s.) - KeepaliveInterval *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` + KeepaliveInterval *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` } func (x *TcpKeepalive) Reset() { @@ -399,21 +399,21 @@ func (*TcpKeepalive) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_address_proto_rawDescGZIP(), []int{3} } -func (x *TcpKeepalive) GetKeepaliveProbes() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveProbes() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveProbes } return nil } -func (x *TcpKeepalive) GetKeepaliveTime() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveTime() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveTime } return nil } -func (x *TcpKeepalive) GetKeepaliveInterval() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveInterval() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveInterval } @@ -498,7 +498,7 @@ type BindConfig struct { // to false, the option “IP_FREEBIND“ is disabled on the socket. When this // flag is not set (default), the socket is not modified, i.e. the option is // neither enabled nor disabled. - Freebind *wrappers.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` + Freebind *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. SocketOptions []*SocketOption `protobuf:"bytes,3,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` @@ -558,7 +558,7 @@ func (x *BindConfig) GetSourceAddress() *SocketAddress { return nil } -func (x *BindConfig) GetFreebind() *wrappers.BoolValue { +func (x *BindConfig) GetFreebind() *wrapperspb.BoolValue { if x != nil { return x.Freebind } @@ -704,7 +704,7 @@ type CidrRange struct { // IPv4 or IPv6 address, e.g. “192.0.0.0“ or “2001:db8::“. AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"` // Length of prefix, e.g. 0, 32. Defaults to 0 when unset. - PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` + PrefixLen *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` } func (x *CidrRange) Reset() { @@ -746,7 +746,7 @@ func (x *CidrRange) GetAddressPrefix() string { return "" } -func (x *CidrRange) GetPrefixLen() *wrappers.UInt32Value { +func (x *CidrRange) GetPrefixLen() *wrapperspb.UInt32Value { if x != nil { return x.PrefixLen } @@ -932,20 +932,20 @@ func file_envoy_config_core_v3_address_proto_rawDescGZIP() []byte { var file_envoy_config_core_v3_address_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_envoy_config_core_v3_address_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_envoy_config_core_v3_address_proto_goTypes = []interface{}{ - (SocketAddress_Protocol)(0), // 0: envoy.config.core.v3.SocketAddress.Protocol - (*Pipe)(nil), // 1: envoy.config.core.v3.Pipe - (*EnvoyInternalAddress)(nil), // 2: envoy.config.core.v3.EnvoyInternalAddress - (*SocketAddress)(nil), // 3: envoy.config.core.v3.SocketAddress - (*TcpKeepalive)(nil), // 4: envoy.config.core.v3.TcpKeepalive - (*ExtraSourceAddress)(nil), // 5: envoy.config.core.v3.ExtraSourceAddress - (*BindConfig)(nil), // 6: envoy.config.core.v3.BindConfig - (*Address)(nil), // 7: envoy.config.core.v3.Address - (*CidrRange)(nil), // 8: envoy.config.core.v3.CidrRange - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value - (*SocketOptionsOverride)(nil), // 10: envoy.config.core.v3.SocketOptionsOverride - (*wrappers.BoolValue)(nil), // 11: google.protobuf.BoolValue - (*SocketOption)(nil), // 12: envoy.config.core.v3.SocketOption - (*TypedExtensionConfig)(nil), // 13: envoy.config.core.v3.TypedExtensionConfig + (SocketAddress_Protocol)(0), // 0: envoy.config.core.v3.SocketAddress.Protocol + (*Pipe)(nil), // 1: envoy.config.core.v3.Pipe + (*EnvoyInternalAddress)(nil), // 2: envoy.config.core.v3.EnvoyInternalAddress + (*SocketAddress)(nil), // 3: envoy.config.core.v3.SocketAddress + (*TcpKeepalive)(nil), // 4: envoy.config.core.v3.TcpKeepalive + (*ExtraSourceAddress)(nil), // 5: envoy.config.core.v3.ExtraSourceAddress + (*BindConfig)(nil), // 6: envoy.config.core.v3.BindConfig + (*Address)(nil), // 7: envoy.config.core.v3.Address + (*CidrRange)(nil), // 8: envoy.config.core.v3.CidrRange + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*SocketOptionsOverride)(nil), // 10: envoy.config.core.v3.SocketOptionsOverride + (*wrapperspb.BoolValue)(nil), // 11: google.protobuf.BoolValue + (*SocketOption)(nil), // 12: envoy.config.core.v3.SocketOption + (*TypedExtensionConfig)(nil), // 13: envoy.config.core.v3.TypedExtensionConfig } var file_envoy_config_core_v3_address_proto_depIdxs = []int32{ 0, // 0: envoy.config.core.v3.SocketAddress.protocol:type_name -> envoy.config.core.v3.SocketAddress.Protocol diff --git a/envoy/config/core/v3/backoff.pb.go b/envoy/config/core/v3/backoff.pb.go index b33ee83fd..844edb20e 100755 --- a/envoy/config/core/v3/backoff.pb.go +++ b/envoy/config/core/v3/backoff.pb.go @@ -9,9 +9,9 @@ package corev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -32,13 +32,13 @@ type BackoffStrategy struct { // The base interval to be used for the next back off computation. It should // be greater than zero and less than or equal to :ref:`max_interval // `. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, // but must be greater than or equal to the :ref:`base_interval // ` if set. The default // is 10 times the :ref:`base_interval // `. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *BackoffStrategy) Reset() { @@ -73,14 +73,14 @@ func (*BackoffStrategy) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_backoff_proto_rawDescGZIP(), []int{0} } -func (x *BackoffStrategy) GetBaseInterval() *duration.Duration { +func (x *BackoffStrategy) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *BackoffStrategy) GetMaxInterval() *duration.Duration { +func (x *BackoffStrategy) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -140,8 +140,8 @@ func file_envoy_config_core_v3_backoff_proto_rawDescGZIP() []byte { var file_envoy_config_core_v3_backoff_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_core_v3_backoff_proto_goTypes = []interface{}{ - (*BackoffStrategy)(nil), // 0: envoy.config.core.v3.BackoffStrategy - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*BackoffStrategy)(nil), // 0: envoy.config.core.v3.BackoffStrategy + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_config_core_v3_backoff_proto_depIdxs = []int32{ 1, // 0: envoy.config.core.v3.BackoffStrategy.base_interval:type_name -> google.protobuf.Duration diff --git a/envoy/config/core/v3/base.pb.go b/envoy/config/core/v3/base.pb.go index 6be6a709a..0e6a8d14d 100755 --- a/envoy/config/core/v3/base.pb.go +++ b/envoy/config/core/v3/base.pb.go @@ -12,11 +12,11 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -358,7 +358,7 @@ type BuildVersion struct { Version *v3.SemanticVersion `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // Free-form build information. // Envoy defines several well known keys in the source/common/version/version.h file - Metadata *_struct.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (x *BuildVersion) Reset() { @@ -400,7 +400,7 @@ func (x *BuildVersion) GetVersion() *v3.SemanticVersion { return nil } -func (x *BuildVersion) GetMetadata() *_struct.Struct { +func (x *BuildVersion) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -545,7 +545,7 @@ type Node struct { Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` // Opaque metadata extending the node identifier. Envoy will pass this // directly to the management server. - Metadata *_struct.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // Map from xDS resource type URL to dynamic context parameters. These may vary at runtime (unlike // other fields in this message). For example, the xDS client may have a shard identifier that // changes during the lifetime of the xDS client. In Envoy, this would be achieved by updating the @@ -625,7 +625,7 @@ func (x *Node) GetCluster() string { return "" } -func (x *Node) GetMetadata() *_struct.Struct { +func (x *Node) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -749,14 +749,14 @@ type Metadata struct { // :ref:`typed_filter_metadata ` // fields are present in the metadata with same keys, // only “typed_filter_metadata“ field will be parsed. - FilterMetadata map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FilterMetadata map[string]*structpb.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Key is the reverse DNS filter name, e.g. com.acme.widget. The “envoy.*“ // namespace is reserved for Envoy's built-in filters. // The value is encoded as google.protobuf.Any. // If both :ref:`filter_metadata ` // and “typed_filter_metadata“ fields are present in the metadata with same keys, // only “typed_filter_metadata“ field will be parsed. - TypedFilterMetadata map[string]*any1.Any `protobuf:"bytes,2,rep,name=typed_filter_metadata,json=typedFilterMetadata,proto3" json:"typed_filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedFilterMetadata map[string]*anypb.Any `protobuf:"bytes,2,rep,name=typed_filter_metadata,json=typedFilterMetadata,proto3" json:"typed_filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Metadata) Reset() { @@ -791,14 +791,14 @@ func (*Metadata) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_base_proto_rawDescGZIP(), []int{4} } -func (x *Metadata) GetFilterMetadata() map[string]*_struct.Struct { +func (x *Metadata) GetFilterMetadata() map[string]*structpb.Struct { if x != nil { return x.FilterMetadata } return nil } -func (x *Metadata) GetTypedFilterMetadata() map[string]*any1.Any { +func (x *Metadata) GetTypedFilterMetadata() map[string]*anypb.Any { if x != nil { return x.TypedFilterMetadata } @@ -986,7 +986,7 @@ type RuntimeFeatureFlag struct { unknownFields protoimpl.UnknownFields // Default value if runtime value is not available. - DefaultValue *wrappers.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + DefaultValue *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` // Runtime key to get value for comparison. This value is used if defined. The boolean value must // be represented via its // `canonical JSON encoding `_. @@ -1025,7 +1025,7 @@ func (*RuntimeFeatureFlag) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_base_proto_rawDescGZIP(), []int{8} } -func (x *RuntimeFeatureFlag) GetDefaultValue() *wrappers.BoolValue { +func (x *RuntimeFeatureFlag) GetDefaultValue() *wrapperspb.BoolValue { if x != nil { return x.DefaultValue } @@ -1191,7 +1191,7 @@ type HeaderValueOption struct { // default value (``false``) for this field. // // Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto. - Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` + Append *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` // Describes the action taken to append/overwrite the given value for an existing header // or to only add this header if it's absent. // Value defaults to :ref:`APPEND_IF_EXISTS_OR_ADD @@ -1242,7 +1242,7 @@ func (x *HeaderValueOption) GetHeader() *HeaderValue { } // Deprecated: Marked as deprecated in envoy/config/core/v3/base.proto. -func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue { +func (x *HeaderValueOption) GetAppend() *wrapperspb.BoolValue { if x != nil { return x.Append } @@ -1488,7 +1488,7 @@ type RetryPolicy struct { RetryBackOff *BackoffStrategy `protobuf:"bytes,1,opt,name=retry_back_off,json=retryBackOff,proto3" json:"retry_back_off,omitempty"` // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // For details, see :ref:`retry_on `. RetryOn string `protobuf:"bytes,3,opt,name=retry_on,json=retryOn,proto3" json:"retry_on,omitempty"` // For details, see :ref:`retry_priority `. @@ -1538,7 +1538,7 @@ func (x *RetryPolicy) GetRetryBackOff() *BackoffStrategy { return nil } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } @@ -1791,7 +1791,7 @@ func (m *TransportSocket) GetConfigType() isTransportSocket_ConfigType { return nil } -func (x *TransportSocket) GetTypedConfig() *any1.Any { +func (x *TransportSocket) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*TransportSocket_TypedConfig); ok { return x.TypedConfig } @@ -1803,7 +1803,7 @@ type isTransportSocket_ConfigType interface { } type TransportSocket_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*TransportSocket_TypedConfig) isTransportSocket_ConfigType() {} @@ -1985,7 +1985,7 @@ func (m *RetryPolicy_RetryPriority) GetConfigType() isRetryPolicy_RetryPriority_ return nil } -func (x *RetryPolicy_RetryPriority) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryPriority) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_TypedConfig); ok { return x.TypedConfig } @@ -1997,7 +1997,7 @@ type isRetryPolicy_RetryPriority_ConfigType interface { } type RetryPolicy_RetryPriority_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryPriority_TypedConfig) isRetryPolicy_RetryPriority_ConfigType() {} @@ -2061,7 +2061,7 @@ func (m *RetryPolicy_RetryHostPredicate) GetConfigType() isRetryPolicy_RetryHost return nil } -func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_TypedConfig); ok { return x.TypedConfig } @@ -2073,7 +2073,7 @@ type isRetryPolicy_RetryHostPredicate_ConfigType interface { } type RetryPolicy_RetryHostPredicate_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryHostPredicate_TypedConfig) isRetryPolicy_RetryHostPredicate_ConfigType() {} @@ -2512,14 +2512,14 @@ var file_envoy_config_core_v3_base_proto_goTypes = []interface{}{ (*RetryPolicy_RetryPriority)(nil), // 28: envoy.config.core.v3.RetryPolicy.RetryPriority (*RetryPolicy_RetryHostPredicate)(nil), // 29: envoy.config.core.v3.RetryPolicy.RetryHostPredicate (*v3.SemanticVersion)(nil), // 30: envoy.type.v3.SemanticVersion - (*_struct.Struct)(nil), // 31: google.protobuf.Struct + (*structpb.Struct)(nil), // 31: google.protobuf.Struct (*Address)(nil), // 32: envoy.config.core.v3.Address (*v3.Percent)(nil), // 33: envoy.type.v3.Percent - (*wrappers.BoolValue)(nil), // 34: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 34: google.protobuf.BoolValue (*BackoffStrategy)(nil), // 35: envoy.config.core.v3.BackoffStrategy - (*wrappers.UInt32Value)(nil), // 36: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 36: google.protobuf.UInt32Value (*HttpUri)(nil), // 37: envoy.config.core.v3.HttpUri - (*any1.Any)(nil), // 38: google.protobuf.Any + (*anypb.Any)(nil), // 38: google.protobuf.Any (*v3.FractionalPercent)(nil), // 39: envoy.type.v3.FractionalPercent (*v31.ContextParams)(nil), // 40: xds.core.v3.ContextParams } diff --git a/envoy/config/core/v3/config_source.pb.go b/envoy/config/core/v3/config_source.pb.go index 07177a6b0..c15faf9b6 100755 --- a/envoy/config/core/v3/config_source.pb.go +++ b/envoy/config/core/v3/config_source.pb.go @@ -11,11 +11,11 @@ import ( v3 "github.com/cncf/xds/go/xds/core/v3" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -189,9 +189,9 @@ type ApiConfigSource struct { // services will be cycled through if any kind of failure occurs. GrpcServices []*GrpcService `protobuf:"bytes,4,rep,name=grpc_services,json=grpcServices,proto3" json:"grpc_services,omitempty"` // For REST APIs, the delay between successive polls. - RefreshDelay *duration.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` + RefreshDelay *durationpb.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` // For REST APIs, the request timeout. If not set, a default value of 1s will be used. - RequestTimeout *duration.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // For GRPC APIs, the rate limit settings. If present, discovery requests made by Envoy will be // rate limited. RateLimitSettings *RateLimitSettings `protobuf:"bytes,6,opt,name=rate_limit_settings,json=rateLimitSettings,proto3" json:"rate_limit_settings,omitempty"` @@ -268,14 +268,14 @@ func (x *ApiConfigSource) GetGrpcServices() []*GrpcService { return nil } -func (x *ApiConfigSource) GetRefreshDelay() *duration.Duration { +func (x *ApiConfigSource) GetRefreshDelay() *durationpb.Duration { if x != nil { return x.RefreshDelay } return nil } -func (x *ApiConfigSource) GetRequestTimeout() *duration.Duration { +func (x *ApiConfigSource) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } @@ -405,11 +405,11 @@ type RateLimitSettings struct { // Maximum number of tokens to be used for rate limiting discovery request calls. If not set, a // default value of 100 will be used. - MaxTokens *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` + MaxTokens *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` // Rate at which tokens will be filled per second. If not set, a default fill rate of 10 tokens // per second will be used. The minimal fill rate is once per year. Lower // fill rates will be set to once per year. - FillRate *wrappers.DoubleValue `protobuf:"bytes,2,opt,name=fill_rate,json=fillRate,proto3" json:"fill_rate,omitempty"` + FillRate *wrapperspb.DoubleValue `protobuf:"bytes,2,opt,name=fill_rate,json=fillRate,proto3" json:"fill_rate,omitempty"` } func (x *RateLimitSettings) Reset() { @@ -444,14 +444,14 @@ func (*RateLimitSettings) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_config_source_proto_rawDescGZIP(), []int{3} } -func (x *RateLimitSettings) GetMaxTokens() *wrappers.UInt32Value { +func (x *RateLimitSettings) GetMaxTokens() *wrapperspb.UInt32Value { if x != nil { return x.MaxTokens } return nil } -func (x *RateLimitSettings) GetFillRate() *wrappers.DoubleValue { +func (x *RateLimitSettings) GetFillRate() *wrapperspb.DoubleValue { if x != nil { return x.FillRate } @@ -575,7 +575,7 @@ type ConfigSource struct { // 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). The default is 15s. - InitialFetchTimeout *duration.Duration `protobuf:"bytes,4,opt,name=initial_fetch_timeout,json=initialFetchTimeout,proto3" json:"initial_fetch_timeout,omitempty"` + InitialFetchTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=initial_fetch_timeout,json=initialFetchTimeout,proto3" json:"initial_fetch_timeout,omitempty"` // API version for xDS resources. This implies the type URLs that the client // will request for resources and the resource type that the client will in // turn expect to be delivered. @@ -664,7 +664,7 @@ func (x *ConfigSource) GetSelf() *SelfConfigSource { return nil } -func (x *ConfigSource) GetInitialFetchTimeout() *duration.Duration { +func (x *ConfigSource) GetInitialFetchTimeout() *durationpb.Duration { if x != nil { return x.InitialFetchTimeout } @@ -750,7 +750,7 @@ type ExtensionConfigSource struct { // Optional default configuration to use as the initial configuration if // there is a failure to receive the initial extension configuration or if // “apply_default_config_without_warming“ flag is set. - DefaultConfig *any1.Any `protobuf:"bytes,2,opt,name=default_config,json=defaultConfig,proto3" json:"default_config,omitempty"` + DefaultConfig *anypb.Any `protobuf:"bytes,2,opt,name=default_config,json=defaultConfig,proto3" json:"default_config,omitempty"` // Use the default config as the initial configuration without warming and // waiting for the first discovery response. Requires the default configuration // to be supplied. @@ -799,7 +799,7 @@ func (x *ExtensionConfigSource) GetConfigSource() *ConfigSource { return nil } -func (x *ExtensionConfigSource) GetDefaultConfig() *any1.Any { +func (x *ExtensionConfigSource) GetDefaultConfig() *anypb.Any { if x != nil { return x.DefaultConfig } @@ -1040,13 +1040,13 @@ var file_envoy_config_core_v3_config_source_proto_goTypes = []interface{}{ (*ConfigSource)(nil), // 7: envoy.config.core.v3.ConfigSource (*ExtensionConfigSource)(nil), // 8: envoy.config.core.v3.ExtensionConfigSource (*GrpcService)(nil), // 9: envoy.config.core.v3.GrpcService - (*duration.Duration)(nil), // 10: google.protobuf.Duration + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration (*TypedExtensionConfig)(nil), // 11: envoy.config.core.v3.TypedExtensionConfig - (*wrappers.UInt32Value)(nil), // 12: google.protobuf.UInt32Value - (*wrappers.DoubleValue)(nil), // 13: google.protobuf.DoubleValue + (*wrapperspb.UInt32Value)(nil), // 12: google.protobuf.UInt32Value + (*wrapperspb.DoubleValue)(nil), // 13: google.protobuf.DoubleValue (*WatchedDirectory)(nil), // 14: envoy.config.core.v3.WatchedDirectory (*v3.Authority)(nil), // 15: xds.core.v3.Authority - (*any1.Any)(nil), // 16: google.protobuf.Any + (*anypb.Any)(nil), // 16: google.protobuf.Any } var file_envoy_config_core_v3_config_source_proto_depIdxs = []int32{ 1, // 0: envoy.config.core.v3.ApiConfigSource.api_type:type_name -> envoy.config.core.v3.ApiConfigSource.ApiType diff --git a/envoy/config/core/v3/extension.pb.go b/envoy/config/core/v3/extension.pb.go index a8952b405..1565f0ef0 100755 --- a/envoy/config/core/v3/extension.pb.go +++ b/envoy/config/core/v3/extension.pb.go @@ -9,9 +9,9 @@ package corev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -39,7 +39,7 @@ type TypedExtensionConfig struct { // URL of “TypedStruct“ will be utilized. See the // :ref:`extension configuration overview // ` for further details. - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *TypedExtensionConfig) Reset() { @@ -81,7 +81,7 @@ func (x *TypedExtensionConfig) GetName() string { return "" } -func (x *TypedExtensionConfig) GetTypedConfig() *any1.Any { +func (x *TypedExtensionConfig) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -134,7 +134,7 @@ func file_envoy_config_core_v3_extension_proto_rawDescGZIP() []byte { var file_envoy_config_core_v3_extension_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_core_v3_extension_proto_goTypes = []interface{}{ (*TypedExtensionConfig)(nil), // 0: envoy.config.core.v3.TypedExtensionConfig - (*any1.Any)(nil), // 1: google.protobuf.Any + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_envoy_config_core_v3_extension_proto_depIdxs = []int32{ 1, // 0: envoy.config.core.v3.TypedExtensionConfig.typed_config:type_name -> google.protobuf.Any diff --git a/envoy/config/core/v3/grpc_service.pb.go b/envoy/config/core/v3/grpc_service.pb.go index ae5dd2b41..8c89f6e6b 100755 --- a/envoy/config/core/v3/grpc_service.pb.go +++ b/envoy/config/core/v3/grpc_service.pb.go @@ -9,13 +9,13 @@ package corev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" emptypb "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -42,7 +42,7 @@ type GrpcService struct { TargetSpecifier isGrpcService_TargetSpecifier `protobuf_oneof:"target_specifier"` // The timeout for the gRPC request. This is the timeout for a specific // request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // Additional metadata to include in streams initiated to the GrpcService. This can be used for // scenarios in which additional ad hoc authorization headers (e.g. “x-foo-bar: baz-key“) are to // be injected. For more information, including details on header value syntax, see the @@ -107,7 +107,7 @@ func (x *GrpcService) GetGoogleGrpc() *GrpcService_GoogleGrpc { return nil } -func (x *GrpcService) GetTimeout() *duration.Duration { +func (x *GrpcService) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -253,10 +253,10 @@ type GrpcService_GoogleGrpc struct { CredentialsFactoryName string `protobuf:"bytes,5,opt,name=credentials_factory_name,json=credentialsFactoryName,proto3" json:"credentials_factory_name,omitempty"` // Additional configuration for site-specific customizations of the Google // gRPC library. - Config *_struct.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"` // How many bytes each stream can buffer internally. // If not set an implementation defined default is applied (1MiB). - PerStreamBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=per_stream_buffer_limit_bytes,json=perStreamBufferLimitBytes,proto3" json:"per_stream_buffer_limit_bytes,omitempty"` + PerStreamBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=per_stream_buffer_limit_bytes,json=perStreamBufferLimitBytes,proto3" json:"per_stream_buffer_limit_bytes,omitempty"` // Custom channels args. ChannelArgs *GrpcService_GoogleGrpc_ChannelArgs `protobuf:"bytes,8,opt,name=channel_args,json=channelArgs,proto3" json:"channel_args,omitempty"` } @@ -328,14 +328,14 @@ func (x *GrpcService_GoogleGrpc) GetCredentialsFactoryName() string { return "" } -func (x *GrpcService_GoogleGrpc) GetConfig() *_struct.Struct { +func (x *GrpcService_GoogleGrpc) GetConfig() *structpb.Struct { if x != nil { return x.Config } return nil } -func (x *GrpcService_GoogleGrpc) GetPerStreamBufferLimitBytes() *wrappers.UInt32Value { +func (x *GrpcService_GoogleGrpc) GetPerStreamBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerStreamBufferLimitBytes } @@ -951,7 +951,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) G return nil } -func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetTypedConfig() *any1.Any { +func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig); ok { return x.TypedConfig } @@ -963,7 +963,7 @@ type isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Conf } type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig) isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_ConfigType() { @@ -1526,15 +1526,15 @@ var file_envoy_config_core_v3_grpc_service_proto_goTypes = []interface{}{ (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin)(nil), // 10: envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin (*GrpcService_GoogleGrpc_CallCredentials_StsService)(nil), // 11: envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.StsService (*GrpcService_GoogleGrpc_ChannelArgs_Value)(nil), // 12: envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.Value - nil, // 13: envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry - (*duration.Duration)(nil), // 14: google.protobuf.Duration - (*HeaderValue)(nil), // 15: envoy.config.core.v3.HeaderValue - (*RetryPolicy)(nil), // 16: envoy.config.core.v3.RetryPolicy - (*_struct.Struct)(nil), // 17: google.protobuf.Struct - (*wrappers.UInt32Value)(nil), // 18: google.protobuf.UInt32Value - (*DataSource)(nil), // 19: envoy.config.core.v3.DataSource - (*emptypb.Empty)(nil), // 20: google.protobuf.Empty - (*any1.Any)(nil), // 21: google.protobuf.Any + nil, // 13: envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry + (*durationpb.Duration)(nil), // 14: google.protobuf.Duration + (*HeaderValue)(nil), // 15: envoy.config.core.v3.HeaderValue + (*RetryPolicy)(nil), // 16: envoy.config.core.v3.RetryPolicy + (*structpb.Struct)(nil), // 17: google.protobuf.Struct + (*wrapperspb.UInt32Value)(nil), // 18: google.protobuf.UInt32Value + (*DataSource)(nil), // 19: envoy.config.core.v3.DataSource + (*emptypb.Empty)(nil), // 20: google.protobuf.Empty + (*anypb.Any)(nil), // 21: google.protobuf.Any } var file_envoy_config_core_v3_grpc_service_proto_depIdxs = []int32{ 1, // 0: envoy.config.core.v3.GrpcService.envoy_grpc:type_name -> envoy.config.core.v3.GrpcService.EnvoyGrpc diff --git a/envoy/config/core/v3/health_check.pb.go b/envoy/config/core/v3/health_check.pb.go index 9111396fc..345d4eb87 100755 --- a/envoy/config/core/v3/health_check.pb.go +++ b/envoy/config/core/v3/health_check.pb.go @@ -12,12 +12,12 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -155,16 +155,16 @@ type HealthCheck struct { // The time to wait for a health check response. If the timeout is reached the // health check attempt will be considered a failure. - Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // The interval between health checks. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // An optional jitter amount in milliseconds. If specified, Envoy will start health // checking after for a random time in ms between 0 and initial_jitter. This only // applies to the first health check. - InitialJitter *duration.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` + InitialJitter *durationpb.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` // An optional jitter amount in milliseconds. If specified, during every // interval Envoy will add interval_jitter to the wait time. - IntervalJitter *duration.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` + IntervalJitter *durationpb.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` // An optional jitter amount as a percentage of interval_ms. If specified, // during every interval Envoy will add “interval_ms“ * // “interval_jitter_percent“ / 100 to the wait time. @@ -177,15 +177,15 @@ type HealthCheck struct { // :ref:`expected_statuses ` // or :ref:`retriable_statuses `, // this threshold is ignored and the host is considered immediately unhealthy. - UnhealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` + UnhealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` // The number of healthy health checks required before a host is marked // healthy. Note that during startup, only a single successful health check is // required to mark a host healthy. - HealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` + HealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` // [#not-implemented-hide:] Non-serving port for health checking. - AltPort *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=alt_port,json=altPort,proto3" json:"alt_port,omitempty"` + AltPort *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=alt_port,json=altPort,proto3" json:"alt_port,omitempty"` // Reuse health check connection between health checks. Default is true. - ReuseConnection *wrappers.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` + ReuseConnection *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` // Types that are assignable to HealthChecker: // // *HealthCheck_HttpHealthCheck_ @@ -201,7 +201,7 @@ type HealthCheck struct { // any other. // // The default value for "no traffic interval" is 60 seconds. - NoTrafficInterval *duration.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` + NoTrafficInterval *durationpb.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` // The "no traffic healthy interval" is a special health check interval that // is used for hosts that are currently passing active health checking // (including new hosts) when the cluster has received no traffic. @@ -215,26 +215,26 @@ type HealthCheck struct { // // If no_traffic_healthy_interval is not set, it will default to the // no traffic interval and send that interval regardless of health state. - NoTrafficHealthyInterval *duration.Duration `protobuf:"bytes,24,opt,name=no_traffic_healthy_interval,json=noTrafficHealthyInterval,proto3" json:"no_traffic_healthy_interval,omitempty"` + NoTrafficHealthyInterval *durationpb.Duration `protobuf:"bytes,24,opt,name=no_traffic_healthy_interval,json=noTrafficHealthyInterval,proto3" json:"no_traffic_healthy_interval,omitempty"` // The "unhealthy interval" is a health check interval that is used for hosts that are marked as // unhealthy. As soon as the host is marked as healthy, Envoy will shift back to using the // standard health check interval that is defined. // // The default value for "unhealthy interval" is the same as "interval". - UnhealthyInterval *duration.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` + UnhealthyInterval *durationpb.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` // The "unhealthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as unhealthy. For subsequent health checks // Envoy will shift back to using either "unhealthy interval" if present or the standard health // check interval that is defined. // // The default value for "unhealthy edge interval" is the same as "unhealthy interval". - UnhealthyEdgeInterval *duration.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` + UnhealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` // The "healthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as healthy. For subsequent health checks // Envoy will shift back to using the standard health check interval that is defined. // // The default value for "healthy edge interval" is the same as the default interval. - HealthyEdgeInterval *duration.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` + HealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` // .. attention:: // This field is deprecated in favor of the extension // :ref:`event_logger ` and @@ -292,7 +292,7 @@ type HealthCheck struct { // :ref:`transport socket matches `, // the cluster's :ref:`transport socket ` // will be used for health check socket configuration. - TransportSocketMatchCriteria *_struct.Struct `protobuf:"bytes,23,opt,name=transport_socket_match_criteria,json=transportSocketMatchCriteria,proto3" json:"transport_socket_match_criteria,omitempty"` + TransportSocketMatchCriteria *structpb.Struct `protobuf:"bytes,23,opt,name=transport_socket_match_criteria,json=transportSocketMatchCriteria,proto3" json:"transport_socket_match_criteria,omitempty"` } func (x *HealthCheck) Reset() { @@ -327,28 +327,28 @@ func (*HealthCheck) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_health_check_proto_rawDescGZIP(), []int{1} } -func (x *HealthCheck) GetTimeout() *duration.Duration { +func (x *HealthCheck) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *HealthCheck) GetInterval() *duration.Duration { +func (x *HealthCheck) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *HealthCheck) GetInitialJitter() *duration.Duration { +func (x *HealthCheck) GetInitialJitter() *durationpb.Duration { if x != nil { return x.InitialJitter } return nil } -func (x *HealthCheck) GetIntervalJitter() *duration.Duration { +func (x *HealthCheck) GetIntervalJitter() *durationpb.Duration { if x != nil { return x.IntervalJitter } @@ -362,28 +362,28 @@ func (x *HealthCheck) GetIntervalJitterPercent() uint32 { return 0 } -func (x *HealthCheck) GetUnhealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetUnhealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.UnhealthyThreshold } return nil } -func (x *HealthCheck) GetHealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetHealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.HealthyThreshold } return nil } -func (x *HealthCheck) GetAltPort() *wrappers.UInt32Value { +func (x *HealthCheck) GetAltPort() *wrapperspb.UInt32Value { if x != nil { return x.AltPort } return nil } -func (x *HealthCheck) GetReuseConnection() *wrappers.BoolValue { +func (x *HealthCheck) GetReuseConnection() *wrapperspb.BoolValue { if x != nil { return x.ReuseConnection } @@ -425,35 +425,35 @@ func (x *HealthCheck) GetCustomHealthCheck() *HealthCheck_CustomHealthCheck { return nil } -func (x *HealthCheck) GetNoTrafficInterval() *duration.Duration { +func (x *HealthCheck) GetNoTrafficInterval() *durationpb.Duration { if x != nil { return x.NoTrafficInterval } return nil } -func (x *HealthCheck) GetNoTrafficHealthyInterval() *duration.Duration { +func (x *HealthCheck) GetNoTrafficHealthyInterval() *durationpb.Duration { if x != nil { return x.NoTrafficHealthyInterval } return nil } -func (x *HealthCheck) GetUnhealthyInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyInterval() *durationpb.Duration { if x != nil { return x.UnhealthyInterval } return nil } -func (x *HealthCheck) GetUnhealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.UnhealthyEdgeInterval } return nil } -func (x *HealthCheck) GetHealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetHealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.HealthyEdgeInterval } @@ -503,7 +503,7 @@ func (x *HealthCheck) GetTlsOptions() *HealthCheck_TlsOptions { return nil } -func (x *HealthCheck) GetTransportSocketMatchCriteria() *_struct.Struct { +func (x *HealthCheck) GetTransportSocketMatchCriteria() *structpb.Struct { if x != nil { return x.TransportSocketMatchCriteria } @@ -654,7 +654,7 @@ type HealthCheck_HttpHealthCheck struct { Receive []*HealthCheck_Payload `protobuf:"bytes,4,rep,name=receive,proto3" json:"receive,omitempty"` // Specifies the size of response buffer in bytes that is used to Payload match. // The default value is 1024. Setting to 0 implies that the Payload will be matched against the entire response. - ResponseBufferSize *wrappers.UInt64Value `protobuf:"bytes,14,opt,name=response_buffer_size,json=responseBufferSize,proto3" json:"response_buffer_size,omitempty"` + ResponseBufferSize *wrapperspb.UInt64Value `protobuf:"bytes,14,opt,name=response_buffer_size,json=responseBufferSize,proto3" json:"response_buffer_size,omitempty"` // Specifies a list of HTTP headers that should be added to each request that is sent to the // health checked cluster. For more information, including details on header value syntax, see // the documentation on :ref:`custom request headers @@ -753,7 +753,7 @@ func (x *HealthCheck_HttpHealthCheck) GetReceive() []*HealthCheck_Payload { return nil } -func (x *HealthCheck_HttpHealthCheck) GetResponseBufferSize() *wrappers.UInt64Value { +func (x *HealthCheck_HttpHealthCheck) GetResponseBufferSize() *wrapperspb.UInt64Value { if x != nil { return x.ResponseBufferSize } @@ -1063,7 +1063,7 @@ func (m *HealthCheck_CustomHealthCheck) GetConfigType() isHealthCheck_CustomHeal return nil } -func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *any1.Any { +func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_TypedConfig); ok { return x.TypedConfig } @@ -1075,7 +1075,7 @@ type isHealthCheck_CustomHealthCheck_ConfigType interface { } type HealthCheck_CustomHealthCheck_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*HealthCheck_CustomHealthCheck_TypedConfig) isHealthCheck_CustomHealthCheck_ConfigType() {} @@ -1471,19 +1471,19 @@ var file_envoy_config_core_v3_health_check_proto_goTypes = []interface{}{ (*HealthCheck_GrpcHealthCheck)(nil), // 7: envoy.config.core.v3.HealthCheck.GrpcHealthCheck (*HealthCheck_CustomHealthCheck)(nil), // 8: envoy.config.core.v3.HealthCheck.CustomHealthCheck (*HealthCheck_TlsOptions)(nil), // 9: envoy.config.core.v3.HealthCheck.TlsOptions - (*duration.Duration)(nil), // 10: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 11: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 12: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 11: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 12: google.protobuf.BoolValue (*TypedExtensionConfig)(nil), // 13: envoy.config.core.v3.TypedExtensionConfig (*EventServiceConfig)(nil), // 14: envoy.config.core.v3.EventServiceConfig - (*_struct.Struct)(nil), // 15: google.protobuf.Struct - (*wrappers.UInt64Value)(nil), // 16: google.protobuf.UInt64Value + (*structpb.Struct)(nil), // 15: google.protobuf.Struct + (*wrapperspb.UInt64Value)(nil), // 16: google.protobuf.UInt64Value (*HeaderValueOption)(nil), // 17: envoy.config.core.v3.HeaderValueOption (*v3.Int64Range)(nil), // 18: envoy.type.v3.Int64Range (v3.CodecClientType)(0), // 19: envoy.type.v3.CodecClientType (*v31.StringMatcher)(nil), // 20: envoy.type.matcher.v3.StringMatcher (RequestMethod)(0), // 21: envoy.config.core.v3.RequestMethod - (*any1.Any)(nil), // 22: google.protobuf.Any + (*anypb.Any)(nil), // 22: google.protobuf.Any } var file_envoy_config_core_v3_health_check_proto_depIdxs = []int32{ 0, // 0: envoy.config.core.v3.HealthStatusSet.statuses:type_name -> envoy.config.core.v3.HealthStatus diff --git a/envoy/config/core/v3/http_uri.pb.go b/envoy/config/core/v3/http_uri.pb.go index 86ed6982d..0b016baaa 100755 --- a/envoy/config/core/v3/http_uri.pb.go +++ b/envoy/config/core/v3/http_uri.pb.go @@ -9,9 +9,9 @@ package corev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -47,7 +47,7 @@ type HttpUri struct { // *HttpUri_Cluster HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"` // Sets the maximum duration in milliseconds that a response can take to arrive upon request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *HttpUri) Reset() { @@ -103,7 +103,7 @@ func (x *HttpUri) GetCluster() string { return "" } -func (x *HttpUri) GetTimeout() *duration.Duration { +func (x *HttpUri) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -181,8 +181,8 @@ func file_envoy_config_core_v3_http_uri_proto_rawDescGZIP() []byte { var file_envoy_config_core_v3_http_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_core_v3_http_uri_proto_goTypes = []interface{}{ - (*HttpUri)(nil), // 0: envoy.config.core.v3.HttpUri - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*HttpUri)(nil), // 0: envoy.config.core.v3.HttpUri + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_config_core_v3_http_uri_proto_depIdxs = []int32{ 1, // 0: envoy.config.core.v3.HttpUri.timeout:type_name -> google.protobuf.Duration diff --git a/envoy/config/core/v3/protocol.pb.go b/envoy/config/core/v3/protocol.pb.go index 1f613162b..05288b555 100755 --- a/envoy/config/core/v3/protocol.pb.go +++ b/envoy/config/core/v3/protocol.pb.go @@ -12,10 +12,10 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -141,13 +141,13 @@ type QuicKeepAliveSettings struct { // // If zero, disable keepalive probing. // If absent, use the QUICHE default interval to probe. - MaxInterval *duration.Duration `protobuf:"bytes,1,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` // The interval to send the first few keep-alive probing packets to prevent connection from hitting the idle timeout. Subsequent probes will be sent, each one with an interval exponentially longer than previous one, till it reaches :ref:`max_interval `. And the probes afterwards will always use :ref:`max_interval `. // // The value should be smaller than :ref:`connection idle_timeout ` to prevent idle timeout and smaller than max_interval to take effect. // // If absent or zero, disable keepalive probing for a server connection. For a client connection, if :ref:`max_interval ` is also zero, do not keepalive, otherwise use max_interval or QUICHE default to probe all the time. - InitialInterval *duration.Duration `protobuf:"bytes,2,opt,name=initial_interval,json=initialInterval,proto3" json:"initial_interval,omitempty"` + InitialInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=initial_interval,json=initialInterval,proto3" json:"initial_interval,omitempty"` } func (x *QuicKeepAliveSettings) Reset() { @@ -182,14 +182,14 @@ func (*QuicKeepAliveSettings) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{1} } -func (x *QuicKeepAliveSettings) GetMaxInterval() *duration.Duration { +func (x *QuicKeepAliveSettings) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } return nil } -func (x *QuicKeepAliveSettings) GetInitialInterval() *duration.Duration { +func (x *QuicKeepAliveSettings) GetInitialInterval() *durationpb.Duration { if x != nil { return x.InitialInterval } @@ -205,7 +205,7 @@ type QuicProtocolOptions struct { // Maximum number of streams that the client can negotiate per connection. 100 // if not specified. - MaxConcurrentStreams *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` + MaxConcurrentStreams *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` // `Initial stream-level flow-control receive window // `_ size. Valid values range from // 1 to 16777216 (2^24, maximum supported by QUICHE) and defaults to 16777216 (16 * 1024 * 1024). @@ -216,19 +216,19 @@ type QuicProtocolOptions struct { // This field also acts as a soft limit on the number of bytes Envoy will buffer per-stream in the // QUIC stream send and receive buffers. Once the buffer reaches this pointer, watermark callbacks will fire to // stop the flow of data to the stream buffers. - InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` + InitialStreamWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` // Similar to “initial_stream_window_size“, but for connection-level // flow-control. Valid values rage from 1 to 25165824 (24MB, maximum supported by QUICHE) and defaults // to 25165824 (24 * 1024 * 1024). // // NOTE: 16384 (2^14) is the minimum window size supported in Google QUIC. We only support increasing the default // window size now, so it's also the minimum. - InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` + InitialConnectionWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` // The number of timeouts that can occur before port migration is triggered for QUIC clients. // This defaults to 4. If set to 0, port migration will not occur on path degrading. // Timeout here refers to QUIC internal path degrading timeout mechanism, such as PTO. // This has no effect on server sessions. - NumTimeoutsToTriggerPortMigration *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=num_timeouts_to_trigger_port_migration,json=numTimeoutsToTriggerPortMigration,proto3" json:"num_timeouts_to_trigger_port_migration,omitempty"` + NumTimeoutsToTriggerPortMigration *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=num_timeouts_to_trigger_port_migration,json=numTimeoutsToTriggerPortMigration,proto3" json:"num_timeouts_to_trigger_port_migration,omitempty"` // Probes the peer at the configured interval to solicit traffic, i.e. ACK or PATH_RESPONSE, from the peer to push back connection idle timeout. // If absent, use the default keepalive behavior of which a client connection sends PINGs every 15s, and a server connection doesn't do anything. ConnectionKeepalive *QuicKeepAliveSettings `protobuf:"bytes,5,opt,name=connection_keepalive,json=connectionKeepalive,proto3" json:"connection_keepalive,omitempty"` @@ -242,7 +242,7 @@ type QuicProtocolOptions struct { // default 600s will be applied. // For internal corporate network, a long timeout is often fine. // But for client facing network, 30s is usually a good choice. - IdleNetworkTimeout *duration.Duration `protobuf:"bytes,8,opt,name=idle_network_timeout,json=idleNetworkTimeout,proto3" json:"idle_network_timeout,omitempty"` + IdleNetworkTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=idle_network_timeout,json=idleNetworkTimeout,proto3" json:"idle_network_timeout,omitempty"` } func (x *QuicProtocolOptions) Reset() { @@ -277,28 +277,28 @@ func (*QuicProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{2} } -func (x *QuicProtocolOptions) GetMaxConcurrentStreams() *wrappers.UInt32Value { +func (x *QuicProtocolOptions) GetMaxConcurrentStreams() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrentStreams } return nil } -func (x *QuicProtocolOptions) GetInitialStreamWindowSize() *wrappers.UInt32Value { +func (x *QuicProtocolOptions) GetInitialStreamWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialStreamWindowSize } return nil } -func (x *QuicProtocolOptions) GetInitialConnectionWindowSize() *wrappers.UInt32Value { +func (x *QuicProtocolOptions) GetInitialConnectionWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialConnectionWindowSize } return nil } -func (x *QuicProtocolOptions) GetNumTimeoutsToTriggerPortMigration() *wrappers.UInt32Value { +func (x *QuicProtocolOptions) GetNumTimeoutsToTriggerPortMigration() *wrapperspb.UInt32Value { if x != nil { return x.NumTimeoutsToTriggerPortMigration } @@ -326,7 +326,7 @@ func (x *QuicProtocolOptions) GetClientConnectionOptions() string { return "" } -func (x *QuicProtocolOptions) GetIdleNetworkTimeout() *duration.Duration { +func (x *QuicProtocolOptions) GetIdleNetworkTimeout() *durationpb.Duration { if x != nil { return x.IdleNetworkTimeout } @@ -437,7 +437,7 @@ type AlternateProtocolsCacheOptions struct { // The implementation is approximate and enforced independently on each worker thread, thus // it is possible for the maximum entries in the cache to go slightly above the configured // value depending on timing. This is similar to how other circuit breakers work. - MaxEntries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty"` + MaxEntries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty"` // Allows configuring a persistent // :ref:`key value store ` to flush // alternate protocols entries to disk. @@ -497,7 +497,7 @@ func (x *AlternateProtocolsCacheOptions) GetName() string { return "" } -func (x *AlternateProtocolsCacheOptions) GetMaxEntries() *wrappers.UInt32Value { +func (x *AlternateProtocolsCacheOptions) GetMaxEntries() *wrapperspb.UInt32Value { if x != nil { return x.MaxEntries } @@ -548,21 +548,21 @@ type HttpProtocolOptions struct { // If the :ref:`overload action ` "envoy.overload_actions.reduce_timeouts" // is configured, this timeout is scaled for downstream connections according to the value for // :ref:`HTTP_DOWNSTREAM_CONNECTION_IDLE `. - IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // The maximum duration of a connection. The duration is defined as a period since a connection // was established. If not set, there is no max duration. When max_connection_duration is reached // and if there are no active streams, the connection will be closed. If the connection is a // downstream connection and there are any active streams, the drain sequence will kick-in, // and the connection will be force-closed after the drain period. See :ref:`drain_timeout // `. - MaxConnectionDuration *duration.Duration `protobuf:"bytes,3,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` + MaxConnectionDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` // The maximum number of headers. If unconfigured, the default // maximum number of request headers allowed is 100. Requests that exceed this limit will receive // a 431 response for HTTP/1.x and cause a stream reset for HTTP/2. - MaxHeadersCount *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` + MaxHeadersCount *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` // Total duration to keep alive an HTTP request/response stream. If the time limit is reached the stream will be // reset independent of any other timeouts. If not specified, this value is not set. - MaxStreamDuration *duration.Duration `protobuf:"bytes,4,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` + MaxStreamDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` // Action to take when a client request with a header name containing underscore characters is received. // If this setting is not specified, the value defaults to ALLOW. // Note: upstream responses are not affected by this setting. @@ -573,7 +573,7 @@ type HttpProtocolOptions struct { // If not specified, there is no limit. // Setting this parameter to 1 will effectively disable keep alive. // For HTTP/2 and HTTP/3, due to concurrent stream processing, the limit is approximate. - MaxRequestsPerConnection *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` + MaxRequestsPerConnection *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` } func (x *HttpProtocolOptions) Reset() { @@ -608,28 +608,28 @@ func (*HttpProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{5} } -func (x *HttpProtocolOptions) GetIdleTimeout() *duration.Duration { +func (x *HttpProtocolOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *HttpProtocolOptions) GetMaxConnectionDuration() *duration.Duration { +func (x *HttpProtocolOptions) GetMaxConnectionDuration() *durationpb.Duration { if x != nil { return x.MaxConnectionDuration } return nil } -func (x *HttpProtocolOptions) GetMaxHeadersCount() *wrappers.UInt32Value { +func (x *HttpProtocolOptions) GetMaxHeadersCount() *wrapperspb.UInt32Value { if x != nil { return x.MaxHeadersCount } return nil } -func (x *HttpProtocolOptions) GetMaxStreamDuration() *duration.Duration { +func (x *HttpProtocolOptions) GetMaxStreamDuration() *durationpb.Duration { if x != nil { return x.MaxStreamDuration } @@ -643,7 +643,7 @@ func (x *HttpProtocolOptions) GetHeadersWithUnderscoresAction() HttpProtocolOpti return HttpProtocolOptions_ALLOW } -func (x *HttpProtocolOptions) GetMaxRequestsPerConnection() *wrappers.UInt32Value { +func (x *HttpProtocolOptions) GetMaxRequestsPerConnection() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestsPerConnection } @@ -660,7 +660,7 @@ type Http1ProtocolOptions struct { // are generally sent by clients to forward/explicit proxies. This allows clients to configure // envoy as their HTTP proxy. In Unix, for example, this is typically done by setting the // “http_proxy“ environment variable. - AllowAbsoluteUrl *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_absolute_url,json=allowAbsoluteUrl,proto3" json:"allow_absolute_url,omitempty"` + AllowAbsoluteUrl *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=allow_absolute_url,json=allowAbsoluteUrl,proto3" json:"allow_absolute_url,omitempty"` // Handle incoming HTTP/1.0 and HTTP 0.9 requests. // This is off by default, and not fully standards compliant. There is support for pre-HTTP/1.1 // style connect logic, dechunking, and handling lack of client host iff @@ -703,7 +703,7 @@ type Http1ProtocolOptions struct { // open where possible. // If set, this overrides any HCM :ref:`stream_error_on_invalid_http_messaging // `. - OverrideStreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,7,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` + OverrideStreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` // Allows sending fully qualified URLs when proxying the first line of the // response. By default, Envoy will only send the path components in the first line. // If this is true, Envoy will create a fully qualified URI composing scheme @@ -715,7 +715,7 @@ type Http1ProtocolOptions struct { // If unset, HTTP/1 parser is selected based on // envoy.reloadable_features.http1_use_balsa_parser. // See issue #21245. - UseBalsaParser *wrappers.BoolValue `protobuf:"bytes,9,opt,name=use_balsa_parser,json=useBalsaParser,proto3" json:"use_balsa_parser,omitempty"` + UseBalsaParser *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=use_balsa_parser,json=useBalsaParser,proto3" json:"use_balsa_parser,omitempty"` // [#not-implemented-hide:] Hiding so that field can be removed. // If true, and BalsaParser is used (either `use_balsa_parser` above is true, // or `envoy.reloadable_features.http1_use_balsa_parser` is true and @@ -762,7 +762,7 @@ func (*Http1ProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{6} } -func (x *Http1ProtocolOptions) GetAllowAbsoluteUrl() *wrappers.BoolValue { +func (x *Http1ProtocolOptions) GetAllowAbsoluteUrl() *wrapperspb.BoolValue { if x != nil { return x.AllowAbsoluteUrl } @@ -804,7 +804,7 @@ func (x *Http1ProtocolOptions) GetAllowChunkedLength() bool { return false } -func (x *Http1ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *Http1ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.OverrideStreamErrorOnInvalidHttpMessage } @@ -818,7 +818,7 @@ func (x *Http1ProtocolOptions) GetSendFullyQualifiedUrl() bool { return false } -func (x *Http1ProtocolOptions) GetUseBalsaParser() *wrappers.BoolValue { +func (x *Http1ProtocolOptions) GetUseBalsaParser() *wrapperspb.BoolValue { if x != nil { return x.UseBalsaParser } @@ -839,12 +839,12 @@ type KeepaliveSettings struct { // Send HTTP/2 PING frames at this period, in order to test that the connection is still alive. // If this is zero, interval PINGs will not be sent. - Interval *duration.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` // How long to wait for a response to a keepalive PING. If a response is not received within this // time period, the connection will be aborted. Note that in order to prevent the influence of // Head-of-line (HOL) blocking the timeout period is extended when *any* frame is received on // the connection, under the assumption that if a frame is received the connection is healthy. - Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` // A random jitter amount as a percentage of interval that will be added to each interval. // A value of zero means there will be no jitter. // The default value is 15%. @@ -856,7 +856,7 @@ type KeepaliveSettings struct { // interval ping will determine if the connection is dead. // // The same feature for HTTP/3 is given by inheritance from QUICHE which uses :ref:`connection idle_timeout ` and the current PTO of the connection to decide whether to probe before sending a new request. - ConnectionIdleInterval *duration.Duration `protobuf:"bytes,4,opt,name=connection_idle_interval,json=connectionIdleInterval,proto3" json:"connection_idle_interval,omitempty"` + ConnectionIdleInterval *durationpb.Duration `protobuf:"bytes,4,opt,name=connection_idle_interval,json=connectionIdleInterval,proto3" json:"connection_idle_interval,omitempty"` } func (x *KeepaliveSettings) Reset() { @@ -891,14 +891,14 @@ func (*KeepaliveSettings) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{7} } -func (x *KeepaliveSettings) GetInterval() *duration.Duration { +func (x *KeepaliveSettings) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *KeepaliveSettings) GetTimeout() *duration.Duration { +func (x *KeepaliveSettings) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -912,7 +912,7 @@ func (x *KeepaliveSettings) GetIntervalJitter() *v3.Percent { return nil } -func (x *KeepaliveSettings) GetConnectionIdleInterval() *duration.Duration { +func (x *KeepaliveSettings) GetConnectionIdleInterval() *durationpb.Duration { if x != nil { return x.ConnectionIdleInterval } @@ -929,7 +929,7 @@ type Http2ProtocolOptions struct { // (in octets) that the encoder is permitted to use for the dynamic HPACK table. Valid values // range from 0 to 4294967295 (2^32 - 1) and defaults to 4096. 0 effectively disables header // compression. - HpackTableSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=hpack_table_size,json=hpackTableSize,proto3" json:"hpack_table_size,omitempty"` + HpackTableSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=hpack_table_size,json=hpackTableSize,proto3" json:"hpack_table_size,omitempty"` // `Maximum concurrent streams `_ // allowed for peer on one HTTP/2 connection. Valid values range from 1 to 2147483647 (2^31 - 1) // and defaults to 2147483647. @@ -941,7 +941,7 @@ type Http2ProtocolOptions struct { // This acts as an upper bound: Envoy will lower the max concurrent streams allowed on a given // connection based on upstream settings. Config dumps will reflect the configured upper bound, // not the per-connection negotiated limits. - MaxConcurrentStreams *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` + MaxConcurrentStreams *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` // `Initial stream-level flow-control window // `_ size. Valid values range from 65535 // (2^16 - 1, HTTP/2 default) to 2147483647 (2^31 - 1, HTTP/2 maximum) and defaults to 268435456 @@ -953,10 +953,10 @@ type Http2ProtocolOptions struct { // This field also acts as a soft limit on the number of bytes Envoy will buffer per-stream in the // HTTP/2 codec buffers. Once the buffer reaches this pointer, watermark callbacks will fire to // stop the flow of data to the codec buffers. - InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` + InitialStreamWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` // Similar to “initial_stream_window_size“, but for connection-level flow-control // window. Currently, this has the same minimum/maximum/default as “initial_stream_window_size“. - InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` + InitialConnectionWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` // Allows proxying Websocket and other upgrades over H2 connect. AllowConnect bool `protobuf:"varint,5,opt,name=allow_connect,json=allowConnect,proto3" json:"allow_connect,omitempty"` // [#not-implemented-hide:] Hiding until Envoy has full metadata support. @@ -970,20 +970,20 @@ type Http2ProtocolOptions struct { // be written into the socket). Exceeding this limit triggers flood mitigation and connection is // terminated. The “http2.outbound_flood“ stat tracks the number of terminated connections due // to flood mitigation. The default limit is 10000. - MaxOutboundFrames *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_outbound_frames,json=maxOutboundFrames,proto3" json:"max_outbound_frames,omitempty"` + MaxOutboundFrames *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_outbound_frames,json=maxOutboundFrames,proto3" json:"max_outbound_frames,omitempty"` // Limit the number of pending outbound downstream frames of types PING, SETTINGS and RST_STREAM, // preventing high memory utilization when receiving continuous stream of these frames. Exceeding // this limit triggers flood mitigation and connection is terminated. The // “http2.outbound_control_flood“ stat tracks the number of terminated connections due to flood // mitigation. The default limit is 1000. - MaxOutboundControlFrames *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=max_outbound_control_frames,json=maxOutboundControlFrames,proto3" json:"max_outbound_control_frames,omitempty"` + MaxOutboundControlFrames *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=max_outbound_control_frames,json=maxOutboundControlFrames,proto3" json:"max_outbound_control_frames,omitempty"` // Limit the number of consecutive inbound frames of types HEADERS, CONTINUATION and DATA with an // empty payload and no end stream flag. Those frames have no legitimate use and are abusive, but // might be a result of a broken HTTP/2 implementation. The `http2.inbound_empty_frames_flood“ // stat tracks the number of connections terminated due to flood mitigation. // Setting this to 0 will terminate connection upon receiving first frame with an empty payload // and no end stream flag. The default limit is 1. - MaxConsecutiveInboundFramesWithEmptyPayload *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=max_consecutive_inbound_frames_with_empty_payload,json=maxConsecutiveInboundFramesWithEmptyPayload,proto3" json:"max_consecutive_inbound_frames_with_empty_payload,omitempty"` + MaxConsecutiveInboundFramesWithEmptyPayload *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=max_consecutive_inbound_frames_with_empty_payload,json=maxConsecutiveInboundFramesWithEmptyPayload,proto3" json:"max_consecutive_inbound_frames_with_empty_payload,omitempty"` // Limit the number of inbound PRIORITY frames allowed per each opened stream. If the number // of PRIORITY frames received over the lifetime of connection exceeds the value calculated // using this formula:: @@ -995,7 +995,7 @@ type Http2ProtocolOptions struct { // “opened_streams“ is incremented when Envoy send the HEADERS frame for a new stream. The // “http2.inbound_priority_frames_flood“ stat tracks // the number of connections terminated due to flood mitigation. The default limit is 100. - MaxInboundPriorityFramesPerStream *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=max_inbound_priority_frames_per_stream,json=maxInboundPriorityFramesPerStream,proto3" json:"max_inbound_priority_frames_per_stream,omitempty"` + MaxInboundPriorityFramesPerStream *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=max_inbound_priority_frames_per_stream,json=maxInboundPriorityFramesPerStream,proto3" json:"max_inbound_priority_frames_per_stream,omitempty"` // Limit the number of inbound WINDOW_UPDATE frames allowed per DATA frame sent. If the number // of WINDOW_UPDATE frames received over the lifetime of connection exceeds the value calculated // using this formula:: @@ -1010,7 +1010,7 @@ type Http2ProtocolOptions struct { // flood mitigation. The default max_inbound_window_update_frames_per_data_frame_sent value is 10. // Setting this to 1 should be enough to support HTTP/2 implementations with basic flow control, // but more complex implementations that try to estimate available bandwidth require at least 2. - MaxInboundWindowUpdateFramesPerDataFrameSent *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=max_inbound_window_update_frames_per_data_frame_sent,json=maxInboundWindowUpdateFramesPerDataFrameSent,proto3" json:"max_inbound_window_update_frames_per_data_frame_sent,omitempty"` + MaxInboundWindowUpdateFramesPerDataFrameSent *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=max_inbound_window_update_frames_per_data_frame_sent,json=maxInboundWindowUpdateFramesPerDataFrameSent,proto3" json:"max_inbound_window_update_frames_per_data_frame_sent,omitempty"` // Allows invalid HTTP messaging and headers. When this option is disabled (default), then // the whole HTTP/2 connection is terminated upon receiving invalid HEADERS frame. However, // when this option is enabled, only the offending stream is terminated. @@ -1034,7 +1034,7 @@ type Http2ProtocolOptions struct { // ` // // See `RFC7540, sec. 8.1 `_ for details. - OverrideStreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,14,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` + OverrideStreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` // [#not-implemented-hide:] // Specifies SETTINGS frame parameters to be sent to the peer, with two exceptions: // @@ -1068,7 +1068,7 @@ type Http2ProtocolOptions struct { // [#not-implemented-hide:] Hiding so that the field can be removed after oghttp2 is rolled out. // If set, force use of a particular HTTP/2 codec: oghttp2 if true, nghttp2 if false. // If unset, HTTP/2 codec is selected based on envoy.reloadable_features.http2_use_oghttp2. - UseOghttp2Codec *wrappers.BoolValue `protobuf:"bytes,16,opt,name=use_oghttp2_codec,json=useOghttp2Codec,proto3" json:"use_oghttp2_codec,omitempty"` + UseOghttp2Codec *wrapperspb.BoolValue `protobuf:"bytes,16,opt,name=use_oghttp2_codec,json=useOghttp2Codec,proto3" json:"use_oghttp2_codec,omitempty"` } func (x *Http2ProtocolOptions) Reset() { @@ -1103,28 +1103,28 @@ func (*Http2ProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{8} } -func (x *Http2ProtocolOptions) GetHpackTableSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetHpackTableSize() *wrapperspb.UInt32Value { if x != nil { return x.HpackTableSize } return nil } -func (x *Http2ProtocolOptions) GetMaxConcurrentStreams() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxConcurrentStreams() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrentStreams } return nil } -func (x *Http2ProtocolOptions) GetInitialStreamWindowSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetInitialStreamWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialStreamWindowSize } return nil } -func (x *Http2ProtocolOptions) GetInitialConnectionWindowSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetInitialConnectionWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialConnectionWindowSize } @@ -1145,35 +1145,35 @@ func (x *Http2ProtocolOptions) GetAllowMetadata() bool { return false } -func (x *Http2ProtocolOptions) GetMaxOutboundFrames() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxOutboundFrames() *wrapperspb.UInt32Value { if x != nil { return x.MaxOutboundFrames } return nil } -func (x *Http2ProtocolOptions) GetMaxOutboundControlFrames() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxOutboundControlFrames() *wrapperspb.UInt32Value { if x != nil { return x.MaxOutboundControlFrames } return nil } -func (x *Http2ProtocolOptions) GetMaxConsecutiveInboundFramesWithEmptyPayload() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxConsecutiveInboundFramesWithEmptyPayload() *wrapperspb.UInt32Value { if x != nil { return x.MaxConsecutiveInboundFramesWithEmptyPayload } return nil } -func (x *Http2ProtocolOptions) GetMaxInboundPriorityFramesPerStream() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxInboundPriorityFramesPerStream() *wrapperspb.UInt32Value { if x != nil { return x.MaxInboundPriorityFramesPerStream } return nil } -func (x *Http2ProtocolOptions) GetMaxInboundWindowUpdateFramesPerDataFrameSent() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxInboundWindowUpdateFramesPerDataFrameSent() *wrapperspb.UInt32Value { if x != nil { return x.MaxInboundWindowUpdateFramesPerDataFrameSent } @@ -1188,7 +1188,7 @@ func (x *Http2ProtocolOptions) GetStreamErrorOnInvalidHttpMessaging() bool { return false } -func (x *Http2ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *Http2ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.OverrideStreamErrorOnInvalidHttpMessage } @@ -1209,7 +1209,7 @@ func (x *Http2ProtocolOptions) GetConnectionKeepalive() *KeepaliveSettings { return nil } -func (x *Http2ProtocolOptions) GetUseOghttp2Codec() *wrappers.BoolValue { +func (x *Http2ProtocolOptions) GetUseOghttp2Codec() *wrapperspb.BoolValue { if x != nil { return x.UseOghttp2Codec } @@ -1278,7 +1278,7 @@ type Http3ProtocolOptions struct { // // If set, this overrides any HCM :ref:`stream_error_on_invalid_http_messaging // `. - OverrideStreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,2,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` + OverrideStreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` // Allows proxying Websocket and other upgrades over HTTP/3 CONNECT using // the header mechanisms from the `HTTP/2 extended connect RFC // `_ @@ -1334,7 +1334,7 @@ func (x *Http3ProtocolOptions) GetQuicProtocolOptions() *QuicProtocolOptions { return nil } -func (x *Http3ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *Http3ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.OverrideStreamErrorOnInvalidHttpMessage } @@ -1628,9 +1628,9 @@ type Http2ProtocolOptions_SettingsParameter struct { unknownFields protoimpl.UnknownFields // The 16 bit parameter identifier. - Identifier *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` + Identifier *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=identifier,proto3" json:"identifier,omitempty"` // The 32 bit parameter value. - Value *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (x *Http2ProtocolOptions_SettingsParameter) Reset() { @@ -1665,14 +1665,14 @@ func (*Http2ProtocolOptions_SettingsParameter) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_protocol_proto_rawDescGZIP(), []int{8, 0} } -func (x *Http2ProtocolOptions_SettingsParameter) GetIdentifier() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions_SettingsParameter) GetIdentifier() *wrapperspb.UInt32Value { if x != nil { return x.Identifier } return nil } -func (x *Http2ProtocolOptions_SettingsParameter) GetValue() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions_SettingsParameter) GetValue() *wrapperspb.UInt32Value { if x != nil { return x.Value } @@ -2151,10 +2151,10 @@ var file_envoy_config_core_v3_protocol_proto_goTypes = []interface{}{ (*Http1ProtocolOptions_HeaderKeyFormat)(nil), // 14: envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat (*Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords)(nil), // 15: envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat.ProperCaseWords (*Http2ProtocolOptions_SettingsParameter)(nil), // 16: envoy.config.core.v3.Http2ProtocolOptions.SettingsParameter - (*duration.Duration)(nil), // 17: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 18: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 17: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 18: google.protobuf.UInt32Value (*TypedExtensionConfig)(nil), // 19: envoy.config.core.v3.TypedExtensionConfig - (*wrappers.BoolValue)(nil), // 20: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 20: google.protobuf.BoolValue (*v3.Percent)(nil), // 21: envoy.type.v3.Percent } var file_envoy_config_core_v3_protocol_proto_depIdxs = []int32{ diff --git a/envoy/config/core/v3/substitution_format_string.pb.go b/envoy/config/core/v3/substitution_format_string.pb.go index f4a2c6619..dd01df45b 100755 --- a/envoy/config/core/v3/substitution_format_string.pb.go +++ b/envoy/config/core/v3/substitution_format_string.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -158,7 +158,7 @@ func (x *SubstitutionFormatString) GetTextFormat() string { return "" } -func (x *SubstitutionFormatString) GetJsonFormat() *_struct.Struct { +func (x *SubstitutionFormatString) GetJsonFormat() *structpb.Struct { if x, ok := x.GetFormat().(*SubstitutionFormatString_JsonFormat); ok { return x.JsonFormat } @@ -251,7 +251,7 @@ type SubstitutionFormatString_JsonFormat struct { // "status": 500, // "message": "My error message" // } - JsonFormat *_struct.Struct `protobuf:"bytes,2,opt,name=json_format,json=jsonFormat,proto3,oneof"` + JsonFormat *structpb.Struct `protobuf:"bytes,2,opt,name=json_format,json=jsonFormat,proto3,oneof"` } type SubstitutionFormatString_TextFormatSource struct { @@ -364,7 +364,7 @@ var file_envoy_config_core_v3_substitution_format_string_proto_msgTypes = make([ var file_envoy_config_core_v3_substitution_format_string_proto_goTypes = []interface{}{ (*JsonFormatOptions)(nil), // 0: envoy.config.core.v3.JsonFormatOptions (*SubstitutionFormatString)(nil), // 1: envoy.config.core.v3.SubstitutionFormatString - (*_struct.Struct)(nil), // 2: google.protobuf.Struct + (*structpb.Struct)(nil), // 2: google.protobuf.Struct (*DataSource)(nil), // 3: envoy.config.core.v3.DataSource (*TypedExtensionConfig)(nil), // 4: envoy.config.core.v3.TypedExtensionConfig } diff --git a/envoy/config/core/v3/udp_socket_config.pb.go b/envoy/config/core/v3/udp_socket_config.pb.go index 8d2225b8c..39d253df5 100755 --- a/envoy/config/core/v3/udp_socket_config.pb.go +++ b/envoy/config/core/v3/udp_socket_config.pb.go @@ -9,9 +9,9 @@ package corev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -32,13 +32,13 @@ type UdpSocketConfig struct { // The maximum size of received UDP datagrams. Using a larger size will cause Envoy to allocate // more memory per socket. Received datagrams above this size will be dropped. If not set // defaults to 1500 bytes. - MaxRxDatagramSize *wrappers.UInt64Value `protobuf:"bytes,1,opt,name=max_rx_datagram_size,json=maxRxDatagramSize,proto3" json:"max_rx_datagram_size,omitempty"` + MaxRxDatagramSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=max_rx_datagram_size,json=maxRxDatagramSize,proto3" json:"max_rx_datagram_size,omitempty"` // Configures whether Generic Receive Offload (GRO) // _ is preferred when reading from the // UDP socket. The default is context dependent and is documented where UdpSocketConfig is used. // This option affects performance but not functionality. If GRO is not supported by the operating // system, non-GRO receive will be used. - PreferGro *wrappers.BoolValue `protobuf:"bytes,2,opt,name=prefer_gro,json=preferGro,proto3" json:"prefer_gro,omitempty"` + PreferGro *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=prefer_gro,json=preferGro,proto3" json:"prefer_gro,omitempty"` } func (x *UdpSocketConfig) Reset() { @@ -73,14 +73,14 @@ func (*UdpSocketConfig) Descriptor() ([]byte, []int) { return file_envoy_config_core_v3_udp_socket_config_proto_rawDescGZIP(), []int{0} } -func (x *UdpSocketConfig) GetMaxRxDatagramSize() *wrappers.UInt64Value { +func (x *UdpSocketConfig) GetMaxRxDatagramSize() *wrapperspb.UInt64Value { if x != nil { return x.MaxRxDatagramSize } return nil } -func (x *UdpSocketConfig) GetPreferGro() *wrappers.BoolValue { +func (x *UdpSocketConfig) GetPreferGro() *wrapperspb.BoolValue { if x != nil { return x.PreferGro } @@ -136,9 +136,9 @@ func file_envoy_config_core_v3_udp_socket_config_proto_rawDescGZIP() []byte { var file_envoy_config_core_v3_udp_socket_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_core_v3_udp_socket_config_proto_goTypes = []interface{}{ - (*UdpSocketConfig)(nil), // 0: envoy.config.core.v3.UdpSocketConfig - (*wrappers.UInt64Value)(nil), // 1: google.protobuf.UInt64Value - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*UdpSocketConfig)(nil), // 0: envoy.config.core.v3.UdpSocketConfig + (*wrapperspb.UInt64Value)(nil), // 1: google.protobuf.UInt64Value + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_envoy_config_core_v3_udp_socket_config_proto_depIdxs = []int32{ 1, // 0: envoy.config.core.v3.UdpSocketConfig.max_rx_datagram_size:type_name -> google.protobuf.UInt64Value diff --git a/envoy/config/endpoint/v3/endpoint.pb.go b/envoy/config/endpoint/v3/endpoint.pb.go index 9424804be..92445f94b 100755 --- a/envoy/config/endpoint/v3/endpoint.pb.go +++ b/envoy/config/endpoint/v3/endpoint.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -159,12 +159,12 @@ type ClusterLoadAssignment_Policy struct { // // Read more at :ref:`priority levels ` and // :ref:`localities `. - OverprovisioningFactor *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=overprovisioning_factor,json=overprovisioningFactor,proto3" json:"overprovisioning_factor,omitempty"` + OverprovisioningFactor *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=overprovisioning_factor,json=overprovisioningFactor,proto3" json:"overprovisioning_factor,omitempty"` // The max time until which the endpoints from this assignment can be used. // If no new assignments are received before this time expires the endpoints // are considered stale and should be marked unhealthy. // Defaults to 0 which means endpoints never go stale. - EndpointStaleAfter *duration.Duration `protobuf:"bytes,4,opt,name=endpoint_stale_after,json=endpointStaleAfter,proto3" json:"endpoint_stale_after,omitempty"` + EndpointStaleAfter *durationpb.Duration `protobuf:"bytes,4,opt,name=endpoint_stale_after,json=endpointStaleAfter,proto3" json:"endpoint_stale_after,omitempty"` // If true, use the :ref:`load balancing weight // ` of healthy and unhealthy // hosts to determine the health of the priority level. If false, use the number of healthy and unhealthy hosts @@ -215,14 +215,14 @@ func (x *ClusterLoadAssignment_Policy) GetDropOverloads() []*ClusterLoadAssignme return nil } -func (x *ClusterLoadAssignment_Policy) GetOverprovisioningFactor() *wrappers.UInt32Value { +func (x *ClusterLoadAssignment_Policy) GetOverprovisioningFactor() *wrapperspb.UInt32Value { if x != nil { return x.OverprovisioningFactor } return nil } -func (x *ClusterLoadAssignment_Policy) GetEndpointStaleAfter() *duration.Duration { +func (x *ClusterLoadAssignment_Policy) GetEndpointStaleAfter() *durationpb.Duration { if x != nil { return x.EndpointStaleAfter } @@ -416,8 +416,8 @@ var file_envoy_config_endpoint_v3_endpoint_proto_goTypes = []interface{}{ nil, // 2: envoy.config.endpoint.v3.ClusterLoadAssignment.NamedEndpointsEntry (*ClusterLoadAssignment_Policy_DropOverload)(nil), // 3: envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload (*LocalityLbEndpoints)(nil), // 4: envoy.config.endpoint.v3.LocalityLbEndpoints - (*wrappers.UInt32Value)(nil), // 5: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 6: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 5: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 6: google.protobuf.Duration (*Endpoint)(nil), // 7: envoy.config.endpoint.v3.Endpoint (*v3.FractionalPercent)(nil), // 8: envoy.type.v3.FractionalPercent } diff --git a/envoy/config/endpoint/v3/endpoint_components.pb.go b/envoy/config/endpoint/v3/endpoint_components.pb.go index 0d7762885..382029f7e 100755 --- a/envoy/config/endpoint/v3/endpoint_components.pb.go +++ b/envoy/config/endpoint/v3/endpoint_components.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -154,7 +154,7 @@ type LbEndpoint struct { // LocalityLbEndpoints. If unspecified, will be treated as 1. The sum // of the weights of all endpoints in the endpoint's locality must not // exceed uint32_t maximal value (4294967295). - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` } func (x *LbEndpoint) Reset() { @@ -224,7 +224,7 @@ func (x *LbEndpoint) GetMetadata() *v3.Metadata { return nil } -func (x *LbEndpoint) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *LbEndpoint) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } @@ -341,7 +341,7 @@ type LocalityLbEndpoints struct { // configured. These weights are ignored otherwise. If no weights are // specified when locality weighted load balancing is enabled, the locality is // assigned no load. - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` // Optional: the priority for this LocalityLbEndpoints. If unspecified this will // default to the highest priority (0). // @@ -358,7 +358,7 @@ type LocalityLbEndpoints struct { // This will be consumed by load balancing schemes that need proximity order // to determine where to route the requests. // [#not-implemented-hide:] - Proximity *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=proximity,proto3" json:"proximity,omitempty"` + Proximity *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=proximity,proto3" json:"proximity,omitempty"` } func (x *LocalityLbEndpoints) Reset() { @@ -428,7 +428,7 @@ func (x *LocalityLbEndpoints) GetLedsClusterLocalityConfig() *LedsClusterLocalit return nil } -func (x *LocalityLbEndpoints) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *LocalityLbEndpoints) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } @@ -442,7 +442,7 @@ func (x *LocalityLbEndpoints) GetPriority() uint32 { return 0 } -func (x *LocalityLbEndpoints) GetProximity() *wrappers.UInt32Value { +func (x *LocalityLbEndpoints) GetProximity() *wrapperspb.UInt32Value { if x != nil { return x.Proximity } @@ -842,7 +842,7 @@ var file_envoy_config_endpoint_v3_endpoint_components_proto_goTypes = []interfac (*v3.Address)(nil), // 7: envoy.config.core.v3.Address (v3.HealthStatus)(0), // 8: envoy.config.core.v3.HealthStatus (*v3.Metadata)(nil), // 9: envoy.config.core.v3.Metadata - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value (*v3.ConfigSource)(nil), // 11: envoy.config.core.v3.ConfigSource (*v3.Locality)(nil), // 12: envoy.config.core.v3.Locality } diff --git a/envoy/config/endpoint/v3/load_report.pb.go b/envoy/config/endpoint/v3/load_report.pb.go index bbf50ad43..fa603c1da 100755 --- a/envoy/config/endpoint/v3/load_report.pb.go +++ b/envoy/config/endpoint/v3/load_report.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -158,7 +158,7 @@ type UpstreamEndpointStats struct { Address *v3.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Opaque and implementation dependent metadata of the // endpoint. Envoy will pass this directly to the management server. - Metadata *_struct.Struct `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` // The total number of requests successfully completed by the endpoints in the // locality. These include non-5xx responses for HTTP, where errors // originate at the client and the endpoint responded successfully. For gRPC, @@ -224,7 +224,7 @@ func (x *UpstreamEndpointStats) GetAddress() *v3.Address { return nil } -func (x *UpstreamEndpointStats) GetMetadata() *_struct.Struct { +func (x *UpstreamEndpointStats) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -364,7 +364,7 @@ type ClusterStats struct { // request reported. Due to system load and delays between the “LoadStatsRequest“ sent from Envoy // and the “LoadStatsResponse“ message sent from the management server, this may be longer than // the requested load reporting interval in the “LoadStatsResponse“. - LoadReportInterval *duration.Duration `protobuf:"bytes,4,opt,name=load_report_interval,json=loadReportInterval,proto3" json:"load_report_interval,omitempty"` + LoadReportInterval *durationpb.Duration `protobuf:"bytes,4,opt,name=load_report_interval,json=loadReportInterval,proto3" json:"load_report_interval,omitempty"` } func (x *ClusterStats) Reset() { @@ -434,7 +434,7 @@ func (x *ClusterStats) GetDroppedRequests() []*ClusterStats_DroppedRequests { return nil } -func (x *ClusterStats) GetLoadReportInterval() *duration.Duration { +func (x *ClusterStats) GetLoadReportInterval() *durationpb.Duration { if x != nil { return x.LoadReportInterval } @@ -676,8 +676,8 @@ var file_envoy_config_endpoint_v3_load_report_proto_goTypes = []interface{}{ (*ClusterStats_DroppedRequests)(nil), // 4: envoy.config.endpoint.v3.ClusterStats.DroppedRequests (*v3.Locality)(nil), // 5: envoy.config.core.v3.Locality (*v3.Address)(nil), // 6: envoy.config.core.v3.Address - (*_struct.Struct)(nil), // 7: google.protobuf.Struct - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*structpb.Struct)(nil), // 7: google.protobuf.Struct + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration } var file_envoy_config_endpoint_v3_load_report_proto_depIdxs = []int32{ 5, // 0: envoy.config.endpoint.v3.UpstreamLocalityStats.locality:type_name -> envoy.config.core.v3.Locality diff --git a/envoy/config/filter/accesslog/v2/accesslog.pb.go b/envoy/config/filter/accesslog/v2/accesslog.pb.go index a578e443a..4b2f9f4fb 100755 --- a/envoy/config/filter/accesslog/v2/accesslog.pb.go +++ b/envoy/config/filter/accesslog/v2/accesslog.pb.go @@ -12,10 +12,10 @@ import ( 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" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -260,14 +260,14 @@ func (m *AccessLog) GetConfigType() isAccessLog_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto. -func (x *AccessLog) GetConfig() *_struct.Struct { +func (x *AccessLog) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*AccessLog_Config); ok { return x.Config } return nil } -func (x *AccessLog) GetTypedConfig() *any1.Any { +func (x *AccessLog) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*AccessLog_TypedConfig); ok { return x.TypedConfig } @@ -280,11 +280,11 @@ type isAccessLog_ConfigType interface { type AccessLog_Config struct { // Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto. - Config *_struct.Struct `protobuf:"bytes,3,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,3,opt,name=config,proto3,oneof"` } type AccessLog_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*AccessLog_Config) isAccessLog_ConfigType() {} @@ -1153,14 +1153,14 @@ func (m *ExtensionFilter) GetConfigType() isExtensionFilter_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto. -func (x *ExtensionFilter) GetConfig() *_struct.Struct { +func (x *ExtensionFilter) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*ExtensionFilter_Config); ok { return x.Config } return nil } -func (x *ExtensionFilter) GetTypedConfig() *any1.Any { +func (x *ExtensionFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ExtensionFilter_TypedConfig); ok { return x.TypedConfig } @@ -1173,11 +1173,11 @@ type isExtensionFilter_ConfigType interface { type ExtensionFilter_Config struct { // Deprecated: Marked as deprecated in envoy/config/filter/accesslog/v2/accesslog.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type ExtensionFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ExtensionFilter_Config) isExtensionFilter_ConfigType() {} @@ -1443,8 +1443,8 @@ var file_envoy_config_filter_accesslog_v2_accesslog_proto_goTypes = []interface{ (*ResponseFlagFilter)(nil), // 13: envoy.config.filter.accesslog.v2.ResponseFlagFilter (*GrpcStatusFilter)(nil), // 14: envoy.config.filter.accesslog.v2.GrpcStatusFilter (*ExtensionFilter)(nil), // 15: envoy.config.filter.accesslog.v2.ExtensionFilter - (*_struct.Struct)(nil), // 16: google.protobuf.Struct - (*any1.Any)(nil), // 17: google.protobuf.Any + (*structpb.Struct)(nil), // 16: google.protobuf.Struct + (*anypb.Any)(nil), // 17: google.protobuf.Any (*core.RuntimeUInt32)(nil), // 18: envoy.api.v2.core.RuntimeUInt32 (*_type.FractionalPercent)(nil), // 19: envoy.type.FractionalPercent (*route.HeaderMatcher)(nil), // 20: envoy.api.v2.route.HeaderMatcher diff --git a/envoy/config/filter/fault/v2/fault.pb.go b/envoy/config/filter/fault/v2/fault.pb.go index 2ce053ede..d4bf75096 100755 --- a/envoy/config/filter/fault/v2/fault.pb.go +++ b/envoy/config/filter/fault/v2/fault.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _type "github.com/envoyproxy/go-control-plane/envoy/type" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -137,7 +137,7 @@ func (m *FaultDelay) GetFaultDelaySecifier() isFaultDelay_FaultDelaySecifier { return nil } -func (x *FaultDelay) GetFixedDelay() *duration.Duration { +func (x *FaultDelay) GetFixedDelay() *durationpb.Duration { if x, ok := x.GetFaultDelaySecifier().(*FaultDelay_FixedDelay); ok { return x.FixedDelay } @@ -169,7 +169,7 @@ type FaultDelay_FixedDelay struct { // delay will be injected before a new request/operation. For TCP // connections, the proxying of the connection upstream will be delayed // for the specified period. This is required if type is FIXED. - FixedDelay *duration.Duration `protobuf:"bytes,3,opt,name=fixed_delay,json=fixedDelay,proto3,oneof"` + FixedDelay *durationpb.Duration `protobuf:"bytes,3,opt,name=fixed_delay,json=fixedDelay,proto3,oneof"` } type FaultDelay_HeaderDelay_ struct { @@ -508,7 +508,7 @@ var file_envoy_config_filter_fault_v2_fault_proto_goTypes = []interface{}{ (*FaultDelay_HeaderDelay)(nil), // 3: envoy.config.filter.fault.v2.FaultDelay.HeaderDelay (*FaultRateLimit_FixedLimit)(nil), // 4: envoy.config.filter.fault.v2.FaultRateLimit.FixedLimit (*FaultRateLimit_HeaderLimit)(nil), // 5: envoy.config.filter.fault.v2.FaultRateLimit.HeaderLimit - (*duration.Duration)(nil), // 6: google.protobuf.Duration + (*durationpb.Duration)(nil), // 6: google.protobuf.Duration (*_type.FractionalPercent)(nil), // 7: envoy.type.FractionalPercent } var file_envoy_config_filter_fault_v2_fault_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.go b/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.go index 39c126859..ffa956e82 100755 --- a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.go +++ b/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.go @@ -11,10 +11,10 @@ import ( 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" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -178,9 +178,9 @@ type GradientControllerConfig_ConcurrencyLimitCalculationParams struct { unknownFields protoimpl.UnknownFields // The allowed upper-bound on the calculated concurrency limit. Defaults to 1000. - MaxConcurrencyLimit *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrency_limit,json=maxConcurrencyLimit,proto3" json:"max_concurrency_limit,omitempty"` + MaxConcurrencyLimit *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrency_limit,json=maxConcurrencyLimit,proto3" json:"max_concurrency_limit,omitempty"` // The period of time samples are taken to recalculate the concurrency limit. - ConcurrencyUpdateInterval *duration.Duration `protobuf:"bytes,3,opt,name=concurrency_update_interval,json=concurrencyUpdateInterval,proto3" json:"concurrency_update_interval,omitempty"` + ConcurrencyUpdateInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=concurrency_update_interval,json=concurrencyUpdateInterval,proto3" json:"concurrency_update_interval,omitempty"` } func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) Reset() { @@ -215,14 +215,14 @@ func (*GradientControllerConfig_ConcurrencyLimitCalculationParams) Descriptor() return file_envoy_config_filter_http_adaptive_concurrency_v2alpha_adaptive_concurrency_proto_rawDescGZIP(), []int{0, 0} } -func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetMaxConcurrencyLimit() *wrappers.UInt32Value { +func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetMaxConcurrencyLimit() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrencyLimit } return nil } -func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetConcurrencyUpdateInterval() *duration.Duration { +func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetConcurrencyUpdateInterval() *durationpb.Duration { if x != nil { return x.ConcurrencyUpdateInterval } @@ -237,10 +237,10 @@ type GradientControllerConfig_MinimumRTTCalculationParams struct { unknownFields protoimpl.UnknownFields // The time interval between recalculating the minimum request round-trip time. - Interval *duration.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` // The number of requests to aggregate/sample during the minRTT recalculation window before // updating. Defaults to 50. - RequestCount *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=request_count,json=requestCount,proto3" json:"request_count,omitempty"` + RequestCount *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=request_count,json=requestCount,proto3" json:"request_count,omitempty"` // Randomized time delta that will be introduced to the start of the minRTT calculation window. // This is represented as a percentage of the interval duration. Defaults to 15%. // @@ -248,7 +248,7 @@ type GradientControllerConfig_MinimumRTTCalculationParams struct { // somewhere in the range (10s - 11.5s). Jitter *_type.Percent `protobuf:"bytes,3,opt,name=jitter,proto3" json:"jitter,omitempty"` // The concurrency limit set while measuring the minRTT. Defaults to 3. - MinConcurrency *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=min_concurrency,json=minConcurrency,proto3" json:"min_concurrency,omitempty"` + MinConcurrency *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=min_concurrency,json=minConcurrency,proto3" json:"min_concurrency,omitempty"` // Amount added to the measured minRTT to add stability to the concurrency limit during natural // variability in latency. This is expressed as a percentage of the measured value and can be // adjusted to allow more or less tolerance to the sampled latency values. @@ -289,14 +289,14 @@ func (*GradientControllerConfig_MinimumRTTCalculationParams) Descriptor() ([]byt return file_envoy_config_filter_http_adaptive_concurrency_v2alpha_adaptive_concurrency_proto_rawDescGZIP(), []int{0, 1} } -func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetInterval() *duration.Duration { +func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetRequestCount() *wrappers.UInt32Value { +func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetRequestCount() *wrapperspb.UInt32Value { if x != nil { return x.RequestCount } @@ -310,7 +310,7 @@ func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetJitter() *_typ return nil } -func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetMinConcurrency() *wrappers.UInt32Value { +func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetMinConcurrency() *wrapperspb.UInt32Value { if x != nil { return x.MinConcurrency } @@ -471,8 +471,8 @@ var file_envoy_config_filter_http_adaptive_concurrency_v2alpha_adaptive_concurre (*GradientControllerConfig_MinimumRTTCalculationParams)(nil), // 3: envoy.config.filter.http.adaptive_concurrency.v2alpha.GradientControllerConfig.MinimumRTTCalculationParams (*_type.Percent)(nil), // 4: envoy.type.Percent (*core.RuntimeFeatureFlag)(nil), // 5: envoy.api.v2.core.RuntimeFeatureFlag - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 7: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 7: google.protobuf.Duration } var file_envoy_config_filter_http_adaptive_concurrency_v2alpha_adaptive_concurrency_proto_depIdxs = []int32{ 4, // 0: envoy.config.filter.http.adaptive_concurrency.v2alpha.GradientControllerConfig.sample_aggregate_percentile:type_name -> envoy.type.Percent diff --git a/envoy/config/filter/http/buffer/v2/buffer.pb.go b/envoy/config/filter/http/buffer/v2/buffer.pb.go index 8d0766670..f499b91e9 100755 --- a/envoy/config/filter/http/buffer/v2/buffer.pb.go +++ b/envoy/config/filter/http/buffer/v2/buffer.pb.go @@ -9,9 +9,9 @@ package bufferv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -30,7 +30,7 @@ type Buffer struct { // The maximum request size that the filter will buffer before the connection // manager will stop buffering and return a 413 response. - MaxRequestBytes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` + MaxRequestBytes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` } func (x *Buffer) Reset() { @@ -65,7 +65,7 @@ func (*Buffer) Descriptor() ([]byte, []int) { return file_envoy_config_filter_http_buffer_v2_buffer_proto_rawDescGZIP(), []int{0} } -func (x *Buffer) GetMaxRequestBytes() *wrappers.UInt32Value { +func (x *Buffer) GetMaxRequestBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestBytes } @@ -217,9 +217,9 @@ func file_envoy_config_filter_http_buffer_v2_buffer_proto_rawDescGZIP() []byte { var file_envoy_config_filter_http_buffer_v2_buffer_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_config_filter_http_buffer_v2_buffer_proto_goTypes = []interface{}{ - (*Buffer)(nil), // 0: envoy.config.filter.http.buffer.v2.Buffer - (*BufferPerRoute)(nil), // 1: envoy.config.filter.http.buffer.v2.BufferPerRoute - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*Buffer)(nil), // 0: envoy.config.filter.http.buffer.v2.Buffer + (*BufferPerRoute)(nil), // 1: envoy.config.filter.http.buffer.v2.BufferPerRoute + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_config_filter_http_buffer_v2_buffer_proto_depIdxs = []int32{ 2, // 0: envoy.config.filter.http.buffer.v2.Buffer.max_request_bytes:type_name -> google.protobuf.UInt32Value diff --git a/envoy/config/filter/http/cache/v2alpha/cache.pb.go b/envoy/config/filter/http/cache/v2alpha/cache.pb.go index 8766f1481..9fb2d40cd 100755 --- a/envoy/config/filter/http/cache/v2alpha/cache.pb.go +++ b/envoy/config/filter/http/cache/v2alpha/cache.pb.go @@ -11,9 +11,9 @@ import ( 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" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -31,7 +31,7 @@ type CacheConfig struct { unknownFields protoimpl.UnknownFields // Config specific to the cache storage implementation. - TypedConfig *any1.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` // List of matching rules that defines allowed *Vary* headers. // // The *vary* response header holds a list of header names that affect the @@ -90,7 +90,7 @@ func (*CacheConfig) Descriptor() ([]byte, []int) { return file_envoy_config_filter_http_cache_v2alpha_cache_proto_rawDescGZIP(), []int{0} } -func (x *CacheConfig) GetTypedConfig() *any1.Any { +func (x *CacheConfig) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -293,7 +293,7 @@ var file_envoy_config_filter_http_cache_v2alpha_cache_proto_msgTypes = make([]pr var file_envoy_config_filter_http_cache_v2alpha_cache_proto_goTypes = []interface{}{ (*CacheConfig)(nil), // 0: envoy.config.filter.http.cache.v2alpha.CacheConfig (*CacheConfig_KeyCreatorParams)(nil), // 1: envoy.config.filter.http.cache.v2alpha.CacheConfig.KeyCreatorParams - (*any1.Any)(nil), // 2: google.protobuf.Any + (*anypb.Any)(nil), // 2: google.protobuf.Any (*matcher.StringMatcher)(nil), // 3: envoy.type.matcher.StringMatcher (*route.QueryParameterMatcher)(nil), // 4: envoy.api.v2.route.QueryParameterMatcher } diff --git a/envoy/config/filter/http/compressor/v2/compressor.pb.go b/envoy/config/filter/http/compressor/v2/compressor.pb.go index 2b362a6f1..d706f188d 100755 --- a/envoy/config/filter/http/compressor/v2/compressor.pb.go +++ b/envoy/config/filter/http/compressor/v2/compressor.pb.go @@ -9,9 +9,9 @@ package compressorv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -30,7 +30,7 @@ type Compressor struct { unknownFields protoimpl.UnknownFields // Minimum response length, in bytes, which will trigger compression. The default value is 30. - ContentLength *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` + ContentLength *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` // Set of strings that allows specifying which mime-types yield compression; e.g., // application/json, text/html, etc. When this field is not defined, compression will be applied // to the following mime-types: "application/javascript", "application/json", @@ -84,7 +84,7 @@ func (*Compressor) Descriptor() ([]byte, []int) { return file_envoy_config_filter_http_compressor_v2_compressor_proto_rawDescGZIP(), []int{0} } -func (x *Compressor) GetContentLength() *wrappers.UInt32Value { +func (x *Compressor) GetContentLength() *wrapperspb.UInt32Value { if x != nil { return x.ContentLength } @@ -188,7 +188,7 @@ func file_envoy_config_filter_http_compressor_v2_compressor_proto_rawDescGZIP() var file_envoy_config_filter_http_compressor_v2_compressor_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_http_compressor_v2_compressor_proto_goTypes = []interface{}{ (*Compressor)(nil), // 0: envoy.config.filter.http.compressor.v2.Compressor - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value (*core.RuntimeFeatureFlag)(nil), // 2: envoy.api.v2.core.RuntimeFeatureFlag } var file_envoy_config_filter_http_compressor_v2_compressor_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/http/fault/v2/fault.pb.go b/envoy/config/filter/http/fault/v2/fault.pb.go index 58f3b98a6..2c3a8c5ac 100755 --- a/envoy/config/filter/http/fault/v2/fault.pb.go +++ b/envoy/config/filter/http/fault/v2/fault.pb.go @@ -12,9 +12,9 @@ import ( 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" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -165,7 +165,7 @@ type HTTPFault struct { // Like other :ref:`circuit breakers ` in Envoy, this is a fuzzy // limit. It's possible for the number of active faults to rise slightly above the configured // amount due to the implementation details. - MaxActiveFaults *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=max_active_faults,json=maxActiveFaults,proto3" json:"max_active_faults,omitempty"` + MaxActiveFaults *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=max_active_faults,json=maxActiveFaults,proto3" json:"max_active_faults,omitempty"` // The response rate limit to be applied to the response body of the stream. When configured, // the percentage can be overridden by the :ref:`fault.http.rate_limit.response_percent // ` runtime key. @@ -262,7 +262,7 @@ func (x *HTTPFault) GetDownstreamNodes() []string { return nil } -func (x *HTTPFault) GetMaxActiveFaults() *wrappers.UInt32Value { +func (x *HTTPFault) GetMaxActiveFaults() *wrapperspb.UInt32Value { if x != nil { return x.MaxActiveFaults } @@ -485,7 +485,7 @@ var file_envoy_config_filter_http_fault_v2_fault_proto_goTypes = []interface{}{ (*_type.FractionalPercent)(nil), // 3: envoy.type.FractionalPercent (*v2.FaultDelay)(nil), // 4: envoy.config.filter.fault.v2.FaultDelay (*route.HeaderMatcher)(nil), // 5: envoy.api.v2.route.HeaderMatcher - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value (*v2.FaultRateLimit)(nil), // 7: envoy.config.filter.fault.v2.FaultRateLimit } var file_envoy_config_filter_http_fault_v2_fault_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go b/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go index 5da217a80..74d7f44f5 100755 --- a/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go +++ b/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go @@ -9,9 +9,9 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -92,7 +92,7 @@ func (x *FilterConfig) GetIndividualMethodStatsAllowlist() *core.GrpcMethodList return nil } -func (x *FilterConfig) GetStatsForAllMethods() *wrappers.BoolValue { +func (x *FilterConfig) GetStatsForAllMethods() *wrapperspb.BoolValue { if x, ok := x.GetPerMethodStatSpecifier().(*FilterConfig_StatsForAllMethods); ok { return x.StatsForAllMethods } @@ -127,7 +127,7 @@ type FilterConfig_StatsForAllMethods struct { // // If neither `individual_method_stats_allowlist` nor `stats_for_all_methods` is set, the // behavior will default to `stats_for_all_methods=false`. - StatsForAllMethods *wrappers.BoolValue `protobuf:"bytes,3,opt,name=stats_for_all_methods,json=statsForAllMethods,proto3,oneof"` + StatsForAllMethods *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=stats_for_all_methods,json=statsForAllMethods,proto3,oneof"` } func (*FilterConfig_IndividualMethodStatsAllowlist) isFilterConfig_PerMethodStatSpecifier() {} @@ -266,10 +266,10 @@ func file_envoy_config_filter_http_grpc_stats_v2alpha_config_proto_rawDescGZIP() var file_envoy_config_filter_http_grpc_stats_v2alpha_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_config_filter_http_grpc_stats_v2alpha_config_proto_goTypes = []interface{}{ - (*FilterConfig)(nil), // 0: envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig - (*FilterObject)(nil), // 1: envoy.config.filter.http.grpc_stats.v2alpha.FilterObject - (*core.GrpcMethodList)(nil), // 2: envoy.api.v2.core.GrpcMethodList - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*FilterConfig)(nil), // 0: envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig + (*FilterObject)(nil), // 1: envoy.config.filter.http.grpc_stats.v2alpha.FilterObject + (*core.GrpcMethodList)(nil), // 2: envoy.api.v2.core.GrpcMethodList + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue } var file_envoy_config_filter_http_grpc_stats_v2alpha_config_proto_depIdxs = []int32{ 2, // 0: envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig.individual_method_stats_allowlist:type_name -> envoy.api.v2.core.GrpcMethodList diff --git a/envoy/config/filter/http/gzip/v2/gzip.pb.go b/envoy/config/filter/http/gzip/v2/gzip.pb.go index 3bc88d672..20a3dab2e 100755 --- a/envoy/config/filter/http/gzip/v2/gzip.pb.go +++ b/envoy/config/filter/http/gzip/v2/gzip.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/compressor/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -133,14 +133,14 @@ type Gzip struct { // Value from 1 to 9 that controls the amount of internal memory used by zlib. Higher values // use more memory, but are faster and produce better compression results. The default value is 5. - MemoryLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` + MemoryLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` // Minimum response length, in bytes, which will trigger compression. The default value is 30. // .. attention: // // **This field is deprecated**. Set the `compressor` field instead. // // Deprecated: Marked as deprecated in envoy/config/filter/http/gzip/v2/gzip.proto. - ContentLength *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` + ContentLength *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` // A value used for selecting the zlib compression level. This setting will affect speed and // amount of compression applied to the content. "BEST" provides higher compression at the cost of // higher latency, "SPEED" provides lower compression with minimum impact on response time. @@ -184,7 +184,7 @@ type Gzip struct { // Larger window results in better compression at the expense of memory usage. The default is 12 // which will produce a 4096 bytes window. For more details about this parameter, please refer to // zlib manual > deflateInit2. - WindowBits *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` + WindowBits *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` // Set of configuration parameters common for all compression filters. If this field is set then // the fields `content_length`, `content_type`, `disable_on_etag_header` and // `remove_accept_encoding_header` are ignored. @@ -223,7 +223,7 @@ func (*Gzip) Descriptor() ([]byte, []int) { return file_envoy_config_filter_http_gzip_v2_gzip_proto_rawDescGZIP(), []int{0} } -func (x *Gzip) GetMemoryLevel() *wrappers.UInt32Value { +func (x *Gzip) GetMemoryLevel() *wrapperspb.UInt32Value { if x != nil { return x.MemoryLevel } @@ -231,7 +231,7 @@ func (x *Gzip) GetMemoryLevel() *wrappers.UInt32Value { } // Deprecated: Marked as deprecated in envoy/config/filter/http/gzip/v2/gzip.proto. -func (x *Gzip) GetContentLength() *wrappers.UInt32Value { +func (x *Gzip) GetContentLength() *wrapperspb.UInt32Value { if x != nil { return x.ContentLength } @@ -276,7 +276,7 @@ func (x *Gzip) GetRemoveAcceptEncodingHeader() bool { return false } -func (x *Gzip) GetWindowBits() *wrappers.UInt32Value { +func (x *Gzip) GetWindowBits() *wrapperspb.UInt32Value { if x != nil { return x.WindowBits } @@ -435,7 +435,7 @@ var file_envoy_config_filter_http_gzip_v2_gzip_proto_goTypes = []interface{}{ (Gzip_CompressionLevel_Enum)(0), // 1: envoy.config.filter.http.gzip.v2.Gzip.CompressionLevel.Enum (*Gzip)(nil), // 2: envoy.config.filter.http.gzip.v2.Gzip (*Gzip_CompressionLevel)(nil), // 3: envoy.config.filter.http.gzip.v2.Gzip.CompressionLevel - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value (*v2.Compressor)(nil), // 5: envoy.config.filter.http.compressor.v2.Compressor } var file_envoy_config_filter_http_gzip_v2_gzip_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/http/health_check/v2/health_check.pb.go b/envoy/config/filter/http/health_check/v2/health_check.pb.go index 1a66f586d..9083e2296 100755 --- a/envoy/config/filter/http/health_check/v2/health_check.pb.go +++ b/envoy/config/filter/http/health_check/v2/health_check.pb.go @@ -11,10 +11,10 @@ import ( 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" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -33,10 +33,10 @@ type HealthCheck struct { unknownFields protoimpl.UnknownFields // Specifies whether the filter operates in pass through mode or not. - PassThroughMode *wrappers.BoolValue `protobuf:"bytes,1,opt,name=pass_through_mode,json=passThroughMode,proto3" json:"pass_through_mode,omitempty"` + PassThroughMode *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=pass_through_mode,json=passThroughMode,proto3" json:"pass_through_mode,omitempty"` // If operating in pass through mode, the amount of time in milliseconds // that the filter should cache the upstream response. - CacheTime *duration.Duration `protobuf:"bytes,3,opt,name=cache_time,json=cacheTime,proto3" json:"cache_time,omitempty"` + CacheTime *durationpb.Duration `protobuf:"bytes,3,opt,name=cache_time,json=cacheTime,proto3" json:"cache_time,omitempty"` // If operating in non-pass-through mode, specifies a set of upstream cluster // names and the minimum percentage of servers in each of those clusters that // must be healthy or degraded in order for the filter to return a 200. @@ -84,14 +84,14 @@ func (*HealthCheck) Descriptor() ([]byte, []int) { return file_envoy_config_filter_http_health_check_v2_health_check_proto_rawDescGZIP(), []int{0} } -func (x *HealthCheck) GetPassThroughMode() *wrappers.BoolValue { +func (x *HealthCheck) GetPassThroughMode() *wrapperspb.BoolValue { if x != nil { return x.PassThroughMode } return nil } -func (x *HealthCheck) GetCacheTime() *duration.Duration { +func (x *HealthCheck) GetCacheTime() *durationpb.Duration { if x != nil { return x.CacheTime } @@ -197,12 +197,12 @@ func file_envoy_config_filter_http_health_check_v2_health_check_proto_rawDescGZI var file_envoy_config_filter_http_health_check_v2_health_check_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_config_filter_http_health_check_v2_health_check_proto_goTypes = []interface{}{ - (*HealthCheck)(nil), // 0: envoy.config.filter.http.health_check.v2.HealthCheck - nil, // 1: envoy.config.filter.http.health_check.v2.HealthCheck.ClusterMinHealthyPercentagesEntry - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue - (*duration.Duration)(nil), // 3: google.protobuf.Duration - (*route.HeaderMatcher)(nil), // 4: envoy.api.v2.route.HeaderMatcher - (*_type.Percent)(nil), // 5: envoy.type.Percent + (*HealthCheck)(nil), // 0: envoy.config.filter.http.health_check.v2.HealthCheck + nil, // 1: envoy.config.filter.http.health_check.v2.HealthCheck.ClusterMinHealthyPercentagesEntry + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration + (*route.HeaderMatcher)(nil), // 4: envoy.api.v2.route.HeaderMatcher + (*_type.Percent)(nil), // 5: envoy.type.Percent } var file_envoy_config_filter_http_health_check_v2_health_check_proto_depIdxs = []int32{ 2, // 0: envoy.config.filter.http.health_check.v2.HealthCheck.pass_through_mode:type_name -> google.protobuf.BoolValue diff --git a/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go b/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go index 902bfccf1..c3f453624 100755 --- a/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go +++ b/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.go @@ -11,9 +11,9 @@ import ( 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" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" @@ -316,7 +316,7 @@ type RemoteJwks struct { HttpUri *core.HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri,proto3" json:"http_uri,omitempty"` // Duration after which the cached JWKS should be expired. If not specified, default cache // duration is 5 minutes. - CacheDuration *duration.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + CacheDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` } func (x *RemoteJwks) Reset() { @@ -358,7 +358,7 @@ func (x *RemoteJwks) GetHttpUri() *core.HttpUri { return nil } -func (x *RemoteJwks) GetCacheDuration() *duration.Duration { +func (x *RemoteJwks) GetCacheDuration() *durationpb.Duration { if x != nil { return x.CacheDuration } @@ -1346,7 +1346,7 @@ var file_envoy_config_filter_http_jwt_authn_v2alpha_config_proto_goTypes = []int nil, // 11: envoy.config.filter.http.jwt_authn.v2alpha.JwtAuthentication.ProvidersEntry (*core.DataSource)(nil), // 12: envoy.api.v2.core.DataSource (*core.HttpUri)(nil), // 13: envoy.api.v2.core.HttpUri - (*duration.Duration)(nil), // 14: google.protobuf.Duration + (*durationpb.Duration)(nil), // 14: google.protobuf.Duration (*emptypb.Empty)(nil), // 15: google.protobuf.Empty (*route.RouteMatch)(nil), // 16: envoy.api.v2.route.RouteMatch } diff --git a/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.go b/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.go index 0ad7745be..75324cee2 100755 --- a/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.go +++ b/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -48,7 +48,7 @@ type RateLimit struct { RequestType string `protobuf:"bytes,3,opt,name=request_type,json=requestType,proto3" json:"request_type,omitempty"` // The timeout in milliseconds for the rate limit service RPC. If not // set, this defaults to 20ms. - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // The filter's behaviour in case the rate limiting service does // not respond back. When it is set to true, Envoy will not allow traffic in case of // communication failure between rate limiting service and the proxy. @@ -117,7 +117,7 @@ func (x *RateLimit) GetRequestType() string { return "" } -func (x *RateLimit) GetTimeout() *duration.Duration { +func (x *RateLimit) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -223,7 +223,7 @@ func file_envoy_config_filter_http_rate_limit_v2_rate_limit_proto_rawDescGZIP() var file_envoy_config_filter_http_rate_limit_v2_rate_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_http_rate_limit_v2_rate_limit_proto_goTypes = []interface{}{ (*RateLimit)(nil), // 0: envoy.config.filter.http.rate_limit.v2.RateLimit - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration (*v2.RateLimitServiceConfig)(nil), // 2: envoy.config.ratelimit.v2.RateLimitServiceConfig } var file_envoy_config_filter_http_rate_limit_v2_rate_limit_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/http/router/v2/router.pb.go b/envoy/config/filter/http/router/v2/router.pb.go index 3d19e3330..53f3d0dda 100755 --- a/envoy/config/filter/http/router/v2/router.pb.go +++ b/envoy/config/filter/http/router/v2/router.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -32,7 +32,7 @@ type Router struct { // Whether the router generates dynamic cluster statistics. Defaults to // true. Can be disabled in high performance scenarios. - DynamicStats *wrappers.BoolValue `protobuf:"bytes,1,opt,name=dynamic_stats,json=dynamicStats,proto3" json:"dynamic_stats,omitempty"` + DynamicStats *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=dynamic_stats,json=dynamicStats,proto3" json:"dynamic_stats,omitempty"` // Whether to start a child span for egress routed calls. This can be // useful in scenarios where other filters (auth, ratelimit, etc.) make // outbound calls and have child spans rooted at the same ingress @@ -103,7 +103,7 @@ func (*Router) Descriptor() ([]byte, []int) { return file_envoy_config_filter_http_router_v2_router_proto_rawDescGZIP(), []int{0} } -func (x *Router) GetDynamicStats() *wrappers.BoolValue { +func (x *Router) GetDynamicStats() *wrapperspb.BoolValue { if x != nil { return x.DynamicStats } @@ -226,9 +226,9 @@ func file_envoy_config_filter_http_router_v2_router_proto_rawDescGZIP() []byte { var file_envoy_config_filter_http_router_v2_router_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_http_router_v2_router_proto_goTypes = []interface{}{ - (*Router)(nil), // 0: envoy.config.filter.http.router.v2.Router - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue - (*v2.AccessLog)(nil), // 2: envoy.config.filter.accesslog.v2.AccessLog + (*Router)(nil), // 0: envoy.config.filter.http.router.v2.Router + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue + (*v2.AccessLog)(nil), // 2: envoy.config.filter.accesslog.v2.AccessLog } var file_envoy_config_filter_http_router_v2_router_proto_depIdxs = []int32{ 1, // 0: envoy.config.filter.http.router.v2.Router.dynamic_stats:type_name -> google.protobuf.BoolValue diff --git a/envoy/config/filter/http/squash/v2/squash.pb.go b/envoy/config/filter/http/squash/v2/squash.pb.go index f61371890..46648a889 100755 --- a/envoy/config/filter/http/squash/v2/squash.pb.go +++ b/envoy/config/filter/http/squash/v2/squash.pb.go @@ -9,10 +9,10 @@ package squashv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -51,15 +51,15 @@ type Squash struct { // } // // (where POD_NAME, POD_NAMESPACE are configured in the pod via the Downward API) - AttachmentTemplate *_struct.Struct `protobuf:"bytes,2,opt,name=attachment_template,json=attachmentTemplate,proto3" json:"attachment_template,omitempty"` + AttachmentTemplate *structpb.Struct `protobuf:"bytes,2,opt,name=attachment_template,json=attachmentTemplate,proto3" json:"attachment_template,omitempty"` // The timeout for individual requests sent to the Squash cluster. Defaults to 1 second. - RequestTimeout *duration.Duration `protobuf:"bytes,3,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // The total timeout Squash will delay a request and wait for it to be attached. Defaults to 60 // seconds. - AttachmentTimeout *duration.Duration `protobuf:"bytes,4,opt,name=attachment_timeout,json=attachmentTimeout,proto3" json:"attachment_timeout,omitempty"` + AttachmentTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=attachment_timeout,json=attachmentTimeout,proto3" json:"attachment_timeout,omitempty"` // Amount of time to poll for the status of the attachment object in the Squash server // (to check if has been attached). Defaults to 1 second. - AttachmentPollPeriod *duration.Duration `protobuf:"bytes,5,opt,name=attachment_poll_period,json=attachmentPollPeriod,proto3" json:"attachment_poll_period,omitempty"` + AttachmentPollPeriod *durationpb.Duration `protobuf:"bytes,5,opt,name=attachment_poll_period,json=attachmentPollPeriod,proto3" json:"attachment_poll_period,omitempty"` } func (x *Squash) Reset() { @@ -101,28 +101,28 @@ func (x *Squash) GetCluster() string { return "" } -func (x *Squash) GetAttachmentTemplate() *_struct.Struct { +func (x *Squash) GetAttachmentTemplate() *structpb.Struct { if x != nil { return x.AttachmentTemplate } return nil } -func (x *Squash) GetRequestTimeout() *duration.Duration { +func (x *Squash) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } return nil } -func (x *Squash) GetAttachmentTimeout() *duration.Duration { +func (x *Squash) GetAttachmentTimeout() *durationpb.Duration { if x != nil { return x.AttachmentTimeout } return nil } -func (x *Squash) GetAttachmentPollPeriod() *duration.Duration { +func (x *Squash) GetAttachmentPollPeriod() *durationpb.Duration { if x != nil { return x.AttachmentPollPeriod } @@ -198,9 +198,9 @@ func file_envoy_config_filter_http_squash_v2_squash_proto_rawDescGZIP() []byte { var file_envoy_config_filter_http_squash_v2_squash_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_http_squash_v2_squash_proto_goTypes = []interface{}{ - (*Squash)(nil), // 0: envoy.config.filter.http.squash.v2.Squash - (*_struct.Struct)(nil), // 1: google.protobuf.Struct - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*Squash)(nil), // 0: envoy.config.filter.http.squash.v2.Squash + (*structpb.Struct)(nil), // 1: google.protobuf.Struct + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_envoy_config_filter_http_squash_v2_squash_proto_depIdxs = []int32{ 1, // 0: envoy.config.filter.http.squash.v2.Squash.attachment_template:type_name -> google.protobuf.Struct diff --git a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.go b/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.go index 644e159f0..1082a3c72 100755 --- a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.go +++ b/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -41,7 +41,7 @@ type ClientSSLAuth struct { // authentication service. Default is 60000 (60s). The actual fetch time // will be this value plus a random jittered value between // 0-refresh_delay_ms milliseconds. - RefreshDelay *duration.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` + RefreshDelay *durationpb.Duration `protobuf:"bytes,3,opt,name=refresh_delay,json=refreshDelay,proto3" json:"refresh_delay,omitempty"` // An optional list of IP address and subnet masks that should be white // listed for access by the filter. If no list is provided, there is no // IP allowlist. @@ -94,7 +94,7 @@ func (x *ClientSSLAuth) GetStatPrefix() string { return "" } -func (x *ClientSSLAuth) GetRefreshDelay() *duration.Duration { +func (x *ClientSSLAuth) GetRefreshDelay() *durationpb.Duration { if x != nil { return x.RefreshDelay } @@ -176,9 +176,9 @@ func file_envoy_config_filter_network_client_ssl_auth_v2_client_ssl_auth_proto_r var file_envoy_config_filter_network_client_ssl_auth_v2_client_ssl_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_network_client_ssl_auth_v2_client_ssl_auth_proto_goTypes = []interface{}{ - (*ClientSSLAuth)(nil), // 0: envoy.config.filter.network.client_ssl_auth.v2.ClientSSLAuth - (*duration.Duration)(nil), // 1: google.protobuf.Duration - (*core.CidrRange)(nil), // 2: envoy.api.v2.core.CidrRange + (*ClientSSLAuth)(nil), // 0: envoy.config.filter.network.client_ssl_auth.v2.ClientSSLAuth + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration + (*core.CidrRange)(nil), // 2: envoy.api.v2.core.CidrRange } var file_envoy_config_filter_network_client_ssl_auth_v2_client_ssl_auth_proto_depIdxs = []int32{ 1, // 0: envoy.config.filter.network.client_ssl_auth.v2.ClientSSLAuth.refresh_delay:type_name -> google.protobuf.Duration diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.go b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.go index 6488e1b38..aeac1f928 100755 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.go +++ b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.go @@ -9,9 +9,9 @@ package v2alpha1 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -212,7 +212,7 @@ type DubboFilter struct { 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. - Config *any1.Any `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + Config *anypb.Any `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` } func (x *DubboFilter) Reset() { @@ -254,7 +254,7 @@ func (x *DubboFilter) GetName() string { return "" } -func (x *DubboFilter) GetConfig() *any1.Any { +func (x *DubboFilter) GetConfig() *anypb.Any { if x != nil { return x.Config } @@ -361,7 +361,7 @@ var file_envoy_config_filter_network_dubbo_proxy_v2alpha1_dubbo_proxy_proto_goTy (*DubboProxy)(nil), // 2: envoy.config.filter.network.dubbo_proxy.v2alpha1.DubboProxy (*DubboFilter)(nil), // 3: envoy.config.filter.network.dubbo_proxy.v2alpha1.DubboFilter (*RouteConfiguration)(nil), // 4: envoy.config.filter.network.dubbo_proxy.v2alpha1.RouteConfiguration - (*any1.Any)(nil), // 5: google.protobuf.Any + (*anypb.Any)(nil), // 5: google.protobuf.Any } var file_envoy_config_filter_network_dubbo_proxy_v2alpha1_dubbo_proxy_proto_depIdxs = []int32{ 0, // 0: envoy.config.filter.network.dubbo_proxy.v2alpha1.DubboProxy.protocol_type:type_name -> envoy.config.filter.network.dubbo_proxy.v2alpha1.ProtocolType diff --git a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go index 7f977638b..ac230b76e 100755 --- a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go +++ b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.go @@ -16,12 +16,12 @@ import ( _type "github.com/envoyproxy/go-control-plane/envoy/type" v22 "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -290,7 +290,7 @@ type HttpConnectionManager struct { // Whether the connection manager manipulates the :ref:`config_http_conn_man_headers_user-agent` // and :ref:`config_http_conn_man_headers_downstream-service-cluster` headers. See the linked // documentation for more information. Defaults to false. - AddUserAgent *wrappers.BoolValue `protobuf:"bytes,6,opt,name=add_user_agent,json=addUserAgent,proto3" json:"add_user_agent,omitempty"` + AddUserAgent *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=add_user_agent,json=addUserAgent,proto3" json:"add_user_agent,omitempty"` // Presence of the object defines whether the connection manager // emits :ref:`tracing ` data to the :ref:`configured tracing provider // `. @@ -312,7 +312,7 @@ type HttpConnectionManager struct { // The maximum request headers size for incoming connections. // If unconfigured, the default max request headers allowed is 60 KiB. // Requests that exceed this limit will receive a 431 response. - MaxRequestHeadersKb *wrappers.UInt32Value `protobuf:"bytes,29,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"` + MaxRequestHeadersKb *wrapperspb.UInt32Value `protobuf:"bytes,29,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"` // The idle timeout for connections managed by the connection manager. The // idle timeout is defined as the period in which there are no active // requests. If not set, there is no idle timeout. When the idle timeout is @@ -323,7 +323,7 @@ type HttpConnectionManager struct { // instead. // // Deprecated: Marked as deprecated in envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto. - IdleTimeout *duration.Duration `protobuf:"bytes,11,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,11,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // The stream idle timeout for connections managed by the connection manager. // If not specified, this defaults to 5 minutes. The default value was selected // so as not to interfere with any smaller configured timeouts that may have @@ -359,12 +359,12 @@ type HttpConnectionManager struct { // // A value of 0 will completely disable the connection manager stream idle // timeout, although per-route idle timeout overrides will continue to apply. - StreamIdleTimeout *duration.Duration `protobuf:"bytes,24,opt,name=stream_idle_timeout,json=streamIdleTimeout,proto3" json:"stream_idle_timeout,omitempty"` + StreamIdleTimeout *durationpb.Duration `protobuf:"bytes,24,opt,name=stream_idle_timeout,json=streamIdleTimeout,proto3" json:"stream_idle_timeout,omitempty"` // The amount of time that Envoy will wait for the entire request to be received. // The timer is activated when the request is initiated, and is disarmed when the last byte of the // request is sent upstream (i.e. all decoding filters have processed the request), OR when the // response is initiated. If not specified or set to 0, this timeout is disabled. - RequestTimeout *duration.Duration `protobuf:"bytes,28,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,28,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // The time that Envoy will wait between sending an HTTP/2 “shutdown // notification” (GOAWAY frame with max stream ID) and a final GOAWAY frame. // This is used so that Envoy provides a grace period for new streams that @@ -374,7 +374,7 @@ type HttpConnectionManager struct { // both when a connection hits the idle timeout or during general server // draining. The default grace period is 5000 milliseconds (5 seconds) if this // option is not specified. - DrainTimeout *duration.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` + DrainTimeout *durationpb.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` // The delayed close timeout is for downstream connections managed by the HTTP connection manager. // It is defined as a grace period after connection close processing has been locally initiated // during which Envoy will wait for the peer to close (i.e., a TCP FIN/RST is received by Envoy @@ -407,7 +407,7 @@ type HttpConnectionManager struct { // A value of 0 will completely disable delayed close processing. When disabled, the downstream // connection's socket will be closed immediately after the write flush is completed or will // never close if the write flush does not complete. - DelayedCloseTimeout *duration.Duration `protobuf:"bytes,26,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"` + DelayedCloseTimeout *durationpb.Duration `protobuf:"bytes,26,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"` // Configuration for :ref:`HTTP access logs ` // emitted by the connection manager. AccessLog []*v2.AccessLog `protobuf:"bytes,13,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` @@ -418,7 +418,7 @@ type HttpConnectionManager struct { // :ref:`config_http_conn_man_headers_x-forwarded-for`, // :ref:`config_http_conn_man_headers_x-envoy-internal`, and // :ref:`config_http_conn_man_headers_x-envoy-external-address` for more information. - UseRemoteAddress *wrappers.BoolValue `protobuf:"bytes,14,opt,name=use_remote_address,json=useRemoteAddress,proto3" json:"use_remote_address,omitempty"` + UseRemoteAddress *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=use_remote_address,json=useRemoteAddress,proto3" json:"use_remote_address,omitempty"` // The number of additional ingress proxy hops from the right side of the // :ref:`config_http_conn_man_headers_x-forwarded-for` HTTP header to trust when // determining the origin client's IP address. The default is zero if this option @@ -446,7 +446,7 @@ type HttpConnectionManager struct { // ` header if it does not exist. This defaults to // true. Generating a random UUID4 is expensive so in high throughput scenarios where this feature // is not desired it can be disabled. - GenerateRequestId *wrappers.BoolValue `protobuf:"bytes,15,opt,name=generate_request_id,json=generateRequestId,proto3" json:"generate_request_id,omitempty"` + GenerateRequestId *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=generate_request_id,json=generateRequestId,proto3" json:"generate_request_id,omitempty"` // Whether the connection manager will keep the :ref:`x-request-id // ` header if passed for a request that is edge // (Edge request is the request from external clients to front Envoy) and not reset it, which @@ -494,7 +494,7 @@ type HttpConnectionManager struct { // for details of normalization. // Note that Envoy does not perform // `case normalization `_ - NormalizePath *wrappers.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"` + NormalizePath *wrapperspb.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 @@ -595,7 +595,7 @@ func (x *HttpConnectionManager) GetHttpFilters() []*HttpFilter { return nil } -func (x *HttpConnectionManager) GetAddUserAgent() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetAddUserAgent() *wrapperspb.BoolValue { if x != nil { return x.AddUserAgent } @@ -644,7 +644,7 @@ func (x *HttpConnectionManager) GetServerHeaderTransformation() HttpConnectionMa return HttpConnectionManager_OVERWRITE } -func (x *HttpConnectionManager) GetMaxRequestHeadersKb() *wrappers.UInt32Value { +func (x *HttpConnectionManager) GetMaxRequestHeadersKb() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestHeadersKb } @@ -652,35 +652,35 @@ func (x *HttpConnectionManager) GetMaxRequestHeadersKb() *wrappers.UInt32Value { } // Deprecated: Marked as deprecated in envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto. -func (x *HttpConnectionManager) GetIdleTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *HttpConnectionManager) GetStreamIdleTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetStreamIdleTimeout() *durationpb.Duration { if x != nil { return x.StreamIdleTimeout } return nil } -func (x *HttpConnectionManager) GetRequestTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } return nil } -func (x *HttpConnectionManager) GetDrainTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetDrainTimeout() *durationpb.Duration { if x != nil { return x.DrainTimeout } return nil } -func (x *HttpConnectionManager) GetDelayedCloseTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetDelayedCloseTimeout() *durationpb.Duration { if x != nil { return x.DelayedCloseTimeout } @@ -694,7 +694,7 @@ func (x *HttpConnectionManager) GetAccessLog() []*v2.AccessLog { return nil } -func (x *HttpConnectionManager) GetUseRemoteAddress() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetUseRemoteAddress() *wrapperspb.BoolValue { if x != nil { return x.UseRemoteAddress } @@ -729,7 +729,7 @@ func (x *HttpConnectionManager) GetVia() string { return "" } -func (x *HttpConnectionManager) GetGenerateRequestId() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetGenerateRequestId() *wrapperspb.BoolValue { if x != nil { return x.GenerateRequestId } @@ -778,7 +778,7 @@ func (x *HttpConnectionManager) GetUpgradeConfigs() []*HttpConnectionManager_Upg return nil } -func (x *HttpConnectionManager) GetNormalizePath() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetNormalizePath() *wrapperspb.BoolValue { if x != nil { return x.NormalizePath } @@ -1168,14 +1168,14 @@ func (m *HttpFilter) GetConfigType() isHttpFilter_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto. -func (x *HttpFilter) GetConfig() *_struct.Struct { +func (x *HttpFilter) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*HttpFilter_Config); ok { return x.Config } return nil } -func (x *HttpFilter) GetTypedConfig() *any1.Any { +func (x *HttpFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*HttpFilter_TypedConfig); ok { return x.TypedConfig } @@ -1188,11 +1188,11 @@ type isHttpFilter_ConfigType interface { type HttpFilter_Config struct { // Deprecated: Marked as deprecated in envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type HttpFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*HttpFilter_Config) isHttpFilter_ConfigType() {} @@ -1205,7 +1205,7 @@ type RequestIDExtension struct { unknownFields protoimpl.UnknownFields // Request ID extension specific configuration. - TypedConfig *any1.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *RequestIDExtension) Reset() { @@ -1240,7 +1240,7 @@ func (*RequestIDExtension) Descriptor() ([]byte, []int) { return file_envoy_config_filter_network_http_connection_manager_v2_http_connection_manager_proto_rawDescGZIP(), []int{6} } -func (x *RequestIDExtension) GetTypedConfig() *any1.Any { +func (x *RequestIDExtension) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -1302,7 +1302,7 @@ type HttpConnectionManager_Tracing struct { // Maximum length of the request path to extract and include in the HttpUrl tag. Used to // truncate lengthy request paths to meet the needs of a tracing backend. // Default: 256 - MaxPathTagLength *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_path_tag_length,json=maxPathTagLength,proto3" json:"max_path_tag_length,omitempty"` + MaxPathTagLength *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_path_tag_length,json=maxPathTagLength,proto3" json:"max_path_tag_length,omitempty"` // A list of custom tags with unique tag name to create tags for the active span. CustomTags []*v22.CustomTag `protobuf:"bytes,8,rep,name=custom_tags,json=customTags,proto3" json:"custom_tags,omitempty"` // Configuration for an external tracing provider. @@ -1395,7 +1395,7 @@ func (x *HttpConnectionManager_Tracing) GetVerbose() bool { return false } -func (x *HttpConnectionManager_Tracing) GetMaxPathTagLength() *wrappers.UInt32Value { +func (x *HttpConnectionManager_Tracing) GetMaxPathTagLength() *wrapperspb.UInt32Value { if x != nil { return x.MaxPathTagLength } @@ -1471,7 +1471,7 @@ type HttpConnectionManager_SetCurrentClientCertDetails struct { unknownFields protoimpl.UnknownFields // Whether to forward the subject of the client cert. Defaults to false. - Subject *wrappers.BoolValue `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"` + Subject *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"` // Whether to forward the entire client cert in URL encoded PEM format. This will appear in the // XFCC header comma separated from other values with the value Cert="PEM". // Defaults to false. @@ -1521,7 +1521,7 @@ func (*HttpConnectionManager_SetCurrentClientCertDetails) Descriptor() ([]byte, return file_envoy_config_filter_network_http_connection_manager_v2_http_connection_manager_proto_rawDescGZIP(), []int{0, 2} } -func (x *HttpConnectionManager_SetCurrentClientCertDetails) GetSubject() *wrappers.BoolValue { +func (x *HttpConnectionManager_SetCurrentClientCertDetails) GetSubject() *wrapperspb.BoolValue { if x != nil { return x.Subject } @@ -1587,7 +1587,7 @@ type HttpConnectionManager_UpgradeConfig struct { // This can be overridden on a per-route basis with :ref:`cluster // ` as documented in the // :ref:`upgrade documentation `. - Enabled *wrappers.BoolValue `protobuf:"bytes,3,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=enabled,proto3" json:"enabled,omitempty"` } func (x *HttpConnectionManager_UpgradeConfig) Reset() { @@ -1636,7 +1636,7 @@ func (x *HttpConnectionManager_UpgradeConfig) GetFilters() []*HttpFilter { return nil } -func (x *HttpConnectionManager_UpgradeConfig) GetEnabled() *wrappers.BoolValue { +func (x *HttpConnectionManager_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -2473,17 +2473,17 @@ var file_envoy_config_filter_network_http_connection_manager_v2_http_connection_ (*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor)(nil), // 17: envoy.config.filter.network.http_connection_manager.v2.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor (*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement)(nil), // 18: envoy.config.filter.network.http_connection_manager.v2.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement (*v21.RouteConfiguration)(nil), // 19: envoy.api.v2.RouteConfiguration - (*wrappers.BoolValue)(nil), // 20: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 20: google.protobuf.BoolValue (*core.HttpProtocolOptions)(nil), // 21: envoy.api.v2.core.HttpProtocolOptions (*core.Http1ProtocolOptions)(nil), // 22: envoy.api.v2.core.Http1ProtocolOptions (*core.Http2ProtocolOptions)(nil), // 23: envoy.api.v2.core.Http2ProtocolOptions - (*wrappers.UInt32Value)(nil), // 24: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 25: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 24: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 25: google.protobuf.Duration (*v2.AccessLog)(nil), // 26: envoy.config.filter.accesslog.v2.AccessLog (*core.ConfigSource)(nil), // 27: envoy.api.v2.core.ConfigSource (*v21.ScopedRouteConfiguration)(nil), // 28: envoy.api.v2.ScopedRouteConfiguration - (*_struct.Struct)(nil), // 29: google.protobuf.Struct - (*any1.Any)(nil), // 30: google.protobuf.Any + (*structpb.Struct)(nil), // 29: google.protobuf.Struct + (*anypb.Any)(nil), // 30: google.protobuf.Any (*_type.Percent)(nil), // 31: envoy.type.Percent (*v22.CustomTag)(nil), // 32: envoy.type.tracing.v2.CustomTag (*v23.Tracing_Http)(nil), // 33: envoy.config.trace.v2.Tracing.Http diff --git a/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.go b/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.go index 1bcade8db..2c4145fe8 100755 --- a/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.go +++ b/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.go @@ -11,9 +11,9 @@ import ( ratelimit "github.com/envoyproxy/go-control-plane/envoy/api/v2/ratelimit" v2 "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -39,7 +39,7 @@ type RateLimit struct { Descriptors []*ratelimit.RateLimitDescriptor `protobuf:"bytes,3,rep,name=descriptors,proto3" json:"descriptors,omitempty"` // The timeout in milliseconds for the rate limit service RPC. If not // set, this defaults to 20ms. - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // The filter's behaviour in case the rate limiting service does // not respond back. When it is set to true, Envoy will not allow traffic in case of // communication failure between rate limiting service and the proxy. @@ -104,7 +104,7 @@ func (x *RateLimit) GetDescriptors() []*ratelimit.RateLimitDescriptor { return nil } -func (x *RateLimit) GetTimeout() *duration.Duration { +func (x *RateLimit) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -204,7 +204,7 @@ var file_envoy_config_filter_network_rate_limit_v2_rate_limit_proto_msgTypes = m var file_envoy_config_filter_network_rate_limit_v2_rate_limit_proto_goTypes = []interface{}{ (*RateLimit)(nil), // 0: envoy.config.filter.network.rate_limit.v2.RateLimit (*ratelimit.RateLimitDescriptor)(nil), // 1: envoy.api.v2.ratelimit.RateLimitDescriptor - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration (*v2.RateLimitServiceConfig)(nil), // 3: envoy.config.ratelimit.v2.RateLimitServiceConfig } var file_envoy_config_filter_network_rate_limit_v2_rate_limit_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go index 1173ee075..ebad0b6d9 100755 --- a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go +++ b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.go @@ -11,10 +11,10 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -297,7 +297,7 @@ type RedisProxy_ConnPoolSettings struct { // The only exception to this behavior is when a connection to a backend is not yet established. // In that case, the connect timeout on the cluster will govern the timeout until the connection // is ready. - OpTimeout *duration.Duration `protobuf:"bytes,1,opt,name=op_timeout,json=opTimeout,proto3" json:"op_timeout,omitempty"` + OpTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=op_timeout,json=opTimeout,proto3" json:"op_timeout,omitempty"` // Use hash tagging on every redis key to guarantee that keys with the same hash tag will be // forwarded to the same upstream. The hash key used for determining the upstream in a // consistent hash ring configuration will be computed from the hash tagged key instead of the @@ -333,13 +333,13 @@ 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 *duration.Duration `protobuf:"bytes,5,opt,name=buffer_flush_timeout,json=bufferFlushTimeout,proto3" json:"buffer_flush_timeout,omitempty"` + BufferFlushTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=buffer_flush_timeout,json=bufferFlushTimeout,proto3" 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 *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=max_upstream_unknown_connections,json=maxUpstreamUnknownConnections,proto3" json:"max_upstream_unknown_connections,omitempty"` + MaxUpstreamUnknownConnections *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=max_upstream_unknown_connections,json=maxUpstreamUnknownConnections,proto3" json:"max_upstream_unknown_connections,omitempty"` // Enable per-command statistics per upstream cluster, in addition to the filter level aggregate // count. EnableCommandStats bool `protobuf:"varint,8,opt,name=enable_command_stats,json=enableCommandStats,proto3" json:"enable_command_stats,omitempty"` @@ -379,7 +379,7 @@ func (*RedisProxy_ConnPoolSettings) Descriptor() ([]byte, []int) { return file_envoy_config_filter_network_redis_proxy_v2_redis_proxy_proto_rawDescGZIP(), []int{0, 0} } -func (x *RedisProxy_ConnPoolSettings) GetOpTimeout() *duration.Duration { +func (x *RedisProxy_ConnPoolSettings) GetOpTimeout() *durationpb.Duration { if x != nil { return x.OpTimeout } @@ -407,14 +407,14 @@ func (x *RedisProxy_ConnPoolSettings) GetMaxBufferSizeBeforeFlush() uint32 { return 0 } -func (x *RedisProxy_ConnPoolSettings) GetBufferFlushTimeout() *duration.Duration { +func (x *RedisProxy_ConnPoolSettings) GetBufferFlushTimeout() *durationpb.Duration { if x != nil { return x.BufferFlushTimeout } return nil } -func (x *RedisProxy_ConnPoolSettings) GetMaxUpstreamUnknownConnections() *wrappers.UInt32Value { +func (x *RedisProxy_ConnPoolSettings) GetMaxUpstreamUnknownConnections() *wrapperspb.UInt32Value { if x != nil { return x.MaxUpstreamUnknownConnections } @@ -865,8 +865,8 @@ var file_envoy_config_filter_network_redis_proxy_v2_redis_proxy_proto_goTypes = (*RedisProxy_PrefixRoutes_Route)(nil), // 5: envoy.config.filter.network.redis_proxy.v2.RedisProxy.PrefixRoutes.Route (*RedisProxy_PrefixRoutes_Route_RequestMirrorPolicy)(nil), // 6: envoy.config.filter.network.redis_proxy.v2.RedisProxy.PrefixRoutes.Route.RequestMirrorPolicy (*core.DataSource)(nil), // 7: envoy.api.v2.core.DataSource - (*duration.Duration)(nil), // 8: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value (*core.RuntimeFractionalPercent)(nil), // 10: envoy.api.v2.core.RuntimeFractionalPercent } var file_envoy_config_filter_network_redis_proxy_v2_redis_proxy_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go index 1ce0cf07c..0452dc448 100755 --- a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go +++ b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.go @@ -12,10 +12,10 @@ import ( v2 "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" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -54,16 +54,16 @@ type TcpProxy struct { // // Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP // FIN packets, etc. - IdleTimeout *duration.Duration `protobuf:"bytes,8,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // [#not-implemented-hide:] The idle timeout for connections managed by the TCP proxy // filter. The idle timeout is defined as the period in which there is no // active traffic. If not set, there is no idle timeout. When the idle timeout // is reached the connection will be closed. The distinction between // downstream_idle_timeout/upstream_idle_timeout provides a means to set // timeout based on the last byte sent on the downstream/upstream connection. - DownstreamIdleTimeout *duration.Duration `protobuf:"bytes,3,opt,name=downstream_idle_timeout,json=downstreamIdleTimeout,proto3" json:"downstream_idle_timeout,omitempty"` + DownstreamIdleTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=downstream_idle_timeout,json=downstreamIdleTimeout,proto3" json:"downstream_idle_timeout,omitempty"` // [#not-implemented-hide:] - UpstreamIdleTimeout *duration.Duration `protobuf:"bytes,4,opt,name=upstream_idle_timeout,json=upstreamIdleTimeout,proto3" json:"upstream_idle_timeout,omitempty"` + UpstreamIdleTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=upstream_idle_timeout,json=upstreamIdleTimeout,proto3" json:"upstream_idle_timeout,omitempty"` // Configuration for :ref:`access logs ` // emitted by the this tcp_proxy. AccessLog []*v2.AccessLog `protobuf:"bytes,5,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` @@ -73,7 +73,7 @@ type TcpProxy struct { DeprecatedV1 *TcpProxy_DeprecatedV1 `protobuf:"bytes,6,opt,name=deprecated_v1,json=deprecatedV1,proto3" json:"deprecated_v1,omitempty"` // The maximum number of unsuccessful connection attempts that will be made before // giving up. If the parameter is not specified, 1 connection attempt will be made. - MaxConnectAttempts *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` + MaxConnectAttempts *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` // Optional configuration for TCP proxy hash policy. If hash_policy is not set, the hash-based // load balancing algorithms will select a host randomly. Currently the number of hash policies is // limited to 1. @@ -152,21 +152,21 @@ func (x *TcpProxy) GetMetadataMatch() *core.Metadata { return nil } -func (x *TcpProxy) GetIdleTimeout() *duration.Duration { +func (x *TcpProxy) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *TcpProxy) GetDownstreamIdleTimeout() *duration.Duration { +func (x *TcpProxy) GetDownstreamIdleTimeout() *durationpb.Duration { if x != nil { return x.DownstreamIdleTimeout } return nil } -func (x *TcpProxy) GetUpstreamIdleTimeout() *duration.Duration { +func (x *TcpProxy) GetUpstreamIdleTimeout() *durationpb.Duration { if x != nil { return x.UpstreamIdleTimeout } @@ -188,7 +188,7 @@ func (x *TcpProxy) GetDeprecatedV1() *TcpProxy_DeprecatedV1 { return nil } -func (x *TcpProxy) GetMaxConnectAttempts() *wrappers.UInt32Value { +func (x *TcpProxy) GetMaxConnectAttempts() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectAttempts } @@ -744,9 +744,9 @@ var file_envoy_config_filter_network_tcp_proxy_v2_tcp_proxy_proto_goTypes = []in (*TcpProxy_DeprecatedV1_TCPRoute)(nil), // 4: envoy.config.filter.network.tcp_proxy.v2.TcpProxy.DeprecatedV1.TCPRoute (*TcpProxy_WeightedCluster_ClusterWeight)(nil), // 5: envoy.config.filter.network.tcp_proxy.v2.TcpProxy.WeightedCluster.ClusterWeight (*core.Metadata)(nil), // 6: envoy.api.v2.core.Metadata - (*duration.Duration)(nil), // 7: google.protobuf.Duration + (*durationpb.Duration)(nil), // 7: google.protobuf.Duration (*v2.AccessLog)(nil), // 8: envoy.config.filter.accesslog.v2.AccessLog - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value (*_type.HashPolicy)(nil), // 10: envoy.type.HashPolicy (*core.CidrRange)(nil), // 11: envoy.api.v2.core.CidrRange } diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go index 9707aa915..fb3e1cfbc 100755 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.go @@ -11,9 +11,9 @@ import ( 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" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -461,7 +461,7 @@ type WeightedCluster_ClusterWeight struct { // When a request matches the route, the choice of an upstream cluster is determined by its // weight. The sum of weights across all entries in the clusters array determines the total // weight. - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Optional endpoint metadata match criteria used by the subset load balancer. Only endpoints in // the upstream cluster with metadata matching what is set in this field, combined with what's // provided in :ref:`RouteAction's metadata_match @@ -510,7 +510,7 @@ func (x *WeightedCluster_ClusterWeight) GetName() string { return "" } -func (x *WeightedCluster_ClusterWeight) GetWeight() *wrappers.UInt32Value { +func (x *WeightedCluster_ClusterWeight) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -666,7 +666,7 @@ var file_envoy_config_filter_network_thrift_proxy_v2alpha1_route_proto_goTypes = (*route.HeaderMatcher)(nil), // 6: envoy.api.v2.route.HeaderMatcher (*core.Metadata)(nil), // 7: envoy.api.v2.core.Metadata (*route.RateLimit)(nil), // 8: envoy.api.v2.route.RateLimit - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value } var file_envoy_config_filter_network_thrift_proxy_v2alpha1_route_proto_depIdxs = []int32{ 1, // 0: envoy.config.filter.network.thrift_proxy.v2alpha1.RouteConfiguration.routes:type_name -> envoy.config.filter.network.thrift_proxy.v2alpha1.Route diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.go b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.go index 70e73e2cf..8ebda47f8 100755 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.go +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.go @@ -9,10 +9,10 @@ package v2alpha1 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -307,14 +307,14 @@ func (m *ThriftFilter) GetConfigType() isThriftFilter_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto. -func (x *ThriftFilter) GetConfig() *_struct.Struct { +func (x *ThriftFilter) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*ThriftFilter_Config); ok { return x.Config } return nil } -func (x *ThriftFilter) GetTypedConfig() *any1.Any { +func (x *ThriftFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ThriftFilter_TypedConfig); ok { return x.TypedConfig } @@ -327,11 +327,11 @@ type isThriftFilter_ConfigType interface { type ThriftFilter_Config struct { // Deprecated: Marked as deprecated in envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type ThriftFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ThriftFilter_Config) isThriftFilter_ConfigType() {} @@ -533,8 +533,8 @@ var file_envoy_config_filter_network_thrift_proxy_v2alpha1_thrift_proxy_proto_go (*ThriftFilter)(nil), // 3: envoy.config.filter.network.thrift_proxy.v2alpha1.ThriftFilter (*ThriftProtocolOptions)(nil), // 4: envoy.config.filter.network.thrift_proxy.v2alpha1.ThriftProtocolOptions (*RouteConfiguration)(nil), // 5: envoy.config.filter.network.thrift_proxy.v2alpha1.RouteConfiguration - (*_struct.Struct)(nil), // 6: google.protobuf.Struct - (*any1.Any)(nil), // 7: google.protobuf.Any + (*structpb.Struct)(nil), // 6: google.protobuf.Struct + (*anypb.Any)(nil), // 7: google.protobuf.Any } var file_envoy_config_filter_network_thrift_proxy_v2alpha1_thrift_proxy_proto_depIdxs = []int32{ 0, // 0: envoy.config.filter.network.thrift_proxy.v2alpha1.ThriftProxy.transport:type_name -> envoy.config.filter.network.thrift_proxy.v2alpha1.TransportType diff --git a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.go b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.go index 051926d2c..0265b6296 100755 --- a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.go +++ b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.go @@ -9,9 +9,9 @@ package v1alpha1 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -42,7 +42,7 @@ type ZooKeeperProxy struct { // https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#Unsafe+Options // // if that is set. If it isn't, ZooKeeper's default is also 1Mb. - MaxPacketBytes *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_packet_bytes,json=maxPacketBytes,proto3" json:"max_packet_bytes,omitempty"` + MaxPacketBytes *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_packet_bytes,json=maxPacketBytes,proto3" json:"max_packet_bytes,omitempty"` } func (x *ZooKeeperProxy) Reset() { @@ -91,7 +91,7 @@ func (x *ZooKeeperProxy) GetAccessLog() string { return "" } -func (x *ZooKeeperProxy) GetMaxPacketBytes() *wrappers.UInt32Value { +func (x *ZooKeeperProxy) GetMaxPacketBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxPacketBytes } @@ -160,8 +160,8 @@ func file_envoy_config_filter_network_zookeeper_proxy_v1alpha1_zookeeper_proxy_p var file_envoy_config_filter_network_zookeeper_proxy_v1alpha1_zookeeper_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_network_zookeeper_proxy_v1alpha1_zookeeper_proxy_proto_goTypes = []interface{}{ - (*ZooKeeperProxy)(nil), // 0: envoy.config.filter.network.zookeeper_proxy.v1alpha1.ZooKeeperProxy - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*ZooKeeperProxy)(nil), // 0: envoy.config.filter.network.zookeeper_proxy.v1alpha1.ZooKeeperProxy + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value } var file_envoy_config_filter_network_zookeeper_proxy_v1alpha1_zookeeper_proxy_proto_depIdxs = []int32{ 1, // 0: envoy.config.filter.network.zookeeper_proxy.v1alpha1.ZooKeeperProxy.max_packet_bytes:type_name -> google.protobuf.UInt32Value diff --git a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.go b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.go index f58e43f3f..ddaf8d8b8 100755 --- a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.go +++ b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -44,7 +44,7 @@ type RateLimit struct { Stage uint32 `protobuf:"varint,2,opt,name=stage,proto3" json:"stage,omitempty"` // The timeout in milliseconds for the rate limit service RPC. If not // set, this defaults to 20ms. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // The filter's behaviour in case the rate limiting service does // not respond back. When it is set to true, Envoy will not allow traffic in case of // communication failure between rate limiting service and the proxy. @@ -102,7 +102,7 @@ func (x *RateLimit) GetStage() uint32 { return 0 } -func (x *RateLimit) GetTimeout() *duration.Duration { +func (x *RateLimit) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -194,7 +194,7 @@ func file_envoy_config_filter_thrift_rate_limit_v2alpha1_rate_limit_proto_rawDes var file_envoy_config_filter_thrift_rate_limit_v2alpha1_rate_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_thrift_rate_limit_v2alpha1_rate_limit_proto_goTypes = []interface{}{ (*RateLimit)(nil), // 0: envoy.config.filter.thrift.rate_limit.v2alpha1.RateLimit - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration (*v2.RateLimitServiceConfig)(nil), // 2: envoy.config.ratelimit.v2.RateLimitServiceConfig } var file_envoy_config_filter_thrift_rate_limit_v2alpha1_rate_limit_proto_depIdxs = []int32{ diff --git a/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.go b/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.go index 8fb584601..287358738 100755 --- a/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.go +++ b/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.go @@ -9,9 +9,9 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -37,7 +37,7 @@ type UdpProxyConfig struct { RouteSpecifier isUdpProxyConfig_RouteSpecifier `protobuf_oneof:"route_specifier"` // The idle timeout for sessions. Idle is defined as no datagrams between received or sent by // the session. The default if not specified is 1 minute. - IdleTimeout *duration.Duration `protobuf:"bytes,3,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` } func (x *UdpProxyConfig) Reset() { @@ -93,7 +93,7 @@ func (x *UdpProxyConfig) GetCluster() string { return "" } -func (x *UdpProxyConfig) GetIdleTimeout() *duration.Duration { +func (x *UdpProxyConfig) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -170,8 +170,8 @@ func file_envoy_config_filter_udp_udp_proxy_v2alpha_udp_proxy_proto_rawDescGZIP( var file_envoy_config_filter_udp_udp_proxy_v2alpha_udp_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_filter_udp_udp_proxy_v2alpha_udp_proxy_proto_goTypes = []interface{}{ - (*UdpProxyConfig)(nil), // 0: envoy.config.filter.udp.udp_proxy.v2alpha.UdpProxyConfig - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*UdpProxyConfig)(nil), // 0: envoy.config.filter.udp.udp_proxy.v2alpha.UdpProxyConfig + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_config_filter_udp_udp_proxy_v2alpha_udp_proxy_proto_depIdxs = []int32{ 1, // 0: envoy.config.filter.udp.udp_proxy.v2alpha.UdpProxyConfig.idle_timeout:type_name -> google.protobuf.Duration diff --git a/envoy/config/listener/v2/api_listener.pb.go b/envoy/config/listener/v2/api_listener.pb.go index ec0af1b93..bfc99af8b 100755 --- a/envoy/config/listener/v2/api_listener.pb.go +++ b/envoy/config/listener/v2/api_listener.pb.go @@ -8,9 +8,9 @@ package listenerv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -37,7 +37,7 @@ type ApiListener struct { // it would have caused circular dependencies for go protos: lds.proto depends on this file, // and http_connection_manager.proto depends on rds.proto, which is in the same directory as // lds.proto, so lds.proto cannot depend on this file.] - ApiListener *any1.Any `protobuf:"bytes,1,opt,name=api_listener,json=apiListener,proto3" json:"api_listener,omitempty"` + ApiListener *anypb.Any `protobuf:"bytes,1,opt,name=api_listener,json=apiListener,proto3" json:"api_listener,omitempty"` } func (x *ApiListener) Reset() { @@ -72,7 +72,7 @@ func (*ApiListener) Descriptor() ([]byte, []int) { return file_envoy_config_listener_v2_api_listener_proto_rawDescGZIP(), []int{0} } -func (x *ApiListener) GetApiListener() *any1.Any { +func (x *ApiListener) GetApiListener() *anypb.Any { if x != nil { return x.ApiListener } @@ -126,7 +126,7 @@ func file_envoy_config_listener_v2_api_listener_proto_rawDescGZIP() []byte { var file_envoy_config_listener_v2_api_listener_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_listener_v2_api_listener_proto_goTypes = []interface{}{ (*ApiListener)(nil), // 0: envoy.config.listener.v2.ApiListener - (*any1.Any)(nil), // 1: google.protobuf.Any + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_envoy_config_listener_v2_api_listener_proto_depIdxs = []int32{ 1, // 0: envoy.config.listener.v2.ApiListener.api_listener:type_name -> google.protobuf.Any diff --git a/envoy/config/listener/v3/api_listener.pb.go b/envoy/config/listener/v3/api_listener.pb.go index b3211d21c..201e9ef11 100755 --- a/envoy/config/listener/v3/api_listener.pb.go +++ b/envoy/config/listener/v3/api_listener.pb.go @@ -8,9 +8,9 @@ package listenerv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -38,7 +38,7 @@ type ApiListener struct { // it would have caused circular dependencies for go protos: lds.proto depends on this file, // and http_connection_manager.proto depends on rds.proto, which is in the same directory as // lds.proto, so lds.proto cannot depend on this file.] - ApiListener *any1.Any `protobuf:"bytes,1,opt,name=api_listener,json=apiListener,proto3" json:"api_listener,omitempty"` + ApiListener *anypb.Any `protobuf:"bytes,1,opt,name=api_listener,json=apiListener,proto3" json:"api_listener,omitempty"` } func (x *ApiListener) Reset() { @@ -73,7 +73,7 @@ func (*ApiListener) Descriptor() ([]byte, []int) { return file_envoy_config_listener_v3_api_listener_proto_rawDescGZIP(), []int{0} } -func (x *ApiListener) GetApiListener() *any1.Any { +func (x *ApiListener) GetApiListener() *anypb.Any { if x != nil { return x.ApiListener } @@ -128,7 +128,7 @@ func file_envoy_config_listener_v3_api_listener_proto_rawDescGZIP() []byte { var file_envoy_config_listener_v3_api_listener_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_listener_v3_api_listener_proto_goTypes = []interface{}{ (*ApiListener)(nil), // 0: envoy.config.listener.v3.ApiListener - (*any1.Any)(nil), // 1: google.protobuf.Any + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_envoy_config_listener_v3_api_listener_proto_depIdxs = []int32{ 1, // 0: envoy.config.listener.v3.ApiListener.api_listener:type_name -> google.protobuf.Any diff --git a/envoy/config/listener/v3/listener.pb.go b/envoy/config/listener/v3/listener.pb.go index 9c2308060..2b87d751a 100755 --- a/envoy/config/listener/v3/listener.pb.go +++ b/envoy/config/listener/v3/listener.pb.go @@ -15,10 +15,10 @@ import ( v33 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -246,13 +246,13 @@ type Listener struct { // true, the listener hands off redirected connections to the listener associated with the // original destination address. If there is no listener associated with the original destination // address, the connection is handled by the listener that receives it. Defaults to false. - UseOriginalDst *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_original_dst,json=useOriginalDst,proto3" json:"use_original_dst,omitempty"` + UseOriginalDst *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=use_original_dst,json=useOriginalDst,proto3" json:"use_original_dst,omitempty"` // The default filter chain if none of the filter chain matches. If no default filter chain is supplied, // the connection will be closed. The filter chain match is ignored in this field. DefaultFilterChain *FilterChain `protobuf:"bytes,25,opt,name=default_filter_chain,json=defaultFilterChain,proto3" json:"default_filter_chain,omitempty"` // Soft limit on size of the listener’s new connection read and write buffers. // If unspecified, an implementation defined default is applied (1MiB). - PerConnectionBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` + PerConnectionBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` // Listener metadata. Metadata *v3.Metadata `protobuf:"bytes,6,opt,name=metadata,proto3" json:"metadata,omitempty"` // [#not-implemented-hide:] @@ -279,7 +279,7 @@ type Listener struct { // the accepted socket is closed without a connection being created unless // “continue_on_listener_filters_timeout“ is set to true. Specify 0 to disable the // timeout. If not specified, a default timeout of 15s is used. - ListenerFiltersTimeout *duration.Duration `protobuf:"bytes,15,opt,name=listener_filters_timeout,json=listenerFiltersTimeout,proto3" json:"listener_filters_timeout,omitempty"` + ListenerFiltersTimeout *durationpb.Duration `protobuf:"bytes,15,opt,name=listener_filters_timeout,json=listenerFiltersTimeout,proto3" json:"listener_filters_timeout,omitempty"` // Whether a connection should be created when listener filters timeout. Default is false. // // .. attention:: @@ -302,14 +302,14 @@ type Listener struct { // Setting this flag requires Envoy to run with the “CAP_NET_ADMIN“ capability. // When this flag is not set (default), the socket is not modified, i.e. the transparent option // is neither set nor reset. - Transparent *wrappers.BoolValue `protobuf:"bytes,10,opt,name=transparent,proto3" json:"transparent,omitempty"` + Transparent *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=transparent,proto3" json:"transparent,omitempty"` // Whether the listener should set the “IP_FREEBIND“ socket option. When this // flag is set to true, listeners can be bound to an IP address that is not // configured on the system running Envoy. When this flag is set to false, the // option “IP_FREEBIND“ is disabled on the socket. When this flag is not set // (default), the socket is not modified, i.e. the option is neither enabled // nor disabled. - Freebind *wrappers.BoolValue `protobuf:"bytes,11,opt,name=freebind,proto3" json:"freebind,omitempty"` + Freebind *wrapperspb.BoolValue `protobuf:"bytes,11,opt,name=freebind,proto3" json:"freebind,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. The socket options can be updated for a listener when // :ref:`enable_reuse_port ` @@ -330,7 +330,7 @@ type Listener struct { // // On macOS, only values of 0, 1, and unset are valid; other values may result in an error. // To set the queue length on macOS, set the net.inet.tcp.fastopen_backlog kernel parameter. - TcpFastOpenQueueLength *wrappers.UInt32Value `protobuf:"bytes,12,opt,name=tcp_fast_open_queue_length,json=tcpFastOpenQueueLength,proto3" json:"tcp_fast_open_queue_length,omitempty"` + TcpFastOpenQueueLength *wrapperspb.UInt32Value `protobuf:"bytes,12,opt,name=tcp_fast_open_queue_length,json=tcpFastOpenQueueLength,proto3" json:"tcp_fast_open_queue_length,omitempty"` // Specifies the intended direction of the traffic relative to the local Envoy. // This property is required on Windows for listeners using the original destination filter, // see :ref:`Original Destination `. @@ -393,13 +393,13 @@ type Listener struct { // a single worker will currently receive packets. // - On Windows, reuse_port for TCP has undefined behavior. It is force disabled and the user // is warned similar to macOS. It is left enabled for UDP with undefined behavior currently. - EnableReusePort *wrappers.BoolValue `protobuf:"bytes,29,opt,name=enable_reuse_port,json=enableReusePort,proto3" json:"enable_reuse_port,omitempty"` + EnableReusePort *wrapperspb.BoolValue `protobuf:"bytes,29,opt,name=enable_reuse_port,json=enableReusePort,proto3" json:"enable_reuse_port,omitempty"` // Configuration for :ref:`access logs ` // emitted by this listener. AccessLog []*v33.AccessLog `protobuf:"bytes,22,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` // The maximum length a tcp listener's pending connections queue can grow to. If no value is // provided net.core.somaxconn will be used on Linux and 128 otherwise. - TcpBacklogSize *wrappers.UInt32Value `protobuf:"bytes,24,opt,name=tcp_backlog_size,json=tcpBacklogSize,proto3" json:"tcp_backlog_size,omitempty"` + TcpBacklogSize *wrapperspb.UInt32Value `protobuf:"bytes,24,opt,name=tcp_backlog_size,json=tcpBacklogSize,proto3" json:"tcp_backlog_size,omitempty"` // The maximum number of connections to accept from the kernel per socket // event. Envoy may decide to close these connections after accepting them // from the kernel e.g. due to load shedding, or other policies. @@ -408,12 +408,12 @@ type Listener struct { // accepted in later event loop iterations. // If no value is provided Envoy will accept all connections pending accept // from the kernel. - MaxConnectionsToAcceptPerSocketEvent *wrappers.UInt32Value `protobuf:"bytes,34,opt,name=max_connections_to_accept_per_socket_event,json=maxConnectionsToAcceptPerSocketEvent,proto3" json:"max_connections_to_accept_per_socket_event,omitempty"` + MaxConnectionsToAcceptPerSocketEvent *wrapperspb.UInt32Value `protobuf:"bytes,34,opt,name=max_connections_to_accept_per_socket_event,json=maxConnectionsToAcceptPerSocketEvent,proto3" json:"max_connections_to_accept_per_socket_event,omitempty"` // Whether the listener should bind to the port. A listener that doesn't // bind can only receive connections redirected from other listeners that set // :ref:`use_original_dst ` // to true. Default is true. - BindToPort *wrappers.BoolValue `protobuf:"bytes,26,opt,name=bind_to_port,json=bindToPort,proto3" json:"bind_to_port,omitempty"` + BindToPort *wrapperspb.BoolValue `protobuf:"bytes,26,opt,name=bind_to_port,json=bindToPort,proto3" json:"bind_to_port,omitempty"` // The exclusive listener type and the corresponding config. // // Types that are assignable to ListenerSpecifier: @@ -502,7 +502,7 @@ func (x *Listener) GetFilterChainMatcher() *v32.Matcher { return nil } -func (x *Listener) GetUseOriginalDst() *wrappers.BoolValue { +func (x *Listener) GetUseOriginalDst() *wrapperspb.BoolValue { if x != nil { return x.UseOriginalDst } @@ -516,7 +516,7 @@ func (x *Listener) GetDefaultFilterChain() *FilterChain { return nil } -func (x *Listener) GetPerConnectionBufferLimitBytes() *wrappers.UInt32Value { +func (x *Listener) GetPerConnectionBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerConnectionBufferLimitBytes } @@ -552,7 +552,7 @@ func (x *Listener) GetListenerFilters() []*ListenerFilter { return nil } -func (x *Listener) GetListenerFiltersTimeout() *duration.Duration { +func (x *Listener) GetListenerFiltersTimeout() *durationpb.Duration { if x != nil { return x.ListenerFiltersTimeout } @@ -566,14 +566,14 @@ func (x *Listener) GetContinueOnListenerFiltersTimeout() bool { return false } -func (x *Listener) GetTransparent() *wrappers.BoolValue { +func (x *Listener) GetTransparent() *wrapperspb.BoolValue { if x != nil { return x.Transparent } return nil } -func (x *Listener) GetFreebind() *wrappers.BoolValue { +func (x *Listener) GetFreebind() *wrapperspb.BoolValue { if x != nil { return x.Freebind } @@ -587,7 +587,7 @@ func (x *Listener) GetSocketOptions() []*v3.SocketOption { return nil } -func (x *Listener) GetTcpFastOpenQueueLength() *wrappers.UInt32Value { +func (x *Listener) GetTcpFastOpenQueueLength() *wrapperspb.UInt32Value { if x != nil { return x.TcpFastOpenQueueLength } @@ -630,7 +630,7 @@ func (x *Listener) GetReusePort() bool { return false } -func (x *Listener) GetEnableReusePort() *wrappers.BoolValue { +func (x *Listener) GetEnableReusePort() *wrapperspb.BoolValue { if x != nil { return x.EnableReusePort } @@ -644,21 +644,21 @@ func (x *Listener) GetAccessLog() []*v33.AccessLog { return nil } -func (x *Listener) GetTcpBacklogSize() *wrappers.UInt32Value { +func (x *Listener) GetTcpBacklogSize() *wrapperspb.UInt32Value { if x != nil { return x.TcpBacklogSize } return nil } -func (x *Listener) GetMaxConnectionsToAcceptPerSocketEvent() *wrappers.UInt32Value { +func (x *Listener) GetMaxConnectionsToAcceptPerSocketEvent() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectionsToAcceptPerSocketEvent } return nil } -func (x *Listener) GetBindToPort() *wrappers.BoolValue { +func (x *Listener) GetBindToPort() *wrapperspb.BoolValue { if x != nil { return x.BindToPort } @@ -852,7 +852,7 @@ type Listener_DeprecatedV1 struct { // // This is deprecated. Use :ref:`Listener.bind_to_port // ` - BindToPort *wrappers.BoolValue `protobuf:"bytes,1,opt,name=bind_to_port,json=bindToPort,proto3" json:"bind_to_port,omitempty"` + BindToPort *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=bind_to_port,json=bindToPort,proto3" json:"bind_to_port,omitempty"` } func (x *Listener_DeprecatedV1) Reset() { @@ -887,7 +887,7 @@ func (*Listener_DeprecatedV1) Descriptor() ([]byte, []int) { return file_envoy_config_listener_v3_listener_proto_rawDescGZIP(), []int{2, 0} } -func (x *Listener_DeprecatedV1) GetBindToPort() *wrappers.BoolValue { +func (x *Listener_DeprecatedV1) GetBindToPort() *wrapperspb.BoolValue { if x != nil { return x.BindToPort } @@ -1369,11 +1369,11 @@ var file_envoy_config_listener_v3_listener_proto_goTypes = []interface{}{ (*v31.CollectionEntry)(nil), // 13: xds.core.v3.CollectionEntry (*FilterChain)(nil), // 14: envoy.config.listener.v3.FilterChain (*v32.Matcher)(nil), // 15: xds.type.matcher.v3.Matcher - (*wrappers.BoolValue)(nil), // 16: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 17: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 16: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 17: google.protobuf.UInt32Value (*v3.Metadata)(nil), // 18: envoy.config.core.v3.Metadata (*ListenerFilter)(nil), // 19: envoy.config.listener.v3.ListenerFilter - (*duration.Duration)(nil), // 20: google.protobuf.Duration + (*durationpb.Duration)(nil), // 20: google.protobuf.Duration (*v3.SocketOption)(nil), // 21: envoy.config.core.v3.SocketOption (v3.TrafficDirection)(0), // 22: envoy.config.core.v3.TrafficDirection (*UdpListenerConfig)(nil), // 23: envoy.config.listener.v3.UdpListenerConfig diff --git a/envoy/config/listener/v3/listener_components.pb.go b/envoy/config/listener/v3/listener_components.pb.go index 0b16513df..2f41ec0e0 100755 --- a/envoy/config/listener/v3/listener_components.pb.go +++ b/envoy/config/listener/v3/listener_components.pb.go @@ -12,11 +12,11 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -141,7 +141,7 @@ func (m *Filter) GetConfigType() isFilter_ConfigType { return nil } -func (x *Filter) GetTypedConfig() *any1.Any { +func (x *Filter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*Filter_TypedConfig); ok { return x.TypedConfig } @@ -163,7 +163,7 @@ type Filter_TypedConfig struct { // Filter specific configuration which depends on the filter being // instantiated. See the supported filters for further documentation. // [#extension-category: envoy.filters.network] - TypedConfig *any1.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` } type Filter_ConfigDiscovery struct { @@ -228,7 +228,7 @@ type FilterChainMatch struct { // Optional destination port to consider when use_original_dst is set on the // listener in determining a filter chain match. - DestinationPort *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` + DestinationPort *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` // If non-empty, an IP address and prefix length to match addresses when the // listener is bound to 0.0.0.0/:: or when use_original_dst is specified. PrefixRanges []*v3.CidrRange `protobuf:"bytes,3,rep,name=prefix_ranges,json=prefixRanges,proto3" json:"prefix_ranges,omitempty"` @@ -237,7 +237,7 @@ type FilterChainMatch struct { // [#not-implemented-hide:] AddressSuffix string `protobuf:"bytes,4,opt,name=address_suffix,json=addressSuffix,proto3" json:"address_suffix,omitempty"` // [#not-implemented-hide:] - SuffixLen *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=suffix_len,json=suffixLen,proto3" json:"suffix_len,omitempty"` + SuffixLen *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=suffix_len,json=suffixLen,proto3" json:"suffix_len,omitempty"` // The criteria is satisfied if the directly connected source IP address of the downstream // connection is contained in at least one of the specified subnets. If the parameter is not // specified or the list is empty, the directly connected source IP address is ignored. @@ -332,7 +332,7 @@ func (*FilterChainMatch) Descriptor() ([]byte, []int) { return file_envoy_config_listener_v3_listener_components_proto_rawDescGZIP(), []int{1} } -func (x *FilterChainMatch) GetDestinationPort() *wrappers.UInt32Value { +func (x *FilterChainMatch) GetDestinationPort() *wrapperspb.UInt32Value { if x != nil { return x.DestinationPort } @@ -353,7 +353,7 @@ func (x *FilterChainMatch) GetAddressSuffix() string { return "" } -func (x *FilterChainMatch) GetSuffixLen() *wrappers.UInt32Value { +func (x *FilterChainMatch) GetSuffixLen() *wrapperspb.UInt32Value { if x != nil { return x.SuffixLen } @@ -442,7 +442,7 @@ type FilterChain struct { // explicitly instead. // // Deprecated: Marked as deprecated in envoy/config/listener/v3/listener_components.proto. - UseProxyProto *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` + UseProxyProto *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` // [#not-implemented-hide:] filter chain metadata. Metadata *v3.Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` // Optional custom transport socket implementation to use for downstream connections. @@ -455,7 +455,7 @@ type FilterChain struct { // If present and nonzero, the amount of time to allow incoming connections to complete any // transport socket negotiations. If this expires before the transport reports connection // establishment, the connection is summarily closed. - TransportSocketConnectTimeout *duration.Duration `protobuf:"bytes,9,opt,name=transport_socket_connect_timeout,json=transportSocketConnectTimeout,proto3" json:"transport_socket_connect_timeout,omitempty"` + TransportSocketConnectTimeout *durationpb.Duration `protobuf:"bytes,9,opt,name=transport_socket_connect_timeout,json=transportSocketConnectTimeout,proto3" json:"transport_socket_connect_timeout,omitempty"` // The unique name (or empty) by which this filter chain is known. // Note: :ref:`filter_chain_matcher // ` @@ -514,7 +514,7 @@ func (x *FilterChain) GetFilters() []*Filter { } // Deprecated: Marked as deprecated in envoy/config/listener/v3/listener_components.proto. -func (x *FilterChain) GetUseProxyProto() *wrappers.BoolValue { +func (x *FilterChain) GetUseProxyProto() *wrapperspb.BoolValue { if x != nil { return x.UseProxyProto } @@ -535,7 +535,7 @@ func (x *FilterChain) GetTransportSocket() *v3.TransportSocket { return nil } -func (x *FilterChain) GetTransportSocketConnectTimeout() *duration.Duration { +func (x *FilterChain) GetTransportSocketConnectTimeout() *durationpb.Duration { if x != nil { return x.TransportSocketConnectTimeout } @@ -780,7 +780,7 @@ func (m *ListenerFilter) GetConfigType() isListenerFilter_ConfigType { return nil } -func (x *ListenerFilter) GetTypedConfig() *any1.Any { +func (x *ListenerFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ListenerFilter_TypedConfig); ok { return x.TypedConfig } @@ -809,7 +809,7 @@ type ListenerFilter_TypedConfig struct { // Filter specific configuration which depends on the filter being // instantiated. See the supported filters for further documentation. // [#extension-category: envoy.filters.listener,envoy.filters.udp_listener] - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } type ListenerFilter_ConfigDiscovery struct { @@ -839,7 +839,7 @@ type FilterChain_OnDemandConfiguration struct { // Rebuilding will wait until dependencies are ready, have failed, or this timeout is reached. // Upon failure or timeout, all connections related to this filter chain will be closed. // Rebuilding will start again on the next new connection. - RebuildTimeout *duration.Duration `protobuf:"bytes,1,opt,name=rebuild_timeout,json=rebuildTimeout,proto3" json:"rebuild_timeout,omitempty"` + RebuildTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=rebuild_timeout,json=rebuildTimeout,proto3" json:"rebuild_timeout,omitempty"` } func (x *FilterChain_OnDemandConfiguration) Reset() { @@ -874,7 +874,7 @@ func (*FilterChain_OnDemandConfiguration) Descriptor() ([]byte, []int) { return file_envoy_config_listener_v3_listener_components_proto_rawDescGZIP(), []int{2, 0} } -func (x *FilterChain_OnDemandConfiguration) GetRebuildTimeout() *duration.Duration { +func (x *FilterChain_OnDemandConfiguration) GetRebuildTimeout() *durationpb.Duration { if x != nil { return x.RebuildTimeout } @@ -1183,14 +1183,14 @@ var file_envoy_config_listener_v3_listener_components_proto_goTypes = []interfac (*ListenerFilter)(nil), // 5: envoy.config.listener.v3.ListenerFilter (*FilterChain_OnDemandConfiguration)(nil), // 6: envoy.config.listener.v3.FilterChain.OnDemandConfiguration (*ListenerFilterChainMatchPredicate_MatchSet)(nil), // 7: envoy.config.listener.v3.ListenerFilterChainMatchPredicate.MatchSet - (*any1.Any)(nil), // 8: google.protobuf.Any + (*anypb.Any)(nil), // 8: google.protobuf.Any (*v3.ExtensionConfigSource)(nil), // 9: envoy.config.core.v3.ExtensionConfigSource - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value (*v3.CidrRange)(nil), // 11: envoy.config.core.v3.CidrRange - (*wrappers.BoolValue)(nil), // 12: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 12: google.protobuf.BoolValue (*v3.Metadata)(nil), // 13: envoy.config.core.v3.Metadata (*v3.TransportSocket)(nil), // 14: envoy.config.core.v3.TransportSocket - (*duration.Duration)(nil), // 15: google.protobuf.Duration + (*durationpb.Duration)(nil), // 15: google.protobuf.Duration (*v31.Int32Range)(nil), // 16: envoy.type.v3.Int32Range } var file_envoy_config_listener_v3_listener_components_proto_depIdxs = []int32{ diff --git a/envoy/config/listener/v3/quic_config.pb.go b/envoy/config/listener/v3/quic_config.pb.go index b05716d73..d6b2a87ef 100755 --- a/envoy/config/listener/v3/quic_config.pb.go +++ b/envoy/config/listener/v3/quic_config.pb.go @@ -11,10 +11,10 @@ import ( _ "github.com/cncf/xds/go/xds/annotations/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -38,11 +38,11 @@ type QuicProtocolOptions struct { // no network activity. // // If it is less than 1ms, Envoy will use 1ms. 300000ms if not specified. - IdleTimeout *duration.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Connection timeout in milliseconds before the crypto handshake is finished. // // If it is less than 5000ms, Envoy will use 5000ms. 20000ms if not specified. - CryptoHandshakeTimeout *duration.Duration `protobuf:"bytes,3,opt,name=crypto_handshake_timeout,json=cryptoHandshakeTimeout,proto3" json:"crypto_handshake_timeout,omitempty"` + CryptoHandshakeTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=crypto_handshake_timeout,json=cryptoHandshakeTimeout,proto3" json:"crypto_handshake_timeout,omitempty"` // Runtime flag that controls whether the listener is enabled or not. If not specified, defaults // to enabled. Enabled *v3.RuntimeFeatureFlag `protobuf:"bytes,4,opt,name=enabled,proto3" json:"enabled,omitempty"` @@ -53,7 +53,7 @@ type QuicProtocolOptions struct { // packets to read in each read event will be 32 * N. // The actual number of packets to read in total by the UDP listener is also // bound by 6000, regardless of this field or how many connections there are. - PacketsToReadToConnectionCountRatio *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=packets_to_read_to_connection_count_ratio,json=packetsToReadToConnectionCountRatio,proto3" json:"packets_to_read_to_connection_count_ratio,omitempty"` + PacketsToReadToConnectionCountRatio *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=packets_to_read_to_connection_count_ratio,json=packetsToReadToConnectionCountRatio,proto3" json:"packets_to_read_to_connection_count_ratio,omitempty"` // Configure which implementation of “quic::QuicCryptoClientStreamBase“ to be used for this listener. // If not specified the :ref:`QUICHE default one configured by ` will be used. // [#extension-category: envoy.quic.server.crypto_stream] @@ -73,7 +73,7 @@ type QuicProtocolOptions struct { ServerPreferredAddressConfig *v3.TypedExtensionConfig `protobuf:"bytes,9,opt,name=server_preferred_address_config,json=serverPreferredAddressConfig,proto3" json:"server_preferred_address_config,omitempty"` // Configure the server to send transport parameter `disable_active_migration `_. // Defaults to false (do not send this transport parameter). - SendDisableActiveMigration *wrappers.BoolValue `protobuf:"bytes,10,opt,name=send_disable_active_migration,json=sendDisableActiveMigration,proto3" json:"send_disable_active_migration,omitempty"` + SendDisableActiveMigration *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=send_disable_active_migration,json=sendDisableActiveMigration,proto3" json:"send_disable_active_migration,omitempty"` } func (x *QuicProtocolOptions) Reset() { @@ -115,14 +115,14 @@ func (x *QuicProtocolOptions) GetQuicProtocolOptions() *v3.QuicProtocolOptions { return nil } -func (x *QuicProtocolOptions) GetIdleTimeout() *duration.Duration { +func (x *QuicProtocolOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *QuicProtocolOptions) GetCryptoHandshakeTimeout() *duration.Duration { +func (x *QuicProtocolOptions) GetCryptoHandshakeTimeout() *durationpb.Duration { if x != nil { return x.CryptoHandshakeTimeout } @@ -136,7 +136,7 @@ func (x *QuicProtocolOptions) GetEnabled() *v3.RuntimeFeatureFlag { return nil } -func (x *QuicProtocolOptions) GetPacketsToReadToConnectionCountRatio() *wrappers.UInt32Value { +func (x *QuicProtocolOptions) GetPacketsToReadToConnectionCountRatio() *wrapperspb.UInt32Value { if x != nil { return x.PacketsToReadToConnectionCountRatio } @@ -171,7 +171,7 @@ func (x *QuicProtocolOptions) GetServerPreferredAddressConfig() *v3.TypedExtensi return nil } -func (x *QuicProtocolOptions) GetSendDisableActiveMigration() *wrappers.BoolValue { +func (x *QuicProtocolOptions) GetSendDisableActiveMigration() *wrapperspb.BoolValue { if x != nil { return x.SendDisableActiveMigration } @@ -296,11 +296,11 @@ var file_envoy_config_listener_v3_quic_config_proto_msgTypes = make([]protoimpl. var file_envoy_config_listener_v3_quic_config_proto_goTypes = []interface{}{ (*QuicProtocolOptions)(nil), // 0: envoy.config.listener.v3.QuicProtocolOptions (*v3.QuicProtocolOptions)(nil), // 1: envoy.config.core.v3.QuicProtocolOptions - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration (*v3.RuntimeFeatureFlag)(nil), // 3: envoy.config.core.v3.RuntimeFeatureFlag - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value (*v3.TypedExtensionConfig)(nil), // 5: envoy.config.core.v3.TypedExtensionConfig - (*wrappers.BoolValue)(nil), // 6: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 6: google.protobuf.BoolValue } var file_envoy_config_listener_v3_quic_config_proto_depIdxs = []int32{ 1, // 0: envoy.config.listener.v3.QuicProtocolOptions.quic_protocol_options:type_name -> envoy.config.core.v3.QuicProtocolOptions diff --git a/envoy/config/metrics/v2/stats.pb.go b/envoy/config/metrics/v2/stats.pb.go index 4ea77d222..7b63da181 100755 --- a/envoy/config/metrics/v2/stats.pb.go +++ b/envoy/config/metrics/v2/stats.pb.go @@ -11,11 +11,11 @@ import ( 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" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -100,14 +100,14 @@ func (m *StatsSink) GetConfigType() isStatsSink_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/metrics/v2/stats.proto. -func (x *StatsSink) GetConfig() *_struct.Struct { +func (x *StatsSink) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*StatsSink_Config); ok { return x.Config } return nil } -func (x *StatsSink) GetTypedConfig() *any1.Any { +func (x *StatsSink) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*StatsSink_TypedConfig); ok { return x.TypedConfig } @@ -120,11 +120,11 @@ type isStatsSink_ConfigType interface { type StatsSink_Config struct { // Deprecated: Marked as deprecated in envoy/config/metrics/v2/stats.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type StatsSink_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*StatsSink_Config) isStatsSink_ConfigType() {} @@ -156,7 +156,7 @@ type StatsConfig struct { // default tags in Envoy. // // If not provided, the value is assumed to be true. - UseAllDefaultTags *wrappers.BoolValue `protobuf:"bytes,2,opt,name=use_all_default_tags,json=useAllDefaultTags,proto3" json:"use_all_default_tags,omitempty"` + UseAllDefaultTags *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=use_all_default_tags,json=useAllDefaultTags,proto3" json:"use_all_default_tags,omitempty"` // Inclusion/exclusion matcher for stat name creation. If not provided, all stats are instantiated // as normal. Preventing the instantiation of certain families of stats can improve memory // performance for Envoys running especially large configs. @@ -208,7 +208,7 @@ func (x *StatsConfig) GetStatsTags() []*TagSpecifier { return nil } -func (x *StatsConfig) GetUseAllDefaultTags() *wrappers.BoolValue { +func (x *StatsConfig) GetUseAllDefaultTags() *wrapperspb.BoolValue { if x != nil { return x.UseAllDefaultTags } @@ -882,9 +882,9 @@ var file_envoy_config_metrics_v2_stats_proto_goTypes = []interface{}{ (*StatsdSink)(nil), // 4: envoy.config.metrics.v2.StatsdSink (*DogStatsdSink)(nil), // 5: envoy.config.metrics.v2.DogStatsdSink (*HystrixSink)(nil), // 6: envoy.config.metrics.v2.HystrixSink - (*_struct.Struct)(nil), // 7: google.protobuf.Struct - (*any1.Any)(nil), // 8: google.protobuf.Any - (*wrappers.BoolValue)(nil), // 9: google.protobuf.BoolValue + (*structpb.Struct)(nil), // 7: google.protobuf.Struct + (*anypb.Any)(nil), // 8: google.protobuf.Any + (*wrapperspb.BoolValue)(nil), // 9: google.protobuf.BoolValue (*matcher.ListStringMatcher)(nil), // 10: envoy.type.matcher.ListStringMatcher (*core.Address)(nil), // 11: envoy.api.v2.core.Address } diff --git a/envoy/config/metrics/v3/metrics_service.pb.go b/envoy/config/metrics/v3/metrics_service.pb.go index ffe78b7ac..7e04b7b24 100755 --- a/envoy/config/metrics/v3/metrics_service.pb.go +++ b/envoy/config/metrics/v3/metrics_service.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -107,7 +107,7 @@ type MetricsServiceConfig struct { // counter value is reported. Defaults to false. // Eventually (https://github.com/envoyproxy/envoy/issues/10968) if this value is not set, the // sink will take updates from the :ref:`MetricsResponse `. - ReportCountersAsDeltas *wrappers.BoolValue `protobuf:"bytes,2,opt,name=report_counters_as_deltas,json=reportCountersAsDeltas,proto3" json:"report_counters_as_deltas,omitempty"` + ReportCountersAsDeltas *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=report_counters_as_deltas,json=reportCountersAsDeltas,proto3" json:"report_counters_as_deltas,omitempty"` // If true, metrics will have their tags emitted as labels on the metrics objects sent to the MetricsService, // and the tag extracted name will be used instead of the full name, which may contain values used by the tag // extractor or additional tags added during stats creation. @@ -162,7 +162,7 @@ func (x *MetricsServiceConfig) GetTransportApiVersion() v3.ApiVersion { return v3.ApiVersion(0) } -func (x *MetricsServiceConfig) GetReportCountersAsDeltas() *wrappers.BoolValue { +func (x *MetricsServiceConfig) GetReportCountersAsDeltas() *wrapperspb.BoolValue { if x != nil { return x.ReportCountersAsDeltas } @@ -270,7 +270,7 @@ var file_envoy_config_metrics_v3_metrics_service_proto_goTypes = []interface{}{ (*MetricsServiceConfig)(nil), // 1: envoy.config.metrics.v3.MetricsServiceConfig (*v3.GrpcService)(nil), // 2: envoy.config.core.v3.GrpcService (v3.ApiVersion)(0), // 3: envoy.config.core.v3.ApiVersion - (*wrappers.BoolValue)(nil), // 4: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue } var file_envoy_config_metrics_v3_metrics_service_proto_depIdxs = []int32{ 2, // 0: envoy.config.metrics.v3.MetricsServiceConfig.grpc_service:type_name -> envoy.config.core.v3.GrpcService diff --git a/envoy/config/metrics/v3/stats.pb.go b/envoy/config/metrics/v3/stats.pb.go index f3c5024fc..adf20a589 100755 --- a/envoy/config/metrics/v3/stats.pb.go +++ b/envoy/config/metrics/v3/stats.pb.go @@ -11,10 +11,10 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -93,7 +93,7 @@ func (m *StatsSink) GetConfigType() isStatsSink_ConfigType { return nil } -func (x *StatsSink) GetTypedConfig() *any1.Any { +func (x *StatsSink) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*StatsSink_TypedConfig); ok { return x.TypedConfig } @@ -105,7 +105,7 @@ type isStatsSink_ConfigType interface { } type StatsSink_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*StatsSink_TypedConfig) isStatsSink_ConfigType() {} @@ -136,7 +136,7 @@ type StatsConfig struct { // default tags in Envoy. // // If not provided, the value is assumed to be true. - UseAllDefaultTags *wrappers.BoolValue `protobuf:"bytes,2,opt,name=use_all_default_tags,json=useAllDefaultTags,proto3" json:"use_all_default_tags,omitempty"` + UseAllDefaultTags *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=use_all_default_tags,json=useAllDefaultTags,proto3" json:"use_all_default_tags,omitempty"` // Inclusion/exclusion matcher for stat name creation. If not provided, all stats are instantiated // as normal. Preventing the instantiation of certain families of stats can improve memory // performance for Envoys running especially large configs. @@ -216,7 +216,7 @@ func (x *StatsConfig) GetStatsTags() []*TagSpecifier { return nil } -func (x *StatsConfig) GetUseAllDefaultTags() *wrappers.BoolValue { +func (x *StatsConfig) GetUseAllDefaultTags() *wrapperspb.BoolValue { if x != nil { return x.UseAllDefaultTags } @@ -710,7 +710,7 @@ type DogStatsdSink struct { // size should not exceed your network's MTU. // // Note that this value may not be respected if smaller than a single metric. - MaxBytesPerDatagram *wrappers.UInt64Value `protobuf:"bytes,4,opt,name=max_bytes_per_datagram,json=maxBytesPerDatagram,proto3" json:"max_bytes_per_datagram,omitempty"` + MaxBytesPerDatagram *wrapperspb.UInt64Value `protobuf:"bytes,4,opt,name=max_bytes_per_datagram,json=maxBytesPerDatagram,proto3" json:"max_bytes_per_datagram,omitempty"` } func (x *DogStatsdSink) Reset() { @@ -766,7 +766,7 @@ func (x *DogStatsdSink) GetPrefix() string { return "" } -func (x *DogStatsdSink) GetMaxBytesPerDatagram() *wrappers.UInt64Value { +func (x *DogStatsdSink) GetMaxBytesPerDatagram() *wrapperspb.UInt64Value { if x != nil { return x.MaxBytesPerDatagram } @@ -1016,12 +1016,12 @@ var file_envoy_config_metrics_v3_stats_proto_goTypes = []interface{}{ (*StatsdSink)(nil), // 5: envoy.config.metrics.v3.StatsdSink (*DogStatsdSink)(nil), // 6: envoy.config.metrics.v3.DogStatsdSink (*HystrixSink)(nil), // 7: envoy.config.metrics.v3.HystrixSink - (*any1.Any)(nil), // 8: google.protobuf.Any - (*wrappers.BoolValue)(nil), // 9: google.protobuf.BoolValue + (*anypb.Any)(nil), // 8: google.protobuf.Any + (*wrapperspb.BoolValue)(nil), // 9: google.protobuf.BoolValue (*v3.ListStringMatcher)(nil), // 10: envoy.type.matcher.v3.ListStringMatcher (*v3.StringMatcher)(nil), // 11: envoy.type.matcher.v3.StringMatcher (*v31.Address)(nil), // 12: envoy.config.core.v3.Address - (*wrappers.UInt64Value)(nil), // 13: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 13: google.protobuf.UInt64Value } var file_envoy_config_metrics_v3_stats_proto_depIdxs = []int32{ 8, // 0: envoy.config.metrics.v3.StatsSink.typed_config:type_name -> google.protobuf.Any diff --git a/envoy/config/overload/v2alpha/overload.pb.go b/envoy/config/overload/v2alpha/overload.pb.go index 8b83500af..4b990b10b 100755 --- a/envoy/config/overload/v2alpha/overload.pb.go +++ b/envoy/config/overload/v2alpha/overload.pb.go @@ -9,11 +9,11 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -94,14 +94,14 @@ func (m *ResourceMonitor) GetConfigType() isResourceMonitor_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/overload/v2alpha/overload.proto. -func (x *ResourceMonitor) GetConfig() *_struct.Struct { +func (x *ResourceMonitor) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*ResourceMonitor_Config); ok { return x.Config } return nil } -func (x *ResourceMonitor) GetTypedConfig() *any1.Any { +func (x *ResourceMonitor) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ResourceMonitor_TypedConfig); ok { return x.TypedConfig } @@ -114,11 +114,11 @@ type isResourceMonitor_ConfigType interface { type ResourceMonitor_Config struct { // Deprecated: Marked as deprecated in envoy/config/overload/v2alpha/overload.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type ResourceMonitor_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ResourceMonitor_Config) isResourceMonitor_ConfigType() {} @@ -317,7 +317,7 @@ type OverloadManager struct { unknownFields protoimpl.UnknownFields // The interval for refreshing resource usage. - RefreshInterval *duration.Duration `protobuf:"bytes,1,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` + RefreshInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` // The set of resources to monitor. ResourceMonitors []*ResourceMonitor `protobuf:"bytes,2,rep,name=resource_monitors,json=resourceMonitors,proto3" json:"resource_monitors,omitempty"` // The set of overload actions. @@ -356,7 +356,7 @@ func (*OverloadManager) Descriptor() ([]byte, []int) { return file_envoy_config_overload_v2alpha_overload_proto_rawDescGZIP(), []int{4} } -func (x *OverloadManager) GetRefreshInterval() *duration.Duration { +func (x *OverloadManager) GetRefreshInterval() *durationpb.Duration { if x != nil { return x.RefreshInterval } @@ -469,14 +469,14 @@ func file_envoy_config_overload_v2alpha_overload_proto_rawDescGZIP() []byte { var file_envoy_config_overload_v2alpha_overload_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_envoy_config_overload_v2alpha_overload_proto_goTypes = []interface{}{ - (*ResourceMonitor)(nil), // 0: envoy.config.overload.v2alpha.ResourceMonitor - (*ThresholdTrigger)(nil), // 1: envoy.config.overload.v2alpha.ThresholdTrigger - (*Trigger)(nil), // 2: envoy.config.overload.v2alpha.Trigger - (*OverloadAction)(nil), // 3: envoy.config.overload.v2alpha.OverloadAction - (*OverloadManager)(nil), // 4: envoy.config.overload.v2alpha.OverloadManager - (*_struct.Struct)(nil), // 5: google.protobuf.Struct - (*any1.Any)(nil), // 6: google.protobuf.Any - (*duration.Duration)(nil), // 7: google.protobuf.Duration + (*ResourceMonitor)(nil), // 0: envoy.config.overload.v2alpha.ResourceMonitor + (*ThresholdTrigger)(nil), // 1: envoy.config.overload.v2alpha.ThresholdTrigger + (*Trigger)(nil), // 2: envoy.config.overload.v2alpha.Trigger + (*OverloadAction)(nil), // 3: envoy.config.overload.v2alpha.OverloadAction + (*OverloadManager)(nil), // 4: envoy.config.overload.v2alpha.OverloadManager + (*structpb.Struct)(nil), // 5: google.protobuf.Struct + (*anypb.Any)(nil), // 6: google.protobuf.Any + (*durationpb.Duration)(nil), // 7: google.protobuf.Duration } var file_envoy_config_overload_v2alpha_overload_proto_depIdxs = []int32{ 5, // 0: envoy.config.overload.v2alpha.ResourceMonitor.config:type_name -> google.protobuf.Struct diff --git a/envoy/config/overload/v3/overload.pb.go b/envoy/config/overload/v3/overload.pb.go index b36bfb4e7..7507b9199 100755 --- a/envoy/config/overload/v3/overload.pb.go +++ b/envoy/config/overload/v3/overload.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -153,7 +153,7 @@ func (m *ResourceMonitor) GetConfigType() isResourceMonitor_ConfigType { return nil } -func (x *ResourceMonitor) GetTypedConfig() *any1.Any { +func (x *ResourceMonitor) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ResourceMonitor_TypedConfig); ok { return x.TypedConfig } @@ -165,7 +165,7 @@ type isResourceMonitor_ConfigType interface { } type ResourceMonitor_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ResourceMonitor_TypedConfig) isResourceMonitor_ConfigType() {} @@ -437,7 +437,7 @@ type OverloadAction struct { // in this list. Triggers []*Trigger `protobuf:"bytes,2,rep,name=triggers,proto3" json:"triggers,omitempty"` // Configuration for the action being instantiated. - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *OverloadAction) Reset() { @@ -486,7 +486,7 @@ func (x *OverloadAction) GetTriggers() []*Trigger { return nil } -func (x *OverloadAction) GetTypedConfig() *any1.Any { +func (x *OverloadAction) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -631,7 +631,7 @@ type OverloadManager struct { unknownFields protoimpl.UnknownFields // The interval for refreshing resource usage. - RefreshInterval *duration.Duration `protobuf:"bytes,1,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` + RefreshInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` // The set of resources to monitor. ResourceMonitors []*ResourceMonitor `protobuf:"bytes,2,rep,name=resource_monitors,json=resourceMonitors,proto3" json:"resource_monitors,omitempty"` // The set of overload actions. @@ -674,7 +674,7 @@ func (*OverloadManager) Descriptor() ([]byte, []int) { return file_envoy_config_overload_v3_overload_proto_rawDescGZIP(), []int{8} } -func (x *OverloadManager) GetRefreshInterval() *duration.Duration { +func (x *OverloadManager) GetRefreshInterval() *durationpb.Duration { if x != nil { return x.RefreshInterval } @@ -769,7 +769,7 @@ func (m *ScaleTimersOverloadActionConfig_ScaleTimer) GetOverloadAdjust() isScale return nil } -func (x *ScaleTimersOverloadActionConfig_ScaleTimer) GetMinTimeout() *duration.Duration { +func (x *ScaleTimersOverloadActionConfig_ScaleTimer) GetMinTimeout() *durationpb.Duration { if x, ok := x.GetOverloadAdjust().(*ScaleTimersOverloadActionConfig_ScaleTimer_MinTimeout); ok { return x.MinTimeout } @@ -789,7 +789,7 @@ type isScaleTimersOverloadActionConfig_ScaleTimer_OverloadAdjust interface { type ScaleTimersOverloadActionConfig_ScaleTimer_MinTimeout struct { // Sets the minimum duration as an absolute value. - MinTimeout *duration.Duration `protobuf:"bytes,2,opt,name=min_timeout,json=minTimeout,proto3,oneof"` + MinTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=min_timeout,json=minTimeout,proto3,oneof"` } type ScaleTimersOverloadActionConfig_ScaleTimer_MinScale struct { @@ -999,8 +999,8 @@ var file_envoy_config_overload_v3_overload_proto_goTypes = []interface{}{ (*BufferFactoryConfig)(nil), // 8: envoy.config.overload.v3.BufferFactoryConfig (*OverloadManager)(nil), // 9: envoy.config.overload.v3.OverloadManager (*ScaleTimersOverloadActionConfig_ScaleTimer)(nil), // 10: envoy.config.overload.v3.ScaleTimersOverloadActionConfig.ScaleTimer - (*any1.Any)(nil), // 11: google.protobuf.Any - (*duration.Duration)(nil), // 12: google.protobuf.Duration + (*anypb.Any)(nil), // 11: google.protobuf.Any + (*durationpb.Duration)(nil), // 12: google.protobuf.Duration (*v3.Percent)(nil), // 13: envoy.type.v3.Percent } var file_envoy_config_overload_v3_overload_proto_depIdxs = []int32{ diff --git a/envoy/config/route/v3/route.pb.go b/envoy/config/route/v3/route.pb.go index 930107553..c9d2945f3 100755 --- a/envoy/config/route/v3/route.pb.go +++ b/envoy/config/route/v3/route.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -89,7 +89,7 @@ type RouteConfiguration struct { // ` // option. Users may wish to override the default behavior in certain cases (for example when // using CDS with a static route table). - ValidateClusters *wrappers.BoolValue `protobuf:"bytes,7,opt,name=validate_clusters,json=validateClusters,proto3" json:"validate_clusters,omitempty"` + ValidateClusters *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=validate_clusters,json=validateClusters,proto3" json:"validate_clusters,omitempty"` // The maximum bytes of the response :ref:`direct response body // ` size. If not specified the default // is 4096. @@ -100,7 +100,7 @@ type RouteConfiguration struct { // ` in memory. Be careful setting // this to be larger than the default 4KB, since the allocated memory for direct response body // is not subject to data plane buffering controls. - MaxDirectResponseBodySizeBytes *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=max_direct_response_body_size_bytes,json=maxDirectResponseBodySizeBytes,proto3" json:"max_direct_response_body_size_bytes,omitempty"` + MaxDirectResponseBodySizeBytes *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=max_direct_response_body_size_bytes,json=maxDirectResponseBodySizeBytes,proto3" json:"max_direct_response_body_size_bytes,omitempty"` // A list of plugins and their configurations which may be used by a // :ref:`cluster specifier plugin name ` // within the route. All “extension.name“ fields in this list must be unique. @@ -126,7 +126,7 @@ type RouteConfiguration struct { // [#comment: An entry's value may be wrapped in a // :ref:`FilterConfig` // message to specify additional options.] - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,16,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,16,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The metadata field can be used to provide additional information // about the route configuration. It can be used for configuration, stats, and logging. // The metadata should go under the filter namespace that will need it. @@ -230,14 +230,14 @@ func (x *RouteConfiguration) GetMostSpecificHeaderMutationsWins() bool { return false } -func (x *RouteConfiguration) GetValidateClusters() *wrappers.BoolValue { +func (x *RouteConfiguration) GetValidateClusters() *wrapperspb.BoolValue { if x != nil { return x.ValidateClusters } return nil } -func (x *RouteConfiguration) GetMaxDirectResponseBodySizeBytes() *wrappers.UInt32Value { +func (x *RouteConfiguration) GetMaxDirectResponseBodySizeBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxDirectResponseBodySizeBytes } @@ -272,7 +272,7 @@ func (x *RouteConfiguration) GetIgnorePathParametersInPathMatching() bool { return false } -func (x *RouteConfiguration) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *RouteConfiguration) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -492,13 +492,13 @@ var file_envoy_config_route_v3_route_proto_goTypes = []interface{}{ nil, // 2: envoy.config.route.v3.RouteConfiguration.TypedPerFilterConfigEntry (*VirtualHost)(nil), // 3: envoy.config.route.v3.VirtualHost (*v3.HeaderValueOption)(nil), // 4: envoy.config.core.v3.HeaderValueOption - (*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 5: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value (*ClusterSpecifierPlugin)(nil), // 7: envoy.config.route.v3.ClusterSpecifierPlugin (*RouteAction_RequestMirrorPolicy)(nil), // 8: envoy.config.route.v3.RouteAction.RequestMirrorPolicy (*v3.Metadata)(nil), // 9: envoy.config.core.v3.Metadata (*v3.ConfigSource)(nil), // 10: envoy.config.core.v3.ConfigSource - (*any1.Any)(nil), // 11: google.protobuf.Any + (*anypb.Any)(nil), // 11: google.protobuf.Any } var file_envoy_config_route_v3_route_proto_depIdxs = []int32{ 3, // 0: envoy.config.route.v3.RouteConfiguration.virtual_hosts:type_name -> envoy.config.route.v3.VirtualHost diff --git a/envoy/config/route/v3/route_components.pb.go b/envoy/config/route/v3/route_components.pb.go index 94169892d..69078e406 100755 --- a/envoy/config/route/v3/route_components.pb.go +++ b/envoy/config/route/v3/route_components.pb.go @@ -17,11 +17,11 @@ import ( v34 "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3" v33 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -433,7 +433,7 @@ type VirtualHost struct { // [#comment: An entry's value may be wrapped in a // :ref:`FilterConfig` // message to specify additional options.] - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Decides whether the :ref:`x-envoy-attempt-count // ` header should be included // in the upstream request. Setting this option will cause it to override any existing header @@ -463,7 +463,7 @@ type VirtualHost struct { // will take precedence over this config and it'll be treated independently (e.g.: values are not // inherited). :ref:`Retry policy ` should not be // set if this field is used. - RetryPolicyTypedConfig *any1.Any `protobuf:"bytes,20,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` + RetryPolicyTypedConfig *anypb.Any `protobuf:"bytes,20,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` // Indicates the hedge policy for all routes in this virtual host. Note that setting a // route level entry will take precedence over this config and it'll be treated // independently (e.g.: values are not inherited). @@ -474,7 +474,7 @@ type VirtualHost struct { // The maximum bytes which will be buffered for retries and shadowing. // If set and a route-specific limit is not set, the bytes actually buffered will be the minimum // value of this and the listener per_connection_buffer_limit_bytes. - PerRequestBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,18,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` + PerRequestBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` // Specify a set of default request mirroring policies for every route under this virtual host. // It takes precedence over the route config mirror policy entirely. // That is, policies are not merged, the most specific non-empty one becomes the mirror policies. @@ -604,7 +604,7 @@ func (x *VirtualHost) GetCors() *CorsPolicy { return nil } -func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -632,7 +632,7 @@ func (x *VirtualHost) GetRetryPolicy() *RetryPolicy { return nil } -func (x *VirtualHost) GetRetryPolicyTypedConfig() *any1.Any { +func (x *VirtualHost) GetRetryPolicyTypedConfig() *anypb.Any { if x != nil { return x.RetryPolicyTypedConfig } @@ -653,7 +653,7 @@ func (x *VirtualHost) GetIncludeIsTimeoutRetryHeader() bool { return false } -func (x *VirtualHost) GetPerRequestBufferLimitBytes() *wrappers.UInt32Value { +func (x *VirtualHost) GetPerRequestBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerRequestBufferLimitBytes } @@ -680,7 +680,7 @@ type FilterAction struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Action *any1.Any `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + Action *anypb.Any `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` } func (x *FilterAction) Reset() { @@ -715,7 +715,7 @@ func (*FilterAction) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{1} } -func (x *FilterAction) GetAction() *any1.Any { +func (x *FilterAction) GetAction() *anypb.Any { if x != nil { return x.Action } @@ -814,7 +814,7 @@ type Route struct { // [#comment: An entry's value may be wrapped in a // :ref:`FilterConfig` // message to specify additional options.] - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specifies a set of headers that will be added to requests matching this // route. Headers specified at this level are applied before headers from the // enclosing :ref:`envoy_v3_api_msg_config.route.v3.VirtualHost` and @@ -841,7 +841,7 @@ type Route struct { // The maximum bytes which will be buffered for retries and shadowing. // If set, the bytes actually buffered will be the minimum value of this and the // listener per_connection_buffer_limit_bytes. - PerRequestBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` + PerRequestBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` // The human readable prefix to use when emitting statistics for this endpoint. // The statistics are rooted at vhost..route.. // This should be set for highly critical @@ -960,7 +960,7 @@ func (x *Route) GetDecorator() *Decorator { return nil } -func (x *Route) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *Route) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -1002,7 +1002,7 @@ func (x *Route) GetTracing() *Tracing { return nil } -func (x *Route) GetPerRequestBufferLimitBytes() *wrappers.UInt32Value { +func (x *Route) GetPerRequestBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerRequestBufferLimitBytes } @@ -1081,7 +1081,7 @@ type WeightedCluster struct { // cluster weights. It is up to the management server to supply the correct weights. // // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. - TotalWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` + TotalWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` // Specifies the runtime key prefix that should be used to construct the // runtime keys associated with each cluster. When the “runtime_key_prefix“ is // specified, the router will look for weights associated with each upstream @@ -1137,7 +1137,7 @@ func (x *WeightedCluster) GetClusters() []*WeightedCluster_ClusterWeight { } // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. -func (x *WeightedCluster) GetTotalWeight() *wrappers.UInt32Value { +func (x *WeightedCluster) GetTotalWeight() *wrapperspb.UInt32Value { if x != nil { return x.TotalWeight } @@ -1259,7 +1259,7 @@ type RouteMatch struct { PathSpecifier isRouteMatch_PathSpecifier `protobuf_oneof:"path_specifier"` // Indicates that prefix/path matching should be case sensitive. The default // is true. Ignored for safe_regex matching. - CaseSensitive *wrappers.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` + CaseSensitive *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` // Indicates that the route should additionally match on a runtime key. Every time the route // is considered for a match, it must also fall under the percentage of matches indicated by // this field. For some fraction N/D, a random number in the range [0,D) is selected. If the @@ -1395,7 +1395,7 @@ func (x *RouteMatch) GetPathMatchPolicy() *v31.TypedExtensionConfig { return nil } -func (x *RouteMatch) GetCaseSensitive() *wrappers.BoolValue { +func (x *RouteMatch) GetCaseSensitive() *wrapperspb.BoolValue { if x != nil { return x.CaseSensitive } @@ -1526,7 +1526,7 @@ func (*RouteMatch_PathMatchPolicy) isRouteMatch_PathSpecifier() {} // :ref:`CorsPolicy in filter extension ` // as as alternative. // -// [#next-free-field: 13] +// [#next-free-field: 14] type CorsPolicy struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1544,7 +1544,7 @@ type CorsPolicy struct { // Specifies the content for the “access-control-max-age“ header. MaxAge string `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Specifies whether the resource allows credentials. - AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` + AllowCredentials *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` // Types that are assignable to EnabledSpecifier: // // *CorsPolicy_FilterEnabled @@ -1563,7 +1563,10 @@ type CorsPolicy struct { // which the request initiator was fetched. // // More details refer to https://developer.chrome.com/blog/private-network-access-preflight. - AllowPrivateNetworkAccess *wrappers.BoolValue `protobuf:"bytes,12,opt,name=allow_private_network_access,json=allowPrivateNetworkAccess,proto3" json:"allow_private_network_access,omitempty"` + AllowPrivateNetworkAccess *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=allow_private_network_access,json=allowPrivateNetworkAccess,proto3" json:"allow_private_network_access,omitempty"` + // Specifies if preflight requests not matching the configured allowed origin should be forwarded + // to the upstream. Default is true. + ForwardNotMatchingPreflights *wrapperspb.BoolValue `protobuf:"bytes,13,opt,name=forward_not_matching_preflights,json=forwardNotMatchingPreflights,proto3" json:"forward_not_matching_preflights,omitempty"` } func (x *CorsPolicy) Reset() { @@ -1633,7 +1636,7 @@ func (x *CorsPolicy) GetMaxAge() string { return "" } -func (x *CorsPolicy) GetAllowCredentials() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowCredentials() *wrapperspb.BoolValue { if x != nil { return x.AllowCredentials } @@ -1661,13 +1664,20 @@ func (x *CorsPolicy) GetShadowEnabled() *v31.RuntimeFractionalPercent { return nil } -func (x *CorsPolicy) GetAllowPrivateNetworkAccess() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowPrivateNetworkAccess() *wrapperspb.BoolValue { if x != nil { return x.AllowPrivateNetworkAccess } return nil } +func (x *CorsPolicy) GetForwardNotMatchingPreflights() *wrapperspb.BoolValue { + if x != nil { + return x.ForwardNotMatchingPreflights + } + return nil +} + type isCorsPolicy_EnabledSpecifier interface { isCorsPolicy_EnabledSpecifier() } @@ -1799,7 +1809,7 @@ type RouteAction struct { // :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // :ref:`retry overview `. - Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` // Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout, // although the connection manager wide :ref:`stream_idle_timeout // ` @@ -1822,7 +1832,7 @@ type RouteAction struct { // If the :ref:`overload action ` "envoy.overload_actions.reduce_timeouts" // is configured, this timeout is scaled according to the value for // :ref:`HTTP_DOWNSTREAM_STREAM_IDLE `. - IdleTimeout *duration.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Specifies how to send request over TLS early data. // If absent, allows `safe HTTP requests `_ to be sent on early data. // [#extension-category: envoy.route.early_data_policy] @@ -1836,7 +1846,7 @@ type RouteAction struct { // precedence over the virtual host level retry policy entirely (e.g.: policies are not merged, // most internal one becomes the enforced policy). :ref:`Retry policy ` // should not be set if this field is used. - RetryPolicyTypedConfig *any1.Any `protobuf:"bytes,33,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` + RetryPolicyTypedConfig *anypb.Any `protobuf:"bytes,33,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` // Specify a set of route request mirroring policies. // It takes precedence over the virtual host and route config mirror policy entirely. // That is, policies are not merged, the most specific non-empty one becomes the mirror policies. @@ -1854,7 +1864,7 @@ type RouteAction struct { // This field is deprecated. Please use :ref:`vh_rate_limits ` // // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. - IncludeVhRateLimits *wrappers.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` + IncludeVhRateLimits *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` // Specifies a list of hash policies to use for ring hash load balancing. Each // hash policy is evaluated individually and the combined result is used to // route the request. The method of combination is deterministic such that @@ -1903,7 +1913,7 @@ type RouteAction struct { // :ref:`retry overview `. // // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. - MaxGrpcTimeout *duration.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` + MaxGrpcTimeout *durationpb.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` // Deprecated by :ref:`grpc_timeout_header_offset `. // If present, Envoy will adjust the timeout provided by the “grpc-timeout“ header by subtracting // the provided duration from the header. This is useful in allowing Envoy to set its global @@ -1914,7 +1924,7 @@ type RouteAction struct { // infinity). // // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. - GrpcTimeoutOffset *duration.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` + GrpcTimeoutOffset *durationpb.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` UpgradeConfigs []*RouteAction_UpgradeConfig `protobuf:"bytes,25,rep,name=upgrade_configs,json=upgradeConfigs,proto3" json:"upgrade_configs,omitempty"` // If present, Envoy will try to follow an upstream redirect response instead of proxying the // response back to the downstream. An upstream redirect response is defined @@ -1939,7 +1949,7 @@ type RouteAction struct { // If not specified, at most one redirect will be followed. // // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. - MaxInternalRedirects *wrappers.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` + MaxInternalRedirects *wrapperspb.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` // Indicates that the route has a hedge policy. Note that if this is set, // it'll take precedence over the virtual host level hedge policy entirely // (e.g.: policies are not merged, most internal one becomes the enforced policy). @@ -2071,7 +2081,7 @@ func (x *RouteAction) GetHostRewriteLiteral() string { return "" } -func (x *RouteAction) GetAutoHostRewrite() *wrappers.BoolValue { +func (x *RouteAction) GetAutoHostRewrite() *wrapperspb.BoolValue { if x, ok := x.GetHostRewriteSpecifier().(*RouteAction_AutoHostRewrite); ok { return x.AutoHostRewrite } @@ -2099,14 +2109,14 @@ func (x *RouteAction) GetAppendXForwardedHost() bool { return false } -func (x *RouteAction) GetTimeout() *duration.Duration { +func (x *RouteAction) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *RouteAction) GetIdleTimeout() *duration.Duration { +func (x *RouteAction) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -2127,7 +2137,7 @@ func (x *RouteAction) GetRetryPolicy() *RetryPolicy { return nil } -func (x *RouteAction) GetRetryPolicyTypedConfig() *any1.Any { +func (x *RouteAction) GetRetryPolicyTypedConfig() *anypb.Any { if x != nil { return x.RetryPolicyTypedConfig } @@ -2156,7 +2166,7 @@ func (x *RouteAction) GetRateLimits() []*RateLimit { } // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. -func (x *RouteAction) GetIncludeVhRateLimits() *wrappers.BoolValue { +func (x *RouteAction) GetIncludeVhRateLimits() *wrapperspb.BoolValue { if x != nil { return x.IncludeVhRateLimits } @@ -2179,7 +2189,7 @@ func (x *RouteAction) GetCors() *CorsPolicy { } // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. -func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration { +func (x *RouteAction) GetMaxGrpcTimeout() *durationpb.Duration { if x != nil { return x.MaxGrpcTimeout } @@ -2187,7 +2197,7 @@ func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration { } // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. -func (x *RouteAction) GetGrpcTimeoutOffset() *duration.Duration { +func (x *RouteAction) GetGrpcTimeoutOffset() *durationpb.Duration { if x != nil { return x.GrpcTimeoutOffset } @@ -2217,7 +2227,7 @@ func (x *RouteAction) GetInternalRedirectAction() RouteAction_InternalRedirectAc } // Deprecated: Marked as deprecated in envoy/config/route/v3/route_components.proto. -func (x *RouteAction) GetMaxInternalRedirects() *wrappers.UInt32Value { +func (x *RouteAction) GetMaxInternalRedirects() *wrapperspb.UInt32Value { if x != nil { return x.MaxInternalRedirects } @@ -2322,7 +2332,7 @@ type RouteAction_AutoHostRewrite struct { // :ref:`config_http_conn_man_headers_x-forwarded-host` header if // :ref:`append_x_forwarded_host ` // is set. - AutoHostRewrite *wrappers.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` + AutoHostRewrite *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` } type RouteAction_HostRewriteHeader struct { @@ -2389,7 +2399,7 @@ type RetryPolicy struct { // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. These are the same conditions documented for // :ref:`config_http_filters_router_x-envoy-max-retries`. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // Specifies a non-zero upstream timeout per retry attempt (including the initial attempt). This // parameter is optional. The same conditions documented for // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` apply. @@ -2401,7 +2411,7 @@ type RetryPolicy struct { // Consequently, when using a :ref:`5xx ` based // retry policy, a request that times out will not be retried as the total timeout budget // would have been exhausted. - PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` + PerTryTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` // Specifies an upstream idle timeout per retry attempt (including the initial attempt). This // parameter is optional and if absent there is no per try idle timeout. The semantics of the per // try idle timeout are similar to the @@ -2421,7 +2431,7 @@ type RetryPolicy struct { // the idle timer continues once the response starts streaming back to the downstream client. // This ensures that response data continues to make progress without using one of the HTTP // connection manager idle timeouts. - PerTryIdleTimeout *duration.Duration `protobuf:"bytes,13,opt,name=per_try_idle_timeout,json=perTryIdleTimeout,proto3" json:"per_try_idle_timeout,omitempty"` + PerTryIdleTimeout *durationpb.Duration `protobuf:"bytes,13,opt,name=per_try_idle_timeout,json=perTryIdleTimeout,proto3" json:"per_try_idle_timeout,omitempty"` // Specifies an implementation of a RetryPriority which is used to determine the // distribution of load across priorities used for retries. Refer to // :ref:`retry plugin configuration ` for more details. @@ -2502,21 +2512,21 @@ func (x *RetryPolicy) GetRetryOn() string { return "" } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } return nil } -func (x *RetryPolicy) GetPerTryTimeout() *duration.Duration { +func (x *RetryPolicy) GetPerTryTimeout() *durationpb.Duration { if x != nil { return x.PerTryTimeout } return nil } -func (x *RetryPolicy) GetPerTryIdleTimeout() *duration.Duration { +func (x *RetryPolicy) GetPerTryIdleTimeout() *durationpb.Duration { if x != nil { return x.PerTryIdleTimeout } @@ -2596,7 +2606,7 @@ type HedgePolicy struct { // Must be at least 1. // Defaults to 1. // [#not-implemented-hide:] - InitialRequests *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` + InitialRequests *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` // Specifies a probability that an additional upstream request should be sent // on top of what is specified by initial_requests. // Defaults to 0. @@ -2650,7 +2660,7 @@ func (*HedgePolicy) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{10} } -func (x *HedgePolicy) GetInitialRequests() *wrappers.UInt32Value { +func (x *HedgePolicy) GetInitialRequests() *wrapperspb.UInt32Value { if x != nil { return x.InitialRequests } @@ -3020,7 +3030,7 @@ type Decorator struct { // ` header. Operation string `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"` // Whether the decorated details should be propagated to the other party. The default is true. - Propagate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"` + Propagate *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"` } func (x *Decorator) Reset() { @@ -3062,7 +3072,7 @@ func (x *Decorator) GetOperation() string { return "" } -func (x *Decorator) GetPropagate() *wrappers.BoolValue { +func (x *Decorator) GetPropagate() *wrapperspb.BoolValue { if x != nil { return x.Propagate } @@ -3257,7 +3267,7 @@ type RateLimit struct { // .. note:: // // The filter supports a range of 0 - 10 inclusively for stage numbers. - Stage *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` + Stage *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` // The key to be set in runtime to disable this rate limit configuration. DisableKey string `protobuf:"bytes,2,opt,name=disable_key,json=disableKey,proto3" json:"disable_key,omitempty"` // A list of actions that are to be applied for this rate limit configuration. @@ -3306,7 +3316,7 @@ func (*RateLimit) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{17} } -func (x *RateLimit) GetStage() *wrappers.UInt32Value { +func (x *RateLimit) GetStage() *wrapperspb.UInt32Value { if x != nil { return x.Stage } @@ -3755,7 +3765,7 @@ type InternalRedirectPolicy struct { // will pass the redirect back to downstream. // // If not specified, at most one redirect will be followed. - MaxInternalRedirects *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` + MaxInternalRedirects *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` // Defines what upstream response codes are allowed to trigger internal redirect. If unspecified, // only 302 will be treated as internal redirect. // Only 301, 302, 303, 307 and 308 are valid values. Any other codes will be ignored. @@ -3806,7 +3816,7 @@ func (*InternalRedirectPolicy) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{20} } -func (x *InternalRedirectPolicy) GetMaxInternalRedirects() *wrappers.UInt32Value { +func (x *InternalRedirectPolicy) GetMaxInternalRedirects() *wrapperspb.UInt32Value { if x != nil { return x.MaxInternalRedirects } @@ -3853,7 +3863,7 @@ type FilterConfig struct { unknownFields protoimpl.UnknownFields // The filter config. - Config *any1.Any `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` + Config *anypb.Any `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` // If true, the filter is optional, meaning that if the client does // not support the specified filter, it may ignore the map entry rather // than rejecting the config. @@ -3907,7 +3917,7 @@ func (*FilterConfig) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{21} } -func (x *FilterConfig) GetConfig() *any1.Any { +func (x *FilterConfig) GetConfig() *anypb.Any { if x != nil { return x.Config } @@ -3960,7 +3970,7 @@ type WeightedCluster_ClusterWeight struct { // is determined by its weight. The sum of weights across all // entries in the clusters array must be greater than 0, and must not exceed // uint32_t maximal value (4294967295). - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Optional endpoint metadata match criteria used by the subset load balancer. Only endpoints in // the upstream cluster with metadata matching what is set in this field will be considered for // load balancing. Note that this will be merged with what's provided in @@ -3997,7 +4007,7 @@ type WeightedCluster_ClusterWeight struct { // [#comment: An entry's value may be wrapped in a // :ref:`FilterConfig` // message to specify additional options.] - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Types that are assignable to HostRewriteSpecifier: // // *WeightedCluster_ClusterWeight_HostRewriteLiteral @@ -4050,7 +4060,7 @@ func (x *WeightedCluster_ClusterWeight) GetClusterHeader() string { return "" } -func (x *WeightedCluster_ClusterWeight) GetWeight() *wrappers.UInt32Value { +func (x *WeightedCluster_ClusterWeight) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -4092,7 +4102,7 @@ func (x *WeightedCluster_ClusterWeight) GetResponseHeadersToRemove() []string { return nil } -func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -4171,7 +4181,7 @@ type RouteMatch_TlsContextMatchOptions struct { // If specified, the route will match against whether or not a certificate is presented. // If not specified, certificate presentation status (true or false) will not be considered when route matching. - Presented *wrappers.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"` + Presented *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"` // If specified, the route will match against whether or not a certificate is validated. // If not specified, certificate validation status (true or false) will not be considered when route matching. // @@ -4184,7 +4194,7 @@ type RouteMatch_TlsContextMatchOptions struct { // The only known workaround for this issue is to disable TLS session resumption entirely, by // setting both :ref:`disable_stateless_session_resumption ` // and :ref:`disable_stateful_session_resumption ` on the DownstreamTlsContext. - Validated *wrappers.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"` + Validated *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"` } func (x *RouteMatch_TlsContextMatchOptions) Reset() { @@ -4219,14 +4229,14 @@ func (*RouteMatch_TlsContextMatchOptions) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{6, 1} } -func (x *RouteMatch_TlsContextMatchOptions) GetPresented() *wrappers.BoolValue { +func (x *RouteMatch_TlsContextMatchOptions) GetPresented() *wrapperspb.BoolValue { if x != nil { return x.Presented } return nil } -func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrappers.BoolValue { +func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrapperspb.BoolValue { if x != nil { return x.Validated } @@ -4324,7 +4334,7 @@ type RouteAction_RequestMirrorPolicy struct { // value, the request will be mirrored. RuntimeFraction *v31.RuntimeFractionalPercent `protobuf:"bytes,3,opt,name=runtime_fraction,json=runtimeFraction,proto3" json:"runtime_fraction,omitempty"` // Determines if the trace span should be sampled. Defaults to true. - TraceSampled *wrappers.BoolValue `protobuf:"bytes,4,opt,name=trace_sampled,json=traceSampled,proto3" json:"trace_sampled,omitempty"` + TraceSampled *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=trace_sampled,json=traceSampled,proto3" json:"trace_sampled,omitempty"` } func (x *RouteAction_RequestMirrorPolicy) Reset() { @@ -4380,7 +4390,7 @@ func (x *RouteAction_RequestMirrorPolicy) GetRuntimeFraction() *v31.RuntimeFract return nil } -func (x *RouteAction_RequestMirrorPolicy) GetTraceSampled() *wrappers.BoolValue { +func (x *RouteAction_RequestMirrorPolicy) GetTraceSampled() *wrapperspb.BoolValue { if x != nil { return x.TraceSampled } @@ -4561,7 +4571,7 @@ type RouteAction_UpgradeConfig struct { // Upgrade: [upgrade_type] will be proxied upstream. UpgradeType string `protobuf:"bytes,1,opt,name=upgrade_type,json=upgradeType,proto3" json:"upgrade_type,omitempty"` // Determines if upgrades are available on this route. Defaults to true. - Enabled *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` // Configuration for sending data upstream as a raw data payload. This is used for // CONNECT requests, when forwarding CONNECT payload as raw TCP. // Note that CONNECT support is currently considered alpha in Envoy. @@ -4608,7 +4618,7 @@ func (x *RouteAction_UpgradeConfig) GetUpgradeType() string { return "" } -func (x *RouteAction_UpgradeConfig) GetEnabled() *wrappers.BoolValue { +func (x *RouteAction_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -4635,19 +4645,19 @@ type RouteAction_MaxStreamDuration struct { // is used. If this field is set explicitly to zero, any // HttpConnectionManager max_stream_duration timeout will be disabled for // this route. - MaxStreamDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` + MaxStreamDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` // If present, and the request contains a `grpc-timeout header // `_, use that value as the // “max_stream_duration“, but limit the applied timeout to the maximum value specified here. // If set to 0, the “grpc-timeout“ header is used without modification. - GrpcTimeoutHeaderMax *duration.Duration `protobuf:"bytes,2,opt,name=grpc_timeout_header_max,json=grpcTimeoutHeaderMax,proto3" json:"grpc_timeout_header_max,omitempty"` + GrpcTimeoutHeaderMax *durationpb.Duration `protobuf:"bytes,2,opt,name=grpc_timeout_header_max,json=grpcTimeoutHeaderMax,proto3" json:"grpc_timeout_header_max,omitempty"` // If present, Envoy will adjust the timeout provided by the “grpc-timeout“ header by // subtracting the provided duration from the header. This is useful for allowing Envoy to set // its global timeout to be less than that of the deadline imposed by the calling client, which // makes it more likely that Envoy will handle the timeout instead of having the call canceled // by the client. If, after applying the offset, the resulting timeout is zero or negative, // the stream will timeout immediately. - GrpcTimeoutHeaderOffset *duration.Duration `protobuf:"bytes,3,opt,name=grpc_timeout_header_offset,json=grpcTimeoutHeaderOffset,proto3" json:"grpc_timeout_header_offset,omitempty"` + GrpcTimeoutHeaderOffset *durationpb.Duration `protobuf:"bytes,3,opt,name=grpc_timeout_header_offset,json=grpcTimeoutHeaderOffset,proto3" json:"grpc_timeout_header_offset,omitempty"` } func (x *RouteAction_MaxStreamDuration) Reset() { @@ -4682,21 +4692,21 @@ func (*RouteAction_MaxStreamDuration) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8, 3} } -func (x *RouteAction_MaxStreamDuration) GetMaxStreamDuration() *duration.Duration { +func (x *RouteAction_MaxStreamDuration) GetMaxStreamDuration() *durationpb.Duration { if x != nil { return x.MaxStreamDuration } return nil } -func (x *RouteAction_MaxStreamDuration) GetGrpcTimeoutHeaderMax() *duration.Duration { +func (x *RouteAction_MaxStreamDuration) GetGrpcTimeoutHeaderMax() *durationpb.Duration { if x != nil { return x.GrpcTimeoutHeaderMax } return nil } -func (x *RouteAction_MaxStreamDuration) GetGrpcTimeoutHeaderOffset() *duration.Duration { +func (x *RouteAction_MaxStreamDuration) GetGrpcTimeoutHeaderOffset() *durationpb.Duration { if x != nil { return x.GrpcTimeoutHeaderOffset } @@ -4846,7 +4856,7 @@ type RouteAction_HashPolicy_Cookie struct { // If specified, a cookie with the TTL will be generated if the cookie is // not present. If the TTL is present and zero, the generated cookie will // be a session cookie. - Ttl *duration.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` // The name of the path for the cookie. If no path is specified here, no path // will be set for the cookie. Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` @@ -4893,7 +4903,7 @@ func (x *RouteAction_HashPolicy_Cookie) GetName() string { return "" } -func (x *RouteAction_HashPolicy_Cookie) GetTtl() *duration.Duration { +func (x *RouteAction_HashPolicy_Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -5182,7 +5192,7 @@ func (m *RetryPolicy_RetryPriority) GetConfigType() isRetryPolicy_RetryPriority_ return nil } -func (x *RetryPolicy_RetryPriority) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryPriority) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_TypedConfig); ok { return x.TypedConfig } @@ -5194,7 +5204,7 @@ type isRetryPolicy_RetryPriority_ConfigType interface { } type RetryPolicy_RetryPriority_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryPriority_TypedConfig) isRetryPolicy_RetryPriority_ConfigType() {} @@ -5259,7 +5269,7 @@ func (m *RetryPolicy_RetryHostPredicate) GetConfigType() isRetryPolicy_RetryHost return nil } -func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_TypedConfig); ok { return x.TypedConfig } @@ -5271,7 +5281,7 @@ type isRetryPolicy_RetryHostPredicate_ConfigType interface { } type RetryPolicy_RetryHostPredicate_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryHostPredicate_TypedConfig) isRetryPolicy_RetryHostPredicate_ConfigType() {} @@ -5285,12 +5295,12 @@ type RetryPolicy_RetryBackOff struct { // than zero. Values less than 1 ms are rounded up to 1 ms. // See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion of Envoy's // back-off algorithm. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, but must be // greater than or equal to the “base_interval“ if set. The default is 10 times the // “base_interval“. See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion // of Envoy's back-off algorithm. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RetryPolicy_RetryBackOff) Reset() { @@ -5325,14 +5335,14 @@ func (*RetryPolicy_RetryBackOff) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{9, 2} } -func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -5456,7 +5466,7 @@ type RetryPolicy_RateLimitedRetryBackOff struct { // Specifies the maximum back off interval that Envoy will allow. If a reset // header contains an interval longer than this then it will be discarded and // the next header will be tried. Defaults to 300 seconds. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RetryPolicy_RateLimitedRetryBackOff) Reset() { @@ -5498,7 +5508,7 @@ func (x *RetryPolicy_RateLimitedRetryBackOff) GetResetHeaders() []*RetryPolicy_R return nil } -func (x *RetryPolicy_RateLimitedRetryBackOff) GetMaxInterval() *duration.Duration { +func (x *RetryPolicy_RateLimitedRetryBackOff) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -6041,13 +6051,13 @@ type RateLimit_Action_MaskedRemoteAddress struct { // For example, trusted address from x-forwarded-for is “192.168.1.1“, // the descriptor entry is ("masked_remote_address", "192.168.1.1/32"); // if mask len is 24, the descriptor entry is ("masked_remote_address", "192.168.1.0/24"). - V4PrefixMaskLen *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=v4_prefix_mask_len,json=v4PrefixMaskLen,proto3" json:"v4_prefix_mask_len,omitempty"` + V4PrefixMaskLen *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=v4_prefix_mask_len,json=v4PrefixMaskLen,proto3" json:"v4_prefix_mask_len,omitempty"` // Length of prefix mask len for IPv6 (e.g. 0, 128). // Defaults to 128 when unset. // For example, trusted address from x-forwarded-for is “2001:abcd:ef01:2345:6789:abcd:ef01:234“, // the descriptor entry is ("masked_remote_address", "2001:abcd:ef01:2345:6789:abcd:ef01:234/128"); // if mask len is 64, the descriptor entry is ("masked_remote_address", "2001:abcd:ef01:2345::/64"). - V6PrefixMaskLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=v6_prefix_mask_len,json=v6PrefixMaskLen,proto3" json:"v6_prefix_mask_len,omitempty"` + V6PrefixMaskLen *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=v6_prefix_mask_len,json=v6PrefixMaskLen,proto3" json:"v6_prefix_mask_len,omitempty"` } func (x *RateLimit_Action_MaskedRemoteAddress) Reset() { @@ -6082,14 +6092,14 @@ func (*RateLimit_Action_MaskedRemoteAddress) Descriptor() ([]byte, []int) { return file_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{17, 0, 4} } -func (x *RateLimit_Action_MaskedRemoteAddress) GetV4PrefixMaskLen() *wrappers.UInt32Value { +func (x *RateLimit_Action_MaskedRemoteAddress) GetV4PrefixMaskLen() *wrapperspb.UInt32Value { if x != nil { return x.V4PrefixMaskLen } return nil } -func (x *RateLimit_Action_MaskedRemoteAddress) GetV6PrefixMaskLen() *wrappers.UInt32Value { +func (x *RateLimit_Action_MaskedRemoteAddress) GetV6PrefixMaskLen() *wrapperspb.UInt32Value { if x != nil { return x.V6PrefixMaskLen } @@ -6177,7 +6187,7 @@ type RateLimit_Action_HeaderValueMatch struct { // request matches the headers. If set to false, the action will append a // descriptor entry when the request does not match the headers. The // default value is true. - ExpectMatch *wrappers.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` + ExpectMatch *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` // Specifies a set of headers that the rate limit action should match // on. The action will check the request’s headers against all the // specified headers in the config. A match will happen if all the @@ -6232,7 +6242,7 @@ func (x *RateLimit_Action_HeaderValueMatch) GetDescriptorValue() string { return "" } -func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrappers.BoolValue { +func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrapperspb.BoolValue { if x != nil { return x.ExpectMatch } @@ -6438,7 +6448,7 @@ type RateLimit_Action_QueryParameterValueMatch struct { // request matches the headers. If set to false, the action will append a // descriptor entry when the request does not match the headers. The // default value is true. - ExpectMatch *wrappers.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` + ExpectMatch *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` // Specifies a set of query parameters that the rate limit action should match // on. The action will check the request’s query parameters against all the // specified query parameters in the config. A match will happen if all the @@ -6493,7 +6503,7 @@ func (x *RateLimit_Action_QueryParameterValueMatch) GetDescriptorValue() string return "" } -func (x *RateLimit_Action_QueryParameterValueMatch) GetExpectMatch() *wrappers.BoolValue { +func (x *RateLimit_Action_QueryParameterValueMatch) GetExpectMatch() *wrapperspb.BoolValue { if x != nil { return x.ExpectMatch } @@ -7012,7 +7022,7 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{ 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x15, 0x0a, 0x0e, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, - 0x08, 0x03, 0x10, 0x04, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0xc5, 0x05, 0x0a, 0x0a, + 0x08, 0x03, 0x10, 0x04, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0xa8, 0x06, 0x0a, 0x0a, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5f, 0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, @@ -7049,958 +7059,964 @@ var file_envoy_config_route_v3_route_components_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3a, 0x24, 0x9a, 0xc5, 0x88, - 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, - 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x42, 0x13, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x5f, 0x73, 0x70, 0x65, - 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x08, - 0x10, 0x09, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, - 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, - 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x64, 0x22, 0xdc, 0x2c, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, - 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x48, - 0x00, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x12, 0x55, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x3a, 0x0a, 0x18, 0x63, 0x6c, 0x75, 0x73, 0x74, - 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, 0x70, 0x6c, 0x75, - 0x67, 0x69, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x16, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, - 0x67, 0x69, 0x6e, 0x12, 0x76, 0x0a, 0x1f, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x63, 0x6c, - 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, - 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, - 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x1c, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, - 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x8e, 0x01, 0x0a, 0x1f, - 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x66, 0x6f, 0x75, 0x6e, - 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, - 0x14, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, - 0x1b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x45, 0x0a, 0x0e, - 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x12, 0x32, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x72, 0x65, - 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, - 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, - 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78, - 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, - 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, - 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52, 0x0c, - 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x5a, 0x0a, 0x13, - 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x70, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x77, 0x72, 0x69, - 0x74, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3f, 0x0a, 0x14, 0x68, 0x6f, 0x73, 0x74, - 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, - 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x12, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, - 0x74, 0x65, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x48, 0x0a, 0x11, 0x61, 0x75, 0x74, - 0x6f, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x07, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x61, 0x0a, 0x1f, 0x66, + 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, + 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x48, 0x01, 0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, - 0x69, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x13, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, - 0x69, 0x74, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x48, 0x01, 0x52, - 0x11, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x12, 0x67, 0x0a, 0x17, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, - 0x74, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x23, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, - 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, - 0x75, 0x74, 0x65, 0x48, 0x01, 0x52, 0x14, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, - 0x74, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x35, 0x0a, 0x17, 0x61, - 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x78, 0x5f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, - 0x64, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x26, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x70, - 0x70, 0x65, 0x6e, 0x64, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x48, 0x6f, - 0x73, 0x74, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x69, 0x64, 0x6c, 0x65, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x5f, 0x64, - 0x61, 0x74, 0x61, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, - 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x65, 0x61, - 0x72, 0x6c, 0x79, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x45, 0x0a, - 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, - 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4f, 0x0a, 0x19, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x16, 0x72, - 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x64, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6e, 0x0a, 0x17, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, - 0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x15, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, - 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, - 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, - 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x08, - 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, - 0x74, 0x79, 0x12, 0x41, 0x0a, 0x0b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, - 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, - 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x72, 0x61, 0x74, 0x65, 0x4c, - 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x16, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, - 0x5f, 0x76, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, - 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x13, - 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x68, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x73, 0x12, 0x4e, 0x0a, 0x0b, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x52, 0x1c, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x4e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, + 0x68, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x65, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x3a, 0x24, + 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, + 0x6c, 0x69, 0x63, 0x79, 0x42, 0x13, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x5f, + 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, + 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, + 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x12, 0x61, 0x6c, 0x6c, 0x6f, 0x77, + 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x07, 0x65, + 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22, 0xdc, 0x2c, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, + 0x48, 0x00, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x0e, 0x63, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, + 0x01, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, + 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, + 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x3a, 0x0a, 0x18, 0x63, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, + 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x16, + 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, + 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x76, 0x0a, 0x1f, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, + 0x65, 0x72, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, + 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x48, 0x00, + 0x52, 0x1c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, + 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x8e, + 0x01, 0x0a, 0x1f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, 0x66, + 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, + 0x64, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, - 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0a, 0x68, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, - 0x01, 0x52, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x61, 0x78, 0x5f, 0x67, - 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7, - 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x47, 0x72, - 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x13, 0x67, 0x72, 0x70, - 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, - 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, + 0x10, 0x01, 0x52, 0x1b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x45, 0x0a, 0x0e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6d, 0x61, 0x74, 0x63, + 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x32, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, + 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, + 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0d, 0x70, 0x72, 0x65, + 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, + 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x20, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, + 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, + 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, + 0x65, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, + 0x5a, 0x0a, 0x13, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, + 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, + 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, + 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, + 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x70, 0x61, 0x74, 0x68, 0x52, 0x65, + 0x77, 0x72, 0x69, 0x74, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x3f, 0x0a, 0x14, 0x68, + 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x74, 0x65, + 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, + 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x12, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, + 0x77, 0x72, 0x69, 0x74, 0x65, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x48, 0x0a, 0x11, + 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, + 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x48, 0x01, 0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74, 0x52, + 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x13, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, + 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x1d, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, + 0x48, 0x01, 0x52, 0x11, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x48, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x17, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, + 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, + 0x18, 0x23, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, + 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, + 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x48, 0x01, 0x52, 0x14, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, + 0x77, 0x72, 0x69, 0x74, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x35, + 0x0a, 0x17, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x78, 0x5f, 0x66, 0x6f, 0x72, 0x77, 0x61, + 0x72, 0x64, 0x65, 0x64, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x26, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x14, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, + 0x64, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x11, - 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4f, 0x66, 0x66, 0x73, 0x65, - 0x74, 0x12, 0x59, 0x0a, 0x0f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, + 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x69, 0x64, + 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x69, 0x64, 0x6c, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x65, 0x61, 0x72, 0x6c, + 0x79, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x28, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, + 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, + 0x0f, 0x65, 0x61, 0x72, 0x6c, 0x79, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x12, 0x45, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, + 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, + 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4f, 0x0a, 0x19, 0x72, 0x65, 0x74, 0x72, 0x79, + 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, + 0x52, 0x16, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, + 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6e, 0x0a, 0x17, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x69, 0x65, 0x73, 0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, + 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, + 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x52, 0x15, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, + 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, + 0x72, 0x69, 0x74, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, + 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, + 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72, 0x69, + 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x41, 0x0a, 0x0b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, - 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, - 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x75, 0x70, - 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x67, 0x0a, 0x18, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, - 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, - 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, - 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x16, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x50, - 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x18, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, - 0x52, 0x16, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, - 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5f, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, - 0x74, 0x73, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, - 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, - 0x30, 0x18, 0x01, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x0c, 0x68, 0x65, 0x64, - 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x52, 0x0b, 0x68, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, - 0x12, 0x64, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x64, - 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, + 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x72, 0x61, + 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x16, 0x69, 0x6e, 0x63, 0x6c, + 0x75, 0x64, 0x65, 0x5f, 0x76, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, + 0x01, 0x52, 0x13, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x56, 0x68, 0x52, 0x61, 0x74, 0x65, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x4e, 0x0a, 0x0b, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x70, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, + 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0a, 0x68, 0x61, 0x73, 0x68, + 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x42, 0x0a, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x18, 0x11, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x72, + 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, + 0x2e, 0x30, 0x18, 0x01, 0x52, 0x04, 0x63, 0x6f, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x10, 0x6d, 0x61, + 0x78, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x17, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, + 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x0e, 0x6d, 0x61, + 0x78, 0x47, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x56, 0x0a, 0x13, + 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x6f, 0x66, 0x66, + 0x73, 0x65, 0x74, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, + 0x01, 0x52, 0x11, 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4f, 0x66, + 0x66, 0x73, 0x65, 0x74, 0x12, 0x59, 0x0a, 0x0f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x5f, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x81, 0x03, 0x0a, 0x13, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x33, - 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x19, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x12, 0x4b, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x24, 0xfa, 0x42, 0x08, - 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, - 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, - 0x72, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x12, 0x59, 0x0a, 0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, - 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x72, 0x75, 0x6e, 0x74, - 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x0d, 0x74, - 0x72, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0c, - 0x74, 0x72, 0x61, 0x63, 0x65, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x3a, 0x39, 0x9a, 0xc5, - 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x6e, 0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, + 0x0e, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, + 0x67, 0x0a, 0x18, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, + 0x72, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x22, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x2d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x52, 0x16, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x80, 0x01, 0x0a, 0x18, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x65, 0x6e, + 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, + 0x30, 0x18, 0x01, 0x52, 0x16, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, + 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5f, 0x0a, 0x16, 0x6d, + 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, + 0x72, 0x65, 0x63, 0x74, 0x73, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, + 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, + 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x0c, + 0x68, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x1b, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x64, 0x67, 0x65, + 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x68, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x12, 0x64, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, + 0x6d, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, + 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x81, 0x03, 0x0a, 0x13, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x12, 0x33, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x19, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, + 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x07, 0x63, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x4b, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x24, + 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, + 0x13, 0x12, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, + 0x66, 0x69, 0x65, 0x72, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x12, 0x59, 0x0a, 0x10, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, + 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, + 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, + 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x72, + 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, + 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x52, 0x0c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x3a, + 0x39, 0x9a, 0xc5, 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, + 0x72, 0x72, 0x6f, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, + 0x52, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x1a, 0xd6, 0x0b, + 0x0a, 0x0a, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4e, 0x0a, 0x06, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, + 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x06, + 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, + 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, + 0x69, 0x65, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x79, 0x0a, 0x15, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x65, 0x6e, + 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, + 0x00, 0x52, 0x14, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x67, 0x0a, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79, + 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x48, 0x00, + 0x52, 0x0e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, + 0x12, 0x5e, 0x0a, 0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x48, 0x00, 0x52, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x1a, 0xc6, 0x01, 0x0a, + 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, + 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78, + 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, + 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, + 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, + 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52, 0x0c, + 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x3a, 0x37, 0x9a, 0xc5, + 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x69, 0x72, 0x72, 0x6f, - 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x0b, 0x72, - 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x1a, 0xd6, 0x0b, 0x0a, 0x0a, 0x48, - 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4e, 0x0a, 0x06, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, - 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, - 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x48, - 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x06, 0x63, 0x6f, 0x6f, - 0x6b, 0x69, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, - 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, - 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x48, - 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x79, 0x0a, 0x15, 0x63, 0x6f, 0x6e, - 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, - 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, - 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x48, 0x00, 0x52, 0x14, - 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x69, 0x65, 0x73, 0x12, 0x67, 0x0a, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0e, 0x71, - 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x5e, 0x0a, - 0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x1a, 0x5f, 0x0a, 0x0f, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x41, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x10, 0x01, 0x28, + 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, + 0xfa, 0x42, 0x0c, 0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xfe, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69, + 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, + 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, + 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, + 0x5d, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x48, 0x00, - 0x52, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x1a, 0xc6, 0x01, 0x0a, 0x06, 0x48, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, - 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, - 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, - 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, - 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x52, 0x0c, 0x72, 0x65, 0x67, - 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, - 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x1a, 0x5f, 0x0a, 0x0f, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x41, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, - 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0xfa, 0x42, 0x0c, - 0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x1a, 0xfe, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x1b, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, - 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x03, 0x74, - 0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x5d, 0x0a, 0x0a, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, + 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3a, 0x37, + 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x1a, 0x7a, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, + 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x70, 0x3a, 0x45, 0x9a, 0xc5, + 0x88, 0x1e, 0x40, 0x0a, 0x3e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, + 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x69, 0x65, 0x73, 0x1a, 0x6e, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, + 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x3a, 0x3f, 0x9a, 0xc5, 0x88, 0x1e, 0x3a, 0x0a, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, + 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, + 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, + 0x74, 0x65, 0x72, 0x1a, 0x66, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x12, 0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x3c, 0x9a, + 0xc5, 0x88, 0x1e, 0x37, 0x0a, 0x35, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, + 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, - 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, - 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3a, 0x37, 0x9a, 0xc5, 0x88, - 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, + 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x3a, 0x30, 0x9a, 0xc5, 0x88, + 0x1e, 0x2b, 0x0a, 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, - 0x6f, 0x6b, 0x69, 0x65, 0x1a, 0x7a, 0x0a, 0x14, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x70, 0x3a, 0x45, 0x9a, 0xc5, 0x88, 0x1e, 0x40, - 0x0a, 0x3e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, - 0x1a, 0x6e, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, - 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x3a, - 0x3f, 0x9a, 0xc5, 0x88, 0x1e, 0x3a, 0x0a, 0x38, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, - 0x1a, 0x66, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, - 0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, - 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x3a, 0x3c, 0x9a, 0xc5, 0x88, 0x1e, - 0x37, 0x0a, 0x35, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x46, 0x69, 0x6c, - 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x3a, 0x30, 0x9a, 0xc5, 0x88, 0x1e, 0x2b, 0x0a, - 0x29, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x17, 0x0a, 0x10, 0x70, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, - 0xf8, 0x42, 0x01, 0x1a, 0xa3, 0x03, 0x0a, 0x0d, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, - 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, - 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0b, 0x75, 0x70, 0x67, 0x72, - 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x34, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, - 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x65, 0x0a, - 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x8d, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5d, 0x0a, 0x15, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x6f, - 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x52, 0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x70, - 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x6f, 0x77, - 0x50, 0x6f, 0x73, 0x74, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x67, 0x72, - 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x88, 0x02, 0x0a, 0x11, 0x4d, 0x61, - 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, - 0x49, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x64, 0x75, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, - 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, - 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, 0x17, 0x67, 0x72, - 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x14, 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x12, 0x56, 0x0a, 0x1a, - 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x17, 0x67, 0x72, 0x70, - 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4f, 0x66, - 0x66, 0x73, 0x65, 0x74, 0x22, 0x60, 0x0a, 0x1b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, - 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, - 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x55, - 0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, - 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x49, - 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x45, - 0x52, 0x52, 0x4f, 0x52, 0x10, 0x02, 0x22, 0x5e, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x41, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x52, 0x4f, 0x55, 0x47, 0x48, - 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, - 0x43, 0x54, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x41, 0x4e, 0x44, 0x4c, 0x45, 0x5f, 0x49, - 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, - 0x10, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x18, 0x0a, - 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, - 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x6f, 0x73, 0x74, 0x5f, - 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, - 0x72, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x4a, 0x04, 0x08, 0x12, 0x10, 0x13, 0x4a, 0x04, 0x08, - 0x13, 0x10, 0x14, 0x4a, 0x04, 0x08, 0x10, 0x10, 0x11, 0x4a, 0x04, 0x08, 0x16, 0x10, 0x17, 0x4a, - 0x04, 0x08, 0x15, 0x10, 0x16, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x52, 0x15, 0x72, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x22, 0xbf, 0x10, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x12, 0x52, 0x0a, - 0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, - 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, - 0x73, 0x12, 0x41, 0x0a, 0x0f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x70, 0x65, 0x72, 0x54, 0x72, 0x79, 0x54, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, - 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x70, - 0x65, 0x72, 0x54, 0x72, 0x79, 0x49, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x12, 0x57, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, - 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x6f, 0x6e, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x17, 0x0a, + 0x10, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, + 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xa3, 0x03, 0x0a, 0x0d, 0x55, 0x70, 0x67, 0x72, 0x61, + 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a, 0x0c, 0x75, 0x70, 0x67, 0x72, + 0x61, 0x64, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, + 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0b, 0x75, + 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x34, 0x0a, 0x07, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, + 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x12, 0x65, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, - 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x74, 0x72, - 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x67, 0x0a, 0x14, 0x72, 0x65, 0x74, - 0x72, 0x79, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, + 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x67, + 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, + 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x8d, 0x01, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5d, 0x0a, 0x15, 0x70, 0x72, 0x6f, + 0x78, 0x79, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, + 0x50, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x52, 0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, + 0x6f, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, + 0x77, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x6c, + 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x73, 0x74, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a, 0x2c, + 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, + 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x88, 0x02, 0x0a, + 0x11, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x49, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, + 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x53, + 0x74, 0x72, 0x65, 0x61, 0x6d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, + 0x17, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x14, 0x67, 0x72, 0x70, 0x63, 0x54, + 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x78, 0x12, + 0x56, 0x0a, 0x1a, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x17, + 0x67, 0x72, 0x70, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0x60, 0x0a, 0x1b, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, + 0x45, 0x5f, 0x55, 0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x00, 0x12, + 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x19, + 0x0a, 0x15, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, + 0x52, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x02, 0x22, 0x5e, 0x0a, 0x16, 0x49, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x41, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x52, 0x4f, + 0x55, 0x47, 0x48, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, + 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x41, 0x4e, 0x44, 0x4c, + 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, + 0x45, 0x43, 0x54, 0x10, 0x01, 0x1a, 0x02, 0x18, 0x01, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, + 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x42, 0x18, 0x0a, 0x11, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x70, 0x65, 0x63, + 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x6f, + 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, + 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x0c, 0x10, 0x0d, 0x4a, 0x04, 0x08, 0x12, 0x10, 0x13, + 0x4a, 0x04, 0x08, 0x13, 0x10, 0x14, 0x4a, 0x04, 0x08, 0x10, 0x10, 0x11, 0x4a, 0x04, 0x08, 0x16, + 0x10, 0x17, 0x4a, 0x04, 0x08, 0x15, 0x10, 0x16, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x52, 0x15, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xbf, 0x10, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, + 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, + 0x12, 0x52, 0x0a, 0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, + 0x6c, 0x75, 0x65, 0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61, 0x78, + 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x74, + 0x72, 0x69, 0x65, 0x73, 0x12, 0x41, 0x0a, 0x0f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x70, 0x65, 0x72, 0x54, 0x72, 0x79, + 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x4a, 0x0a, 0x14, 0x70, 0x65, 0x72, 0x5f, 0x74, + 0x72, 0x79, 0x5f, 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, + 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x11, 0x70, 0x65, 0x72, 0x54, 0x72, 0x79, 0x49, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x12, 0x57, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x72, 0x69, + 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, + 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, + 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x0d, 0x72, + 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x67, 0x0a, 0x14, + 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, + 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, + 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x52, 0x12, 0x72, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, + 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x64, 0x0a, 0x18, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, + 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x52, 0x16, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x21, 0x68, + 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, + 0x74, 0x72, 0x79, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x74, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x73, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x68, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x41, 0x74, 0x74, + 0x65, 0x6d, 0x70, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, + 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, + 0x07, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x14, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x55, 0x0a, 0x0e, 0x72, + 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, + 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, + 0x6b, 0x4f, 0x66, 0x66, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, + 0x66, 0x66, 0x12, 0x78, 0x0a, 0x1b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x65, 0x64, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, + 0x66, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, - 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, - 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x12, - 0x72, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x12, 0x64, 0x0a, 0x18, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x0c, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, - 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x52, 0x16, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, - 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x21, 0x68, 0x6f, 0x73, 0x74, - 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79, - 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x74, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x73, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x1d, 0x68, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x41, 0x74, 0x74, 0x65, 0x6d, 0x70, - 0x74, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, - 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, - 0x28, 0x0d, 0x52, 0x14, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x55, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, - 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, - 0x66, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, - 0x78, 0x0a, 0x1b, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x5f, - 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, - 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, - 0x52, 0x17, 0x72, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, - 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x51, 0x0a, 0x11, 0x72, 0x65, 0x74, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x09, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x10, 0x72, 0x65, 0x74, 0x72, - 0x69, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x60, 0x0a, 0x19, - 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x17, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0xb9, - 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, - 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, - 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, - 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, - 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x33, 0x9a, 0xc5, 0x88, 0x1e, 0x2e, 0x0a, - 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, + 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x61, 0x74, 0x65, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, + 0x4f, 0x66, 0x66, 0x52, 0x17, 0x72, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, + 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x51, 0x0a, 0x11, + 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, + 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x10, 0x72, + 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, + 0x60, 0x0a, 0x19, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x17, 0x72, 0x65, 0x74, 0x72, 0x69, 0x61, + 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x73, 0x1a, 0xb9, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, + 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, + 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x33, 0x9a, 0xc5, 0x88, + 0x1e, 0x2e, 0x0a, 0x2c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, + 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, + 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, + 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, + 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xc3, 0x01, + 0x0a, 0x12, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, + 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x38, 0x9a, 0xc5, + 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x1a, 0xd6, 0x01, 0x0a, 0x0c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, + 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x4a, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0xaa, 0x01, 0x04, 0x08, 0x01, + 0x2a, 0x00, 0x52, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, + 0x12, 0x46, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78, + 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d, 0x0a, + 0x2b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, - 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x0d, 0x0a, - 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, - 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0xc3, 0x01, 0x0a, 0x12, 0x52, - 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, - 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, - 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, - 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, - 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x1a, 0xd6, 0x01, 0x0a, 0x0c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, - 0x66, 0x12, 0x4a, 0x0a, 0x0d, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, - 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x1a, 0x88, 0x01, 0x0a, + 0x0b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, + 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x56, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, + 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, + 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x1a, 0xc0, 0x01, 0x0a, 0x17, 0x52, 0x61, 0x74, 0x65, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, + 0x4f, 0x66, 0x66, 0x12, 0x5d, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, + 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, + 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, + 0x01, 0x02, 0x08, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x73, 0x12, 0x46, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, + 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0xaa, 0x01, 0x04, 0x08, 0x01, 0x2a, 0x00, 0x52, - 0x0c, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x46, 0x0a, - 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, - 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, - 0x65, 0x72, 0x76, 0x61, 0x6c, 0x3a, 0x32, 0x9a, 0xc5, 0x88, 0x1e, 0x2d, 0x0a, 0x2b, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, - 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x1a, 0x88, 0x01, 0x0a, 0x0b, 0x52, 0x65, - 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, - 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56, 0x0a, 0x06, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x34, 0x2e, 0x65, + 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, + 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x34, 0x0a, 0x11, 0x52, 0x65, + 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, + 0x0b, 0x0a, 0x07, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x53, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, + 0x55, 0x4e, 0x49, 0x58, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x01, + 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, + 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x9c, 0x02, 0x0a, 0x0b, 0x48, 0x65, 0x64, 0x67, + 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x50, 0x0a, 0x10, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, + 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x0f, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, + 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x19, 0x61, 0x64, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, + 0x63, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, + 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x17, + 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x18, 0x68, 0x65, 0x64, 0x67, 0x65, + 0x5f, 0x6f, 0x6e, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x68, 0x65, 0x64, 0x67, 0x65, + 0x4f, 0x6e, 0x50, 0x65, 0x72, 0x54, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3a, + 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x64, 0x67, 0x65, + 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xe1, 0x05, 0x0a, 0x0e, 0x52, 0x65, 0x64, 0x69, 0x72, + 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0e, 0x68, 0x74, 0x74, + 0x70, 0x73, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x48, 0x00, 0x52, 0x0d, 0x68, 0x74, 0x74, 0x70, 0x73, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x12, 0x29, 0x0a, 0x0f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, 0x65, 0x64, + 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x73, + 0x63, 0x68, 0x65, 0x6d, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x30, 0x0a, + 0x0d, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, + 0x02, 0x52, 0x0c, 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, + 0x23, 0x0a, 0x0d, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x64, 0x69, + 0x72, 0x65, 0x63, 0x74, 0x12, 0x32, 0x0a, 0x0d, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x64, + 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, + 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x74, 0x68, + 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x34, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, + 0x69, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, + 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x55, + 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, + 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, + 0x69, 0x74, 0x75, 0x74, 0x65, 0x48, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, + 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x69, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, - 0x2e, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, - 0x61, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x66, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x1a, 0xc0, 0x01, 0x0a, 0x17, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x65, 0x64, 0x52, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, - 0x12, 0x5d, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, - 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x65, - 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, - 0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, - 0x46, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01, 0x02, 0x2a, 0x00, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x49, - 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x34, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x65, 0x74, - 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x0b, 0x0a, 0x07, - 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x53, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x55, 0x4e, 0x49, - 0x58, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x01, 0x3a, 0x25, 0x9a, - 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x22, 0x9c, 0x02, 0x0a, 0x0b, 0x48, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x12, 0x50, 0x0a, 0x10, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, - 0x04, 0x2a, 0x02, 0x28, 0x01, 0x52, 0x0f, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x5c, 0x0a, 0x19, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, - 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, + 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, + 0x10, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, + 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x70, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x70, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x22, 0x77, 0x0a, 0x14, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, + 0x45, 0x44, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x4c, 0x59, 0x10, 0x00, + 0x12, 0x09, 0x0a, 0x05, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, + 0x45, 0x45, 0x5f, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x45, + 0x4d, 0x50, 0x4f, 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, + 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x5f, + 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x04, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, + 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, + 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, + 0x42, 0x18, 0x0a, 0x16, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, + 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x44, + 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xd8, 0x04, 0x28, 0xc8, 0x01, + 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, + 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x3a, 0x2e, + 0x9a, 0xc5, 0x88, 0x1e, 0x29, 0x0a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x15, + 0x0a, 0x13, 0x4e, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x91, 0x01, 0x0a, 0x09, 0x44, 0x65, 0x63, 0x6f, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, + 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x70, 0x72, + 0x6f, 0x70, 0x61, 0x67, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x61, + 0x67, 0x61, 0x74, 0x65, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, + 0x44, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0xd2, 0x02, 0x0a, 0x07, 0x54, 0x72, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x12, 0x49, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, + 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, + 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, + 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, + 0x52, 0x0e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, + 0x12, 0x49, 0x0a, 0x0f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, + 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x17, 0x61, 0x64, 0x64, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x68, - 0x61, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x18, 0x68, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x6f, 0x6e, - 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x68, 0x65, 0x64, 0x67, 0x65, 0x4f, 0x6e, 0x50, - 0x65, 0x72, 0x54, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3a, 0x25, 0x9a, 0xc5, - 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, - 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x64, 0x67, 0x65, 0x50, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x22, 0xe1, 0x05, 0x0a, 0x0e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0e, 0x68, 0x74, 0x74, 0x70, 0x73, 0x5f, - 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, - 0x52, 0x0d, 0x68, 0x74, 0x74, 0x70, 0x73, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, - 0x29, 0x0a, 0x0f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, - 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x63, 0x68, 0x65, - 0x6d, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x30, 0x0a, 0x0d, 0x68, 0x6f, - 0x73, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x52, 0x0c, - 0x68, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x23, 0x0a, 0x0d, - 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, - 0x74, 0x12, 0x32, 0x0a, 0x0d, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, - 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, - 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x0c, 0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x64, - 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x34, 0x0a, 0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, - 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, - 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0x48, 0x01, 0x52, 0x0d, 0x70, 0x72, - 0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x55, 0x0a, 0x0d, 0x72, - 0x65, 0x67, 0x65, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, - 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x41, 0x6e, 0x64, 0x53, 0x75, 0x62, 0x73, 0x74, 0x69, 0x74, 0x75, - 0x74, 0x65, 0x48, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x77, 0x72, 0x69, - 0x74, 0x65, 0x12, 0x69, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, - 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, - 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, - 0x33, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, - 0x0c, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, - 0x0b, 0x73, 0x74, 0x72, 0x69, 0x70, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x70, 0x51, 0x75, 0x65, 0x72, 0x79, 0x22, 0x77, - 0x0a, 0x14, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x4f, 0x56, 0x45, 0x44, 0x5f, - 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x4c, 0x59, 0x10, 0x00, 0x12, 0x09, 0x0a, - 0x05, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x45, 0x45, 0x5f, - 0x4f, 0x54, 0x48, 0x45, 0x52, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x54, 0x45, 0x4d, 0x50, 0x4f, - 0x52, 0x41, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x03, 0x12, - 0x16, 0x0a, 0x12, 0x50, 0x45, 0x52, 0x4d, 0x41, 0x4e, 0x45, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x44, - 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x04, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x2e, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, 0x65, 0x77, 0x72, - 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x18, 0x0a, - 0x16, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x70, - 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x44, 0x69, 0x72, 0x65, - 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x23, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, - 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x2a, 0x06, 0x10, 0xd8, 0x04, 0x28, 0xc8, 0x01, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x3a, 0x2e, 0x9a, 0xc5, 0x88, - 0x1e, 0x29, 0x0a, 0x27, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, - 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x15, 0x0a, 0x13, 0x4e, - 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x91, 0x01, 0x0a, 0x09, 0x44, 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x12, 0x25, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x09, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x61, - 0x67, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, - 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x70, 0x61, 0x67, 0x61, 0x74, - 0x65, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x44, 0x65, 0x63, - 0x6f, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0xd2, 0x02, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x12, 0x49, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x61, 0x6d, - 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x63, - 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x49, 0x0a, - 0x0f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, - 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, - 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x4b, 0x0a, 0x10, 0x6f, 0x76, 0x65, 0x72, - 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, - 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, - 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x6c, 0x6c, 0x53, 0x61, 0x6d, - 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x41, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, - 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, - 0x76, 0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x52, 0x0a, 0x63, 0x75, - 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x73, 0x3a, 0x21, 0x9a, 0xc5, 0x88, 0x1e, 0x1c, 0x0a, - 0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0xb4, 0x01, 0x0a, 0x0e, - 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x3e, - 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x1b, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, - 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88, - 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, - 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43, 0x6c, - 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x03, 0x10, - 0x04, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, - 0x6f, 0x64, 0x22, 0xc9, 0x1c, 0x0a, 0x09, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x12, 0x3b, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, - 0x42, 0x04, 0x2a, 0x02, 0x18, 0x0a, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x1f, 0x0a, - 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x4b, - 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, - 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, - 0x08, 0x01, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3f, 0x0a, 0x05, 0x6c, - 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x65, 0x6e, 0x76, - 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, - 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x4f, 0x76, 0x65, - 0x72, 0x72, 0x69, 0x64, 0x65, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0xb5, 0x18, 0x0a, - 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5e, 0x0a, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, - 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x6d, 0x0a, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, + 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x61, 0x6e, + 0x64, 0x6f, 0x6d, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x4b, 0x0a, 0x10, 0x6f, + 0x76, 0x65, 0x72, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, + 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0f, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x6c, 0x6c, + 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x41, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, + 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x52, + 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x54, 0x61, 0x67, 0x73, 0x3a, 0x21, 0x9a, 0xc5, 0x88, + 0x1e, 0x1c, 0x0a, 0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, + 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0xb4, + 0x01, 0x0a, 0x0e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x28, + 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, + 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, + 0x08, 0x03, 0x10, 0x04, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x52, 0x06, 0x6d, + 0x65, 0x74, 0x68, 0x6f, 0x64, 0x22, 0xc9, 0x1c, 0x0a, 0x09, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x12, 0x3b, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x18, 0x0a, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, + 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, + 0x79, 0x12, 0x4b, 0x0a, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, + 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x07, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3f, + 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, + 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, + 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, + 0xb5, 0x18, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5e, 0x0a, 0x0e, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x6d, 0x0a, 0x13, 0x64, 0x65, + 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, + 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, + 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x61, 0x0a, 0x0f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x5e, 0x0a, 0x0e, + 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, - 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x48, 0x00, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x61, 0x0a, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, + 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, + 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x0d, 0x72, + 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x55, 0x0a, 0x0b, + 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x32, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, + 0x69, 0x63, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, + 0x4b, 0x65, 0x79, 0x12, 0x68, 0x0a, 0x12, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, - 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x5e, 0x0a, 0x0e, 0x72, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x10, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x77, 0x0a, + 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, + 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, + 0x42, 0x11, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0xb8, 0xee, 0xf2, 0xd2, 0x05, + 0x01, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, + 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x08, 0x6d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x4a, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, + 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, + 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, + 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, + 0x6f, 0x6e, 0x12, 0x71, 0x0a, 0x15, 0x6d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x73, 0x6b, 0x65, + 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, + 0x52, 0x13, 0x6d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x1b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, + 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, + 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, + 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, + 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, + 0x18, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x49, 0x0a, 0x0d, 0x53, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, + 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x1a, 0x53, 0x0a, 0x12, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3d, 0x9a, 0xc5, 0x88, 0x1e, + 0x38, 0x0a, 0x36, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0xd1, 0x01, 0x0a, 0x0e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x0b, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, + 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0e, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, + 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0e, + 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, + 0x6e, 0x74, 0x3a, 0x39, 0x9a, 0xc5, 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, + 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x49, 0x0a, + 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x38, + 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x55, 0x0a, 0x0b, 0x67, 0x65, 0x6e, - 0x65, 0x72, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, - 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, - 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, - 0x65, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, - 0x12, 0x68, 0x0a, 0x12, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x10, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x77, 0x0a, 0x10, 0x64, 0x79, - 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x79, - 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x42, 0x11, 0x92, - 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0xb8, 0xee, 0xf2, 0xd2, 0x05, 0x01, 0x18, 0x01, - 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x4e, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, - 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, - 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x4a, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, - 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x48, 0x00, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, - 0x71, 0x0a, 0x15, 0x6d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, - 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, + 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x1a, 0xbe, 0x01, 0x0a, 0x13, 0x4d, 0x61, 0x73, + 0x6b, 0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x12, 0x52, 0x0a, 0x12, 0x76, 0x34, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, + 0x73, 0x6b, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, + 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, + 0x02, 0x18, 0x20, 0x52, 0x0f, 0x76, 0x34, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x73, + 0x6b, 0x4c, 0x65, 0x6e, 0x12, 0x53, 0x0a, 0x12, 0x76, 0x36, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, + 0x78, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, + 0xfa, 0x42, 0x05, 0x2a, 0x03, 0x18, 0x80, 0x01, 0x52, 0x0f, 0x76, 0x36, 0x50, 0x72, 0x65, 0x66, + 0x69, 0x78, 0x4d, 0x61, 0x73, 0x6b, 0x4c, 0x65, 0x6e, 0x1a, 0x9e, 0x01, 0x0a, 0x0a, 0x47, 0x65, + 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, + 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0e, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, + 0x4b, 0x65, 0x79, 0x3a, 0x35, 0x9a, 0xc5, 0x88, 0x1e, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, + 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x1a, 0xb3, 0x02, 0x0a, 0x10, 0x48, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, + 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x65, 0x78, + 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0b, 0x65, 0x78, + 0x70, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x48, 0x0a, 0x07, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, + 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, + 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x73, 0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, + 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, + 0x1a, 0xb8, 0x01, 0x0a, 0x0f, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, + 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, + 0x72, 0x4b, 0x65, 0x79, 0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, + 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, + 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xda, 0x02, 0x0a, 0x08, + 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, + 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, + 0x59, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, + 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, + 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, + 0x61, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, + 0x10, 0x01, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6b, + 0x69, 0x70, 0x5f, 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, + 0x22, 0x26, 0x0a, 0x06, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x59, + 0x4e, 0x41, 0x4d, 0x49, 0x43, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x4f, 0x55, 0x54, 0x45, + 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x10, 0x01, 0x1a, 0x97, 0x02, 0x0a, 0x18, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, + 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, + 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x12, 0x3d, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, + 0x75, 0x65, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, + 0x61, 0x0a, 0x10, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, + 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, + 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, + 0x33, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, + 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, + 0x01, 0x52, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, + 0x72, 0x73, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, + 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x17, + 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, + 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xf2, 0x01, 0x0a, 0x08, 0x4f, 0x76, 0x65, 0x72, + 0x72, 0x69, 0x64, 0x65, 0x12, 0x66, 0x0a, 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, + 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x61, 0x73, 0x6b, 0x65, 0x64, 0x52, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x13, 0x6d, - 0x61, 0x73, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x1b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, - 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, - 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, - 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x71, 0x75, - 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x49, 0x0a, 0x0d, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x38, 0x9a, 0xc5, 0x88, 0x1e, 0x33, 0x0a, 0x31, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x1a, 0x53, 0x0a, 0x12, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3d, 0x9a, 0xc5, 0x88, 0x1e, 0x38, 0x0a, 0x36, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0xd1, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x0b, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, - 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x0a, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6b, 0x69, - 0x70, 0x5f, 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x3a, - 0x39, 0x9a, 0xc5, 0x88, 0x1e, 0x34, 0x0a, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, - 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x49, 0x0a, 0x0d, 0x52, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x3a, 0x38, 0x9a, 0xc5, 0x88, - 0x1e, 0x33, 0x0a, 0x31, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, - 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, - 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x1a, 0xbe, 0x01, 0x0a, 0x13, 0x4d, 0x61, 0x73, 0x6b, 0x65, 0x64, - 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x52, 0x0a, - 0x12, 0x76, 0x34, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x5f, - 0x6c, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, - 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x18, 0x20, - 0x52, 0x0f, 0x76, 0x34, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x73, 0x6b, 0x4c, 0x65, - 0x6e, 0x12, 0x53, 0x0a, 0x12, 0x76, 0x36, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, - 0x61, 0x73, 0x6b, 0x5f, 0x6c, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, - 0x2a, 0x03, 0x18, 0x80, 0x01, 0x52, 0x0f, 0x76, 0x36, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, - 0x61, 0x73, 0x6b, 0x4c, 0x65, 0x6e, 0x1a, 0x9e, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x6e, 0x65, 0x72, - 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, - 0x3a, 0x35, 0x9a, 0xc5, 0x88, 0x1e, 0x30, 0x0a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, - 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x1a, 0xb3, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, - 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, - 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, - 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, - 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x63, - 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x65, 0x63, - 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x48, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, - 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, - 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, - 0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, - 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, - 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xb8, 0x01, - 0x0a, 0x0f, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, - 0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, - 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, - 0x79, 0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, - 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, - 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0xda, 0x02, 0x0a, 0x08, 0x4d, 0x65, 0x74, - 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2e, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x6f, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, - 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, - 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, - 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x59, 0x0a, 0x06, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x53, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, - 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6b, 0x69, 0x70, 0x5f, - 0x69, 0x66, 0x5f, 0x61, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0c, 0x73, 0x6b, 0x69, 0x70, 0x49, 0x66, 0x41, 0x62, 0x73, 0x65, 0x6e, 0x74, 0x22, 0x26, 0x0a, - 0x06, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x59, 0x4e, 0x41, 0x4d, - 0x49, 0x43, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x4f, 0x55, 0x54, 0x45, 0x5f, 0x45, 0x4e, - 0x54, 0x52, 0x59, 0x10, 0x01, 0x1a, 0x97, 0x02, 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74, - 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, - 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x64, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x32, 0x0a, 0x10, 0x64, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0f, 0x64, 0x65, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3d, 0x0a, - 0x0c, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, - 0x0b, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x61, 0x0a, 0x10, - 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x51, + 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, + 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, + 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x63, 0x0a, 0x0f, + 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, + 0x50, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x2e, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, + 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, + 0x79, 0x42, 0x19, 0x0a, 0x12, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x70, + 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x23, 0x9a, 0xc5, + 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, + 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, + 0x74, 0x22, 0xe6, 0x05, 0x0a, 0x0d, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, + 0x68, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, + 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0b, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, + 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, + 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x61, 0x63, + 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x5c, 0x0a, 0x10, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, + 0x65, 0x67, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, + 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, + 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, + 0x18, 0x01, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x61, 0x66, 0x65, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, + 0x61, 0x74, 0x63, 0x68, 0x12, 0x3c, 0x0a, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x61, + 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x76, 0x6f, + 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x74, + 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, + 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72, 0x65, + 0x73, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x0c, 0x70, 0x72, 0x65, + 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, + 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, + 0x63, 0x68, 0x12, 0x37, 0x0a, 0x0c, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, + 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, + 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0b, + 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3b, 0x0a, 0x0e, 0x63, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, + 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, + 0x69, 0x6e, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x49, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, + 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, + 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, + 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, + 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, + 0x74, 0x63, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x5f, 0x6d, 0x61, + 0x74, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x65, 0x72, + 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x40, 0x0a, 0x1d, 0x74, 0x72, 0x65, 0x61, 0x74, 0x5f, + 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x61, + 0x73, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x74, + 0x72, 0x65, 0x61, 0x74, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x41, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, + 0x20, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, + 0x72, 0x42, 0x18, 0x0a, 0x16, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, + 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x02, 0x10, + 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x52, 0x0b, 0x72, + 0x65, 0x67, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xa1, 0x02, 0x0a, 0x15, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, - 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x0f, - 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x3a, - 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, - 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, - 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x17, 0x0a, 0x10, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, - 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xf2, 0x01, 0x0a, 0x08, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, - 0x65, 0x12, 0x66, 0x0a, 0x10, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x4f, 0x76, - 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, - 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x63, 0x0a, 0x0f, 0x44, 0x79, 0x6e, - 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x50, 0x0a, 0x0c, - 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, - 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, - 0x01, 0x52, 0x0b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x42, 0x19, - 0x0a, 0x12, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, - 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, - 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, - 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0xe6, - 0x05, 0x0a, 0x0d, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, - 0x12, 0x21, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, - 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x0b, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, - 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, - 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x12, 0x5c, 0x0a, 0x10, 0x73, 0x61, 0x66, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x65, - 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, - 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, - 0x65, 0x72, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, - 0x00, 0x52, 0x0e, 0x73, 0x61, 0x66, 0x65, 0x52, 0x65, 0x67, 0x65, 0x78, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x12, 0x3c, 0x0a, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, - 0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, - 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x0c, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, - 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, - 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, - 0x48, 0x00, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, - 0x37, 0x0a, 0x0c, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, - 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x75, 0x66, - 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3b, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74, - 0x61, 0x69, 0x6e, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x12, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, - 0x2e, 0x30, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x49, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, - 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, - 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, - 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x4d, 0x61, - 0x74, 0x63, 0x68, 0x12, 0x40, 0x0a, 0x1d, 0x74, 0x72, 0x65, 0x61, 0x74, 0x5f, 0x6d, 0x69, 0x73, - 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x61, 0x73, 0x5f, 0x65, - 0x6d, 0x70, 0x74, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x19, 0x74, 0x72, 0x65, 0x61, - 0x74, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x73, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x3a, 0x27, 0x9a, 0xc5, 0x88, 0x1e, 0x22, 0x0a, 0x20, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x18, - 0x0a, 0x16, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, - 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, - 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x52, 0x0b, 0x72, 0x65, 0x67, 0x65, - 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xa1, 0x02, 0x0a, 0x15, 0x51, 0x75, 0x65, 0x72, + 0x63, 0x68, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, 0x10, 0x01, 0x28, 0x80, 0x08, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, + 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, + 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, + 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, + 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, + 0x73, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, + 0x48, 0x00, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, + 0x3a, 0x2f, 0x9a, 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x12, 0x1e, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, 0x10, 0x01, 0x28, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x53, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, - 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, - 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, - 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, - 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, - 0x0c, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x3a, 0x2f, 0x9a, - 0xc5, 0x88, 0x1e, 0x2a, 0x0a, 0x28, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, - 0x76, 0x32, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, - 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x21, - 0x0a, 0x1f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, - 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, - 0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0x86, 0x03, 0x0a, 0x16, - 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, - 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x52, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x17, 0x72, 0x65, - 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, - 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x08, 0xfa, 0x42, 0x05, - 0x92, 0x01, 0x02, 0x10, 0x05, 0x52, 0x15, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x4a, 0x0a, 0x0a, - 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, - 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x70, 0x72, - 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x61, 0x6c, 0x6c, 0x6f, - 0x77, 0x5f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x72, - 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x18, 0x61, - 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x52, - 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x4b, 0x0a, 0x18, 0x72, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x63, - 0x6f, 0x70, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x92, 0x01, - 0x0c, 0x18, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x15, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x54, 0x6f, - 0x43, 0x6f, 0x70, 0x79, 0x22, 0x79, 0x0a, 0x0c, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, - 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x42, - 0x8b, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, 0x6f, 0x2e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, - 0x14, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, - 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, - 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x72, 0x6f, 0x75, - 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x42, 0x21, 0x0a, 0x1f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x65, 0x74, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, + 0x66, 0x69, 0x65, 0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x22, 0x86, + 0x03, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, + 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x52, 0x0a, 0x16, 0x6d, 0x61, 0x78, + 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, + 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x14, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x40, 0x0a, + 0x17, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x42, 0x08, + 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x10, 0x05, 0x52, 0x15, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, + 0x4a, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, + 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, + 0x0a, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x61, + 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, + 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x18, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x53, 0x63, 0x68, 0x65, + 0x6d, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x4b, 0x0a, 0x18, 0x72, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x74, + 0x6f, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, + 0x0f, 0x92, 0x01, 0x0c, 0x18, 0x01, 0x22, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, + 0x52, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x73, 0x54, 0x6f, 0x43, 0x6f, 0x70, 0x79, 0x22, 0x79, 0x0a, 0x0c, 0x46, 0x69, 0x6c, 0x74, 0x65, + 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, + 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, + 0x65, 0x64, 0x42, 0x8b, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x23, 0x69, + 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, + 0x76, 0x33, 0x42, 0x14, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, + 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, + 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, + 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x76, 0x33, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -8084,17 +8100,17 @@ var file_envoy_config_route_v3_route_components_proto_goTypes = []interface{}{ (*RateLimit_Override_DynamicMetadata)(nil), // 63: envoy.config.route.v3.RateLimit.Override.DynamicMetadata (*v3.Matcher)(nil), // 64: xds.type.matcher.v3.Matcher (*v31.HeaderValueOption)(nil), // 65: envoy.config.core.v3.HeaderValueOption - (*any1.Any)(nil), // 66: google.protobuf.Any - (*wrappers.UInt32Value)(nil), // 67: google.protobuf.UInt32Value + (*anypb.Any)(nil), // 66: google.protobuf.Any + (*wrapperspb.UInt32Value)(nil), // 67: google.protobuf.UInt32Value (*v31.Metadata)(nil), // 68: envoy.config.core.v3.Metadata (*v31.TypedExtensionConfig)(nil), // 69: envoy.config.core.v3.TypedExtensionConfig (*v32.RegexMatcher)(nil), // 70: envoy.type.matcher.v3.RegexMatcher - (*wrappers.BoolValue)(nil), // 71: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 71: google.protobuf.BoolValue (*v31.RuntimeFractionalPercent)(nil), // 72: envoy.config.core.v3.RuntimeFractionalPercent (*v32.MetadataMatcher)(nil), // 73: envoy.type.matcher.v3.MetadataMatcher (*v32.StringMatcher)(nil), // 74: envoy.type.matcher.v3.StringMatcher (*v32.RegexMatchAndSubstitute)(nil), // 75: envoy.type.matcher.v3.RegexMatchAndSubstitute - (*duration.Duration)(nil), // 76: google.protobuf.Duration + (*durationpb.Duration)(nil), // 76: google.protobuf.Duration (v31.RoutingPriority)(0), // 77: envoy.config.core.v3.RoutingPriority (*v33.FractionalPercent)(nil), // 78: envoy.type.v3.FractionalPercent (*v31.DataSource)(nil), // 79: envoy.config.core.v3.DataSource @@ -8152,124 +8168,125 @@ var file_envoy_config_route_v3_route_components_proto_depIdxs = []int32{ 72, // 45: envoy.config.route.v3.CorsPolicy.filter_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent 72, // 46: envoy.config.route.v3.CorsPolicy.shadow_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent 71, // 47: envoy.config.route.v3.CorsPolicy.allow_private_network_access:type_name -> google.protobuf.BoolValue - 10, // 48: envoy.config.route.v3.RouteAction.weighted_clusters:type_name -> envoy.config.route.v3.WeightedCluster - 11, // 49: envoy.config.route.v3.RouteAction.inline_cluster_specifier_plugin:type_name -> envoy.config.route.v3.ClusterSpecifierPlugin - 1, // 50: envoy.config.route.v3.RouteAction.cluster_not_found_response_code:type_name -> envoy.config.route.v3.RouteAction.ClusterNotFoundResponseCode - 68, // 51: envoy.config.route.v3.RouteAction.metadata_match:type_name -> envoy.config.core.v3.Metadata - 75, // 52: envoy.config.route.v3.RouteAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute - 69, // 53: envoy.config.route.v3.RouteAction.path_rewrite_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig - 71, // 54: envoy.config.route.v3.RouteAction.auto_host_rewrite:type_name -> google.protobuf.BoolValue - 75, // 55: envoy.config.route.v3.RouteAction.host_rewrite_path_regex:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute - 76, // 56: envoy.config.route.v3.RouteAction.timeout:type_name -> google.protobuf.Duration - 76, // 57: envoy.config.route.v3.RouteAction.idle_timeout:type_name -> google.protobuf.Duration - 69, // 58: envoy.config.route.v3.RouteAction.early_data_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig - 15, // 59: envoy.config.route.v3.RouteAction.retry_policy:type_name -> envoy.config.route.v3.RetryPolicy - 66, // 60: envoy.config.route.v3.RouteAction.retry_policy_typed_config:type_name -> google.protobuf.Any - 35, // 61: envoy.config.route.v3.RouteAction.request_mirror_policies:type_name -> envoy.config.route.v3.RouteAction.RequestMirrorPolicy - 77, // 62: envoy.config.route.v3.RouteAction.priority:type_name -> envoy.config.core.v3.RoutingPriority - 23, // 63: envoy.config.route.v3.RouteAction.rate_limits:type_name -> envoy.config.route.v3.RateLimit - 71, // 64: envoy.config.route.v3.RouteAction.include_vh_rate_limits:type_name -> google.protobuf.BoolValue - 36, // 65: envoy.config.route.v3.RouteAction.hash_policy:type_name -> envoy.config.route.v3.RouteAction.HashPolicy - 13, // 66: envoy.config.route.v3.RouteAction.cors:type_name -> envoy.config.route.v3.CorsPolicy - 76, // 67: envoy.config.route.v3.RouteAction.max_grpc_timeout:type_name -> google.protobuf.Duration - 76, // 68: envoy.config.route.v3.RouteAction.grpc_timeout_offset:type_name -> google.protobuf.Duration - 37, // 69: envoy.config.route.v3.RouteAction.upgrade_configs:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig - 26, // 70: envoy.config.route.v3.RouteAction.internal_redirect_policy:type_name -> envoy.config.route.v3.InternalRedirectPolicy - 2, // 71: envoy.config.route.v3.RouteAction.internal_redirect_action:type_name -> envoy.config.route.v3.RouteAction.InternalRedirectAction - 67, // 72: envoy.config.route.v3.RouteAction.max_internal_redirects:type_name -> google.protobuf.UInt32Value - 16, // 73: envoy.config.route.v3.RouteAction.hedge_policy:type_name -> envoy.config.route.v3.HedgePolicy - 38, // 74: envoy.config.route.v3.RouteAction.max_stream_duration:type_name -> envoy.config.route.v3.RouteAction.MaxStreamDuration - 67, // 75: envoy.config.route.v3.RetryPolicy.num_retries:type_name -> google.protobuf.UInt32Value - 76, // 76: envoy.config.route.v3.RetryPolicy.per_try_timeout:type_name -> google.protobuf.Duration - 76, // 77: envoy.config.route.v3.RetryPolicy.per_try_idle_timeout:type_name -> google.protobuf.Duration - 46, // 78: envoy.config.route.v3.RetryPolicy.retry_priority:type_name -> envoy.config.route.v3.RetryPolicy.RetryPriority - 47, // 79: envoy.config.route.v3.RetryPolicy.retry_host_predicate:type_name -> envoy.config.route.v3.RetryPolicy.RetryHostPredicate - 69, // 80: envoy.config.route.v3.RetryPolicy.retry_options_predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig - 48, // 81: envoy.config.route.v3.RetryPolicy.retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RetryBackOff - 50, // 82: envoy.config.route.v3.RetryPolicy.rate_limited_retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff - 24, // 83: envoy.config.route.v3.RetryPolicy.retriable_headers:type_name -> envoy.config.route.v3.HeaderMatcher - 24, // 84: envoy.config.route.v3.RetryPolicy.retriable_request_headers:type_name -> envoy.config.route.v3.HeaderMatcher - 67, // 85: envoy.config.route.v3.HedgePolicy.initial_requests:type_name -> google.protobuf.UInt32Value - 78, // 86: envoy.config.route.v3.HedgePolicy.additional_request_chance:type_name -> envoy.type.v3.FractionalPercent - 75, // 87: envoy.config.route.v3.RedirectAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute - 4, // 88: envoy.config.route.v3.RedirectAction.response_code:type_name -> envoy.config.route.v3.RedirectAction.RedirectResponseCode - 79, // 89: envoy.config.route.v3.DirectResponseAction.body:type_name -> envoy.config.core.v3.DataSource - 71, // 90: envoy.config.route.v3.Decorator.propagate:type_name -> google.protobuf.BoolValue - 78, // 91: envoy.config.route.v3.Tracing.client_sampling:type_name -> envoy.type.v3.FractionalPercent - 78, // 92: envoy.config.route.v3.Tracing.random_sampling:type_name -> envoy.type.v3.FractionalPercent - 78, // 93: envoy.config.route.v3.Tracing.overall_sampling:type_name -> envoy.type.v3.FractionalPercent - 80, // 94: envoy.config.route.v3.Tracing.custom_tags:type_name -> envoy.type.tracing.v3.CustomTag - 24, // 95: envoy.config.route.v3.VirtualCluster.headers:type_name -> envoy.config.route.v3.HeaderMatcher - 67, // 96: envoy.config.route.v3.RateLimit.stage:type_name -> google.protobuf.UInt32Value - 51, // 97: envoy.config.route.v3.RateLimit.actions:type_name -> envoy.config.route.v3.RateLimit.Action - 52, // 98: envoy.config.route.v3.RateLimit.limit:type_name -> envoy.config.route.v3.RateLimit.Override - 70, // 99: envoy.config.route.v3.HeaderMatcher.safe_regex_match:type_name -> envoy.type.matcher.v3.RegexMatcher - 81, // 100: envoy.config.route.v3.HeaderMatcher.range_match:type_name -> envoy.type.v3.Int64Range - 74, // 101: envoy.config.route.v3.HeaderMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher - 74, // 102: envoy.config.route.v3.QueryParameterMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher - 67, // 103: envoy.config.route.v3.InternalRedirectPolicy.max_internal_redirects:type_name -> google.protobuf.UInt32Value - 69, // 104: envoy.config.route.v3.InternalRedirectPolicy.predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig - 66, // 105: envoy.config.route.v3.FilterConfig.config:type_name -> google.protobuf.Any - 66, // 106: envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any - 66, // 107: envoy.config.route.v3.Route.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any - 67, // 108: envoy.config.route.v3.WeightedCluster.ClusterWeight.weight:type_name -> google.protobuf.UInt32Value - 68, // 109: envoy.config.route.v3.WeightedCluster.ClusterWeight.metadata_match:type_name -> envoy.config.core.v3.Metadata - 65, // 110: envoy.config.route.v3.WeightedCluster.ClusterWeight.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption - 65, // 111: envoy.config.route.v3.WeightedCluster.ClusterWeight.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption - 31, // 112: envoy.config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config:type_name -> envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry - 66, // 113: envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any - 71, // 114: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.presented:type_name -> google.protobuf.BoolValue - 71, // 115: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.validated:type_name -> google.protobuf.BoolValue - 72, // 116: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.runtime_fraction:type_name -> envoy.config.core.v3.RuntimeFractionalPercent - 71, // 117: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.trace_sampled:type_name -> google.protobuf.BoolValue - 39, // 118: envoy.config.route.v3.RouteAction.HashPolicy.header:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Header - 41, // 119: envoy.config.route.v3.RouteAction.HashPolicy.cookie:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Cookie - 42, // 120: envoy.config.route.v3.RouteAction.HashPolicy.connection_properties:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties - 43, // 121: envoy.config.route.v3.RouteAction.HashPolicy.query_parameter:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter - 44, // 122: envoy.config.route.v3.RouteAction.HashPolicy.filter_state:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.FilterState - 71, // 123: envoy.config.route.v3.RouteAction.UpgradeConfig.enabled:type_name -> google.protobuf.BoolValue - 45, // 124: envoy.config.route.v3.RouteAction.UpgradeConfig.connect_config:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig - 76, // 125: envoy.config.route.v3.RouteAction.MaxStreamDuration.max_stream_duration:type_name -> google.protobuf.Duration - 76, // 126: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max:type_name -> google.protobuf.Duration - 76, // 127: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_offset:type_name -> google.protobuf.Duration - 75, // 128: envoy.config.route.v3.RouteAction.HashPolicy.Header.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute - 76, // 129: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.ttl:type_name -> google.protobuf.Duration - 40, // 130: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.attributes:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute - 82, // 131: envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig.proxy_protocol_config:type_name -> envoy.config.core.v3.ProxyProtocolConfig - 66, // 132: envoy.config.route.v3.RetryPolicy.RetryPriority.typed_config:type_name -> google.protobuf.Any - 66, // 133: envoy.config.route.v3.RetryPolicy.RetryHostPredicate.typed_config:type_name -> google.protobuf.Any - 76, // 134: envoy.config.route.v3.RetryPolicy.RetryBackOff.base_interval:type_name -> google.protobuf.Duration - 76, // 135: envoy.config.route.v3.RetryPolicy.RetryBackOff.max_interval:type_name -> google.protobuf.Duration - 3, // 136: envoy.config.route.v3.RetryPolicy.ResetHeader.format:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeaderFormat - 49, // 137: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.reset_headers:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeader - 76, // 138: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.max_interval:type_name -> google.protobuf.Duration - 53, // 139: envoy.config.route.v3.RateLimit.Action.source_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.SourceCluster - 54, // 140: envoy.config.route.v3.RateLimit.Action.destination_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.DestinationCluster - 55, // 141: envoy.config.route.v3.RateLimit.Action.request_headers:type_name -> envoy.config.route.v3.RateLimit.Action.RequestHeaders - 56, // 142: envoy.config.route.v3.RateLimit.Action.remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.RemoteAddress - 58, // 143: envoy.config.route.v3.RateLimit.Action.generic_key:type_name -> envoy.config.route.v3.RateLimit.Action.GenericKey - 59, // 144: envoy.config.route.v3.RateLimit.Action.header_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.HeaderValueMatch - 60, // 145: envoy.config.route.v3.RateLimit.Action.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Action.DynamicMetaData - 61, // 146: envoy.config.route.v3.RateLimit.Action.metadata:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData - 69, // 147: envoy.config.route.v3.RateLimit.Action.extension:type_name -> envoy.config.core.v3.TypedExtensionConfig - 57, // 148: envoy.config.route.v3.RateLimit.Action.masked_remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress - 62, // 149: envoy.config.route.v3.RateLimit.Action.query_parameter_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch - 63, // 150: envoy.config.route.v3.RateLimit.Override.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Override.DynamicMetadata - 67, // 151: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v4_prefix_mask_len:type_name -> google.protobuf.UInt32Value - 67, // 152: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v6_prefix_mask_len:type_name -> google.protobuf.UInt32Value - 71, // 153: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.expect_match:type_name -> google.protobuf.BoolValue - 24, // 154: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.headers:type_name -> envoy.config.route.v3.HeaderMatcher - 83, // 155: envoy.config.route.v3.RateLimit.Action.DynamicMetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey - 83, // 156: envoy.config.route.v3.RateLimit.Action.MetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey - 5, // 157: envoy.config.route.v3.RateLimit.Action.MetaData.source:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData.Source - 71, // 158: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.expect_match:type_name -> google.protobuf.BoolValue - 25, // 159: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.query_parameters:type_name -> envoy.config.route.v3.QueryParameterMatcher - 83, // 160: envoy.config.route.v3.RateLimit.Override.DynamicMetadata.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey - 161, // [161:161] is the sub-list for method output_type - 161, // [161:161] is the sub-list for method input_type - 161, // [161:161] is the sub-list for extension type_name - 161, // [161:161] is the sub-list for extension extendee - 0, // [0:161] is the sub-list for field type_name + 71, // 48: envoy.config.route.v3.CorsPolicy.forward_not_matching_preflights:type_name -> google.protobuf.BoolValue + 10, // 49: envoy.config.route.v3.RouteAction.weighted_clusters:type_name -> envoy.config.route.v3.WeightedCluster + 11, // 50: envoy.config.route.v3.RouteAction.inline_cluster_specifier_plugin:type_name -> envoy.config.route.v3.ClusterSpecifierPlugin + 1, // 51: envoy.config.route.v3.RouteAction.cluster_not_found_response_code:type_name -> envoy.config.route.v3.RouteAction.ClusterNotFoundResponseCode + 68, // 52: envoy.config.route.v3.RouteAction.metadata_match:type_name -> envoy.config.core.v3.Metadata + 75, // 53: envoy.config.route.v3.RouteAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute + 69, // 54: envoy.config.route.v3.RouteAction.path_rewrite_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig + 71, // 55: envoy.config.route.v3.RouteAction.auto_host_rewrite:type_name -> google.protobuf.BoolValue + 75, // 56: envoy.config.route.v3.RouteAction.host_rewrite_path_regex:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute + 76, // 57: envoy.config.route.v3.RouteAction.timeout:type_name -> google.protobuf.Duration + 76, // 58: envoy.config.route.v3.RouteAction.idle_timeout:type_name -> google.protobuf.Duration + 69, // 59: envoy.config.route.v3.RouteAction.early_data_policy:type_name -> envoy.config.core.v3.TypedExtensionConfig + 15, // 60: envoy.config.route.v3.RouteAction.retry_policy:type_name -> envoy.config.route.v3.RetryPolicy + 66, // 61: envoy.config.route.v3.RouteAction.retry_policy_typed_config:type_name -> google.protobuf.Any + 35, // 62: envoy.config.route.v3.RouteAction.request_mirror_policies:type_name -> envoy.config.route.v3.RouteAction.RequestMirrorPolicy + 77, // 63: envoy.config.route.v3.RouteAction.priority:type_name -> envoy.config.core.v3.RoutingPriority + 23, // 64: envoy.config.route.v3.RouteAction.rate_limits:type_name -> envoy.config.route.v3.RateLimit + 71, // 65: envoy.config.route.v3.RouteAction.include_vh_rate_limits:type_name -> google.protobuf.BoolValue + 36, // 66: envoy.config.route.v3.RouteAction.hash_policy:type_name -> envoy.config.route.v3.RouteAction.HashPolicy + 13, // 67: envoy.config.route.v3.RouteAction.cors:type_name -> envoy.config.route.v3.CorsPolicy + 76, // 68: envoy.config.route.v3.RouteAction.max_grpc_timeout:type_name -> google.protobuf.Duration + 76, // 69: envoy.config.route.v3.RouteAction.grpc_timeout_offset:type_name -> google.protobuf.Duration + 37, // 70: envoy.config.route.v3.RouteAction.upgrade_configs:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig + 26, // 71: envoy.config.route.v3.RouteAction.internal_redirect_policy:type_name -> envoy.config.route.v3.InternalRedirectPolicy + 2, // 72: envoy.config.route.v3.RouteAction.internal_redirect_action:type_name -> envoy.config.route.v3.RouteAction.InternalRedirectAction + 67, // 73: envoy.config.route.v3.RouteAction.max_internal_redirects:type_name -> google.protobuf.UInt32Value + 16, // 74: envoy.config.route.v3.RouteAction.hedge_policy:type_name -> envoy.config.route.v3.HedgePolicy + 38, // 75: envoy.config.route.v3.RouteAction.max_stream_duration:type_name -> envoy.config.route.v3.RouteAction.MaxStreamDuration + 67, // 76: envoy.config.route.v3.RetryPolicy.num_retries:type_name -> google.protobuf.UInt32Value + 76, // 77: envoy.config.route.v3.RetryPolicy.per_try_timeout:type_name -> google.protobuf.Duration + 76, // 78: envoy.config.route.v3.RetryPolicy.per_try_idle_timeout:type_name -> google.protobuf.Duration + 46, // 79: envoy.config.route.v3.RetryPolicy.retry_priority:type_name -> envoy.config.route.v3.RetryPolicy.RetryPriority + 47, // 80: envoy.config.route.v3.RetryPolicy.retry_host_predicate:type_name -> envoy.config.route.v3.RetryPolicy.RetryHostPredicate + 69, // 81: envoy.config.route.v3.RetryPolicy.retry_options_predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig + 48, // 82: envoy.config.route.v3.RetryPolicy.retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RetryBackOff + 50, // 83: envoy.config.route.v3.RetryPolicy.rate_limited_retry_back_off:type_name -> envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff + 24, // 84: envoy.config.route.v3.RetryPolicy.retriable_headers:type_name -> envoy.config.route.v3.HeaderMatcher + 24, // 85: envoy.config.route.v3.RetryPolicy.retriable_request_headers:type_name -> envoy.config.route.v3.HeaderMatcher + 67, // 86: envoy.config.route.v3.HedgePolicy.initial_requests:type_name -> google.protobuf.UInt32Value + 78, // 87: envoy.config.route.v3.HedgePolicy.additional_request_chance:type_name -> envoy.type.v3.FractionalPercent + 75, // 88: envoy.config.route.v3.RedirectAction.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute + 4, // 89: envoy.config.route.v3.RedirectAction.response_code:type_name -> envoy.config.route.v3.RedirectAction.RedirectResponseCode + 79, // 90: envoy.config.route.v3.DirectResponseAction.body:type_name -> envoy.config.core.v3.DataSource + 71, // 91: envoy.config.route.v3.Decorator.propagate:type_name -> google.protobuf.BoolValue + 78, // 92: envoy.config.route.v3.Tracing.client_sampling:type_name -> envoy.type.v3.FractionalPercent + 78, // 93: envoy.config.route.v3.Tracing.random_sampling:type_name -> envoy.type.v3.FractionalPercent + 78, // 94: envoy.config.route.v3.Tracing.overall_sampling:type_name -> envoy.type.v3.FractionalPercent + 80, // 95: envoy.config.route.v3.Tracing.custom_tags:type_name -> envoy.type.tracing.v3.CustomTag + 24, // 96: envoy.config.route.v3.VirtualCluster.headers:type_name -> envoy.config.route.v3.HeaderMatcher + 67, // 97: envoy.config.route.v3.RateLimit.stage:type_name -> google.protobuf.UInt32Value + 51, // 98: envoy.config.route.v3.RateLimit.actions:type_name -> envoy.config.route.v3.RateLimit.Action + 52, // 99: envoy.config.route.v3.RateLimit.limit:type_name -> envoy.config.route.v3.RateLimit.Override + 70, // 100: envoy.config.route.v3.HeaderMatcher.safe_regex_match:type_name -> envoy.type.matcher.v3.RegexMatcher + 81, // 101: envoy.config.route.v3.HeaderMatcher.range_match:type_name -> envoy.type.v3.Int64Range + 74, // 102: envoy.config.route.v3.HeaderMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher + 74, // 103: envoy.config.route.v3.QueryParameterMatcher.string_match:type_name -> envoy.type.matcher.v3.StringMatcher + 67, // 104: envoy.config.route.v3.InternalRedirectPolicy.max_internal_redirects:type_name -> google.protobuf.UInt32Value + 69, // 105: envoy.config.route.v3.InternalRedirectPolicy.predicates:type_name -> envoy.config.core.v3.TypedExtensionConfig + 66, // 106: envoy.config.route.v3.FilterConfig.config:type_name -> google.protobuf.Any + 66, // 107: envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any + 66, // 108: envoy.config.route.v3.Route.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any + 67, // 109: envoy.config.route.v3.WeightedCluster.ClusterWeight.weight:type_name -> google.protobuf.UInt32Value + 68, // 110: envoy.config.route.v3.WeightedCluster.ClusterWeight.metadata_match:type_name -> envoy.config.core.v3.Metadata + 65, // 111: envoy.config.route.v3.WeightedCluster.ClusterWeight.request_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption + 65, // 112: envoy.config.route.v3.WeightedCluster.ClusterWeight.response_headers_to_add:type_name -> envoy.config.core.v3.HeaderValueOption + 31, // 113: envoy.config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config:type_name -> envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry + 66, // 114: envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry.value:type_name -> google.protobuf.Any + 71, // 115: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.presented:type_name -> google.protobuf.BoolValue + 71, // 116: envoy.config.route.v3.RouteMatch.TlsContextMatchOptions.validated:type_name -> google.protobuf.BoolValue + 72, // 117: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.runtime_fraction:type_name -> envoy.config.core.v3.RuntimeFractionalPercent + 71, // 118: envoy.config.route.v3.RouteAction.RequestMirrorPolicy.trace_sampled:type_name -> google.protobuf.BoolValue + 39, // 119: envoy.config.route.v3.RouteAction.HashPolicy.header:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Header + 41, // 120: envoy.config.route.v3.RouteAction.HashPolicy.cookie:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.Cookie + 42, // 121: envoy.config.route.v3.RouteAction.HashPolicy.connection_properties:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties + 43, // 122: envoy.config.route.v3.RouteAction.HashPolicy.query_parameter:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter + 44, // 123: envoy.config.route.v3.RouteAction.HashPolicy.filter_state:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.FilterState + 71, // 124: envoy.config.route.v3.RouteAction.UpgradeConfig.enabled:type_name -> google.protobuf.BoolValue + 45, // 125: envoy.config.route.v3.RouteAction.UpgradeConfig.connect_config:type_name -> envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig + 76, // 126: envoy.config.route.v3.RouteAction.MaxStreamDuration.max_stream_duration:type_name -> google.protobuf.Duration + 76, // 127: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max:type_name -> google.protobuf.Duration + 76, // 128: envoy.config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_offset:type_name -> google.protobuf.Duration + 75, // 129: envoy.config.route.v3.RouteAction.HashPolicy.Header.regex_rewrite:type_name -> envoy.type.matcher.v3.RegexMatchAndSubstitute + 76, // 130: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.ttl:type_name -> google.protobuf.Duration + 40, // 131: envoy.config.route.v3.RouteAction.HashPolicy.Cookie.attributes:type_name -> envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute + 82, // 132: envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig.proxy_protocol_config:type_name -> envoy.config.core.v3.ProxyProtocolConfig + 66, // 133: envoy.config.route.v3.RetryPolicy.RetryPriority.typed_config:type_name -> google.protobuf.Any + 66, // 134: envoy.config.route.v3.RetryPolicy.RetryHostPredicate.typed_config:type_name -> google.protobuf.Any + 76, // 135: envoy.config.route.v3.RetryPolicy.RetryBackOff.base_interval:type_name -> google.protobuf.Duration + 76, // 136: envoy.config.route.v3.RetryPolicy.RetryBackOff.max_interval:type_name -> google.protobuf.Duration + 3, // 137: envoy.config.route.v3.RetryPolicy.ResetHeader.format:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeaderFormat + 49, // 138: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.reset_headers:type_name -> envoy.config.route.v3.RetryPolicy.ResetHeader + 76, // 139: envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff.max_interval:type_name -> google.protobuf.Duration + 53, // 140: envoy.config.route.v3.RateLimit.Action.source_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.SourceCluster + 54, // 141: envoy.config.route.v3.RateLimit.Action.destination_cluster:type_name -> envoy.config.route.v3.RateLimit.Action.DestinationCluster + 55, // 142: envoy.config.route.v3.RateLimit.Action.request_headers:type_name -> envoy.config.route.v3.RateLimit.Action.RequestHeaders + 56, // 143: envoy.config.route.v3.RateLimit.Action.remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.RemoteAddress + 58, // 144: envoy.config.route.v3.RateLimit.Action.generic_key:type_name -> envoy.config.route.v3.RateLimit.Action.GenericKey + 59, // 145: envoy.config.route.v3.RateLimit.Action.header_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.HeaderValueMatch + 60, // 146: envoy.config.route.v3.RateLimit.Action.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Action.DynamicMetaData + 61, // 147: envoy.config.route.v3.RateLimit.Action.metadata:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData + 69, // 148: envoy.config.route.v3.RateLimit.Action.extension:type_name -> envoy.config.core.v3.TypedExtensionConfig + 57, // 149: envoy.config.route.v3.RateLimit.Action.masked_remote_address:type_name -> envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress + 62, // 150: envoy.config.route.v3.RateLimit.Action.query_parameter_value_match:type_name -> envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch + 63, // 151: envoy.config.route.v3.RateLimit.Override.dynamic_metadata:type_name -> envoy.config.route.v3.RateLimit.Override.DynamicMetadata + 67, // 152: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v4_prefix_mask_len:type_name -> google.protobuf.UInt32Value + 67, // 153: envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress.v6_prefix_mask_len:type_name -> google.protobuf.UInt32Value + 71, // 154: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.expect_match:type_name -> google.protobuf.BoolValue + 24, // 155: envoy.config.route.v3.RateLimit.Action.HeaderValueMatch.headers:type_name -> envoy.config.route.v3.HeaderMatcher + 83, // 156: envoy.config.route.v3.RateLimit.Action.DynamicMetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey + 83, // 157: envoy.config.route.v3.RateLimit.Action.MetaData.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey + 5, // 158: envoy.config.route.v3.RateLimit.Action.MetaData.source:type_name -> envoy.config.route.v3.RateLimit.Action.MetaData.Source + 71, // 159: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.expect_match:type_name -> google.protobuf.BoolValue + 25, // 160: envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch.query_parameters:type_name -> envoy.config.route.v3.QueryParameterMatcher + 83, // 161: envoy.config.route.v3.RateLimit.Override.DynamicMetadata.metadata_key:type_name -> envoy.type.metadata.v3.MetadataKey + 162, // [162:162] is the sub-list for method output_type + 162, // [162:162] is the sub-list for method input_type + 162, // [162:162] is the sub-list for extension type_name + 162, // [162:162] is the sub-list for extension extendee + 0, // [0:162] is the sub-list for field type_name } func init() { file_envoy_config_route_v3_route_components_proto_init() } diff --git a/envoy/config/route/v3/route_components.pb.validate.go b/envoy/config/route/v3/route_components.pb.validate.go index c2c1e61e1..5014da361 100755 --- a/envoy/config/route/v3/route_components.pb.validate.go +++ b/envoy/config/route/v3/route_components.pb.validate.go @@ -2691,6 +2691,35 @@ func (m *CorsPolicy) validate(all bool) error { } } + if all { + switch v := interface{}(m.GetForwardNotMatchingPreflights()).(type) { + case interface{ ValidateAll() error }: + if err := v.ValidateAll(); err != nil { + errors = append(errors, CorsPolicyValidationError{ + field: "ForwardNotMatchingPreflights", + reason: "embedded message failed validation", + cause: err, + }) + } + case interface{ Validate() error }: + if err := v.Validate(); err != nil { + errors = append(errors, CorsPolicyValidationError{ + field: "ForwardNotMatchingPreflights", + reason: "embedded message failed validation", + cause: err, + }) + } + } + } else if v, ok := interface{}(m.GetForwardNotMatchingPreflights()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CorsPolicyValidationError{ + field: "ForwardNotMatchingPreflights", + reason: "embedded message failed validation", + cause: err, + } + } + } + switch v := m.EnabledSpecifier.(type) { case *CorsPolicy_FilterEnabled: if v == nil { diff --git a/envoy/config/route/v3/route_components_vtproto.pb.go b/envoy/config/route/v3/route_components_vtproto.pb.go index 2fe1e2e30..93e985ed9 100755 --- a/envoy/config/route/v3/route_components_vtproto.pb.go +++ b/envoy/config/route/v3/route_components_vtproto.pb.go @@ -1559,6 +1559,16 @@ func (m *CorsPolicy) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) { i -= len(m.unknownFields) copy(dAtA[i:], m.unknownFields) } + if m.ForwardNotMatchingPreflights != nil { + size, err := (*wrapperspb.BoolValue)(m.ForwardNotMatchingPreflights).MarshalToSizedBufferVTStrict(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x6a + } if m.AllowPrivateNetworkAccess != nil { size, err := (*wrapperspb.BoolValue)(m.AllowPrivateNetworkAccess).MarshalToSizedBufferVTStrict(dAtA[:i]) if err != nil { @@ -6410,6 +6420,10 @@ func (m *CorsPolicy) SizeVT() (n int) { l = (*wrapperspb.BoolValue)(m.AllowPrivateNetworkAccess).SizeVT() n += 1 + l + sov(uint64(l)) } + if m.ForwardNotMatchingPreflights != nil { + l = (*wrapperspb.BoolValue)(m.ForwardNotMatchingPreflights).SizeVT() + n += 1 + l + sov(uint64(l)) + } n += len(m.unknownFields) return n } diff --git a/envoy/config/tap/v3/common.pb.go b/envoy/config/tap/v3/common.pb.go index 686e197ae..0b91cc91b 100755 --- a/envoy/config/tap/v3/common.pb.go +++ b/envoy/config/tap/v3/common.pb.go @@ -13,10 +13,10 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v32 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -541,12 +541,12 @@ type OutputConfig struct { // truncation. If truncation occurs, the :ref:`truncated // ` field will be set. If not specified, the // default is 1KiB. - MaxBufferedRxBytes *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_buffered_rx_bytes,json=maxBufferedRxBytes,proto3" json:"max_buffered_rx_bytes,omitempty"` + MaxBufferedRxBytes *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_buffered_rx_bytes,json=maxBufferedRxBytes,proto3" json:"max_buffered_rx_bytes,omitempty"` // For buffered tapping, the maximum amount of transmitted body that will be buffered prior to // truncation. If truncation occurs, the :ref:`truncated // ` field will be set. If not specified, the // default is 1KiB. - MaxBufferedTxBytes *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_buffered_tx_bytes,json=maxBufferedTxBytes,proto3" json:"max_buffered_tx_bytes,omitempty"` + MaxBufferedTxBytes *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_buffered_tx_bytes,json=maxBufferedTxBytes,proto3" json:"max_buffered_tx_bytes,omitempty"` // Indicates whether taps produce a single buffered message per tap, or multiple streamed // messages per tap in the emitted :ref:`TraceWrapper // ` messages. Note that streamed tapping does not @@ -595,14 +595,14 @@ func (x *OutputConfig) GetSinks() []*OutputSink { return nil } -func (x *OutputConfig) GetMaxBufferedRxBytes() *wrappers.UInt32Value { +func (x *OutputConfig) GetMaxBufferedRxBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedRxBytes } return nil } -func (x *OutputConfig) GetMaxBufferedTxBytes() *wrappers.UInt32Value { +func (x *OutputConfig) GetMaxBufferedTxBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedTxBytes } @@ -827,7 +827,7 @@ type BufferedAdminSink struct { // This may result in returning fewer traces than were requested, and in the case that no traces are // buffered during this time, no traces will be returned. // Specifying 0 for the timeout value (or not specifying a value at all) indicates an infinite timeout. - Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *BufferedAdminSink) Reset() { @@ -869,7 +869,7 @@ func (x *BufferedAdminSink) GetMaxTraces() uint64 { return 0 } -func (x *BufferedAdminSink) GetTimeout() *duration.Duration { +func (x *BufferedAdminSink) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -1406,9 +1406,9 @@ var file_envoy_config_tap_v3_common_proto_goTypes = []interface{}{ (*v3.MatchPredicate)(nil), // 13: envoy.config.common.matcher.v3.MatchPredicate (*v31.RuntimeFractionalPercent)(nil), // 14: envoy.config.core.v3.RuntimeFractionalPercent (*v32.HeaderMatcher)(nil), // 15: envoy.config.route.v3.HeaderMatcher - (*wrappers.UInt32Value)(nil), // 16: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 16: google.protobuf.UInt32Value (*v31.TypedExtensionConfig)(nil), // 17: envoy.config.core.v3.TypedExtensionConfig - (*duration.Duration)(nil), // 18: google.protobuf.Duration + (*durationpb.Duration)(nil), // 18: google.protobuf.Duration (*v31.GrpcService)(nil), // 19: envoy.config.core.v3.GrpcService } var file_envoy_config_tap_v3_common_proto_depIdxs = []int32{ diff --git a/envoy/config/trace/v2/dynamic_ot.pb.go b/envoy/config/trace/v2/dynamic_ot.pb.go index 99b3c5fc9..7ea920ede 100755 --- a/envoy/config/trace/v2/dynamic_ot.pb.go +++ b/envoy/config/trace/v2/dynamic_ot.pb.go @@ -9,9 +9,9 @@ package tracev2 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -37,7 +37,7 @@ type DynamicOtConfig struct { Library string `protobuf:"bytes,1,opt,name=library,proto3" json:"library,omitempty"` // The configuration to use when creating a tracer from the given dynamic // library. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` } func (x *DynamicOtConfig) Reset() { @@ -79,7 +79,7 @@ func (x *DynamicOtConfig) GetLibrary() string { return "" } -func (x *DynamicOtConfig) GetConfig() *_struct.Struct { +func (x *DynamicOtConfig) GetConfig() *structpb.Struct { if x != nil { return x.Config } @@ -131,7 +131,7 @@ func file_envoy_config_trace_v2_dynamic_ot_proto_rawDescGZIP() []byte { var file_envoy_config_trace_v2_dynamic_ot_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_trace_v2_dynamic_ot_proto_goTypes = []interface{}{ (*DynamicOtConfig)(nil), // 0: envoy.config.trace.v2.DynamicOtConfig - (*_struct.Struct)(nil), // 1: google.protobuf.Struct + (*structpb.Struct)(nil), // 1: google.protobuf.Struct } var file_envoy_config_trace_v2_dynamic_ot_proto_depIdxs = []int32{ 1, // 0: envoy.config.trace.v2.DynamicOtConfig.config:type_name -> google.protobuf.Struct diff --git a/envoy/config/trace/v2/http_tracer.pb.go b/envoy/config/trace/v2/http_tracer.pb.go index d1b6a77d1..ff711c7c0 100755 --- a/envoy/config/trace/v2/http_tracer.pb.go +++ b/envoy/config/trace/v2/http_tracer.pb.go @@ -9,10 +9,10 @@ package tracev2 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -166,14 +166,14 @@ func (m *Tracing_Http) GetConfigType() isTracing_Http_ConfigType { } // Deprecated: Marked as deprecated in envoy/config/trace/v2/http_tracer.proto. -func (x *Tracing_Http) GetConfig() *_struct.Struct { +func (x *Tracing_Http) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*Tracing_Http_Config); ok { return x.Config } return nil } -func (x *Tracing_Http) GetTypedConfig() *any1.Any { +func (x *Tracing_Http) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*Tracing_Http_TypedConfig); ok { return x.TypedConfig } @@ -186,11 +186,11 @@ type isTracing_Http_ConfigType interface { type Tracing_Http_Config struct { // Deprecated: Marked as deprecated in envoy/config/trace/v2/http_tracer.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type Tracing_Http_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*Tracing_Http_Config) isTracing_Http_ConfigType() {} @@ -251,10 +251,10 @@ func file_envoy_config_trace_v2_http_tracer_proto_rawDescGZIP() []byte { var file_envoy_config_trace_v2_http_tracer_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_config_trace_v2_http_tracer_proto_goTypes = []interface{}{ - (*Tracing)(nil), // 0: envoy.config.trace.v2.Tracing - (*Tracing_Http)(nil), // 1: envoy.config.trace.v2.Tracing.Http - (*_struct.Struct)(nil), // 2: google.protobuf.Struct - (*any1.Any)(nil), // 3: google.protobuf.Any + (*Tracing)(nil), // 0: envoy.config.trace.v2.Tracing + (*Tracing_Http)(nil), // 1: envoy.config.trace.v2.Tracing.Http + (*structpb.Struct)(nil), // 2: google.protobuf.Struct + (*anypb.Any)(nil), // 3: google.protobuf.Any } var file_envoy_config_trace_v2_http_tracer_proto_depIdxs = []int32{ 1, // 0: envoy.config.trace.v2.Tracing.http:type_name -> envoy.config.trace.v2.Tracing.Http diff --git a/envoy/config/trace/v2/zipkin.pb.go b/envoy/config/trace/v2/zipkin.pb.go index 6756796f2..8d9138314 100755 --- a/envoy/config/trace/v2/zipkin.pb.go +++ b/envoy/config/trace/v2/zipkin.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -110,7 +110,7 @@ type ZipkinConfig struct { TraceId_128Bit bool `protobuf:"varint,3,opt,name=trace_id_128bit,json=traceId128bit,proto3" json:"trace_id_128bit,omitempty"` // Determines whether client and server spans will share the same span context. // The default value is true. - SharedSpanContext *wrappers.BoolValue `protobuf:"bytes,4,opt,name=shared_span_context,json=sharedSpanContext,proto3" json:"shared_span_context,omitempty"` + SharedSpanContext *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=shared_span_context,json=sharedSpanContext,proto3" json:"shared_span_context,omitempty"` // Determines the selected collector endpoint version. By default, the “HTTP_JSON_V1“ will be // used. CollectorEndpointVersion ZipkinConfig_CollectorEndpointVersion `protobuf:"varint,5,opt,name=collector_endpoint_version,json=collectorEndpointVersion,proto3,enum=envoy.config.trace.v2.ZipkinConfig_CollectorEndpointVersion" json:"collector_endpoint_version,omitempty"` @@ -169,7 +169,7 @@ func (x *ZipkinConfig) GetTraceId_128Bit() bool { return false } -func (x *ZipkinConfig) GetSharedSpanContext() *wrappers.BoolValue { +func (x *ZipkinConfig) GetSharedSpanContext() *wrapperspb.BoolValue { if x != nil { return x.SharedSpanContext } @@ -255,7 +255,7 @@ var file_envoy_config_trace_v2_zipkin_proto_msgTypes = make([]protoimpl.MessageI var file_envoy_config_trace_v2_zipkin_proto_goTypes = []interface{}{ (ZipkinConfig_CollectorEndpointVersion)(0), // 0: envoy.config.trace.v2.ZipkinConfig.CollectorEndpointVersion (*ZipkinConfig)(nil), // 1: envoy.config.trace.v2.ZipkinConfig - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_envoy_config_trace_v2_zipkin_proto_depIdxs = []int32{ 2, // 0: envoy.config.trace.v2.ZipkinConfig.shared_span_context:type_name -> google.protobuf.BoolValue diff --git a/envoy/config/trace/v3/dynamic_ot.pb.go b/envoy/config/trace/v3/dynamic_ot.pb.go index fd29b199d..d4fb90d12 100755 --- a/envoy/config/trace/v3/dynamic_ot.pb.go +++ b/envoy/config/trace/v3/dynamic_ot.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -42,7 +42,7 @@ type DynamicOtConfig struct { // library. // // Deprecated: Marked as deprecated in envoy/config/trace/v3/dynamic_ot.proto. - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` } func (x *DynamicOtConfig) Reset() { @@ -86,7 +86,7 @@ func (x *DynamicOtConfig) GetLibrary() string { } // Deprecated: Marked as deprecated in envoy/config/trace/v3/dynamic_ot.proto. -func (x *DynamicOtConfig) GetConfig() *_struct.Struct { +func (x *DynamicOtConfig) GetConfig() *structpb.Struct { if x != nil { return x.Config } @@ -153,7 +153,7 @@ func file_envoy_config_trace_v3_dynamic_ot_proto_rawDescGZIP() []byte { var file_envoy_config_trace_v3_dynamic_ot_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_config_trace_v3_dynamic_ot_proto_goTypes = []interface{}{ (*DynamicOtConfig)(nil), // 0: envoy.config.trace.v3.DynamicOtConfig - (*_struct.Struct)(nil), // 1: google.protobuf.Struct + (*structpb.Struct)(nil), // 1: google.protobuf.Struct } var file_envoy_config_trace_v3_dynamic_ot_proto_depIdxs = []int32{ 1, // 0: envoy.config.trace.v3.DynamicOtConfig.config:type_name -> google.protobuf.Struct diff --git a/envoy/config/trace/v3/http_tracer.pb.go b/envoy/config/trace/v3/http_tracer.pb.go index ea8260383..c8dc933fa 100755 --- a/envoy/config/trace/v3/http_tracer.pb.go +++ b/envoy/config/trace/v3/http_tracer.pb.go @@ -9,9 +9,9 @@ package tracev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -150,7 +150,7 @@ func (m *Tracing_Http) GetConfigType() isTracing_Http_ConfigType { return nil } -func (x *Tracing_Http) GetTypedConfig() *any1.Any { +func (x *Tracing_Http) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*Tracing_Http_TypedConfig); ok { return x.TypedConfig } @@ -162,7 +162,7 @@ type isTracing_Http_ConfigType interface { } type Tracing_Http_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*Tracing_Http_TypedConfig) isTracing_Http_ConfigType() {} @@ -226,7 +226,7 @@ var file_envoy_config_trace_v3_http_tracer_proto_msgTypes = make([]protoimpl.Mes var file_envoy_config_trace_v3_http_tracer_proto_goTypes = []interface{}{ (*Tracing)(nil), // 0: envoy.config.trace.v3.Tracing (*Tracing_Http)(nil), // 1: envoy.config.trace.v3.Tracing.Http - (*any1.Any)(nil), // 2: google.protobuf.Any + (*anypb.Any)(nil), // 2: google.protobuf.Any } var file_envoy_config_trace_v3_http_tracer_proto_depIdxs = []int32{ 1, // 0: envoy.config.trace.v3.Tracing.http:type_name -> envoy.config.trace.v3.Tracing.Http diff --git a/envoy/config/trace/v3/skywalking.pb.go b/envoy/config/trace/v3/skywalking.pb.go index 4200e44a2..24b5ec431 100755 --- a/envoy/config/trace/v3/skywalking.pb.go +++ b/envoy/config/trace/v3/skywalking.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -116,7 +116,7 @@ type ClientConfig struct { // Envoy caches the segment in memory when the SkyWalking backend service is temporarily unavailable. // This field specifies the maximum number of segments that can be cached. If not specified, the // default is 1024. - MaxCacheSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_cache_size,json=maxCacheSize,proto3" json:"max_cache_size,omitempty"` + MaxCacheSize *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_cache_size,json=maxCacheSize,proto3" json:"max_cache_size,omitempty"` } func (x *ClientConfig) Reset() { @@ -179,7 +179,7 @@ func (x *ClientConfig) GetBackendToken() string { return "" } -func (x *ClientConfig) GetMaxCacheSize() *wrappers.UInt32Value { +func (x *ClientConfig) GetMaxCacheSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxCacheSize } @@ -270,10 +270,10 @@ func file_envoy_config_trace_v3_skywalking_proto_rawDescGZIP() []byte { var file_envoy_config_trace_v3_skywalking_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_config_trace_v3_skywalking_proto_goTypes = []interface{}{ - (*SkyWalkingConfig)(nil), // 0: envoy.config.trace.v3.SkyWalkingConfig - (*ClientConfig)(nil), // 1: envoy.config.trace.v3.ClientConfig - (*v3.GrpcService)(nil), // 2: envoy.config.core.v3.GrpcService - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*SkyWalkingConfig)(nil), // 0: envoy.config.trace.v3.SkyWalkingConfig + (*ClientConfig)(nil), // 1: envoy.config.trace.v3.ClientConfig + (*v3.GrpcService)(nil), // 2: envoy.config.core.v3.GrpcService + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value } var file_envoy_config_trace_v3_skywalking_proto_depIdxs = []int32{ 2, // 0: envoy.config.trace.v3.SkyWalkingConfig.grpc_service:type_name -> envoy.config.core.v3.GrpcService diff --git a/envoy/config/trace/v3/xray.pb.go b/envoy/config/trace/v3/xray.pb.go index 76d7645d9..5bde2a78c 100755 --- a/envoy/config/trace/v3/xray.pb.go +++ b/envoy/config/trace/v3/xray.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -115,7 +115,7 @@ type XRayConfig_SegmentFields struct { Origin string `protobuf:"bytes,1,opt,name=origin,proto3" json:"origin,omitempty"` // AWS resource metadata dictionary. // See: `X-Ray Segment Document documentation `__ - Aws *_struct.Struct `protobuf:"bytes,2,opt,name=aws,proto3" json:"aws,omitempty"` + Aws *structpb.Struct `protobuf:"bytes,2,opt,name=aws,proto3" json:"aws,omitempty"` } func (x *XRayConfig_SegmentFields) Reset() { @@ -157,7 +157,7 @@ func (x *XRayConfig_SegmentFields) GetOrigin() string { return "" } -func (x *XRayConfig_SegmentFields) GetAws() *_struct.Struct { +func (x *XRayConfig_SegmentFields) GetAws() *structpb.Struct { if x != nil { return x.Aws } @@ -244,7 +244,7 @@ var file_envoy_config_trace_v3_xray_proto_goTypes = []interface{}{ (*XRayConfig_SegmentFields)(nil), // 1: envoy.config.trace.v3.XRayConfig.SegmentFields (*v3.SocketAddress)(nil), // 2: envoy.config.core.v3.SocketAddress (*v3.DataSource)(nil), // 3: envoy.config.core.v3.DataSource - (*_struct.Struct)(nil), // 4: google.protobuf.Struct + (*structpb.Struct)(nil), // 4: google.protobuf.Struct } var file_envoy_config_trace_v3_xray_proto_depIdxs = []int32{ 2, // 0: envoy.config.trace.v3.XRayConfig.daemon_endpoint:type_name -> envoy.config.core.v3.SocketAddress diff --git a/envoy/config/trace/v3/zipkin.pb.go b/envoy/config/trace/v3/zipkin.pb.go index 4cd7ffb94..be627104f 100755 --- a/envoy/config/trace/v3/zipkin.pb.go +++ b/envoy/config/trace/v3/zipkin.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -107,7 +107,7 @@ type ZipkinConfig struct { TraceId_128Bit bool `protobuf:"varint,3,opt,name=trace_id_128bit,json=traceId128bit,proto3" json:"trace_id_128bit,omitempty"` // Determines whether client and server spans will share the same span context. // The default value is true. - SharedSpanContext *wrappers.BoolValue `protobuf:"bytes,4,opt,name=shared_span_context,json=sharedSpanContext,proto3" json:"shared_span_context,omitempty"` + SharedSpanContext *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=shared_span_context,json=sharedSpanContext,proto3" json:"shared_span_context,omitempty"` // Determines the selected collector endpoint version. CollectorEndpointVersion ZipkinConfig_CollectorEndpointVersion `protobuf:"varint,5,opt,name=collector_endpoint_version,json=collectorEndpointVersion,proto3,enum=envoy.config.trace.v3.ZipkinConfig_CollectorEndpointVersion" json:"collector_endpoint_version,omitempty"` // Optional hostname to use when sending spans to the collector_cluster. Useful for collectors @@ -188,7 +188,7 @@ func (x *ZipkinConfig) GetTraceId_128Bit() bool { return false } -func (x *ZipkinConfig) GetSharedSpanContext() *wrappers.BoolValue { +func (x *ZipkinConfig) GetSharedSpanContext() *wrapperspb.BoolValue { if x != nil { return x.SharedSpanContext } @@ -307,7 +307,7 @@ var file_envoy_config_trace_v3_zipkin_proto_msgTypes = make([]protoimpl.MessageI var file_envoy_config_trace_v3_zipkin_proto_goTypes = []interface{}{ (ZipkinConfig_CollectorEndpointVersion)(0), // 0: envoy.config.trace.v3.ZipkinConfig.CollectorEndpointVersion (*ZipkinConfig)(nil), // 1: envoy.config.trace.v3.ZipkinConfig - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_envoy_config_trace_v3_zipkin_proto_depIdxs = []int32{ 2, // 0: envoy.config.trace.v3.ZipkinConfig.shared_span_context:type_name -> google.protobuf.BoolValue diff --git a/envoy/data/accesslog/v2/accesslog.pb.go b/envoy/data/accesslog/v2/accesslog.pb.go index e4fbf203f..8f903f007 100755 --- a/envoy/data/accesslog/v2/accesslog.pb.go +++ b/envoy/data/accesslog/v2/accesslog.pb.go @@ -10,12 +10,12 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -396,38 +396,38 @@ type AccessLogCommon struct { TlsProperties *TLSProperties `protobuf:"bytes,4,opt,name=tls_properties,json=tlsProperties,proto3" json:"tls_properties,omitempty"` // The time that Envoy started servicing this request. This is effectively the time that the first // downstream byte is received. - StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + StartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` // Interval between the first downstream byte received and the last // downstream byte received (i.e. time it takes to receive a request). - TimeToLastRxByte *duration.Duration `protobuf:"bytes,6,opt,name=time_to_last_rx_byte,json=timeToLastRxByte,proto3" json:"time_to_last_rx_byte,omitempty"` + TimeToLastRxByte *durationpb.Duration `protobuf:"bytes,6,opt,name=time_to_last_rx_byte,json=timeToLastRxByte,proto3" json:"time_to_last_rx_byte,omitempty"` // Interval between the first downstream byte received and the first upstream byte sent. There may // by considerable delta between *time_to_last_rx_byte* and this value due to filters. // Additionally, the same caveats apply as documented in *time_to_last_downstream_tx_byte* about // not accounting for kernel socket buffer time, etc. - TimeToFirstUpstreamTxByte *duration.Duration `protobuf:"bytes,7,opt,name=time_to_first_upstream_tx_byte,json=timeToFirstUpstreamTxByte,proto3" json:"time_to_first_upstream_tx_byte,omitempty"` + TimeToFirstUpstreamTxByte *durationpb.Duration `protobuf:"bytes,7,opt,name=time_to_first_upstream_tx_byte,json=timeToFirstUpstreamTxByte,proto3" json:"time_to_first_upstream_tx_byte,omitempty"` // Interval between the first downstream byte received and the last upstream byte sent. There may // by considerable delta between *time_to_last_rx_byte* and this value due to filters. // Additionally, the same caveats apply as documented in *time_to_last_downstream_tx_byte* about // not accounting for kernel socket buffer time, etc. - TimeToLastUpstreamTxByte *duration.Duration `protobuf:"bytes,8,opt,name=time_to_last_upstream_tx_byte,json=timeToLastUpstreamTxByte,proto3" json:"time_to_last_upstream_tx_byte,omitempty"` + TimeToLastUpstreamTxByte *durationpb.Duration `protobuf:"bytes,8,opt,name=time_to_last_upstream_tx_byte,json=timeToLastUpstreamTxByte,proto3" json:"time_to_last_upstream_tx_byte,omitempty"` // Interval between the first downstream byte received and the first upstream // byte received (i.e. time it takes to start receiving a response). - TimeToFirstUpstreamRxByte *duration.Duration `protobuf:"bytes,9,opt,name=time_to_first_upstream_rx_byte,json=timeToFirstUpstreamRxByte,proto3" json:"time_to_first_upstream_rx_byte,omitempty"` + TimeToFirstUpstreamRxByte *durationpb.Duration `protobuf:"bytes,9,opt,name=time_to_first_upstream_rx_byte,json=timeToFirstUpstreamRxByte,proto3" json:"time_to_first_upstream_rx_byte,omitempty"` // Interval between the first downstream byte received and the last upstream // byte received (i.e. time it takes to receive a complete response). - TimeToLastUpstreamRxByte *duration.Duration `protobuf:"bytes,10,opt,name=time_to_last_upstream_rx_byte,json=timeToLastUpstreamRxByte,proto3" json:"time_to_last_upstream_rx_byte,omitempty"` + TimeToLastUpstreamRxByte *durationpb.Duration `protobuf:"bytes,10,opt,name=time_to_last_upstream_rx_byte,json=timeToLastUpstreamRxByte,proto3" json:"time_to_last_upstream_rx_byte,omitempty"` // Interval between the first downstream byte received and the first downstream byte sent. // There may be a considerable delta between the *time_to_first_upstream_rx_byte* and this field // due to filters. Additionally, the same caveats apply as documented in // *time_to_last_downstream_tx_byte* about not accounting for kernel socket buffer time, etc. - TimeToFirstDownstreamTxByte *duration.Duration `protobuf:"bytes,11,opt,name=time_to_first_downstream_tx_byte,json=timeToFirstDownstreamTxByte,proto3" json:"time_to_first_downstream_tx_byte,omitempty"` + TimeToFirstDownstreamTxByte *durationpb.Duration `protobuf:"bytes,11,opt,name=time_to_first_downstream_tx_byte,json=timeToFirstDownstreamTxByte,proto3" json:"time_to_first_downstream_tx_byte,omitempty"` // Interval between the first downstream byte received and the last downstream byte sent. // Depending on protocol, buffering, windowing, filters, etc. there may be a considerable delta // between *time_to_last_upstream_rx_byte* and this field. Note also that this is an approximate // time. In the current implementation it does not include kernel socket buffer time. In the // current implementation it also does not include send window buffering inside the HTTP/2 codec. // In the future it is likely that work will be done to make this duration more accurate. - TimeToLastDownstreamTxByte *duration.Duration `protobuf:"bytes,12,opt,name=time_to_last_downstream_tx_byte,json=timeToLastDownstreamTxByte,proto3" json:"time_to_last_downstream_tx_byte,omitempty"` + TimeToLastDownstreamTxByte *durationpb.Duration `protobuf:"bytes,12,opt,name=time_to_last_downstream_tx_byte,json=timeToLastDownstreamTxByte,proto3" json:"time_to_last_downstream_tx_byte,omitempty"` // The upstream remote/destination address that handles this exchange. This does not include // retries. UpstreamRemoteAddress *core.Address `protobuf:"bytes,13,opt,name=upstream_remote_address,json=upstreamRemoteAddress,proto3" json:"upstream_remote_address,omitempty"` @@ -460,7 +460,7 @@ type AccessLogCommon struct { // Map of filter state in stream info that have been configured to be logged. If the filter // state serialized to any message other than `google.protobuf.Any` it will be packed into // `google.protobuf.Any`. - FilterStateObjects map[string]*any1.Any `protobuf:"bytes,21,rep,name=filter_state_objects,json=filterStateObjects,proto3" json:"filter_state_objects,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FilterStateObjects map[string]*anypb.Any `protobuf:"bytes,21,rep,name=filter_state_objects,json=filterStateObjects,proto3" json:"filter_state_objects,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *AccessLogCommon) Reset() { @@ -523,56 +523,56 @@ func (x *AccessLogCommon) GetTlsProperties() *TLSProperties { return nil } -func (x *AccessLogCommon) GetStartTime() *timestamp.Timestamp { +func (x *AccessLogCommon) GetStartTime() *timestamppb.Timestamp { if x != nil { return x.StartTime } return nil } -func (x *AccessLogCommon) GetTimeToLastRxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastRxByte() *durationpb.Duration { if x != nil { return x.TimeToLastRxByte } return nil } -func (x *AccessLogCommon) GetTimeToFirstUpstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToFirstUpstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToFirstUpstreamTxByte } return nil } -func (x *AccessLogCommon) GetTimeToLastUpstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastUpstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToLastUpstreamTxByte } return nil } -func (x *AccessLogCommon) GetTimeToFirstUpstreamRxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToFirstUpstreamRxByte() *durationpb.Duration { if x != nil { return x.TimeToFirstUpstreamRxByte } return nil } -func (x *AccessLogCommon) GetTimeToLastUpstreamRxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastUpstreamRxByte() *durationpb.Duration { if x != nil { return x.TimeToLastUpstreamRxByte } return nil } -func (x *AccessLogCommon) GetTimeToFirstDownstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToFirstDownstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToFirstDownstreamTxByte } return nil } -func (x *AccessLogCommon) GetTimeToLastDownstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastDownstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToLastDownstreamTxByte } @@ -635,7 +635,7 @@ func (x *AccessLogCommon) GetDownstreamDirectRemoteAddress() *core.Address { return nil } -func (x *AccessLogCommon) GetFilterStateObjects() map[string]*any1.Any { +func (x *AccessLogCommon) GetFilterStateObjects() map[string]*anypb.Any { if x != nil { return x.FilterStateObjects } @@ -869,7 +869,7 @@ type TLSProperties struct { // (e.g. “009C“ for “TLS_RSA_WITH_AES_128_GCM_SHA256“). // // Here it is expressed as an integer. - TlsCipherSuite *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tls_cipher_suite,json=tlsCipherSuite,proto3" json:"tls_cipher_suite,omitempty"` + TlsCipherSuite *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=tls_cipher_suite,json=tlsCipherSuite,proto3" json:"tls_cipher_suite,omitempty"` // SNI hostname from handshake. TlsSniHostname string `protobuf:"bytes,3,opt,name=tls_sni_hostname,json=tlsSniHostname,proto3" json:"tls_sni_hostname,omitempty"` // Properties of the local certificate used to negotiate TLS. @@ -919,7 +919,7 @@ func (x *TLSProperties) GetTlsVersion() TLSProperties_TLSVersion { return TLSProperties_VERSION_UNSPECIFIED } -func (x *TLSProperties) GetTlsCipherSuite() *wrappers.UInt32Value { +func (x *TLSProperties) GetTlsCipherSuite() *wrapperspb.UInt32Value { if x != nil { return x.TlsCipherSuite } @@ -968,7 +968,7 @@ type HTTPRequestProperties struct { Authority string `protobuf:"bytes,3,opt,name=authority,proto3" json:"authority,omitempty"` // The port of the incoming request URI // (unused currently, as port is composed onto authority). - Port *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"` + Port *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"` // The path portion from the incoming request URI. Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` // Value of the “User-Agent“ request header. @@ -1052,7 +1052,7 @@ func (x *HTTPRequestProperties) GetAuthority() string { return "" } -func (x *HTTPRequestProperties) GetPort() *wrappers.UInt32Value { +func (x *HTTPRequestProperties) GetPort() *wrapperspb.UInt32Value { if x != nil { return x.Port } @@ -1129,7 +1129,7 @@ type HTTPResponseProperties struct { unknownFields protoimpl.UnknownFields // The HTTP response code returned by Envoy. - ResponseCode *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=response_code,json=responseCode,proto3" json:"response_code,omitempty"` + ResponseCode *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=response_code,json=responseCode,proto3" json:"response_code,omitempty"` // Size of the HTTP response headers in bytes. // // This value is captured from the OSI layer 7 perspective, i.e. it does not @@ -1180,7 +1180,7 @@ func (*HTTPResponseProperties) Descriptor() ([]byte, []int) { return file_envoy_data_accesslog_v2_accesslog_proto_rawDescGZIP(), []int{7} } -func (x *HTTPResponseProperties) GetResponseCode() *wrappers.UInt32Value { +func (x *HTTPResponseProperties) GetResponseCode() *wrapperspb.UInt32Value { if x != nil { return x.ResponseCode } @@ -1843,16 +1843,16 @@ var file_envoy_data_accesslog_v2_accesslog_proto_goTypes = []interface{}{ (*ResponseFlags_Unauthorized)(nil), // 12: envoy.data.accesslog.v2.ResponseFlags.Unauthorized (*TLSProperties_CertificateProperties)(nil), // 13: envoy.data.accesslog.v2.TLSProperties.CertificateProperties (*TLSProperties_CertificateProperties_SubjectAltName)(nil), // 14: envoy.data.accesslog.v2.TLSProperties.CertificateProperties.SubjectAltName - nil, // 15: envoy.data.accesslog.v2.HTTPRequestProperties.RequestHeadersEntry - nil, // 16: envoy.data.accesslog.v2.HTTPResponseProperties.ResponseHeadersEntry - nil, // 17: envoy.data.accesslog.v2.HTTPResponseProperties.ResponseTrailersEntry - (*core.Address)(nil), // 18: envoy.api.v2.core.Address - (*timestamp.Timestamp)(nil), // 19: google.protobuf.Timestamp - (*duration.Duration)(nil), // 20: google.protobuf.Duration - (*core.Metadata)(nil), // 21: envoy.api.v2.core.Metadata - (*wrappers.UInt32Value)(nil), // 22: google.protobuf.UInt32Value - (core.RequestMethod)(0), // 23: envoy.api.v2.core.RequestMethod - (*any1.Any)(nil), // 24: google.protobuf.Any + nil, // 15: envoy.data.accesslog.v2.HTTPRequestProperties.RequestHeadersEntry + nil, // 16: envoy.data.accesslog.v2.HTTPResponseProperties.ResponseHeadersEntry + nil, // 17: envoy.data.accesslog.v2.HTTPResponseProperties.ResponseTrailersEntry + (*core.Address)(nil), // 18: envoy.api.v2.core.Address + (*timestamppb.Timestamp)(nil), // 19: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 20: google.protobuf.Duration + (*core.Metadata)(nil), // 21: envoy.api.v2.core.Metadata + (*wrapperspb.UInt32Value)(nil), // 22: google.protobuf.UInt32Value + (core.RequestMethod)(0), // 23: envoy.api.v2.core.RequestMethod + (*anypb.Any)(nil), // 24: google.protobuf.Any } var file_envoy_data_accesslog_v2_accesslog_proto_depIdxs = []int32{ 6, // 0: envoy.data.accesslog.v2.TCPAccessLogEntry.common_properties:type_name -> envoy.data.accesslog.v2.AccessLogCommon diff --git a/envoy/data/accesslog/v3/accesslog.pb.go b/envoy/data/accesslog/v3/accesslog.pb.go index a082cb875..2b0ced4c5 100755 --- a/envoy/data/accesslog/v3/accesslog.pb.go +++ b/envoy/data/accesslog/v3/accesslog.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -479,38 +479,38 @@ type AccessLogCommon struct { TlsProperties *TLSProperties `protobuf:"bytes,4,opt,name=tls_properties,json=tlsProperties,proto3" json:"tls_properties,omitempty"` // The time that Envoy started servicing this request. This is effectively the time that the first // downstream byte is received. - StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + StartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` // Interval between the first downstream byte received and the last // downstream byte received (i.e. time it takes to receive a request). - TimeToLastRxByte *duration.Duration `protobuf:"bytes,6,opt,name=time_to_last_rx_byte,json=timeToLastRxByte,proto3" json:"time_to_last_rx_byte,omitempty"` + TimeToLastRxByte *durationpb.Duration `protobuf:"bytes,6,opt,name=time_to_last_rx_byte,json=timeToLastRxByte,proto3" json:"time_to_last_rx_byte,omitempty"` // Interval between the first downstream byte received and the first upstream byte sent. There may // by considerable delta between “time_to_last_rx_byte“ and this value due to filters. // Additionally, the same caveats apply as documented in “time_to_last_downstream_tx_byte“ about // not accounting for kernel socket buffer time, etc. - TimeToFirstUpstreamTxByte *duration.Duration `protobuf:"bytes,7,opt,name=time_to_first_upstream_tx_byte,json=timeToFirstUpstreamTxByte,proto3" json:"time_to_first_upstream_tx_byte,omitempty"` + TimeToFirstUpstreamTxByte *durationpb.Duration `protobuf:"bytes,7,opt,name=time_to_first_upstream_tx_byte,json=timeToFirstUpstreamTxByte,proto3" json:"time_to_first_upstream_tx_byte,omitempty"` // Interval between the first downstream byte received and the last upstream byte sent. There may // by considerable delta between “time_to_last_rx_byte“ and this value due to filters. // Additionally, the same caveats apply as documented in “time_to_last_downstream_tx_byte“ about // not accounting for kernel socket buffer time, etc. - TimeToLastUpstreamTxByte *duration.Duration `protobuf:"bytes,8,opt,name=time_to_last_upstream_tx_byte,json=timeToLastUpstreamTxByte,proto3" json:"time_to_last_upstream_tx_byte,omitempty"` + TimeToLastUpstreamTxByte *durationpb.Duration `protobuf:"bytes,8,opt,name=time_to_last_upstream_tx_byte,json=timeToLastUpstreamTxByte,proto3" json:"time_to_last_upstream_tx_byte,omitempty"` // Interval between the first downstream byte received and the first upstream // byte received (i.e. time it takes to start receiving a response). - TimeToFirstUpstreamRxByte *duration.Duration `protobuf:"bytes,9,opt,name=time_to_first_upstream_rx_byte,json=timeToFirstUpstreamRxByte,proto3" json:"time_to_first_upstream_rx_byte,omitempty"` + TimeToFirstUpstreamRxByte *durationpb.Duration `protobuf:"bytes,9,opt,name=time_to_first_upstream_rx_byte,json=timeToFirstUpstreamRxByte,proto3" json:"time_to_first_upstream_rx_byte,omitempty"` // Interval between the first downstream byte received and the last upstream // byte received (i.e. time it takes to receive a complete response). - TimeToLastUpstreamRxByte *duration.Duration `protobuf:"bytes,10,opt,name=time_to_last_upstream_rx_byte,json=timeToLastUpstreamRxByte,proto3" json:"time_to_last_upstream_rx_byte,omitempty"` + TimeToLastUpstreamRxByte *durationpb.Duration `protobuf:"bytes,10,opt,name=time_to_last_upstream_rx_byte,json=timeToLastUpstreamRxByte,proto3" json:"time_to_last_upstream_rx_byte,omitempty"` // Interval between the first downstream byte received and the first downstream byte sent. // There may be a considerable delta between the “time_to_first_upstream_rx_byte“ and this field // due to filters. Additionally, the same caveats apply as documented in // “time_to_last_downstream_tx_byte“ about not accounting for kernel socket buffer time, etc. - TimeToFirstDownstreamTxByte *duration.Duration `protobuf:"bytes,11,opt,name=time_to_first_downstream_tx_byte,json=timeToFirstDownstreamTxByte,proto3" json:"time_to_first_downstream_tx_byte,omitempty"` + TimeToFirstDownstreamTxByte *durationpb.Duration `protobuf:"bytes,11,opt,name=time_to_first_downstream_tx_byte,json=timeToFirstDownstreamTxByte,proto3" json:"time_to_first_downstream_tx_byte,omitempty"` // Interval between the first downstream byte received and the last downstream byte sent. // Depending on protocol, buffering, windowing, filters, etc. there may be a considerable delta // between “time_to_last_upstream_rx_byte“ and this field. Note also that this is an approximate // time. In the current implementation it does not include kernel socket buffer time. In the // current implementation it also does not include send window buffering inside the HTTP/2 codec. // In the future it is likely that work will be done to make this duration more accurate. - TimeToLastDownstreamTxByte *duration.Duration `protobuf:"bytes,12,opt,name=time_to_last_downstream_tx_byte,json=timeToLastDownstreamTxByte,proto3" json:"time_to_last_downstream_tx_byte,omitempty"` + TimeToLastDownstreamTxByte *durationpb.Duration `protobuf:"bytes,12,opt,name=time_to_last_downstream_tx_byte,json=timeToLastDownstreamTxByte,proto3" json:"time_to_last_downstream_tx_byte,omitempty"` // The upstream remote/destination address that handles this exchange. This does not include // retries. UpstreamRemoteAddress *v3.Address `protobuf:"bytes,13,opt,name=upstream_remote_address,json=upstreamRemoteAddress,proto3" json:"upstream_remote_address,omitempty"` @@ -543,7 +543,7 @@ type AccessLogCommon struct { // Map of filter state in stream info that have been configured to be logged. If the filter // state serialized to any message other than “google.protobuf.Any“ it will be packed into // “google.protobuf.Any“. - FilterStateObjects map[string]*any1.Any `protobuf:"bytes,21,rep,name=filter_state_objects,json=filterStateObjects,proto3" json:"filter_state_objects,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FilterStateObjects map[string]*anypb.Any `protobuf:"bytes,21,rep,name=filter_state_objects,json=filterStateObjects,proto3" json:"filter_state_objects,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // A list of custom tags, which annotate logs with additional information. // To configure this value, users should configure // :ref:`custom_tags `. @@ -552,7 +552,7 @@ type AccessLogCommon struct { // For TCP: Total duration in milliseconds of the downstream connection. // This is the total duration of the request (i.e., when the request's ActiveStream is destroyed) // and may be longer than “time_to_last_downstream_tx_byte“. - Duration *duration.Duration `protobuf:"bytes,23,opt,name=duration,proto3" json:"duration,omitempty"` + Duration *durationpb.Duration `protobuf:"bytes,23,opt,name=duration,proto3" json:"duration,omitempty"` // For HTTP: Number of times the request is attempted upstream. Note that the field is omitted when the request was never attempted upstream. // For TCP: Number of times the connection request is attempted upstream. Note that the field is omitted when the connect request was never attempted upstream. UpstreamRequestAttemptCount uint32 `protobuf:"varint,24,opt,name=upstream_request_attempt_count,json=upstreamRequestAttemptCount,proto3" json:"upstream_request_attempt_count,omitempty"` @@ -661,56 +661,56 @@ func (x *AccessLogCommon) GetTlsProperties() *TLSProperties { return nil } -func (x *AccessLogCommon) GetStartTime() *timestamp.Timestamp { +func (x *AccessLogCommon) GetStartTime() *timestamppb.Timestamp { if x != nil { return x.StartTime } return nil } -func (x *AccessLogCommon) GetTimeToLastRxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastRxByte() *durationpb.Duration { if x != nil { return x.TimeToLastRxByte } return nil } -func (x *AccessLogCommon) GetTimeToFirstUpstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToFirstUpstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToFirstUpstreamTxByte } return nil } -func (x *AccessLogCommon) GetTimeToLastUpstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastUpstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToLastUpstreamTxByte } return nil } -func (x *AccessLogCommon) GetTimeToFirstUpstreamRxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToFirstUpstreamRxByte() *durationpb.Duration { if x != nil { return x.TimeToFirstUpstreamRxByte } return nil } -func (x *AccessLogCommon) GetTimeToLastUpstreamRxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastUpstreamRxByte() *durationpb.Duration { if x != nil { return x.TimeToLastUpstreamRxByte } return nil } -func (x *AccessLogCommon) GetTimeToFirstDownstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToFirstDownstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToFirstDownstreamTxByte } return nil } -func (x *AccessLogCommon) GetTimeToLastDownstreamTxByte() *duration.Duration { +func (x *AccessLogCommon) GetTimeToLastDownstreamTxByte() *durationpb.Duration { if x != nil { return x.TimeToLastDownstreamTxByte } @@ -773,7 +773,7 @@ func (x *AccessLogCommon) GetDownstreamDirectRemoteAddress() *v3.Address { return nil } -func (x *AccessLogCommon) GetFilterStateObjects() map[string]*any1.Any { +func (x *AccessLogCommon) GetFilterStateObjects() map[string]*anypb.Any { if x != nil { return x.FilterStateObjects } @@ -787,7 +787,7 @@ func (x *AccessLogCommon) GetCustomTags() map[string]string { return nil } -func (x *AccessLogCommon) GetDuration() *duration.Duration { +func (x *AccessLogCommon) GetDuration() *durationpb.Duration { if x != nil { return x.Duration } @@ -1173,7 +1173,7 @@ type TLSProperties struct { // (e.g. “009C“ for “TLS_RSA_WITH_AES_128_GCM_SHA256“). // // Here it is expressed as an integer. - TlsCipherSuite *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tls_cipher_suite,json=tlsCipherSuite,proto3" json:"tls_cipher_suite,omitempty"` + TlsCipherSuite *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=tls_cipher_suite,json=tlsCipherSuite,proto3" json:"tls_cipher_suite,omitempty"` // SNI hostname from handshake. TlsSniHostname string `protobuf:"bytes,3,opt,name=tls_sni_hostname,json=tlsSniHostname,proto3" json:"tls_sni_hostname,omitempty"` // Properties of the local certificate used to negotiate TLS. @@ -1225,7 +1225,7 @@ func (x *TLSProperties) GetTlsVersion() TLSProperties_TLSVersion { return TLSProperties_VERSION_UNSPECIFIED } -func (x *TLSProperties) GetTlsCipherSuite() *wrappers.UInt32Value { +func (x *TLSProperties) GetTlsCipherSuite() *wrapperspb.UInt32Value { if x != nil { return x.TlsCipherSuite } @@ -1281,7 +1281,7 @@ type HTTPRequestProperties struct { Authority string `protobuf:"bytes,3,opt,name=authority,proto3" json:"authority,omitempty"` // The port of the incoming request URI // (unused currently, as port is composed onto authority). - Port *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"` + Port *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"` // The path portion from the incoming request URI. Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` // Value of the “User-Agent“ request header. @@ -1371,7 +1371,7 @@ func (x *HTTPRequestProperties) GetAuthority() string { return "" } -func (x *HTTPRequestProperties) GetPort() *wrappers.UInt32Value { +func (x *HTTPRequestProperties) GetPort() *wrapperspb.UInt32Value { if x != nil { return x.Port } @@ -1462,7 +1462,7 @@ type HTTPResponseProperties struct { unknownFields protoimpl.UnknownFields // The HTTP response code returned by Envoy. - ResponseCode *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=response_code,json=responseCode,proto3" json:"response_code,omitempty"` + ResponseCode *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=response_code,json=responseCode,proto3" json:"response_code,omitempty"` // Size of the HTTP response headers in bytes. // // This value is captured from the OSI layer 7 perspective, i.e. it does not @@ -1517,7 +1517,7 @@ func (*HTTPResponseProperties) Descriptor() ([]byte, []int) { return file_envoy_data_accesslog_v3_accesslog_proto_rawDescGZIP(), []int{7} } -func (x *HTTPResponseProperties) GetResponseCode() *wrappers.UInt32Value { +func (x *HTTPResponseProperties) GetResponseCode() *wrapperspb.UInt32Value { if x != nil { return x.ResponseCode } @@ -2375,16 +2375,16 @@ var file_envoy_data_accesslog_v3_accesslog_proto_goTypes = []interface{}{ (*ResponseFlags_Unauthorized)(nil), // 14: envoy.data.accesslog.v3.ResponseFlags.Unauthorized (*TLSProperties_CertificateProperties)(nil), // 15: envoy.data.accesslog.v3.TLSProperties.CertificateProperties (*TLSProperties_CertificateProperties_SubjectAltName)(nil), // 16: envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName - nil, // 17: envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry - nil, // 18: envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry - nil, // 19: envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry - (*v3.Address)(nil), // 20: envoy.config.core.v3.Address - (*timestamp.Timestamp)(nil), // 21: google.protobuf.Timestamp - (*duration.Duration)(nil), // 22: google.protobuf.Duration - (*v3.Metadata)(nil), // 23: envoy.config.core.v3.Metadata - (*wrappers.UInt32Value)(nil), // 24: google.protobuf.UInt32Value - (v3.RequestMethod)(0), // 25: envoy.config.core.v3.RequestMethod - (*any1.Any)(nil), // 26: google.protobuf.Any + nil, // 17: envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry + nil, // 18: envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry + nil, // 19: envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry + (*v3.Address)(nil), // 20: envoy.config.core.v3.Address + (*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 22: google.protobuf.Duration + (*v3.Metadata)(nil), // 23: envoy.config.core.v3.Metadata + (*wrapperspb.UInt32Value)(nil), // 24: google.protobuf.UInt32Value + (v3.RequestMethod)(0), // 25: envoy.config.core.v3.RequestMethod + (*anypb.Any)(nil), // 26: google.protobuf.Any } var file_envoy_data_accesslog_v3_accesslog_proto_depIdxs = []int32{ 7, // 0: envoy.data.accesslog.v3.TCPAccessLogEntry.common_properties:type_name -> envoy.data.accesslog.v3.AccessLogCommon diff --git a/envoy/data/cluster/v2alpha/outlier_detection_event.pb.go b/envoy/data/cluster/v2alpha/outlier_detection_event.pb.go index d78085bd1..12acfcd5e 100755 --- a/envoy/data/cluster/v2alpha/outlier_detection_event.pb.go +++ b/envoy/data/cluster/v2alpha/outlier_detection_event.pb.go @@ -9,10 +9,10 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -174,9 +174,9 @@ type OutlierDetectionEvent struct { // In case of eject represents type of ejection that took place. Type OutlierEjectionType `protobuf:"varint,1,opt,name=type,proto3,enum=envoy.data.cluster.v2alpha.OutlierEjectionType" json:"type,omitempty"` // Timestamp for event. - Timestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // The time in seconds since the last action (either an ejection or unejection) took place. - SecsSinceLastAction *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=secs_since_last_action,json=secsSinceLastAction,proto3" json:"secs_since_last_action,omitempty"` + SecsSinceLastAction *wrapperspb.UInt64Value `protobuf:"bytes,3,opt,name=secs_since_last_action,json=secsSinceLastAction,proto3" json:"secs_since_last_action,omitempty"` // The :ref:`cluster ` that owns the ejected host. ClusterName string `protobuf:"bytes,4,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"` // The URL of the ejected host. E.g., “tcp://1.2.3.4:80“. @@ -237,14 +237,14 @@ func (x *OutlierDetectionEvent) GetType() OutlierEjectionType { return OutlierEjectionType_CONSECUTIVE_5XX } -func (x *OutlierDetectionEvent) GetTimestamp() *timestamp.Timestamp { +func (x *OutlierDetectionEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } return nil } -func (x *OutlierDetectionEvent) GetSecsSinceLastAction() *wrappers.UInt64Value { +func (x *OutlierDetectionEvent) GetSecsSinceLastAction() *wrapperspb.UInt64Value { if x != nil { return x.SecsSinceLastAction } @@ -633,8 +633,8 @@ var file_envoy_data_cluster_v2alpha_outlier_detection_event_proto_goTypes = []in (*OutlierEjectSuccessRate)(nil), // 3: envoy.data.cluster.v2alpha.OutlierEjectSuccessRate (*OutlierEjectConsecutive)(nil), // 4: envoy.data.cluster.v2alpha.OutlierEjectConsecutive (*OutlierEjectFailurePercentage)(nil), // 5: envoy.data.cluster.v2alpha.OutlierEjectFailurePercentage - (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp - (*wrappers.UInt64Value)(nil), // 7: google.protobuf.UInt64Value + (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp + (*wrapperspb.UInt64Value)(nil), // 7: google.protobuf.UInt64Value } var file_envoy_data_cluster_v2alpha_outlier_detection_event_proto_depIdxs = []int32{ 0, // 0: envoy.data.cluster.v2alpha.OutlierDetectionEvent.type:type_name -> envoy.data.cluster.v2alpha.OutlierEjectionType diff --git a/envoy/data/cluster/v3/outlier_detection_event.pb.go b/envoy/data/cluster/v3/outlier_detection_event.pb.go index b1bca1350..f7ae081e8 100755 --- a/envoy/data/cluster/v3/outlier_detection_event.pb.go +++ b/envoy/data/cluster/v3/outlier_detection_event.pb.go @@ -9,10 +9,10 @@ package clusterv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -174,9 +174,9 @@ type OutlierDetectionEvent struct { // In case of eject represents type of ejection that took place. Type OutlierEjectionType `protobuf:"varint,1,opt,name=type,proto3,enum=envoy.data.cluster.v3.OutlierEjectionType" json:"type,omitempty"` // Timestamp for event. - Timestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // The time in seconds since the last action (either an ejection or unejection) took place. - SecsSinceLastAction *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=secs_since_last_action,json=secsSinceLastAction,proto3" json:"secs_since_last_action,omitempty"` + SecsSinceLastAction *wrapperspb.UInt64Value `protobuf:"bytes,3,opt,name=secs_since_last_action,json=secsSinceLastAction,proto3" json:"secs_since_last_action,omitempty"` // The :ref:`cluster ` that owns the ejected host. ClusterName string `protobuf:"bytes,4,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"` // The URL of the ejected host. E.g., “tcp://1.2.3.4:80“. @@ -237,14 +237,14 @@ func (x *OutlierDetectionEvent) GetType() OutlierEjectionType { return OutlierEjectionType_CONSECUTIVE_5XX } -func (x *OutlierDetectionEvent) GetTimestamp() *timestamp.Timestamp { +func (x *OutlierDetectionEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } return nil } -func (x *OutlierDetectionEvent) GetSecsSinceLastAction() *wrappers.UInt64Value { +func (x *OutlierDetectionEvent) GetSecsSinceLastAction() *wrapperspb.UInt64Value { if x != nil { return x.SecsSinceLastAction } @@ -645,8 +645,8 @@ var file_envoy_data_cluster_v3_outlier_detection_event_proto_goTypes = []interfa (*OutlierEjectSuccessRate)(nil), // 3: envoy.data.cluster.v3.OutlierEjectSuccessRate (*OutlierEjectConsecutive)(nil), // 4: envoy.data.cluster.v3.OutlierEjectConsecutive (*OutlierEjectFailurePercentage)(nil), // 5: envoy.data.cluster.v3.OutlierEjectFailurePercentage - (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp - (*wrappers.UInt64Value)(nil), // 7: google.protobuf.UInt64Value + (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp + (*wrapperspb.UInt64Value)(nil), // 7: google.protobuf.UInt64Value } var file_envoy_data_cluster_v3_outlier_detection_event_proto_depIdxs = []int32{ 0, // 0: envoy.data.cluster.v3.OutlierDetectionEvent.type:type_name -> envoy.data.cluster.v3.OutlierEjectionType diff --git a/envoy/data/core/v2alpha/health_check_event.pb.go b/envoy/data/core/v2alpha/health_check_event.pb.go index b4983180b..6ea0a1402 100755 --- a/envoy/data/core/v2alpha/health_check_event.pb.go +++ b/envoy/data/core/v2alpha/health_check_event.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -143,7 +143,7 @@ type HealthCheckEvent struct { // *HealthCheckEvent_NoLongerDegradedHost Event isHealthCheckEvent_Event `protobuf_oneof:"event"` // Timestamp for event. - Timestamp *timestamp.Timestamp `protobuf:"bytes,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } func (x *HealthCheckEvent) Reset() { @@ -241,7 +241,7 @@ func (x *HealthCheckEvent) GetNoLongerDegradedHost() *NoLongerDegradedHost { return nil } -func (x *HealthCheckEvent) GetTimestamp() *timestamp.Timestamp { +func (x *HealthCheckEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -650,7 +650,7 @@ var file_envoy_data_core_v2alpha_health_check_event_proto_goTypes = []interface{ (*DegradedHealthyHost)(nil), // 6: envoy.data.core.v2alpha.DegradedHealthyHost (*NoLongerDegradedHost)(nil), // 7: envoy.data.core.v2alpha.NoLongerDegradedHost (*core.Address)(nil), // 8: envoy.api.v2.core.Address - (*timestamp.Timestamp)(nil), // 9: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp } var file_envoy_data_core_v2alpha_health_check_event_proto_depIdxs = []int32{ 1, // 0: envoy.data.core.v2alpha.HealthCheckEvent.health_checker_type:type_name -> envoy.data.core.v2alpha.HealthCheckerType diff --git a/envoy/data/core/v3/health_check_event.pb.go b/envoy/data/core/v3/health_check_event.pb.go index 63f9dffd0..7f28070b5 100755 --- a/envoy/data/core/v3/health_check_event.pb.go +++ b/envoy/data/core/v3/health_check_event.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -150,7 +150,7 @@ type HealthCheckEvent struct { // *HealthCheckEvent_NoLongerDegradedHost Event isHealthCheckEvent_Event `protobuf_oneof:"event"` // Timestamp for event. - Timestamp *timestamp.Timestamp `protobuf:"bytes,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Host metadata Metadata *v3.Metadata `protobuf:"bytes,10,opt,name=metadata,proto3" json:"metadata,omitempty"` // Host locality @@ -259,7 +259,7 @@ func (x *HealthCheckEvent) GetNoLongerDegradedHost() *NoLongerDegradedHost { return nil } -func (x *HealthCheckEvent) GetTimestamp() *timestamp.Timestamp { +func (x *HealthCheckEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -771,7 +771,7 @@ var file_envoy_data_core_v3_health_check_event_proto_goTypes = []interface{}{ (*DegradedHealthyHost)(nil), // 7: envoy.data.core.v3.DegradedHealthyHost (*NoLongerDegradedHost)(nil), // 8: envoy.data.core.v3.NoLongerDegradedHost (*v3.Address)(nil), // 9: envoy.config.core.v3.Address - (*timestamp.Timestamp)(nil), // 10: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp (*v3.Metadata)(nil), // 11: envoy.config.core.v3.Metadata (*v3.Locality)(nil), // 12: envoy.config.core.v3.Locality } diff --git a/envoy/data/dns/v2alpha/dns_table.pb.go b/envoy/data/dns/v2alpha/dns_table.pb.go index 604f87f3a..f923e27a0 100755 --- a/envoy/data/dns/v2alpha/dns_table.pb.go +++ b/envoy/data/dns/v2alpha/dns_table.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -232,7 +232,7 @@ type DnsTable_DnsVirtualDomain struct { // of this endpoint Endpoint *DnsTable_DnsEndpoint `protobuf:"bytes,2,opt,name=endpoint,proto3" json:"endpoint,omitempty"` // Sets the TTL in dns answers from Envoy returned to the client - AnswerTtl *duration.Duration `protobuf:"bytes,3,opt,name=answer_ttl,json=answerTtl,proto3" json:"answer_ttl,omitempty"` + AnswerTtl *durationpb.Duration `protobuf:"bytes,3,opt,name=answer_ttl,json=answerTtl,proto3" json:"answer_ttl,omitempty"` } func (x *DnsTable_DnsVirtualDomain) Reset() { @@ -281,7 +281,7 @@ func (x *DnsTable_DnsVirtualDomain) GetEndpoint() *DnsTable_DnsEndpoint { return nil } -func (x *DnsTable_DnsVirtualDomain) GetAnswerTtl() *duration.Duration { +func (x *DnsTable_DnsVirtualDomain) GetAnswerTtl() *durationpb.Duration { if x != nil { return x.AnswerTtl } @@ -371,7 +371,7 @@ var file_envoy_data_dns_v2alpha_dns_table_proto_goTypes = []interface{}{ (*DnsTable_DnsEndpoint)(nil), // 2: envoy.data.dns.v2alpha.DnsTable.DnsEndpoint (*DnsTable_DnsVirtualDomain)(nil), // 3: envoy.data.dns.v2alpha.DnsTable.DnsVirtualDomain (*matcher.StringMatcher)(nil), // 4: envoy.type.matcher.StringMatcher - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration } var file_envoy_data_dns_v2alpha_dns_table_proto_depIdxs = []int32{ 3, // 0: envoy.data.dns.v2alpha.DnsTable.virtual_domains:type_name -> envoy.data.dns.v2alpha.DnsTable.DnsVirtualDomain diff --git a/envoy/data/dns/v3/dns_table.pb.go b/envoy/data/dns/v3/dns_table.pb.go index d6f5970eb..1fbb949e8 100755 --- a/envoy/data/dns/v3/dns_table.pb.go +++ b/envoy/data/dns/v3/dns_table.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -370,7 +370,7 @@ type DnsTable_DnsService struct { // The service protocol. This can be specified as a string or the numeric value of the protocol Protocol *DnsTable_DnsServiceProtocol `protobuf:"bytes,2,opt,name=protocol,proto3" json:"protocol,omitempty"` // The service entry time to live. This is independent from the DNS Answer record TTL - Ttl *duration.Duration `protobuf:"bytes,3,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,3,opt,name=ttl,proto3" json:"ttl,omitempty"` // The list of targets hosting the service Targets []*DnsTable_DnsServiceTarget `protobuf:"bytes,4,rep,name=targets,proto3" json:"targets,omitempty"` } @@ -421,7 +421,7 @@ func (x *DnsTable_DnsService) GetProtocol() *DnsTable_DnsServiceProtocol { return nil } -func (x *DnsTable_DnsService) GetTtl() *duration.Duration { +func (x *DnsTable_DnsService) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -591,7 +591,7 @@ type DnsTable_DnsVirtualDomain struct { // The configuration containing the method to determine the address of this endpoint Endpoint *DnsTable_DnsEndpoint `protobuf:"bytes,2,opt,name=endpoint,proto3" json:"endpoint,omitempty"` // Sets the TTL in DNS answers from Envoy returned to the client. The default TTL is 300s - AnswerTtl *duration.Duration `protobuf:"bytes,3,opt,name=answer_ttl,json=answerTtl,proto3" json:"answer_ttl,omitempty"` + AnswerTtl *durationpb.Duration `protobuf:"bytes,3,opt,name=answer_ttl,json=answerTtl,proto3" json:"answer_ttl,omitempty"` } func (x *DnsTable_DnsVirtualDomain) Reset() { @@ -640,7 +640,7 @@ func (x *DnsTable_DnsVirtualDomain) GetEndpoint() *DnsTable_DnsEndpoint { return nil } -func (x *DnsTable_DnsVirtualDomain) GetAnswerTtl() *duration.Duration { +func (x *DnsTable_DnsVirtualDomain) GetAnswerTtl() *durationpb.Duration { if x != nil { return x.AnswerTtl } @@ -803,7 +803,7 @@ var file_envoy_data_dns_v3_dns_table_proto_goTypes = []interface{}{ (*DnsTable_DnsEndpoint)(nil), // 6: envoy.data.dns.v3.DnsTable.DnsEndpoint (*DnsTable_DnsVirtualDomain)(nil), // 7: envoy.data.dns.v3.DnsTable.DnsVirtualDomain (*v3.StringMatcher)(nil), // 8: envoy.type.matcher.v3.StringMatcher - (*duration.Duration)(nil), // 9: google.protobuf.Duration + (*durationpb.Duration)(nil), // 9: google.protobuf.Duration } var file_envoy_data_dns_v3_dns_table_proto_depIdxs = []int32{ 7, // 0: envoy.data.dns.v3.DnsTable.virtual_domains:type_name -> envoy.data.dns.v3.DnsTable.DnsVirtualDomain diff --git a/envoy/data/tap/v2alpha/transport.pb.go b/envoy/data/tap/v2alpha/transport.pb.go index 4b46c1f3f..0128d5167 100755 --- a/envoy/data/tap/v2alpha/transport.pb.go +++ b/envoy/data/tap/v2alpha/transport.pb.go @@ -9,9 +9,9 @@ package v2alpha import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -88,7 +88,7 @@ type SocketEvent struct { unknownFields protoimpl.UnknownFields // Timestamp for event. - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Read or write with content as bytes string. // // Types that are assignable to EventSelector: @@ -131,7 +131,7 @@ func (*SocketEvent) Descriptor() ([]byte, []int) { return file_envoy_data_tap_v2alpha_transport_proto_rawDescGZIP(), []int{1} } -func (x *SocketEvent) GetTimestamp() *timestamp.Timestamp { +func (x *SocketEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -632,7 +632,7 @@ var file_envoy_data_tap_v2alpha_transport_proto_goTypes = []interface{}{ (*SocketEvent_Write)(nil), // 5: envoy.data.tap.v2alpha.SocketEvent.Write (*SocketEvent_Closed)(nil), // 6: envoy.data.tap.v2alpha.SocketEvent.Closed (*core.Address)(nil), // 7: envoy.api.v2.core.Address - (*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp (*Body)(nil), // 9: envoy.data.tap.v2alpha.Body } var file_envoy_data_tap_v2alpha_transport_proto_depIdxs = []int32{ diff --git a/envoy/data/tap/v3/http.pb.go b/envoy/data/tap/v3/http.pb.go index 6b4cf8605..c15190cf9 100755 --- a/envoy/data/tap/v3/http.pb.go +++ b/envoy/data/tap/v3/http.pb.go @@ -9,9 +9,9 @@ package tapv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -258,7 +258,7 @@ type HttpBufferedTrace_Message struct { // Message trailers. Trailers []*v3.HeaderValue `protobuf:"bytes,3,rep,name=trailers,proto3" json:"trailers,omitempty"` // The timestamp after receiving the message headers. - HeadersReceivedTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=headers_received_time,json=headersReceivedTime,proto3" json:"headers_received_time,omitempty"` + HeadersReceivedTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=headers_received_time,json=headersReceivedTime,proto3" json:"headers_received_time,omitempty"` } func (x *HttpBufferedTrace_Message) Reset() { @@ -314,7 +314,7 @@ func (x *HttpBufferedTrace_Message) GetTrailers() []*v3.HeaderValue { return nil } -func (x *HttpBufferedTrace_Message) GetHeadersReceivedTime() *timestamp.Timestamp { +func (x *HttpBufferedTrace_Message) GetHeadersReceivedTime() *timestamppb.Timestamp { if x != nil { return x.HeadersReceivedTime } @@ -444,7 +444,7 @@ var file_envoy_data_tap_v3_http_proto_goTypes = []interface{}{ (*v3.HeaderMap)(nil), // 4: envoy.config.core.v3.HeaderMap (*Body)(nil), // 5: envoy.data.tap.v3.Body (*v3.HeaderValue)(nil), // 6: envoy.config.core.v3.HeaderValue - (*timestamp.Timestamp)(nil), // 7: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp } var file_envoy_data_tap_v3_http_proto_depIdxs = []int32{ 2, // 0: envoy.data.tap.v3.HttpBufferedTrace.request:type_name -> envoy.data.tap.v3.HttpBufferedTrace.Message diff --git a/envoy/data/tap/v3/transport.pb.go b/envoy/data/tap/v3/transport.pb.go index ecfb08b5c..49b426cfd 100755 --- a/envoy/data/tap/v3/transport.pb.go +++ b/envoy/data/tap/v3/transport.pb.go @@ -8,9 +8,9 @@ package tapv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -29,7 +29,7 @@ type SocketEvent struct { unknownFields protoimpl.UnknownFields // Timestamp for event. - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Read or write with content as bytes string. // // Types that are assignable to EventSelector: @@ -72,7 +72,7 @@ func (*SocketEvent) Descriptor() ([]byte, []int) { return file_envoy_data_tap_v3_transport_proto_rawDescGZIP(), []int{0} } -func (x *SocketEvent) GetTimestamp() *timestamp.Timestamp { +func (x *SocketEvent) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -577,7 +577,7 @@ var file_envoy_data_tap_v3_transport_proto_goTypes = []interface{}{ (*SocketEvent_Read)(nil), // 3: envoy.data.tap.v3.SocketEvent.Read (*SocketEvent_Write)(nil), // 4: envoy.data.tap.v3.SocketEvent.Write (*SocketEvent_Closed)(nil), // 5: envoy.data.tap.v3.SocketEvent.Closed - (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp (*Connection)(nil), // 7: envoy.data.tap.v3.Connection (*Body)(nil), // 8: envoy.data.tap.v3.Body } diff --git a/envoy/extensions/access_loggers/file/v3/file.pb.go b/envoy/extensions/access_loggers/file/v3/file.pb.go index d27d98e90..a2223aeb4 100755 --- a/envoy/extensions/access_loggers/file/v3/file.pb.go +++ b/envoy/extensions/access_loggers/file/v3/file.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -100,7 +100,7 @@ func (x *FileAccessLog) GetFormat() string { } // Deprecated: Marked as deprecated in envoy/extensions/access_loggers/file/v3/file.proto. -func (x *FileAccessLog) GetJsonFormat() *_struct.Struct { +func (x *FileAccessLog) GetJsonFormat() *structpb.Struct { if x, ok := x.GetAccessLogFormat().(*FileAccessLog_JsonFormat); ok { return x.JsonFormat } @@ -108,7 +108,7 @@ func (x *FileAccessLog) GetJsonFormat() *_struct.Struct { } // Deprecated: Marked as deprecated in envoy/extensions/access_loggers/file/v3/file.proto. -func (x *FileAccessLog) GetTypedJsonFormat() *_struct.Struct { +func (x *FileAccessLog) GetTypedJsonFormat() *structpb.Struct { if x, ok := x.GetAccessLogFormat().(*FileAccessLog_TypedJsonFormat); ok { return x.TypedJsonFormat } @@ -144,7 +144,7 @@ type FileAccessLog_JsonFormat struct { // Please use :ref:`log_format `. // // Deprecated: Marked as deprecated in envoy/extensions/access_loggers/file/v3/file.proto. - JsonFormat *_struct.Struct `protobuf:"bytes,3,opt,name=json_format,json=jsonFormat,proto3,oneof"` + JsonFormat *structpb.Struct `protobuf:"bytes,3,opt,name=json_format,json=jsonFormat,proto3,oneof"` } type FileAccessLog_TypedJsonFormat struct { @@ -156,7 +156,7 @@ type FileAccessLog_TypedJsonFormat struct { // Please use :ref:`log_format `. // // Deprecated: Marked as deprecated in envoy/extensions/access_loggers/file/v3/file.proto. - TypedJsonFormat *_struct.Struct `protobuf:"bytes,4,opt,name=typed_json_format,json=typedJsonFormat,proto3,oneof"` + TypedJsonFormat *structpb.Struct `protobuf:"bytes,4,opt,name=typed_json_format,json=typedJsonFormat,proto3,oneof"` } type FileAccessLog_LogFormat struct { @@ -249,7 +249,7 @@ func file_envoy_extensions_access_loggers_file_v3_file_proto_rawDescGZIP() []byt var file_envoy_extensions_access_loggers_file_v3_file_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_access_loggers_file_v3_file_proto_goTypes = []interface{}{ (*FileAccessLog)(nil), // 0: envoy.extensions.access_loggers.file.v3.FileAccessLog - (*_struct.Struct)(nil), // 1: google.protobuf.Struct + (*structpb.Struct)(nil), // 1: google.protobuf.Struct (*v3.SubstitutionFormatString)(nil), // 2: envoy.config.core.v3.SubstitutionFormatString } var file_envoy_extensions_access_loggers_file_v3_file_proto_depIdxs = []int32{ diff --git a/envoy/extensions/access_loggers/fluentd/v3/fluentd.pb.go b/envoy/extensions/access_loggers/fluentd/v3/fluentd.pb.go index 2da9c9e8c..f6962c46f 100755 --- a/envoy/extensions/access_loggers/fluentd/v3/fluentd.pb.go +++ b/envoy/extensions/access_loggers/fluentd/v3/fluentd.pb.go @@ -10,11 +10,11 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -47,12 +47,12 @@ type FluentdAccessLogConfig struct { // Interval for flushing access logs to the TCP stream. Logger will flush requests every time // this interval is elapsed, or when batch size limit is hit, whichever comes first. Defaults to // 1 second. - BufferFlushInterval *duration.Duration `protobuf:"bytes,4,opt,name=buffer_flush_interval,json=bufferFlushInterval,proto3" json:"buffer_flush_interval,omitempty"` + BufferFlushInterval *durationpb.Duration `protobuf:"bytes,4,opt,name=buffer_flush_interval,json=bufferFlushInterval,proto3" json:"buffer_flush_interval,omitempty"` // Soft size limit in bytes for access log entries buffer. The logger will buffer requests until // this limit it hit, or every time flush interval is elapsed, whichever comes first. When the buffer // limit is hit, the logger will immediately flush the buffer contents. Setting it to zero effectively // disables the batching. Defaults to 16384. - BufferSizeBytes *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=buffer_size_bytes,json=bufferSizeBytes,proto3" json:"buffer_size_bytes,omitempty"` + BufferSizeBytes *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=buffer_size_bytes,json=bufferSizeBytes,proto3" json:"buffer_size_bytes,omitempty"` // A struct that represents the record that is sent for each log entry. // https://github.com/fluent/fluentd/wiki/Forward-Protocol-Specification-v1#entry // Values are rendered as strings, numbers, or boolean values as appropriate. @@ -75,7 +75,7 @@ type FluentdAccessLogConfig struct { // "status": 500, // "message": "My error message" // } - Record *_struct.Struct `protobuf:"bytes,6,opt,name=record,proto3" json:"record,omitempty"` + Record *structpb.Struct `protobuf:"bytes,6,opt,name=record,proto3" json:"record,omitempty"` // Optional retry, in case upstream connection has failed. If this field is not set, the default values will be applied, // as specified in the :ref:`RetryOptions ` // configuration. @@ -139,21 +139,21 @@ func (x *FluentdAccessLogConfig) GetStatPrefix() string { return "" } -func (x *FluentdAccessLogConfig) GetBufferFlushInterval() *duration.Duration { +func (x *FluentdAccessLogConfig) GetBufferFlushInterval() *durationpb.Duration { if x != nil { return x.BufferFlushInterval } return nil } -func (x *FluentdAccessLogConfig) GetBufferSizeBytes() *wrappers.UInt32Value { +func (x *FluentdAccessLogConfig) GetBufferSizeBytes() *wrapperspb.UInt32Value { if x != nil { return x.BufferSizeBytes } return nil } -func (x *FluentdAccessLogConfig) GetRecord() *_struct.Struct { +func (x *FluentdAccessLogConfig) GetRecord() *structpb.Struct { if x != nil { return x.Record } @@ -182,7 +182,7 @@ type FluentdAccessLogConfig_RetryOptions struct { // The number of times the logger will attempt to connect to the upstream during reconnects. // By default, there is no limit. The logger will attempt to reconnect to the upstream each time // connecting to the upstream failed or the upstream connection had been closed for any reason. - MaxConnectAttempts *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` + MaxConnectAttempts *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` // Sets the backoff strategy. If this value is not set, the default base backoff interval is 500 // milliseconds and the default max backoff interval is 5 seconds (10 times the base interval). BackoffOptions *v3.BackoffStrategy `protobuf:"bytes,2,opt,name=backoff_options,json=backoffOptions,proto3" json:"backoff_options,omitempty"` @@ -220,7 +220,7 @@ func (*FluentdAccessLogConfig_RetryOptions) Descriptor() ([]byte, []int) { return file_envoy_extensions_access_loggers_fluentd_v3_fluentd_proto_rawDescGZIP(), []int{0, 0} } -func (x *FluentdAccessLogConfig_RetryOptions) GetMaxConnectAttempts() *wrappers.UInt32Value { +func (x *FluentdAccessLogConfig_RetryOptions) GetMaxConnectAttempts() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectAttempts } @@ -333,9 +333,9 @@ var file_envoy_extensions_access_loggers_fluentd_v3_fluentd_proto_msgTypes = mak var file_envoy_extensions_access_loggers_fluentd_v3_fluentd_proto_goTypes = []interface{}{ (*FluentdAccessLogConfig)(nil), // 0: envoy.extensions.access_loggers.fluentd.v3.FluentdAccessLogConfig (*FluentdAccessLogConfig_RetryOptions)(nil), // 1: envoy.extensions.access_loggers.fluentd.v3.FluentdAccessLogConfig.RetryOptions - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value - (*_struct.Struct)(nil), // 4: google.protobuf.Struct + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*structpb.Struct)(nil), // 4: google.protobuf.Struct (*v3.TypedExtensionConfig)(nil), // 5: envoy.config.core.v3.TypedExtensionConfig (*v3.BackoffStrategy)(nil), // 6: envoy.config.core.v3.BackoffStrategy } diff --git a/envoy/extensions/access_loggers/grpc/v3/als.pb.go b/envoy/extensions/access_loggers/grpc/v3/als.pb.go index de4eaaf89..6153aa91e 100755 --- a/envoy/extensions/access_loggers/grpc/v3/als.pb.go +++ b/envoy/extensions/access_loggers/grpc/v3/als.pb.go @@ -11,10 +11,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -177,11 +177,11 @@ type CommonGrpcAccessLogConfig struct { // Interval for flushing access logs to the gRPC stream. Logger will flush requests every time // this interval is elapsed, or when batch size limit is hit, whichever comes first. Defaults to // 1 second. - BufferFlushInterval *duration.Duration `protobuf:"bytes,3,opt,name=buffer_flush_interval,json=bufferFlushInterval,proto3" json:"buffer_flush_interval,omitempty"` + BufferFlushInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=buffer_flush_interval,json=bufferFlushInterval,proto3" json:"buffer_flush_interval,omitempty"` // Soft size limit in bytes for access log entries buffer. Logger will buffer requests until // this limit it hit, or every time flush interval is elapsed, whichever comes first. Setting it // to zero effectively disables the batching. Defaults to 16384. - BufferSizeBytes *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=buffer_size_bytes,json=bufferSizeBytes,proto3" json:"buffer_size_bytes,omitempty"` + BufferSizeBytes *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=buffer_size_bytes,json=bufferSizeBytes,proto3" json:"buffer_size_bytes,omitempty"` // Additional filter state objects to log in :ref:`filter_state_objects // `. // Logger will call “FilterState::Object::serializeAsProto“ to serialize the filter state object. @@ -250,14 +250,14 @@ func (x *CommonGrpcAccessLogConfig) GetTransportApiVersion() v3.ApiVersion { return v3.ApiVersion(0) } -func (x *CommonGrpcAccessLogConfig) GetBufferFlushInterval() *duration.Duration { +func (x *CommonGrpcAccessLogConfig) GetBufferFlushInterval() *durationpb.Duration { if x != nil { return x.BufferFlushInterval } return nil } -func (x *CommonGrpcAccessLogConfig) GetBufferSizeBytes() *wrappers.UInt32Value { +func (x *CommonGrpcAccessLogConfig) GetBufferSizeBytes() *wrapperspb.UInt32Value { if x != nil { return x.BufferSizeBytes } @@ -428,8 +428,8 @@ var file_envoy_extensions_access_loggers_grpc_v3_als_proto_goTypes = []interface (*CommonGrpcAccessLogConfig)(nil), // 2: envoy.extensions.access_loggers.grpc.v3.CommonGrpcAccessLogConfig (*v3.GrpcService)(nil), // 3: envoy.config.core.v3.GrpcService (v3.ApiVersion)(0), // 4: envoy.config.core.v3.ApiVersion - (*duration.Duration)(nil), // 5: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value (*v3.RetryPolicy)(nil), // 7: envoy.config.core.v3.RetryPolicy (*v31.CustomTag)(nil), // 8: envoy.type.tracing.v3.CustomTag } diff --git a/envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.go b/envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.go index 84145aeaf..ee6051132 100755 --- a/envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.go +++ b/envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.go @@ -9,9 +9,9 @@ package internal_listenerv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -33,7 +33,7 @@ type InternalListener struct { // For example, if “buffer_size_kb“ is set to 5, then the actual buffer size is // 5 KiB = 5 * 1024 bytes. // If the “buffer_size_kb“ is not specified, the buffer size is set to 1024 KiB. - BufferSizeKb *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=buffer_size_kb,json=bufferSizeKb,proto3" json:"buffer_size_kb,omitempty"` + BufferSizeKb *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=buffer_size_kb,json=bufferSizeKb,proto3" json:"buffer_size_kb,omitempty"` } func (x *InternalListener) Reset() { @@ -68,7 +68,7 @@ func (*InternalListener) Descriptor() ([]byte, []int) { return file_envoy_extensions_bootstrap_internal_listener_v3_internal_listener_proto_rawDescGZIP(), []int{0} } -func (x *InternalListener) GetBufferSizeKb() *wrappers.UInt32Value { +func (x *InternalListener) GetBufferSizeKb() *wrapperspb.UInt32Value { if x != nil { return x.BufferSizeKb } @@ -127,8 +127,8 @@ func file_envoy_extensions_bootstrap_internal_listener_v3_internal_listener_prot var file_envoy_extensions_bootstrap_internal_listener_v3_internal_listener_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_bootstrap_internal_listener_v3_internal_listener_proto_goTypes = []interface{}{ - (*InternalListener)(nil), // 0: envoy.extensions.bootstrap.internal_listener.v3.InternalListener - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*InternalListener)(nil), // 0: envoy.extensions.bootstrap.internal_listener.v3.InternalListener + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value } var file_envoy_extensions_bootstrap_internal_listener_v3_internal_listener_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.bootstrap.internal_listener.v3.InternalListener.buffer_size_kb:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.go b/envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.go index 9c9662f54..6fc1ae359 100755 --- a/envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.go +++ b/envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.go @@ -12,10 +12,10 @@ import ( v32 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -174,10 +174,10 @@ type SubClustersConfig struct { // when picking a host in a sub cluster. Note that CLUSTER_PROVIDED is not allowed here. LbPolicy v31.Cluster_LbPolicy `protobuf:"varint,1,opt,name=lb_policy,json=lbPolicy,proto3,enum=envoy.config.cluster.v3.Cluster_LbPolicy" json:"lb_policy,omitempty"` // The maximum number of sub clusters that the DFP cluster will hold. If not specified defaults to 1024. - MaxSubClusters *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_sub_clusters,json=maxSubClusters,proto3" json:"max_sub_clusters,omitempty"` + MaxSubClusters *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_sub_clusters,json=maxSubClusters,proto3" json:"max_sub_clusters,omitempty"` // The TTL for sub clusters that are unused. Sub clusters that have not been used in the configured time // interval will be purged. If not specified defaults to 5m. - SubClusterTtl *duration.Duration `protobuf:"bytes,3,opt,name=sub_cluster_ttl,json=subClusterTtl,proto3" json:"sub_cluster_ttl,omitempty"` + SubClusterTtl *durationpb.Duration `protobuf:"bytes,3,opt,name=sub_cluster_ttl,json=subClusterTtl,proto3" json:"sub_cluster_ttl,omitempty"` // Sub clusters that should be created & warmed upon creation. This might provide a // performance improvement, in the form of cache hits, for sub clusters that are going to be // warmed during steady state and are known at config load time. @@ -223,14 +223,14 @@ func (x *SubClustersConfig) GetLbPolicy() v31.Cluster_LbPolicy { return v31.Cluster_LbPolicy(0) } -func (x *SubClustersConfig) GetMaxSubClusters() *wrappers.UInt32Value { +func (x *SubClustersConfig) GetMaxSubClusters() *wrapperspb.UInt32Value { if x != nil { return x.MaxSubClusters } return nil } -func (x *SubClustersConfig) GetSubClusterTtl() *duration.Duration { +func (x *SubClustersConfig) GetSubClusterTtl() *durationpb.Duration { if x != nil { return x.SubClusterTtl } @@ -355,13 +355,13 @@ func file_envoy_extensions_clusters_dynamic_forward_proxy_v3_cluster_proto_rawDe var file_envoy_extensions_clusters_dynamic_forward_proxy_v3_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_extensions_clusters_dynamic_forward_proxy_v3_cluster_proto_goTypes = []interface{}{ - (*ClusterConfig)(nil), // 0: envoy.extensions.clusters.dynamic_forward_proxy.v3.ClusterConfig - (*SubClustersConfig)(nil), // 1: envoy.extensions.clusters.dynamic_forward_proxy.v3.SubClustersConfig - (*v3.DnsCacheConfig)(nil), // 2: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig - (v31.Cluster_LbPolicy)(0), // 3: envoy.config.cluster.v3.Cluster.LbPolicy - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 5: google.protobuf.Duration - (*v32.SocketAddress)(nil), // 6: envoy.config.core.v3.SocketAddress + (*ClusterConfig)(nil), // 0: envoy.extensions.clusters.dynamic_forward_proxy.v3.ClusterConfig + (*SubClustersConfig)(nil), // 1: envoy.extensions.clusters.dynamic_forward_proxy.v3.SubClustersConfig + (*v3.DnsCacheConfig)(nil), // 2: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig + (v31.Cluster_LbPolicy)(0), // 3: envoy.config.cluster.v3.Cluster.LbPolicy + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration + (*v32.SocketAddress)(nil), // 6: envoy.config.core.v3.SocketAddress } var file_envoy_extensions_clusters_dynamic_forward_proxy_v3_cluster_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.clusters.dynamic_forward_proxy.v3.ClusterConfig.dns_cache_config:type_name -> envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig diff --git a/envoy/extensions/clusters/redis/v3/redis_cluster.pb.go b/envoy/extensions/clusters/redis/v3/redis_cluster.pb.go index c48ceb027..b24f44e9e 100755 --- a/envoy/extensions/clusters/redis/v3/redis_cluster.pb.go +++ b/envoy/extensions/clusters/redis/v3/redis_cluster.pb.go @@ -9,10 +9,10 @@ package redisv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -31,17 +31,17 @@ type RedisClusterConfig struct { unknownFields protoimpl.UnknownFields // Interval between successive topology refresh requests. If not set, this defaults to 5s. - ClusterRefreshRate *duration.Duration `protobuf:"bytes,1,opt,name=cluster_refresh_rate,json=clusterRefreshRate,proto3" json:"cluster_refresh_rate,omitempty"` + ClusterRefreshRate *durationpb.Duration `protobuf:"bytes,1,opt,name=cluster_refresh_rate,json=clusterRefreshRate,proto3" json:"cluster_refresh_rate,omitempty"` // Timeout for topology refresh request. If not set, this defaults to 3s. - ClusterRefreshTimeout *duration.Duration `protobuf:"bytes,2,opt,name=cluster_refresh_timeout,json=clusterRefreshTimeout,proto3" json:"cluster_refresh_timeout,omitempty"` + ClusterRefreshTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=cluster_refresh_timeout,json=clusterRefreshTimeout,proto3" json:"cluster_refresh_timeout,omitempty"` // The minimum interval that must pass after triggering a topology refresh request before a new // request can possibly be triggered again. Any errors received during one of these // time intervals are ignored. If not set, this defaults to 5s. - RedirectRefreshInterval *duration.Duration `protobuf:"bytes,3,opt,name=redirect_refresh_interval,json=redirectRefreshInterval,proto3" json:"redirect_refresh_interval,omitempty"` + RedirectRefreshInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=redirect_refresh_interval,json=redirectRefreshInterval,proto3" json:"redirect_refresh_interval,omitempty"` // The number of redirection errors that must be received before // triggering a topology refresh request. If not set, this defaults to 5. // If this is set to 0, topology refresh after redirect is disabled. - RedirectRefreshThreshold *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=redirect_refresh_threshold,json=redirectRefreshThreshold,proto3" json:"redirect_refresh_threshold,omitempty"` + RedirectRefreshThreshold *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=redirect_refresh_threshold,json=redirectRefreshThreshold,proto3" json:"redirect_refresh_threshold,omitempty"` // The number of failures that must be received before triggering a topology refresh request. // If not set, this defaults to 0, which disables the topology refresh due to failure. FailureRefreshThreshold uint32 `protobuf:"varint,5,opt,name=failure_refresh_threshold,json=failureRefreshThreshold,proto3" json:"failure_refresh_threshold,omitempty"` @@ -83,28 +83,28 @@ func (*RedisClusterConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_clusters_redis_v3_redis_cluster_proto_rawDescGZIP(), []int{0} } -func (x *RedisClusterConfig) GetClusterRefreshRate() *duration.Duration { +func (x *RedisClusterConfig) GetClusterRefreshRate() *durationpb.Duration { if x != nil { return x.ClusterRefreshRate } return nil } -func (x *RedisClusterConfig) GetClusterRefreshTimeout() *duration.Duration { +func (x *RedisClusterConfig) GetClusterRefreshTimeout() *durationpb.Duration { if x != nil { return x.ClusterRefreshTimeout } return nil } -func (x *RedisClusterConfig) GetRedirectRefreshInterval() *duration.Duration { +func (x *RedisClusterConfig) GetRedirectRefreshInterval() *durationpb.Duration { if x != nil { return x.RedirectRefreshInterval } return nil } -func (x *RedisClusterConfig) GetRedirectRefreshThreshold() *wrappers.UInt32Value { +func (x *RedisClusterConfig) GetRedirectRefreshThreshold() *wrapperspb.UInt32Value { if x != nil { return x.RedirectRefreshThreshold } @@ -206,9 +206,9 @@ func file_envoy_extensions_clusters_redis_v3_redis_cluster_proto_rawDescGZIP() [ var file_envoy_extensions_clusters_redis_v3_redis_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_clusters_redis_v3_redis_cluster_proto_goTypes = []interface{}{ - (*RedisClusterConfig)(nil), // 0: envoy.extensions.clusters.redis.v3.RedisClusterConfig - (*duration.Duration)(nil), // 1: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*RedisClusterConfig)(nil), // 0: envoy.extensions.clusters.redis.v3.RedisClusterConfig + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_extensions_clusters_redis_v3_redis_cluster_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.clusters.redis.v3.RedisClusterConfig.cluster_refresh_rate:type_name -> google.protobuf.Duration diff --git a/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.go b/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.go index 4013a79e5..a1f5dd3eb 100755 --- a/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.go +++ b/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.go @@ -13,10 +13,10 @@ import ( v32 "github.com/envoyproxy/go-control-plane/envoy/config/common/key_value/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,7 +36,7 @@ type DnsCacheCircuitBreakers struct { // The maximum number of pending requests that Envoy will allow to the // resolver. If not specified, the default is 1024. - MaxPendingRequests *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` + MaxPendingRequests *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` } func (x *DnsCacheCircuitBreakers) Reset() { @@ -71,7 +71,7 @@ func (*DnsCacheCircuitBreakers) Descriptor() ([]byte, []int) { return file_envoy_extensions_common_dynamic_forward_proxy_v3_dns_cache_proto_rawDescGZIP(), []int{0} } -func (x *DnsCacheCircuitBreakers) GetMaxPendingRequests() *wrappers.UInt32Value { +func (x *DnsCacheCircuitBreakers) GetMaxPendingRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxPendingRequests } @@ -107,11 +107,11 @@ type DnsCacheConfig struct { // // Once a host has been resolved, the refresh rate will be the DNS TTL, capped // at a minimum of “dns_min_refresh_rate“. - DnsRefreshRate *duration.Duration `protobuf:"bytes,3,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + DnsRefreshRate *durationpb.Duration `protobuf:"bytes,3,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` // The minimum rate that DNS resolution will occur. Per “dns_refresh_rate“, once a host is // resolved, the DNS TTL will be used, with a minimum set by “dns_min_refresh_rate“. // “dns_min_refresh_rate“ defaults to 5s and must also be >= 1s. - DnsMinRefreshRate *duration.Duration `protobuf:"bytes,14,opt,name=dns_min_refresh_rate,json=dnsMinRefreshRate,proto3" json:"dns_min_refresh_rate,omitempty"` + DnsMinRefreshRate *durationpb.Duration `protobuf:"bytes,14,opt,name=dns_min_refresh_rate,json=dnsMinRefreshRate,proto3" json:"dns_min_refresh_rate,omitempty"` // The TTL for hosts that are unused. Hosts that have not been used in the configured time // interval will be purged. If not specified defaults to 5m. // @@ -124,7 +124,7 @@ type DnsCacheConfig struct { // .. note: // // The TTL has no relation to DNS TTL and is only used to control Envoy's resource usage. - HostTtl *duration.Duration `protobuf:"bytes,4,opt,name=host_ttl,json=hostTtl,proto3" json:"host_ttl,omitempty"` + HostTtl *durationpb.Duration `protobuf:"bytes,4,opt,name=host_ttl,json=hostTtl,proto3" json:"host_ttl,omitempty"` // The maximum number of hosts that the cache will hold. If not specified defaults to 1024. // // .. note: @@ -132,7 +132,7 @@ type DnsCacheConfig struct { // The implementation is approximate and enforced independently on each worker thread, thus // it is possible for the maximum hosts in the cache to go slightly above the configured // value depending on timing. This is similar to how other circuit breakers work. - MaxHosts *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=max_hosts,json=maxHosts,proto3" json:"max_hosts,omitempty"` + MaxHosts *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=max_hosts,json=maxHosts,proto3" json:"max_hosts,omitempty"` // If the DNS failure refresh rate is specified, // this is used as the cache's DNS refresh rate when DNS requests are failing. If this setting is // not specified, the failure refresh rate defaults to the dns_refresh_rate. @@ -172,7 +172,7 @@ type DnsCacheConfig struct { // used by the underlying DNS implementation (e.g., c-areas and Apple DNS) which are opaque. // Setting this timeout will ensure that queries succeed or fail within the specified time frame // and are then retried using the standard refresh rates. Defaults to 5s if not set. - DnsQueryTimeout *duration.Duration `protobuf:"bytes,11,opt,name=dns_query_timeout,json=dnsQueryTimeout,proto3" json:"dns_query_timeout,omitempty"` + DnsQueryTimeout *durationpb.Duration `protobuf:"bytes,11,opt,name=dns_query_timeout,json=dnsQueryTimeout,proto3" json:"dns_query_timeout,omitempty"` // Configuration to flush the DNS cache to long term storage. KeyValueConfig *v32.KeyValueStoreConfig `protobuf:"bytes,13,opt,name=key_value_config,json=keyValueConfig,proto3" json:"key_value_config,omitempty"` } @@ -223,28 +223,28 @@ func (x *DnsCacheConfig) GetDnsLookupFamily() v3.Cluster_DnsLookupFamily { return v3.Cluster_DnsLookupFamily(0) } -func (x *DnsCacheConfig) GetDnsRefreshRate() *duration.Duration { +func (x *DnsCacheConfig) GetDnsRefreshRate() *durationpb.Duration { if x != nil { return x.DnsRefreshRate } return nil } -func (x *DnsCacheConfig) GetDnsMinRefreshRate() *duration.Duration { +func (x *DnsCacheConfig) GetDnsMinRefreshRate() *durationpb.Duration { if x != nil { return x.DnsMinRefreshRate } return nil } -func (x *DnsCacheConfig) GetHostTtl() *duration.Duration { +func (x *DnsCacheConfig) GetHostTtl() *durationpb.Duration { if x != nil { return x.HostTtl } return nil } -func (x *DnsCacheConfig) GetMaxHosts() *wrappers.UInt32Value { +func (x *DnsCacheConfig) GetMaxHosts() *wrapperspb.UInt32Value { if x != nil { return x.MaxHosts } @@ -295,7 +295,7 @@ func (x *DnsCacheConfig) GetPreresolveHostnames() []*v31.SocketAddress { return nil } -func (x *DnsCacheConfig) GetDnsQueryTimeout() *duration.Duration { +func (x *DnsCacheConfig) GetDnsQueryTimeout() *durationpb.Duration { if x != nil { return x.DnsQueryTimeout } @@ -464,9 +464,9 @@ var file_envoy_extensions_common_dynamic_forward_proxy_v3_dns_cache_proto_msgTyp var file_envoy_extensions_common_dynamic_forward_proxy_v3_dns_cache_proto_goTypes = []interface{}{ (*DnsCacheCircuitBreakers)(nil), // 0: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheCircuitBreakers (*DnsCacheConfig)(nil), // 1: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value (v3.Cluster_DnsLookupFamily)(0), // 3: envoy.config.cluster.v3.Cluster.DnsLookupFamily - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration (*v3.Cluster_RefreshRate)(nil), // 5: envoy.config.cluster.v3.Cluster.RefreshRate (*v31.DnsResolutionConfig)(nil), // 6: envoy.config.core.v3.DnsResolutionConfig (*v31.TypedExtensionConfig)(nil), // 7: envoy.config.core.v3.TypedExtensionConfig diff --git a/envoy/extensions/compression/brotli/compressor/v3/brotli.pb.go b/envoy/extensions/compression/brotli/compressor/v3/brotli.pb.go index 68b9994bd..4654356f2 100755 --- a/envoy/extensions/compression/brotli/compressor/v3/brotli.pb.go +++ b/envoy/extensions/compression/brotli/compressor/v3/brotli.pb.go @@ -9,9 +9,9 @@ package compressorv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -83,7 +83,7 @@ type Brotli struct { // Value from 0 to 11 that controls the main compression speed-density lever. // The higher quality, the slower compression. The default value is 3. - Quality *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=quality,proto3" json:"quality,omitempty"` + Quality *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=quality,proto3" json:"quality,omitempty"` // A value used to tune encoder for specific input. For more information about modes, // please refer to brotli manual: https://brotli.org/encode.html#aa6f // This field will be set to "DEFAULT" if not specified. @@ -92,14 +92,14 @@ type Brotli struct { // Larger window results in better compression at the expense of memory usage. The default is 18. // For more details about this parameter, please refer to brotli manual: // https://brotli.org/encode.html#a9a8 - WindowBits *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` + WindowBits *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` // Value from 16 to 24 that represents the base two logarithmic of the compressor's input block // size. Larger input block results in better compression at the expense of memory usage. The // default is 24. For more details about this parameter, please refer to brotli manual: // https://brotli.org/encode.html#a9a8 - InputBlockBits *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=input_block_bits,json=inputBlockBits,proto3" json:"input_block_bits,omitempty"` + InputBlockBits *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=input_block_bits,json=inputBlockBits,proto3" json:"input_block_bits,omitempty"` // Value for compressor's next output buffer. If not set, defaults to 4096. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` // If true, disables "literal context modeling" format feature. // This flag is a "decoding-speed vs compression ratio" trade-off. DisableLiteralContextModeling bool `protobuf:"varint,6,opt,name=disable_literal_context_modeling,json=disableLiteralContextModeling,proto3" json:"disable_literal_context_modeling,omitempty"` @@ -137,7 +137,7 @@ func (*Brotli) Descriptor() ([]byte, []int) { return file_envoy_extensions_compression_brotli_compressor_v3_brotli_proto_rawDescGZIP(), []int{0} } -func (x *Brotli) GetQuality() *wrappers.UInt32Value { +func (x *Brotli) GetQuality() *wrapperspb.UInt32Value { if x != nil { return x.Quality } @@ -151,21 +151,21 @@ func (x *Brotli) GetEncoderMode() Brotli_EncoderMode { return Brotli_DEFAULT } -func (x *Brotli) GetWindowBits() *wrappers.UInt32Value { +func (x *Brotli) GetWindowBits() *wrapperspb.UInt32Value { if x != nil { return x.WindowBits } return nil } -func (x *Brotli) GetInputBlockBits() *wrappers.UInt32Value { +func (x *Brotli) GetInputBlockBits() *wrapperspb.UInt32Value { if x != nil { return x.InputBlockBits } return nil } -func (x *Brotli) GetChunkSize() *wrappers.UInt32Value { +func (x *Brotli) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -260,9 +260,9 @@ func file_envoy_extensions_compression_brotli_compressor_v3_brotli_proto_rawDesc var file_envoy_extensions_compression_brotli_compressor_v3_brotli_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_envoy_extensions_compression_brotli_compressor_v3_brotli_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_compression_brotli_compressor_v3_brotli_proto_goTypes = []interface{}{ - (Brotli_EncoderMode)(0), // 0: envoy.extensions.compression.brotli.compressor.v3.Brotli.EncoderMode - (*Brotli)(nil), // 1: envoy.extensions.compression.brotli.compressor.v3.Brotli - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (Brotli_EncoderMode)(0), // 0: envoy.extensions.compression.brotli.compressor.v3.Brotli.EncoderMode + (*Brotli)(nil), // 1: envoy.extensions.compression.brotli.compressor.v3.Brotli + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_extensions_compression_brotli_compressor_v3_brotli_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.compression.brotli.compressor.v3.Brotli.quality:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.go b/envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.go index 086f8ba90..5ab28ac23 100755 --- a/envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.go +++ b/envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.go @@ -9,9 +9,9 @@ package decompressorv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -32,7 +32,7 @@ type Brotli struct { // Ring buffer is allocated according to window size, despite the real size of the content. DisableRingBufferReallocation bool `protobuf:"varint,1,opt,name=disable_ring_buffer_reallocation,json=disableRingBufferReallocation,proto3" json:"disable_ring_buffer_reallocation,omitempty"` // Value for decompressor's next output buffer. If not set, defaults to 4096. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` } func (x *Brotli) Reset() { @@ -74,7 +74,7 @@ func (x *Brotli) GetDisableRingBufferReallocation() bool { return false } -func (x *Brotli) GetChunkSize() *wrappers.UInt32Value { +func (x *Brotli) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -136,8 +136,8 @@ func file_envoy_extensions_compression_brotli_decompressor_v3_brotli_proto_rawDe var file_envoy_extensions_compression_brotli_decompressor_v3_brotli_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_compression_brotli_decompressor_v3_brotli_proto_goTypes = []interface{}{ - (*Brotli)(nil), // 0: envoy.extensions.compression.brotli.decompressor.v3.Brotli - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*Brotli)(nil), // 0: envoy.extensions.compression.brotli.decompressor.v3.Brotli + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value } var file_envoy_extensions_compression_brotli_decompressor_v3_brotli_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.compression.brotli.decompressor.v3.Brotli.chunk_size:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/compression/gzip/compressor/v3/gzip.pb.go b/envoy/extensions/compression/gzip/compressor/v3/gzip.pb.go index f61e99c0f..d07c5d3e7 100755 --- a/envoy/extensions/compression/gzip/compressor/v3/gzip.pb.go +++ b/envoy/extensions/compression/gzip/compressor/v3/gzip.pb.go @@ -9,9 +9,9 @@ package compressorv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -164,7 +164,7 @@ type Gzip struct { // Value from 1 to 9 that controls the amount of internal memory used by zlib. Higher values // use more memory, but are faster and produce better compression results. The default value is 5. - MemoryLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` + MemoryLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` // A value used for selecting the zlib compression level. This setting will affect speed and // amount of compression applied to the content. "BEST_COMPRESSION" provides higher compression // at the cost of higher latency and is equal to "COMPRESSION_LEVEL_9". "BEST_SPEED" provides @@ -184,11 +184,11 @@ type Gzip struct { // Larger window results in better compression at the expense of memory usage. The default is 12 // which will produce a 4096 bytes window. For more details about this parameter, please refer to // zlib manual > deflateInit2. - WindowBits *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` + WindowBits *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` // Value for Zlib's next output buffer. If not set, defaults to 4096. // See https://www.zlib.net/manual.html for more details. Also see // https://github.com/envoyproxy/envoy/issues/8448 for context on this filter's performance. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` } func (x *Gzip) Reset() { @@ -223,7 +223,7 @@ func (*Gzip) Descriptor() ([]byte, []int) { return file_envoy_extensions_compression_gzip_compressor_v3_gzip_proto_rawDescGZIP(), []int{0} } -func (x *Gzip) GetMemoryLevel() *wrappers.UInt32Value { +func (x *Gzip) GetMemoryLevel() *wrapperspb.UInt32Value { if x != nil { return x.MemoryLevel } @@ -244,14 +244,14 @@ func (x *Gzip) GetCompressionStrategy() Gzip_CompressionStrategy { return Gzip_DEFAULT_STRATEGY } -func (x *Gzip) GetWindowBits() *wrappers.UInt32Value { +func (x *Gzip) GetWindowBits() *wrapperspb.UInt32Value { if x != nil { return x.WindowBits } return nil } -func (x *Gzip) GetChunkSize() *wrappers.UInt32Value { +func (x *Gzip) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -360,10 +360,10 @@ func file_envoy_extensions_compression_gzip_compressor_v3_gzip_proto_rawDescGZIP var file_envoy_extensions_compression_gzip_compressor_v3_gzip_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_envoy_extensions_compression_gzip_compressor_v3_gzip_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_compression_gzip_compressor_v3_gzip_proto_goTypes = []interface{}{ - (Gzip_CompressionStrategy)(0), // 0: envoy.extensions.compression.gzip.compressor.v3.Gzip.CompressionStrategy - (Gzip_CompressionLevel)(0), // 1: envoy.extensions.compression.gzip.compressor.v3.Gzip.CompressionLevel - (*Gzip)(nil), // 2: envoy.extensions.compression.gzip.compressor.v3.Gzip - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (Gzip_CompressionStrategy)(0), // 0: envoy.extensions.compression.gzip.compressor.v3.Gzip.CompressionStrategy + (Gzip_CompressionLevel)(0), // 1: envoy.extensions.compression.gzip.compressor.v3.Gzip.CompressionLevel + (*Gzip)(nil), // 2: envoy.extensions.compression.gzip.compressor.v3.Gzip + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value } var file_envoy_extensions_compression_gzip_compressor_v3_gzip_proto_depIdxs = []int32{ 3, // 0: envoy.extensions.compression.gzip.compressor.v3.Gzip.memory_level:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.go b/envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.go index 4d05e1e94..21058fec7 100755 --- a/envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.go +++ b/envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.go @@ -9,9 +9,9 @@ package decompressorv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -33,15 +33,15 @@ type Gzip struct { // The default window size is 15. // This is so that the decompressor can decompress a response compressed by a compressor with any compression window size. // For more details about this parameter, please refer to `zlib manual `_ > inflateInit2. - WindowBits *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` + WindowBits *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` // Value for zlib's decompressor output buffer. If not set, defaults to 4096. // See https://www.zlib.net/manual.html for more details. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` // An upper bound to the number of times the output buffer is allowed to be bigger than the size of // the accumulated input. This value is used to prevent decompression bombs. If not set, defaults to 100. // [#comment:TODO(rojkov): Re-design the Decompressor interface to handle compression bombs gracefully instead of this quick solution. // See https://github.com/envoyproxy/envoy/commit/d4c39e635603e2f23e1e08ddecf5a5fb5a706338 for details.] - MaxInflateRatio *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_inflate_ratio,json=maxInflateRatio,proto3" json:"max_inflate_ratio,omitempty"` + MaxInflateRatio *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_inflate_ratio,json=maxInflateRatio,proto3" json:"max_inflate_ratio,omitempty"` } func (x *Gzip) Reset() { @@ -76,21 +76,21 @@ func (*Gzip) Descriptor() ([]byte, []int) { return file_envoy_extensions_compression_gzip_decompressor_v3_gzip_proto_rawDescGZIP(), []int{0} } -func (x *Gzip) GetWindowBits() *wrappers.UInt32Value { +func (x *Gzip) GetWindowBits() *wrapperspb.UInt32Value { if x != nil { return x.WindowBits } return nil } -func (x *Gzip) GetChunkSize() *wrappers.UInt32Value { +func (x *Gzip) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } return nil } -func (x *Gzip) GetMaxInflateRatio() *wrappers.UInt32Value { +func (x *Gzip) GetMaxInflateRatio() *wrapperspb.UInt32Value { if x != nil { return x.MaxInflateRatio } @@ -157,8 +157,8 @@ func file_envoy_extensions_compression_gzip_decompressor_v3_gzip_proto_rawDescGZ var file_envoy_extensions_compression_gzip_decompressor_v3_gzip_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_compression_gzip_decompressor_v3_gzip_proto_goTypes = []interface{}{ - (*Gzip)(nil), // 0: envoy.extensions.compression.gzip.decompressor.v3.Gzip - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*Gzip)(nil), // 0: envoy.extensions.compression.gzip.decompressor.v3.Gzip + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value } var file_envoy_extensions_compression_gzip_decompressor_v3_gzip_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.compression.gzip.decompressor.v3.Gzip.window_bits:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/compression/zstd/compressor/v3/zstd.pb.go b/envoy/extensions/compression/zstd/compressor/v3/zstd.pb.go index 8286edf3d..4c8de49c4 100755 --- a/envoy/extensions/compression/zstd/compressor/v3/zstd.pb.go +++ b/envoy/extensions/compression/zstd/compressor/v3/zstd.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -109,7 +109,7 @@ type Zstd struct { // to default. Setting this will however eventually dynamically impact the compression // parameters which have not been manually set. The manually set // ones will 'stick'. - CompressionLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=compression_level,json=compressionLevel,proto3" json:"compression_level,omitempty"` + CompressionLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=compression_level,json=compressionLevel,proto3" json:"compression_level,omitempty"` // A 32-bits checksum of content is written at end of frame. If not set, defaults to false. EnableChecksum bool `protobuf:"varint,2,opt,name=enable_checksum,json=enableChecksum,proto3" json:"enable_checksum,omitempty"` // The higher the value of selected strategy, the more complex it is, @@ -123,7 +123,7 @@ type Zstd struct { // to train a specific dictionary for compression. Dictionary *v3.DataSource `protobuf:"bytes,4,opt,name=dictionary,proto3" json:"dictionary,omitempty"` // Value for compressor's next output buffer. If not set, defaults to 4096. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` } func (x *Zstd) Reset() { @@ -158,7 +158,7 @@ func (*Zstd) Descriptor() ([]byte, []int) { return file_envoy_extensions_compression_zstd_compressor_v3_zstd_proto_rawDescGZIP(), []int{0} } -func (x *Zstd) GetCompressionLevel() *wrappers.UInt32Value { +func (x *Zstd) GetCompressionLevel() *wrapperspb.UInt32Value { if x != nil { return x.CompressionLevel } @@ -186,7 +186,7 @@ func (x *Zstd) GetDictionary() *v3.DataSource { return nil } -func (x *Zstd) GetChunkSize() *wrappers.UInt32Value { +func (x *Zstd) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -271,10 +271,10 @@ func file_envoy_extensions_compression_zstd_compressor_v3_zstd_proto_rawDescGZIP var file_envoy_extensions_compression_zstd_compressor_v3_zstd_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_envoy_extensions_compression_zstd_compressor_v3_zstd_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_compression_zstd_compressor_v3_zstd_proto_goTypes = []interface{}{ - (Zstd_Strategy)(0), // 0: envoy.extensions.compression.zstd.compressor.v3.Zstd.Strategy - (*Zstd)(nil), // 1: envoy.extensions.compression.zstd.compressor.v3.Zstd - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value - (*v3.DataSource)(nil), // 3: envoy.config.core.v3.DataSource + (Zstd_Strategy)(0), // 0: envoy.extensions.compression.zstd.compressor.v3.Zstd.Strategy + (*Zstd)(nil), // 1: envoy.extensions.compression.zstd.compressor.v3.Zstd + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*v3.DataSource)(nil), // 3: envoy.config.core.v3.DataSource } var file_envoy_extensions_compression_zstd_compressor_v3_zstd_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.compression.zstd.compressor.v3.Zstd.compression_level:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.go b/envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.go index 81aa7fbc5..1895846ef 100755 --- a/envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.go +++ b/envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -38,7 +38,7 @@ type Zstd struct { // to train specific dictionaries for decompression. Dictionaries []*v3.DataSource `protobuf:"bytes,1,rep,name=dictionaries,proto3" json:"dictionaries,omitempty"` // Value for decompressor's next output buffer. If not set, defaults to 4096. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` } func (x *Zstd) Reset() { @@ -80,7 +80,7 @@ func (x *Zstd) GetDictionaries() []*v3.DataSource { return nil } -func (x *Zstd) GetChunkSize() *wrappers.UInt32Value { +func (x *Zstd) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -143,9 +143,9 @@ func file_envoy_extensions_compression_zstd_decompressor_v3_zstd_proto_rawDescGZ var file_envoy_extensions_compression_zstd_decompressor_v3_zstd_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_compression_zstd_decompressor_v3_zstd_proto_goTypes = []interface{}{ - (*Zstd)(nil), // 0: envoy.extensions.compression.zstd.decompressor.v3.Zstd - (*v3.DataSource)(nil), // 1: envoy.config.core.v3.DataSource - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*Zstd)(nil), // 0: envoy.extensions.compression.zstd.decompressor.v3.Zstd + (*v3.DataSource)(nil), // 1: envoy.config.core.v3.DataSource + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_extensions_compression_zstd_decompressor_v3_zstd_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.compression.zstd.decompressor.v3.Zstd.dictionaries:type_name -> envoy.config.core.v3.DataSource diff --git a/envoy/extensions/filters/common/fault/v3/fault.pb.go b/envoy/extensions/filters/common/fault/v3/fault.pb.go index c4747cfc4..19370607d 100755 --- a/envoy/extensions/filters/common/fault/v3/fault.pb.go +++ b/envoy/extensions/filters/common/fault/v3/fault.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -124,7 +124,7 @@ func (m *FaultDelay) GetFaultDelaySecifier() isFaultDelay_FaultDelaySecifier { return nil } -func (x *FaultDelay) GetFixedDelay() *duration.Duration { +func (x *FaultDelay) GetFixedDelay() *durationpb.Duration { if x, ok := x.GetFaultDelaySecifier().(*FaultDelay_FixedDelay); ok { return x.FixedDelay } @@ -155,7 +155,7 @@ type FaultDelay_FixedDelay struct { // the JSON/YAML Duration mapping. For HTTP/Mongo, the specified // delay will be injected before a new request/operation. // This is required if type is FIXED. - FixedDelay *duration.Duration `protobuf:"bytes,3,opt,name=fixed_delay,json=fixedDelay,proto3,oneof"` + FixedDelay *durationpb.Duration `protobuf:"bytes,3,opt,name=fixed_delay,json=fixedDelay,proto3,oneof"` } type FaultDelay_HeaderDelay_ struct { @@ -508,7 +508,7 @@ var file_envoy_extensions_filters_common_fault_v3_fault_proto_goTypes = []interf (*FaultDelay_HeaderDelay)(nil), // 3: envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay (*FaultRateLimit_FixedLimit)(nil), // 4: envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit (*FaultRateLimit_HeaderLimit)(nil), // 5: envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit - (*duration.Duration)(nil), // 6: google.protobuf.Duration + (*durationpb.Duration)(nil), // 6: google.protobuf.Duration (*v3.FractionalPercent)(nil), // 7: envoy.type.v3.FractionalPercent } var file_envoy_extensions_filters_common_fault_v3_fault_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.go b/envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.go index 0d5ddde6e..25f769ac1 100755 --- a/envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.go +++ b/envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.go @@ -11,10 +11,10 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -193,9 +193,9 @@ type GradientControllerConfig_ConcurrencyLimitCalculationParams struct { unknownFields protoimpl.UnknownFields // The allowed upper-bound on the calculated concurrency limit. Defaults to 1000. - MaxConcurrencyLimit *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrency_limit,json=maxConcurrencyLimit,proto3" json:"max_concurrency_limit,omitempty"` + MaxConcurrencyLimit *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrency_limit,json=maxConcurrencyLimit,proto3" json:"max_concurrency_limit,omitempty"` // The period of time samples are taken to recalculate the concurrency limit. - ConcurrencyUpdateInterval *duration.Duration `protobuf:"bytes,3,opt,name=concurrency_update_interval,json=concurrencyUpdateInterval,proto3" json:"concurrency_update_interval,omitempty"` + ConcurrencyUpdateInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=concurrency_update_interval,json=concurrencyUpdateInterval,proto3" json:"concurrency_update_interval,omitempty"` } func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) Reset() { @@ -230,14 +230,14 @@ func (*GradientControllerConfig_ConcurrencyLimitCalculationParams) Descriptor() return file_envoy_extensions_filters_http_adaptive_concurrency_v3_adaptive_concurrency_proto_rawDescGZIP(), []int{0, 0} } -func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetMaxConcurrencyLimit() *wrappers.UInt32Value { +func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetMaxConcurrencyLimit() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrencyLimit } return nil } -func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetConcurrencyUpdateInterval() *duration.Duration { +func (x *GradientControllerConfig_ConcurrencyLimitCalculationParams) GetConcurrencyUpdateInterval() *durationpb.Duration { if x != nil { return x.ConcurrencyUpdateInterval } @@ -253,10 +253,10 @@ type GradientControllerConfig_MinimumRTTCalculationParams struct { // The time interval between recalculating the minimum request round-trip time. Has to be // positive. - Interval *duration.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"` // The number of requests to aggregate/sample during the minRTT recalculation window before // updating. Defaults to 50. - RequestCount *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=request_count,json=requestCount,proto3" json:"request_count,omitempty"` + RequestCount *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=request_count,json=requestCount,proto3" json:"request_count,omitempty"` // Randomized time delta that will be introduced to the start of the minRTT calculation window. // This is represented as a percentage of the interval duration. Defaults to 15%. // @@ -264,7 +264,7 @@ type GradientControllerConfig_MinimumRTTCalculationParams struct { // somewhere in the range (10s - 11.5s). Jitter *v3.Percent `protobuf:"bytes,3,opt,name=jitter,proto3" json:"jitter,omitempty"` // The concurrency limit set while measuring the minRTT. Defaults to 3. - MinConcurrency *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=min_concurrency,json=minConcurrency,proto3" json:"min_concurrency,omitempty"` + MinConcurrency *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=min_concurrency,json=minConcurrency,proto3" json:"min_concurrency,omitempty"` // Amount added to the measured minRTT to add stability to the concurrency limit during natural // variability in latency. This is expressed as a percentage of the measured value and can be // adjusted to allow more or less tolerance to the sampled latency values. @@ -305,14 +305,14 @@ func (*GradientControllerConfig_MinimumRTTCalculationParams) Descriptor() ([]byt return file_envoy_extensions_filters_http_adaptive_concurrency_v3_adaptive_concurrency_proto_rawDescGZIP(), []int{0, 1} } -func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetInterval() *duration.Duration { +func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetRequestCount() *wrappers.UInt32Value { +func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetRequestCount() *wrapperspb.UInt32Value { if x != nil { return x.RequestCount } @@ -326,7 +326,7 @@ func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetJitter() *v3.P return nil } -func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetMinConcurrency() *wrappers.UInt32Value { +func (x *GradientControllerConfig_MinimumRTTCalculationParams) GetMinConcurrency() *wrapperspb.UInt32Value { if x != nil { return x.MinConcurrency } @@ -521,8 +521,8 @@ var file_envoy_extensions_filters_http_adaptive_concurrency_v3_adaptive_concurre (*v3.Percent)(nil), // 4: envoy.type.v3.Percent (*v31.RuntimeFeatureFlag)(nil), // 5: envoy.config.core.v3.RuntimeFeatureFlag (*v3.HttpStatus)(nil), // 6: envoy.type.v3.HttpStatus - (*wrappers.UInt32Value)(nil), // 7: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 7: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration } var file_envoy_extensions_filters_http_adaptive_concurrency_v3_adaptive_concurrency_proto_depIdxs = []int32{ 4, // 0: envoy.extensions.filters.http.adaptive_concurrency.v3.GradientControllerConfig.sample_aggregate_percentile:type_name -> envoy.type.v3.Percent diff --git a/envoy/extensions/filters/http/admission_control/v3/admission_control.pb.go b/envoy/extensions/filters/http/admission_control/v3/admission_control.pb.go index b3cc84ee0..52cdc028f 100755 --- a/envoy/extensions/filters/http/admission_control/v3/admission_control.pb.go +++ b/envoy/extensions/filters/http/admission_control/v3/admission_control.pb.go @@ -11,9 +11,9 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -42,7 +42,7 @@ type AdmissionControl struct { EvaluationCriteria isAdmissionControl_EvaluationCriteria `protobuf_oneof:"evaluation_criteria"` // The sliding time window over which the success rate is calculated. The window is rounded to the // nearest second. Defaults to 30s. - SamplingWindow *duration.Duration `protobuf:"bytes,3,opt,name=sampling_window,json=samplingWindow,proto3" json:"sampling_window,omitempty"` + SamplingWindow *durationpb.Duration `protobuf:"bytes,3,opt,name=sampling_window,json=samplingWindow,proto3" json:"sampling_window,omitempty"` // Rejection probability is defined by the formula:: // // max(0, (rq_count - rq_success_count / sr_threshold) / (rq_count + 1)) ^ (1 / aggression) @@ -120,7 +120,7 @@ func (x *AdmissionControl) GetSuccessCriteria() *AdmissionControl_SuccessCriteri return nil } -func (x *AdmissionControl) GetSamplingWindow() *duration.Duration { +func (x *AdmissionControl) GetSamplingWindow() *durationpb.Duration { if x != nil { return x.SamplingWindow } @@ -462,7 +462,7 @@ var file_envoy_extensions_filters_http_admission_control_v3_admission_control_pr (*AdmissionControl_SuccessCriteria_HttpCriteria)(nil), // 2: envoy.extensions.filters.http.admission_control.v3.AdmissionControl.SuccessCriteria.HttpCriteria (*AdmissionControl_SuccessCriteria_GrpcCriteria)(nil), // 3: envoy.extensions.filters.http.admission_control.v3.AdmissionControl.SuccessCriteria.GrpcCriteria (*v3.RuntimeFeatureFlag)(nil), // 4: envoy.config.core.v3.RuntimeFeatureFlag - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration (*v3.RuntimeDouble)(nil), // 6: envoy.config.core.v3.RuntimeDouble (*v3.RuntimePercent)(nil), // 7: envoy.config.core.v3.RuntimePercent (*v3.RuntimeUInt32)(nil), // 8: envoy.config.core.v3.RuntimeUInt32 diff --git a/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go b/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go index 225841438..8a39217e9 100755 --- a/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go +++ b/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -284,7 +284,7 @@ type AwsRequestSigning_QueryString struct { // Optional expiration time for the query string parameters. As query string parameter based requests are replayable, in effect representing // an API call that has already been authenticated, it is recommended to keep this expiration time as short as feasible. // This value will default to 5 seconds and has a maximum value of 3600 seconds (1 hour). - ExpirationTime *duration.Duration `protobuf:"bytes,1,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` + ExpirationTime *durationpb.Duration `protobuf:"bytes,1,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"` } func (x *AwsRequestSigning_QueryString) Reset() { @@ -319,7 +319,7 @@ func (*AwsRequestSigning_QueryString) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_aws_request_signing_v3_aws_request_signing_proto_rawDescGZIP(), []int{0, 0} } -func (x *AwsRequestSigning_QueryString) GetExpirationTime() *duration.Duration { +func (x *AwsRequestSigning_QueryString) GetExpirationTime() *durationpb.Duration { if x != nil { return x.ExpirationTime } @@ -443,7 +443,7 @@ var file_envoy_extensions_filters_http_aws_request_signing_v3_aws_request_signin (*AwsRequestSigningPerRoute)(nil), // 2: envoy.extensions.filters.http.aws_request_signing.v3.AwsRequestSigningPerRoute (*AwsRequestSigning_QueryString)(nil), // 3: envoy.extensions.filters.http.aws_request_signing.v3.AwsRequestSigning.QueryString (*v3.StringMatcher)(nil), // 4: envoy.type.matcher.v3.StringMatcher - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration } var file_envoy_extensions_filters_http_aws_request_signing_v3_aws_request_signing_proto_depIdxs = []int32{ 4, // 0: envoy.extensions.filters.http.aws_request_signing.v3.AwsRequestSigning.match_excluded_headers:type_name -> envoy.type.matcher.v3.StringMatcher diff --git a/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.pb.go b/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.pb.go index 62e9299d7..2b4c28600 100755 --- a/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.pb.go +++ b/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -105,10 +105,10 @@ type BandwidthLimit struct { // .. note:: // // When using per route configuration, the limit becomes unique to that route. - LimitKbps *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=limit_kbps,json=limitKbps,proto3" json:"limit_kbps,omitempty"` + LimitKbps *wrapperspb.UInt64Value `protobuf:"bytes,3,opt,name=limit_kbps,json=limitKbps,proto3" json:"limit_kbps,omitempty"` // Optional Fill interval in milliseconds for the token refills. Defaults to 50ms. // It must be at least 20ms to avoid too aggressive refills. - FillInterval *duration.Duration `protobuf:"bytes,4,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` + FillInterval *durationpb.Duration `protobuf:"bytes,4,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` // Runtime flag that controls whether the filter is enabled or not. If not specified, defaults // to enabled. RuntimeEnabled *v3.RuntimeFeatureFlag `protobuf:"bytes,5,opt,name=runtime_enabled,json=runtimeEnabled,proto3" json:"runtime_enabled,omitempty"` @@ -174,14 +174,14 @@ func (x *BandwidthLimit) GetEnableMode() BandwidthLimit_EnableMode { return BandwidthLimit_DISABLED } -func (x *BandwidthLimit) GetLimitKbps() *wrappers.UInt64Value { +func (x *BandwidthLimit) GetLimitKbps() *wrapperspb.UInt64Value { if x != nil { return x.LimitKbps } return nil } -func (x *BandwidthLimit) GetFillInterval() *duration.Duration { +func (x *BandwidthLimit) GetFillInterval() *durationpb.Duration { if x != nil { return x.FillInterval } @@ -301,8 +301,8 @@ var file_envoy_extensions_filters_http_bandwidth_limit_v3_bandwidth_limit_proto_ var file_envoy_extensions_filters_http_bandwidth_limit_v3_bandwidth_limit_proto_goTypes = []interface{}{ (BandwidthLimit_EnableMode)(0), // 0: envoy.extensions.filters.http.bandwidth_limit.v3.BandwidthLimit.EnableMode (*BandwidthLimit)(nil), // 1: envoy.extensions.filters.http.bandwidth_limit.v3.BandwidthLimit - (*wrappers.UInt64Value)(nil), // 2: google.protobuf.UInt64Value - (*duration.Duration)(nil), // 3: google.protobuf.Duration + (*wrapperspb.UInt64Value)(nil), // 2: google.protobuf.UInt64Value + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration (*v3.RuntimeFeatureFlag)(nil), // 4: envoy.config.core.v3.RuntimeFeatureFlag } var file_envoy_extensions_filters_http_bandwidth_limit_v3_bandwidth_limit_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/http/buffer/v3/buffer.pb.go b/envoy/extensions/filters/http/buffer/v3/buffer.pb.go index 64bcf3980..1f6783599 100755 --- a/envoy/extensions/filters/http/buffer/v3/buffer.pb.go +++ b/envoy/extensions/filters/http/buffer/v3/buffer.pb.go @@ -9,9 +9,9 @@ package bufferv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -30,7 +30,7 @@ type Buffer struct { // The maximum request size that the filter will buffer before the connection // manager will stop buffering and return a 413 response. - MaxRequestBytes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` + MaxRequestBytes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` } func (x *Buffer) Reset() { @@ -65,7 +65,7 @@ func (*Buffer) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_buffer_v3_buffer_proto_rawDescGZIP(), []int{0} } -func (x *Buffer) GetMaxRequestBytes() *wrappers.UInt32Value { +func (x *Buffer) GetMaxRequestBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestBytes } @@ -223,9 +223,9 @@ func file_envoy_extensions_filters_http_buffer_v3_buffer_proto_rawDescGZIP() []b var file_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_extensions_filters_http_buffer_v3_buffer_proto_goTypes = []interface{}{ - (*Buffer)(nil), // 0: envoy.extensions.filters.http.buffer.v3.Buffer - (*BufferPerRoute)(nil), // 1: envoy.extensions.filters.http.buffer.v3.BufferPerRoute - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*Buffer)(nil), // 0: envoy.extensions.filters.http.buffer.v3.Buffer + (*BufferPerRoute)(nil), // 1: envoy.extensions.filters.http.buffer.v3.BufferPerRoute + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_extensions_filters_http_buffer_v3_buffer_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.buffer.v3.Buffer.max_request_bytes:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/filters/http/cache/v3/cache.pb.go b/envoy/extensions/filters/http/cache/v3/cache.pb.go index 51cf73a1f..ef914d6bf 100755 --- a/envoy/extensions/filters/http/cache/v3/cache.pb.go +++ b/envoy/extensions/filters/http/cache/v3/cache.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v31 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" - any1 "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -35,13 +35,13 @@ type CacheConfig struct { // Config specific to the cache storage implementation. Required unless “disabled“ // is true. // [#extension-category: envoy.http.cache] - TypedConfig *any1.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` // When true, the cache filter is a no-op filter. // // Possible use-cases for this include: // - Turning a filter on and off with :ref:`ECDS `. // [#comment: once route-specific overrides are implemented, they are the more likely use-case.] - Disabled *wrappers.BoolValue `protobuf:"bytes,5,opt,name=disabled,proto3" json:"disabled,omitempty"` + Disabled *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=disabled,proto3" json:"disabled,omitempty"` // List of matching rules that defines allowed “Vary“ headers. // // The “vary“ response header holds a list of header names that affect the @@ -100,14 +100,14 @@ func (*CacheConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_cache_v3_cache_proto_rawDescGZIP(), []int{0} } -func (x *CacheConfig) GetTypedConfig() *any1.Any { +func (x *CacheConfig) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } return nil } -func (x *CacheConfig) GetDisabled() *wrappers.BoolValue { +func (x *CacheConfig) GetDisabled() *wrapperspb.BoolValue { if x != nil { return x.Disabled } @@ -320,8 +320,8 @@ var file_envoy_extensions_filters_http_cache_v3_cache_proto_msgTypes = make([]pr var file_envoy_extensions_filters_http_cache_v3_cache_proto_goTypes = []interface{}{ (*CacheConfig)(nil), // 0: envoy.extensions.filters.http.cache.v3.CacheConfig (*CacheConfig_KeyCreatorParams)(nil), // 1: envoy.extensions.filters.http.cache.v3.CacheConfig.KeyCreatorParams - (*any1.Any)(nil), // 2: google.protobuf.Any - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*anypb.Any)(nil), // 2: google.protobuf.Any + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue (*v3.StringMatcher)(nil), // 4: envoy.type.matcher.v3.StringMatcher (*v31.QueryParameterMatcher)(nil), // 5: envoy.config.route.v3.QueryParameterMatcher } diff --git a/envoy/extensions/filters/http/compressor/v3/compressor.pb.go b/envoy/extensions/filters/http/compressor/v3/compressor.pb.go index 64d133289..4dc52b546 100755 --- a/envoy/extensions/filters/http/compressor/v3/compressor.pb.go +++ b/envoy/extensions/filters/http/compressor/v3/compressor.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -34,7 +34,7 @@ type Compressor struct { // Minimum response length, in bytes, which will trigger compression. The default value is 30. // // Deprecated: Marked as deprecated in envoy/extensions/filters/http/compressor/v3/compressor.proto. - ContentLength *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` + ContentLength *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` // Set of strings that allows specifying which mime-types yield compression; e.g., // application/json, text/html, etc. When this field is not defined, compression will be applied // to the following mime-types: "application/javascript", "application/json", @@ -122,7 +122,7 @@ func (*Compressor) Descriptor() ([]byte, []int) { } // Deprecated: Marked as deprecated in envoy/extensions/filters/http/compressor/v3/compressor.proto. -func (x *Compressor) GetContentLength() *wrappers.UInt32Value { +func (x *Compressor) GetContentLength() *wrapperspb.UInt32Value { if x != nil { return x.ContentLength } @@ -198,7 +198,7 @@ type ResponseDirectionOverrides struct { // If set, overrides the filter-level // :ref:`remove_accept_encoding_header`. - RemoveAcceptEncodingHeader *wrappers.BoolValue `protobuf:"bytes,1,opt,name=remove_accept_encoding_header,json=removeAcceptEncodingHeader,proto3" json:"remove_accept_encoding_header,omitempty"` + RemoveAcceptEncodingHeader *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=remove_accept_encoding_header,json=removeAcceptEncodingHeader,proto3" json:"remove_accept_encoding_header,omitempty"` } func (x *ResponseDirectionOverrides) Reset() { @@ -233,7 +233,7 @@ func (*ResponseDirectionOverrides) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_compressor_v3_compressor_proto_rawDescGZIP(), []int{1} } -func (x *ResponseDirectionOverrides) GetRemoveAcceptEncodingHeader() *wrappers.BoolValue { +func (x *ResponseDirectionOverrides) GetRemoveAcceptEncodingHeader() *wrapperspb.BoolValue { if x != nil { return x.RemoveAcceptEncodingHeader } @@ -387,7 +387,7 @@ type Compressor_CommonDirectionConfig struct { Enabled *v3.RuntimeFeatureFlag `protobuf:"bytes,1,opt,name=enabled,proto3" json:"enabled,omitempty"` // Minimum value of Content-Length header of request or response messages (depending on the direction // this common config is put in), in bytes, which will trigger compression. The default value is 30. - MinContentLength *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=min_content_length,json=minContentLength,proto3" json:"min_content_length,omitempty"` + MinContentLength *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=min_content_length,json=minContentLength,proto3" json:"min_content_length,omitempty"` // Set of strings that allows specifying which mime-types yield compression; e.g., // application/json, text/html, etc. When this field is not defined, compression will be applied // to the following mime-types: "application/javascript", "application/json", @@ -435,7 +435,7 @@ func (x *Compressor_CommonDirectionConfig) GetEnabled() *v3.RuntimeFeatureFlag { return nil } -func (x *Compressor_CommonDirectionConfig) GetMinContentLength() *wrappers.UInt32Value { +func (x *Compressor_CommonDirectionConfig) GetMinContentLength() *wrapperspb.UInt32Value { if x != nil { return x.MinContentLength } @@ -751,10 +751,10 @@ var file_envoy_extensions_filters_http_compressor_v3_compressor_proto_goTypes = (*Compressor_CommonDirectionConfig)(nil), // 4: envoy.extensions.filters.http.compressor.v3.Compressor.CommonDirectionConfig (*Compressor_RequestDirectionConfig)(nil), // 5: envoy.extensions.filters.http.compressor.v3.Compressor.RequestDirectionConfig (*Compressor_ResponseDirectionConfig)(nil), // 6: envoy.extensions.filters.http.compressor.v3.Compressor.ResponseDirectionConfig - (*wrappers.UInt32Value)(nil), // 7: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 7: google.protobuf.UInt32Value (*v3.RuntimeFeatureFlag)(nil), // 8: envoy.config.core.v3.RuntimeFeatureFlag (*v3.TypedExtensionConfig)(nil), // 9: envoy.config.core.v3.TypedExtensionConfig - (*wrappers.BoolValue)(nil), // 10: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 10: google.protobuf.BoolValue } var file_envoy_extensions_filters_http_compressor_v3_compressor_proto_depIdxs = []int32{ 7, // 0: envoy.extensions.filters.http.compressor.v3.Compressor.content_length:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/filters/http/cors/v3/cors.pb.go b/envoy/extensions/filters/http/cors/v3/cors.pb.go index e937a6b75..04f9e8c99 100755 --- a/envoy/extensions/filters/http/cors/v3/cors.pb.go +++ b/envoy/extensions/filters/http/cors/v3/cors.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -70,7 +70,7 @@ func (*Cors) Descriptor() ([]byte, []int) { // Per route configuration for the CORS filter. This configuration should be configured in the “RouteConfiguration“ as “typed_per_filter_config“ at some level to // make the filter work. -// [#next-free-field: 10] +// [#next-free-field: 11] type CorsPolicy struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -88,7 +88,7 @@ type CorsPolicy struct { // Specifies the content for the “access-control-max-age“ header. MaxAge string `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Specifies whether the resource allows credentials. - AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` + AllowCredentials *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` // Specifies the % of requests for which the CORS filter is enabled. // // If neither “filter_enabled“, nor “shadow_enabled“ are specified, the CORS @@ -111,7 +111,10 @@ type CorsPolicy struct { // which the request initiator was fetched. // // More details refer to https://developer.chrome.com/blog/private-network-access-preflight. - AllowPrivateNetworkAccess *wrappers.BoolValue `protobuf:"bytes,9,opt,name=allow_private_network_access,json=allowPrivateNetworkAccess,proto3" json:"allow_private_network_access,omitempty"` + AllowPrivateNetworkAccess *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=allow_private_network_access,json=allowPrivateNetworkAccess,proto3" json:"allow_private_network_access,omitempty"` + // Specifies if preflight requests not matching the configured allowed origin should be forwarded + // to the upstream. Default is true. + ForwardNotMatchingPreflights *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=forward_not_matching_preflights,json=forwardNotMatchingPreflights,proto3" json:"forward_not_matching_preflights,omitempty"` } func (x *CorsPolicy) Reset() { @@ -181,7 +184,7 @@ func (x *CorsPolicy) GetMaxAge() string { return "" } -func (x *CorsPolicy) GetAllowCredentials() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowCredentials() *wrapperspb.BoolValue { if x != nil { return x.AllowCredentials } @@ -202,13 +205,20 @@ func (x *CorsPolicy) GetShadowEnabled() *v31.RuntimeFractionalPercent { return nil } -func (x *CorsPolicy) GetAllowPrivateNetworkAccess() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowPrivateNetworkAccess() *wrapperspb.BoolValue { if x != nil { return x.AllowPrivateNetworkAccess } return nil } +func (x *CorsPolicy) GetForwardNotMatchingPreflights() *wrapperspb.BoolValue { + if x != nil { + return x.ForwardNotMatchingPreflights + } + return nil +} + var File_envoy_extensions_filters_http_cors_v3_cors_proto protoreflect.FileDescriptor var file_envoy_extensions_filters_http_cors_v3_cors_proto_rawDesc = []byte{ @@ -231,7 +241,7 @@ var file_envoy_extensions_filters_http_cors_v3_cors_proto_rawDesc = []byte{ 0x22, 0x34, 0x0a, 0x04, 0x43, 0x6f, 0x72, 0x73, 0x3a, 0x2c, 0x9a, 0xc5, 0x88, 0x1e, 0x27, 0x0a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x63, 0x6f, 0x72, 0x73, 0x2e, 0x76, - 0x32, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x22, 0xcb, 0x04, 0x0a, 0x0a, 0x43, 0x6f, 0x72, 0x73, 0x50, + 0x32, 0x2e, 0x43, 0x6f, 0x72, 0x73, 0x22, 0xae, 0x05, 0x0a, 0x0a, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5f, 0x0a, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, @@ -268,17 +278,24 @@ var file_envoy_extensions_filters_http_cors_v3_cors_proto_rawDesc = []byte{ 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x19, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x42, 0x9f, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, - 0x33, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, - 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, - 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x63, 0x6f, 0x72, - 0x73, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, - 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, - 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, - 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x63, 0x6f, 0x72, 0x73, 0x2f, 0x76, 0x33, 0x3b, - 0x63, 0x6f, 0x72, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x65, 0x73, 0x73, 0x12, 0x61, 0x0a, 0x1f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, + 0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x65, + 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x1c, 0x66, 0x6f, 0x72, 0x77, 0x61, + 0x72, 0x64, 0x4e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x65, + 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x42, 0x9f, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, + 0x10, 0x02, 0x0a, 0x33, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, + 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, + 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, + 0x63, 0x6f, 0x72, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x43, 0x6f, 0x72, 0x73, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, + 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, + 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x63, 0x6f, 0x72, 0x73, 0x2f, + 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -298,7 +315,7 @@ var file_envoy_extensions_filters_http_cors_v3_cors_proto_goTypes = []interface{ (*Cors)(nil), // 0: envoy.extensions.filters.http.cors.v3.Cors (*CorsPolicy)(nil), // 1: envoy.extensions.filters.http.cors.v3.CorsPolicy (*v3.StringMatcher)(nil), // 2: envoy.type.matcher.v3.StringMatcher - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue (*v31.RuntimeFractionalPercent)(nil), // 4: envoy.config.core.v3.RuntimeFractionalPercent } var file_envoy_extensions_filters_http_cors_v3_cors_proto_depIdxs = []int32{ @@ -307,11 +324,12 @@ var file_envoy_extensions_filters_http_cors_v3_cors_proto_depIdxs = []int32{ 4, // 2: envoy.extensions.filters.http.cors.v3.CorsPolicy.filter_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent 4, // 3: envoy.extensions.filters.http.cors.v3.CorsPolicy.shadow_enabled:type_name -> envoy.config.core.v3.RuntimeFractionalPercent 3, // 4: envoy.extensions.filters.http.cors.v3.CorsPolicy.allow_private_network_access:type_name -> google.protobuf.BoolValue - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 3, // 5: envoy.extensions.filters.http.cors.v3.CorsPolicy.forward_not_matching_preflights:type_name -> google.protobuf.BoolValue + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_envoy_extensions_filters_http_cors_v3_cors_proto_init() } diff --git a/envoy/extensions/filters/http/cors/v3/cors.pb.validate.go b/envoy/extensions/filters/http/cors/v3/cors.pb.validate.go index 6ff8d9326..3f6d4ec27 100755 --- a/envoy/extensions/filters/http/cors/v3/cors.pb.validate.go +++ b/envoy/extensions/filters/http/cors/v3/cors.pb.validate.go @@ -314,6 +314,35 @@ func (m *CorsPolicy) validate(all bool) error { } } + if all { + switch v := interface{}(m.GetForwardNotMatchingPreflights()).(type) { + case interface{ ValidateAll() error }: + if err := v.ValidateAll(); err != nil { + errors = append(errors, CorsPolicyValidationError{ + field: "ForwardNotMatchingPreflights", + reason: "embedded message failed validation", + cause: err, + }) + } + case interface{ Validate() error }: + if err := v.Validate(); err != nil { + errors = append(errors, CorsPolicyValidationError{ + field: "ForwardNotMatchingPreflights", + reason: "embedded message failed validation", + cause: err, + }) + } + } + } else if v, ok := interface{}(m.GetForwardNotMatchingPreflights()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return CorsPolicyValidationError{ + field: "ForwardNotMatchingPreflights", + reason: "embedded message failed validation", + cause: err, + } + } + } + if len(errors) > 0 { return CorsPolicyMultiError(errors) } diff --git a/envoy/extensions/filters/http/cors/v3/cors_vtproto.pb.go b/envoy/extensions/filters/http/cors/v3/cors_vtproto.pb.go index 830bb04b7..a110faa1f 100755 --- a/envoy/extensions/filters/http/cors/v3/cors_vtproto.pb.go +++ b/envoy/extensions/filters/http/cors/v3/cors_vtproto.pb.go @@ -82,6 +82,16 @@ func (m *CorsPolicy) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) { i -= len(m.unknownFields) copy(dAtA[i:], m.unknownFields) } + if m.ForwardNotMatchingPreflights != nil { + size, err := (*wrapperspb.BoolValue)(m.ForwardNotMatchingPreflights).MarshalToSizedBufferVTStrict(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x52 + } if m.AllowPrivateNetworkAccess != nil { size, err := (*wrapperspb.BoolValue)(m.AllowPrivateNetworkAccess).MarshalToSizedBufferVTStrict(dAtA[:i]) if err != nil { @@ -284,6 +294,10 @@ func (m *CorsPolicy) SizeVT() (n int) { l = (*wrapperspb.BoolValue)(m.AllowPrivateNetworkAccess).SizeVT() n += 1 + l + sov(uint64(l)) } + if m.ForwardNotMatchingPreflights != nil { + l = (*wrapperspb.BoolValue)(m.ForwardNotMatchingPreflights).SizeVT() + n += 1 + l + sov(uint64(l)) + } n += len(m.unknownFields) return n } diff --git a/envoy/extensions/filters/http/decompressor/v3/decompressor.pb.go b/envoy/extensions/filters/http/decompressor/v3/decompressor.pb.go index e60d4813d..9e7d5782d 100755 --- a/envoy/extensions/filters/http/decompressor/v3/decompressor.pb.go +++ b/envoy/extensions/filters/http/decompressor/v3/decompressor.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -161,7 +161,7 @@ type Decompressor_RequestDirectionConfig struct { CommonConfig *Decompressor_CommonDirectionConfig `protobuf:"bytes,1,opt,name=common_config,json=commonConfig,proto3" json:"common_config,omitempty"` // If set to true, and response decompression is enabled, the filter modifies the Accept-Encoding // request header by appending the decompressor_library's encoding. Defaults to true. - AdvertiseAcceptEncoding *wrappers.BoolValue `protobuf:"bytes,2,opt,name=advertise_accept_encoding,json=advertiseAcceptEncoding,proto3" json:"advertise_accept_encoding,omitempty"` + AdvertiseAcceptEncoding *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=advertise_accept_encoding,json=advertiseAcceptEncoding,proto3" json:"advertise_accept_encoding,omitempty"` } func (x *Decompressor_RequestDirectionConfig) Reset() { @@ -203,7 +203,7 @@ func (x *Decompressor_RequestDirectionConfig) GetCommonConfig() *Decompressor_Co return nil } -func (x *Decompressor_RequestDirectionConfig) GetAdvertiseAcceptEncoding() *wrappers.BoolValue { +func (x *Decompressor_RequestDirectionConfig) GetAdvertiseAcceptEncoding() *wrapperspb.BoolValue { if x != nil { return x.AdvertiseAcceptEncoding } @@ -372,7 +372,7 @@ var file_envoy_extensions_filters_http_decompressor_v3_decompressor_proto_goType (*Decompressor_ResponseDirectionConfig)(nil), // 3: envoy.extensions.filters.http.decompressor.v3.Decompressor.ResponseDirectionConfig (*v3.TypedExtensionConfig)(nil), // 4: envoy.config.core.v3.TypedExtensionConfig (*v3.RuntimeFeatureFlag)(nil), // 5: envoy.config.core.v3.RuntimeFeatureFlag - (*wrappers.BoolValue)(nil), // 6: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 6: google.protobuf.BoolValue } var file_envoy_extensions_filters_http_decompressor_v3_decompressor_proto_depIdxs = []int32{ 4, // 0: envoy.extensions.filters.http.decompressor.v3.Decompressor.decompressor_library:type_name -> envoy.config.core.v3.TypedExtensionConfig diff --git a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go index f860ecdfc..6c9d402c1 100755 --- a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go +++ b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -235,7 +235,7 @@ type SubClusterConfig struct { unknownFields protoimpl.UnknownFields // The timeout used for sub cluster initialization. Defaults to 5s if not set. - ClusterInitTimeout *duration.Duration `protobuf:"bytes,3,opt,name=cluster_init_timeout,json=clusterInitTimeout,proto3" json:"cluster_init_timeout,omitempty"` + ClusterInitTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=cluster_init_timeout,json=clusterInitTimeout,proto3" json:"cluster_init_timeout,omitempty"` } func (x *SubClusterConfig) Reset() { @@ -270,7 +270,7 @@ func (*SubClusterConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_dynamic_forward_proxy_v3_dynamic_forward_proxy_proto_rawDescGZIP(), []int{2} } -func (x *SubClusterConfig) GetClusterInitTimeout() *duration.Duration { +func (x *SubClusterConfig) GetClusterInitTimeout() *durationpb.Duration { if x != nil { return x.ClusterInitTimeout } @@ -378,11 +378,11 @@ func file_envoy_extensions_filters_http_dynamic_forward_proxy_v3_dynamic_forward var file_envoy_extensions_filters_http_dynamic_forward_proxy_v3_dynamic_forward_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_envoy_extensions_filters_http_dynamic_forward_proxy_v3_dynamic_forward_proxy_proto_goTypes = []interface{}{ - (*FilterConfig)(nil), // 0: envoy.extensions.filters.http.dynamic_forward_proxy.v3.FilterConfig - (*PerRouteConfig)(nil), // 1: envoy.extensions.filters.http.dynamic_forward_proxy.v3.PerRouteConfig - (*SubClusterConfig)(nil), // 2: envoy.extensions.filters.http.dynamic_forward_proxy.v3.SubClusterConfig - (*v3.DnsCacheConfig)(nil), // 3: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*FilterConfig)(nil), // 0: envoy.extensions.filters.http.dynamic_forward_proxy.v3.FilterConfig + (*PerRouteConfig)(nil), // 1: envoy.extensions.filters.http.dynamic_forward_proxy.v3.PerRouteConfig + (*SubClusterConfig)(nil), // 2: envoy.extensions.filters.http.dynamic_forward_proxy.v3.SubClusterConfig + (*v3.DnsCacheConfig)(nil), // 3: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration } var file_envoy_extensions_filters_http_dynamic_forward_proxy_v3_dynamic_forward_proxy_proto_depIdxs = []int32{ 3, // 0: envoy.extensions.filters.http.dynamic_forward_proxy.v3.FilterConfig.dns_cache_config:type_name -> envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig diff --git a/envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.go b/envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.go index 41f009551..9699cd1ab 100755 --- a/envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.go +++ b/envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.go @@ -13,9 +13,9 @@ import ( v32 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -185,7 +185,7 @@ type ExtAuthz struct { IncludeTlsSession bool `protobuf:"varint,18,opt,name=include_tls_session,json=includeTlsSession,proto3" json:"include_tls_session,omitempty"` // Whether to increment cluster statistics (e.g. cluster..upstream_rq_*) on authorization failure. // Defaults to true. - ChargeClusterResponseStats *wrappers.BoolValue `protobuf:"bytes,20,opt,name=charge_cluster_response_stats,json=chargeClusterResponseStats,proto3" json:"charge_cluster_response_stats,omitempty"` + ChargeClusterResponseStats *wrapperspb.BoolValue `protobuf:"bytes,20,opt,name=charge_cluster_response_stats,json=chargeClusterResponseStats,proto3" json:"charge_cluster_response_stats,omitempty"` } func (x *ExtAuthz) Reset() { @@ -367,7 +367,7 @@ func (x *ExtAuthz) GetIncludeTlsSession() bool { return false } -func (x *ExtAuthz) GetChargeClusterResponseStats() *wrappers.BoolValue { +func (x *ExtAuthz) GetChargeClusterResponseStats() *wrapperspb.BoolValue { if x != nil { return x.ChargeClusterResponseStats } @@ -1256,7 +1256,7 @@ var file_envoy_extensions_filters_http_ext_authz_v3_ext_authz_proto_goTypes = [] (*v32.MetadataMatcher)(nil), // 12: envoy.type.matcher.v3.MetadataMatcher (*v3.RuntimeFeatureFlag)(nil), // 13: envoy.config.core.v3.RuntimeFeatureFlag (*v32.ListStringMatcher)(nil), // 14: envoy.type.matcher.v3.ListStringMatcher - (*wrappers.BoolValue)(nil), // 15: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 15: google.protobuf.BoolValue (*v3.HttpUri)(nil), // 16: envoy.config.core.v3.HttpUri (*v3.HeaderValue)(nil), // 17: envoy.config.core.v3.HeaderValue } diff --git a/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go index 3346910b2..9f97c1582 100755 --- a/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go +++ b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go @@ -12,10 +12,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v32 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -140,7 +140,7 @@ type ExternalProcessor struct { // timeout when the filter is running in asynchronous mode. Zero is a valid // config which means the timer will be triggered immediately. If not // configured, default is 200 milliseconds. - MessageTimeout *duration.Duration `protobuf:"bytes,7,opt,name=message_timeout,json=messageTimeout,proto3" json:"message_timeout,omitempty"` + MessageTimeout *durationpb.Duration `protobuf:"bytes,7,opt,name=message_timeout,json=messageTimeout,proto3" json:"message_timeout,omitempty"` // Optional additional prefix to use when emitting statistics. This allows to distinguish // emitted statistics between configured *ext_proc* filters in an HTTP filter chain. StatPrefix string `protobuf:"bytes,8,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` @@ -159,7 +159,7 @@ type ExternalProcessor struct { // Specify the upper bound of // :ref:`override_message_timeout ` // If not specified, by default it is 0, which will effectively disable the “override_message_timeout“ API. - MaxMessageTimeout *duration.Duration `protobuf:"bytes,10,opt,name=max_message_timeout,json=maxMessageTimeout,proto3" json:"max_message_timeout,omitempty"` + MaxMessageTimeout *durationpb.Duration `protobuf:"bytes,10,opt,name=max_message_timeout,json=maxMessageTimeout,proto3" json:"max_message_timeout,omitempty"` // Prevents clearing the route-cache when the // :ref:`clear_route_cache ` // field is set in an external processor response. @@ -170,7 +170,7 @@ type ExternalProcessor struct { // Additional metadata to be added to the filter state for logging purposes. The metadata // will be added to StreamInfo's filter state under the namespace corresponding to the // ext_proc filter name. - FilterMetadata *_struct.Struct `protobuf:"bytes,13,opt,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty"` + FilterMetadata *structpb.Struct `protobuf:"bytes,13,opt,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty"` // If “allow_mode_override“ is set to true, the filter config :ref:`processing_mode // ` // can be overridden by the response message from the external processing server @@ -261,7 +261,7 @@ func (x *ExternalProcessor) GetResponseAttributes() []string { return nil } -func (x *ExternalProcessor) GetMessageTimeout() *duration.Duration { +func (x *ExternalProcessor) GetMessageTimeout() *durationpb.Duration { if x != nil { return x.MessageTimeout } @@ -282,7 +282,7 @@ func (x *ExternalProcessor) GetMutationRules() *v31.HeaderMutationRules { return nil } -func (x *ExternalProcessor) GetMaxMessageTimeout() *duration.Duration { +func (x *ExternalProcessor) GetMaxMessageTimeout() *durationpb.Duration { if x != nil { return x.MaxMessageTimeout } @@ -303,7 +303,7 @@ func (x *ExternalProcessor) GetForwardRules() *HeaderForwardingRules { return nil } -func (x *ExternalProcessor) GetFilterMetadata() *_struct.Struct { +func (x *ExternalProcessor) GetFilterMetadata() *structpb.Struct { if x != nil { return x.FilterMetadata } @@ -944,9 +944,9 @@ var file_envoy_extensions_filters_http_ext_proc_v3_ext_proc_proto_goTypes = []in (*MetadataOptions_MetadataNamespaces)(nil), // 5: envoy.extensions.filters.http.ext_proc.v3.MetadataOptions.MetadataNamespaces (*v3.GrpcService)(nil), // 6: envoy.config.core.v3.GrpcService (*ProcessingMode)(nil), // 7: envoy.extensions.filters.http.ext_proc.v3.ProcessingMode - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration (*v31.HeaderMutationRules)(nil), // 9: envoy.config.common.mutation_rules.v3.HeaderMutationRules - (*_struct.Struct)(nil), // 10: google.protobuf.Struct + (*structpb.Struct)(nil), // 10: google.protobuf.Struct (*v32.ListStringMatcher)(nil), // 11: envoy.type.matcher.v3.ListStringMatcher (*v3.HeaderValue)(nil), // 12: envoy.config.core.v3.HeaderValue } diff --git a/envoy/extensions/filters/http/fault/v3/fault.pb.go b/envoy/extensions/filters/http/fault/v3/fault.pb.go index dc4f45701..aaf689bc6 100755 --- a/envoy/extensions/filters/http/fault/v3/fault.pb.go +++ b/envoy/extensions/filters/http/fault/v3/fault.pb.go @@ -12,10 +12,10 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -182,7 +182,7 @@ type HTTPFault struct { // Like other :ref:`circuit breakers ` in Envoy, this is a fuzzy // limit. It's possible for the number of active faults to rise slightly above the configured // amount due to the implementation details. - MaxActiveFaults *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=max_active_faults,json=maxActiveFaults,proto3" json:"max_active_faults,omitempty"` + MaxActiveFaults *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=max_active_faults,json=maxActiveFaults,proto3" json:"max_active_faults,omitempty"` // The response rate limit to be applied to the response body of the stream. When configured, // the percentage can be overridden by the :ref:`fault.http.rate_limit.response_percent // ` runtime key. @@ -223,7 +223,7 @@ type HTTPFault struct { // This data can be logged as part of Access Logs using the :ref:`command operator // ` %DYNAMIC_METADATA(NAMESPACE)%, where NAMESPACE is the name of // the fault filter. - FilterMetadata *_struct.Struct `protobuf:"bytes,16,opt,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty"` + FilterMetadata *structpb.Struct `protobuf:"bytes,16,opt,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty"` } func (x *HTTPFault) Reset() { @@ -293,7 +293,7 @@ func (x *HTTPFault) GetDownstreamNodes() []string { return nil } -func (x *HTTPFault) GetMaxActiveFaults() *wrappers.UInt32Value { +func (x *HTTPFault) GetMaxActiveFaults() *wrapperspb.UInt32Value { if x != nil { return x.MaxActiveFaults } @@ -363,7 +363,7 @@ func (x *HTTPFault) GetDisableDownstreamClusterStats() bool { return false } -func (x *HTTPFault) GetFilterMetadata() *_struct.Struct { +func (x *HTTPFault) GetFilterMetadata() *structpb.Struct { if x != nil { return x.FilterMetadata } @@ -566,9 +566,9 @@ var file_envoy_extensions_filters_http_fault_v3_fault_proto_goTypes = []interfac (*v3.FractionalPercent)(nil), // 3: envoy.type.v3.FractionalPercent (*v31.FaultDelay)(nil), // 4: envoy.extensions.filters.common.fault.v3.FaultDelay (*v32.HeaderMatcher)(nil), // 5: envoy.config.route.v3.HeaderMatcher - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value (*v31.FaultRateLimit)(nil), // 7: envoy.extensions.filters.common.fault.v3.FaultRateLimit - (*_struct.Struct)(nil), // 8: google.protobuf.Struct + (*structpb.Struct)(nil), // 8: google.protobuf.Struct } var file_envoy_extensions_filters_http_fault_v3_fault_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.fault.v3.FaultAbort.header_abort:type_name -> envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort diff --git a/envoy/extensions/filters/http/file_system_buffer/v3/file_system_buffer.pb.go b/envoy/extensions/filters/http/file_system_buffer/v3/file_system_buffer.pb.go index b4c9e0895..d27e43bac 100755 --- a/envoy/extensions/filters/http/file_system_buffer/v3/file_system_buffer.pb.go +++ b/envoy/extensions/filters/http/file_system_buffer/v3/file_system_buffer.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/cncf/xds/go/xds/annotations/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/async_files/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -170,10 +170,10 @@ type StreamConfig struct { Behavior *BufferBehavior `protobuf:"bytes,1,opt,name=behavior,proto3" json:"behavior,omitempty"` // The amount stored in the memory buffer before buffering to disk. // If unset in route, vhost and listener config, defaults to a hardcoded value of 1MiB - MemoryBufferBytesLimit *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=memory_buffer_bytes_limit,json=memoryBufferBytesLimit,proto3" json:"memory_buffer_bytes_limit,omitempty"` + MemoryBufferBytesLimit *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=memory_buffer_bytes_limit,json=memoryBufferBytesLimit,proto3" json:"memory_buffer_bytes_limit,omitempty"` // The maximum storage (excluding memory) to be buffered in this filter. // If unset in route, vhost and listener config, defaults to a hardcoded value of 32MiB - StorageBufferBytesLimit *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=storage_buffer_bytes_limit,json=storageBufferBytesLimit,proto3" json:"storage_buffer_bytes_limit,omitempty"` + StorageBufferBytesLimit *wrapperspb.UInt64Value `protobuf:"bytes,3,opt,name=storage_buffer_bytes_limit,json=storageBufferBytesLimit,proto3" json:"storage_buffer_bytes_limit,omitempty"` // The maximum amount that can be queued for writing to storage, above which the // source is requested to pause. If unset, defaults to the same value as // “memory_buffer_bytes_limit“. @@ -196,7 +196,7 @@ type StreamConfig struct { // // The low watermark signal is sent when the memory buffer is at size // “memory_buffer_bytes_limit + (storage_buffer_queue_high_watermark_bytes / 2)“. - StorageBufferQueueHighWatermarkBytes *wrappers.UInt64Value `protobuf:"bytes,4,opt,name=storage_buffer_queue_high_watermark_bytes,json=storageBufferQueueHighWatermarkBytes,proto3" json:"storage_buffer_queue_high_watermark_bytes,omitempty"` + StorageBufferQueueHighWatermarkBytes *wrapperspb.UInt64Value `protobuf:"bytes,4,opt,name=storage_buffer_queue_high_watermark_bytes,json=storageBufferQueueHighWatermarkBytes,proto3" json:"storage_buffer_queue_high_watermark_bytes,omitempty"` } func (x *StreamConfig) Reset() { @@ -238,21 +238,21 @@ func (x *StreamConfig) GetBehavior() *BufferBehavior { return nil } -func (x *StreamConfig) GetMemoryBufferBytesLimit() *wrappers.UInt64Value { +func (x *StreamConfig) GetMemoryBufferBytesLimit() *wrapperspb.UInt64Value { if x != nil { return x.MemoryBufferBytesLimit } return nil } -func (x *StreamConfig) GetStorageBufferBytesLimit() *wrappers.UInt64Value { +func (x *StreamConfig) GetStorageBufferBytesLimit() *wrapperspb.UInt64Value { if x != nil { return x.StorageBufferBytesLimit } return nil } -func (x *StreamConfig) GetStorageBufferQueueHighWatermarkBytes() *wrappers.UInt64Value { +func (x *StreamConfig) GetStorageBufferQueueHighWatermarkBytes() *wrapperspb.UInt64Value { if x != nil { return x.StorageBufferQueueHighWatermarkBytes } @@ -279,7 +279,7 @@ type FileSystemBufferFilterConfig struct { // // If unset in route, vhost and listener, will use the environment variable // “TMPDIR“, or, if that's also unset, will use “/tmp“. - StorageBufferPath *wrappers.StringValue `protobuf:"bytes,2,opt,name=storage_buffer_path,json=storageBufferPath,proto3" json:"storage_buffer_path,omitempty"` + StorageBufferPath *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=storage_buffer_path,json=storageBufferPath,proto3" json:"storage_buffer_path,omitempty"` // Optional configuration for how to buffer (or not) requests. // If unset in route, vhost and listener, “StreamConfig“ default values will be used // (with behavior “stream_when_possible“) @@ -329,7 +329,7 @@ func (x *FileSystemBufferFilterConfig) GetManagerConfig() *v3.AsyncFileManagerCo return nil } -func (x *FileSystemBufferFilterConfig) GetStorageBufferPath() *wrappers.StringValue { +func (x *FileSystemBufferFilterConfig) GetStorageBufferPath() *wrapperspb.StringValue { if x != nil { return x.StorageBufferPath } @@ -710,9 +710,9 @@ var file_envoy_extensions_filters_http_file_system_buffer_v3_file_system_buffer_ (*BufferBehavior_InjectContentLengthIfNecessary)(nil), // 5: envoy.extensions.filters.http.file_system_buffer.v3.BufferBehavior.InjectContentLengthIfNecessary (*BufferBehavior_FullyBufferAndAlwaysInjectContentLength)(nil), // 6: envoy.extensions.filters.http.file_system_buffer.v3.BufferBehavior.FullyBufferAndAlwaysInjectContentLength (*BufferBehavior_FullyBuffer)(nil), // 7: envoy.extensions.filters.http.file_system_buffer.v3.BufferBehavior.FullyBuffer - (*wrappers.UInt64Value)(nil), // 8: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 8: google.protobuf.UInt64Value (*v3.AsyncFileManagerConfig)(nil), // 9: envoy.extensions.common.async_files.v3.AsyncFileManagerConfig - (*wrappers.StringValue)(nil), // 10: google.protobuf.StringValue + (*wrapperspb.StringValue)(nil), // 10: google.protobuf.StringValue } var file_envoy_extensions_filters_http_file_system_buffer_v3_file_system_buffer_proto_depIdxs = []int32{ 3, // 0: envoy.extensions.filters.http.file_system_buffer.v3.BufferBehavior.stream_when_possible:type_name -> envoy.extensions.filters.http.file_system_buffer.v3.BufferBehavior.StreamWhenPossible diff --git a/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.go b/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.go index e1e692914..1b9f31d8b 100755 --- a/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.go +++ b/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -159,7 +159,7 @@ type TokenCacheConfig struct { // The number of cache entries. The maximum number of entries is INT64_MAX as it is constrained by underlying cache implementation. // Default value 0 (i.e., proto3 defaults) disables the cache by default. Other default values will enable the cache. - CacheSize *wrappers.UInt64Value `protobuf:"bytes,1,opt,name=cache_size,json=cacheSize,proto3" json:"cache_size,omitempty"` + CacheSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=cache_size,json=cacheSize,proto3" json:"cache_size,omitempty"` } func (x *TokenCacheConfig) Reset() { @@ -194,7 +194,7 @@ func (*TokenCacheConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_rawDescGZIP(), []int{2} } -func (x *TokenCacheConfig) GetCacheSize() *wrappers.UInt64Value { +func (x *TokenCacheConfig) GetCacheSize() *wrapperspb.UInt64Value { if x != nil { return x.CacheSize } @@ -344,13 +344,13 @@ func file_envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_rawDescGZIP var file_envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_goTypes = []interface{}{ - (*GcpAuthnFilterConfig)(nil), // 0: envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig - (*Audience)(nil), // 1: envoy.extensions.filters.http.gcp_authn.v3.Audience - (*TokenCacheConfig)(nil), // 2: envoy.extensions.filters.http.gcp_authn.v3.TokenCacheConfig - (*TokenHeader)(nil), // 3: envoy.extensions.filters.http.gcp_authn.v3.TokenHeader - (*v3.HttpUri)(nil), // 4: envoy.config.core.v3.HttpUri - (*v3.RetryPolicy)(nil), // 5: envoy.config.core.v3.RetryPolicy - (*wrappers.UInt64Value)(nil), // 6: google.protobuf.UInt64Value + (*GcpAuthnFilterConfig)(nil), // 0: envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig + (*Audience)(nil), // 1: envoy.extensions.filters.http.gcp_authn.v3.Audience + (*TokenCacheConfig)(nil), // 2: envoy.extensions.filters.http.gcp_authn.v3.TokenCacheConfig + (*TokenHeader)(nil), // 3: envoy.extensions.filters.http.gcp_authn.v3.TokenHeader + (*v3.HttpUri)(nil), // 4: envoy.config.core.v3.HttpUri + (*v3.RetryPolicy)(nil), // 5: envoy.config.core.v3.RetryPolicy + (*wrapperspb.UInt64Value)(nil), // 6: google.protobuf.UInt64Value } var file_envoy_extensions_filters_http_gcp_authn_v3_gcp_authn_proto_depIdxs = []int32{ 4, // 0: envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig.http_uri:type_name -> envoy.config.core.v3.HttpUri diff --git a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go index 9c446e58c..26a900e13 100755 --- a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go +++ b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go @@ -9,9 +9,9 @@ package grpc_json_transcoderv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -243,14 +243,14 @@ type GrpcJsonTranscoder struct { // Large values may cause envoy to use a lot of memory if there are many concurrent requests. // // If unset, the current stream buffer size is used. - MaxRequestBodySize *wrappers.UInt32Value `protobuf:"bytes,15,opt,name=max_request_body_size,json=maxRequestBodySize,proto3" json:"max_request_body_size,omitempty"` + MaxRequestBodySize *wrapperspb.UInt32Value `protobuf:"bytes,15,opt,name=max_request_body_size,json=maxRequestBodySize,proto3" json:"max_request_body_size,omitempty"` // The maximum size of a response body to be transcoded, in bytes. A body exceeding this size will // provoke a “HTTP 500 Internal Server Error“ response. // // Large values may cause envoy to use a lot of memory if there are many concurrent requests. // // If unset, the current stream buffer size is used. - MaxResponseBodySize *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=max_response_body_size,json=maxResponseBodySize,proto3" json:"max_response_body_size,omitempty"` + MaxResponseBodySize *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=max_response_body_size,json=maxResponseBodySize,proto3" json:"max_response_body_size,omitempty"` } func (x *GrpcJsonTranscoder) Reset() { @@ -390,14 +390,14 @@ func (x *GrpcJsonTranscoder) GetCaseInsensitiveEnumParsing() bool { return false } -func (x *GrpcJsonTranscoder) GetMaxRequestBodySize() *wrappers.UInt32Value { +func (x *GrpcJsonTranscoder) GetMaxRequestBodySize() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestBodySize } return nil } -func (x *GrpcJsonTranscoder) GetMaxResponseBodySize() *wrappers.UInt32Value { +func (x *GrpcJsonTranscoder) GetMaxResponseBodySize() *wrapperspb.UInt32Value { if x != nil { return x.MaxResponseBodySize } @@ -781,7 +781,7 @@ var file_envoy_extensions_filters_http_grpc_json_transcoder_v3_transcoder_proto_ (*GrpcJsonTranscoder)(nil), // 1: envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder (*GrpcJsonTranscoder_PrintOptions)(nil), // 2: envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder.PrintOptions (*GrpcJsonTranscoder_RequestValidationOptions)(nil), // 3: envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder.RequestValidationOptions - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value } var file_envoy_extensions_filters_http_grpc_json_transcoder_v3_transcoder_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder.print_options:type_name -> envoy.extensions.filters.http.grpc_json_transcoder.v3.GrpcJsonTranscoder.PrintOptions diff --git a/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go b/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go index 61d341dfb..90a57c63a 100755 --- a/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go +++ b/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go @@ -9,9 +9,9 @@ package grpc_statsv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -108,7 +108,7 @@ func (x *FilterConfig) GetIndividualMethodStatsAllowlist() *v3.GrpcMethodList { return nil } -func (x *FilterConfig) GetStatsForAllMethods() *wrappers.BoolValue { +func (x *FilterConfig) GetStatsForAllMethods() *wrapperspb.BoolValue { if x, ok := x.GetPerMethodStatSpecifier().(*FilterConfig_StatsForAllMethods); ok { return x.StatsForAllMethods } @@ -157,7 +157,7 @@ type FilterConfig_StatsForAllMethods struct { // // If neither ``individual_method_stats_allowlist`` nor ``stats_for_all_methods`` is set, the // behavior will default to ``stats_for_all_methods=false``. - StatsForAllMethods *wrappers.BoolValue `protobuf:"bytes,3,opt,name=stats_for_all_methods,json=statsForAllMethods,proto3,oneof"` + StatsForAllMethods *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=stats_for_all_methods,json=statsForAllMethods,proto3,oneof"` } func (*FilterConfig_IndividualMethodStatsAllowlist) isFilterConfig_PerMethodStatSpecifier() {} @@ -310,10 +310,10 @@ func file_envoy_extensions_filters_http_grpc_stats_v3_config_proto_rawDescGZIP() var file_envoy_extensions_filters_http_grpc_stats_v3_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_extensions_filters_http_grpc_stats_v3_config_proto_goTypes = []interface{}{ - (*FilterConfig)(nil), // 0: envoy.extensions.filters.http.grpc_stats.v3.FilterConfig - (*FilterObject)(nil), // 1: envoy.extensions.filters.http.grpc_stats.v3.FilterObject - (*v3.GrpcMethodList)(nil), // 2: envoy.config.core.v3.GrpcMethodList - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*FilterConfig)(nil), // 0: envoy.extensions.filters.http.grpc_stats.v3.FilterConfig + (*FilterObject)(nil), // 1: envoy.extensions.filters.http.grpc_stats.v3.FilterObject + (*v3.GrpcMethodList)(nil), // 2: envoy.config.core.v3.GrpcMethodList + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue } var file_envoy_extensions_filters_http_grpc_stats_v3_config_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.grpc_stats.v3.FilterConfig.individual_method_stats_allowlist:type_name -> envoy.config.core.v3.GrpcMethodList diff --git a/envoy/extensions/filters/http/gzip/v3/gzip.pb.go b/envoy/extensions/filters/http/gzip/v3/gzip.pb.go index d6e21b79d..5df62b33d 100755 --- a/envoy/extensions/filters/http/gzip/v3/gzip.pb.go +++ b/envoy/extensions/filters/http/gzip/v3/gzip.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/compressor/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -133,7 +133,7 @@ type Gzip struct { // Value from 1 to 9 that controls the amount of internal memory used by zlib. Higher values // use more memory, but are faster and produce better compression results. The default value is 5. - MemoryLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` + MemoryLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` // A value used for selecting the zlib compression level. This setting will affect speed and // amount of compression applied to the content. "BEST" provides higher compression at the cost of // higher latency, "SPEED" provides lower compression with minimum impact on response time. @@ -151,14 +151,14 @@ type Gzip struct { // Larger window results in better compression at the expense of memory usage. The default is 12 // which will produce a 4096 bytes window. For more details about this parameter, please refer to // zlib manual > deflateInit2. - WindowBits *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` + WindowBits *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` // Set of configuration parameters common for all compression filters. You can define // “content_length“, “content_type“ and other parameters in this field. Compressor *v3.Compressor `protobuf:"bytes,10,opt,name=compressor,proto3" json:"compressor,omitempty"` // Value for Zlib's next output buffer. If not set, defaults to 4096. // See https://www.zlib.net/manual.html for more details. Also see // https://github.com/envoyproxy/envoy/issues/8448 for context on this filter's performance. - ChunkSize *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` + ChunkSize *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=chunk_size,json=chunkSize,proto3" json:"chunk_size,omitempty"` } func (x *Gzip) Reset() { @@ -193,7 +193,7 @@ func (*Gzip) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_gzip_v3_gzip_proto_rawDescGZIP(), []int{0} } -func (x *Gzip) GetMemoryLevel() *wrappers.UInt32Value { +func (x *Gzip) GetMemoryLevel() *wrapperspb.UInt32Value { if x != nil { return x.MemoryLevel } @@ -214,7 +214,7 @@ func (x *Gzip) GetCompressionStrategy() Gzip_CompressionStrategy { return Gzip_DEFAULT } -func (x *Gzip) GetWindowBits() *wrappers.UInt32Value { +func (x *Gzip) GetWindowBits() *wrapperspb.UInt32Value { if x != nil { return x.WindowBits } @@ -228,7 +228,7 @@ func (x *Gzip) GetCompressor() *v3.Compressor { return nil } -func (x *Gzip) GetChunkSize() *wrappers.UInt32Value { +func (x *Gzip) GetChunkSize() *wrapperspb.UInt32Value { if x != nil { return x.ChunkSize } @@ -383,7 +383,7 @@ var file_envoy_extensions_filters_http_gzip_v3_gzip_proto_goTypes = []interface{ (Gzip_CompressionLevel_Enum)(0), // 1: envoy.extensions.filters.http.gzip.v3.Gzip.CompressionLevel.Enum (*Gzip)(nil), // 2: envoy.extensions.filters.http.gzip.v3.Gzip (*Gzip_CompressionLevel)(nil), // 3: envoy.extensions.filters.http.gzip.v3.Gzip.CompressionLevel - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value (*v3.Compressor)(nil), // 5: envoy.extensions.filters.http.compressor.v3.Compressor } var file_envoy_extensions_filters_http_gzip_v3_gzip_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/http/health_check/v3/health_check.pb.go b/envoy/extensions/filters/http/health_check/v3/health_check.pb.go index 86cb6a6ec..68dea2a7c 100755 --- a/envoy/extensions/filters/http/health_check/v3/health_check.pb.go +++ b/envoy/extensions/filters/http/health_check/v3/health_check.pb.go @@ -11,10 +11,10 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -33,10 +33,10 @@ type HealthCheck struct { unknownFields protoimpl.UnknownFields // Specifies whether the filter operates in pass through mode or not. - PassThroughMode *wrappers.BoolValue `protobuf:"bytes,1,opt,name=pass_through_mode,json=passThroughMode,proto3" json:"pass_through_mode,omitempty"` + PassThroughMode *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=pass_through_mode,json=passThroughMode,proto3" json:"pass_through_mode,omitempty"` // If operating in pass through mode, the amount of time in milliseconds // that the filter should cache the upstream response. - CacheTime *duration.Duration `protobuf:"bytes,3,opt,name=cache_time,json=cacheTime,proto3" json:"cache_time,omitempty"` + CacheTime *durationpb.Duration `protobuf:"bytes,3,opt,name=cache_time,json=cacheTime,proto3" json:"cache_time,omitempty"` // If operating in non-pass-through mode, specifies a set of upstream cluster // names and the minimum percentage of servers in each of those clusters that // must be healthy or degraded in order for the filter to return a 200. @@ -84,14 +84,14 @@ func (*HealthCheck) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_health_check_v3_health_check_proto_rawDescGZIP(), []int{0} } -func (x *HealthCheck) GetPassThroughMode() *wrappers.BoolValue { +func (x *HealthCheck) GetPassThroughMode() *wrapperspb.BoolValue { if x != nil { return x.PassThroughMode } return nil } -func (x *HealthCheck) GetCacheTime() *duration.Duration { +func (x *HealthCheck) GetCacheTime() *durationpb.Duration { if x != nil { return x.CacheTime } @@ -200,12 +200,12 @@ func file_envoy_extensions_filters_http_health_check_v3_health_check_proto_rawDe var file_envoy_extensions_filters_http_health_check_v3_health_check_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_extensions_filters_http_health_check_v3_health_check_proto_goTypes = []interface{}{ - (*HealthCheck)(nil), // 0: envoy.extensions.filters.http.health_check.v3.HealthCheck - nil, // 1: envoy.extensions.filters.http.health_check.v3.HealthCheck.ClusterMinHealthyPercentagesEntry - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue - (*duration.Duration)(nil), // 3: google.protobuf.Duration - (*v31.HeaderMatcher)(nil), // 4: envoy.config.route.v3.HeaderMatcher - (*v3.Percent)(nil), // 5: envoy.type.v3.Percent + (*HealthCheck)(nil), // 0: envoy.extensions.filters.http.health_check.v3.HealthCheck + nil, // 1: envoy.extensions.filters.http.health_check.v3.HealthCheck.ClusterMinHealthyPercentagesEntry + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration + (*v31.HeaderMatcher)(nil), // 4: envoy.config.route.v3.HeaderMatcher + (*v3.Percent)(nil), // 5: envoy.type.v3.Percent } var file_envoy_extensions_filters_http_health_check_v3_health_check_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.health_check.v3.HealthCheck.pass_through_mode:type_name -> google.protobuf.BoolValue diff --git a/envoy/extensions/filters/http/json_to_metadata/v3/json_to_metadata.pb.go b/envoy/extensions/filters/http/json_to_metadata/v3/json_to_metadata.pb.go index c3e6f18f3..23d810e71 100755 --- a/envoy/extensions/filters/http/json_to_metadata/v3/json_to_metadata.pb.go +++ b/envoy/extensions/filters/http/json_to_metadata/v3/json_to_metadata.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -206,7 +206,7 @@ func (m *JsonToMetadata_KeyValuePair) GetValueType() isJsonToMetadata_KeyValuePa return nil } -func (x *JsonToMetadata_KeyValuePair) GetValue() *_struct.Value { +func (x *JsonToMetadata_KeyValuePair) GetValue() *structpb.Value { if x, ok := x.GetValueType().(*JsonToMetadata_KeyValuePair_Value); ok { return x.Value } @@ -242,7 +242,7 @@ type JsonToMetadata_KeyValuePair_Value struct { // must be provided. // // It ignores ValueType, i.e., not type casting. - Value *_struct.Value `protobuf:"bytes,3,opt,name=value,proto3,oneof"` + Value *structpb.Value `protobuf:"bytes,3,opt,name=value,proto3,oneof"` } func (*JsonToMetadata_KeyValuePair_Value) isJsonToMetadata_KeyValuePair_ValueType() {} @@ -630,7 +630,7 @@ var file_envoy_extensions_filters_http_json_to_metadata_v3_json_to_metadata_prot (*JsonToMetadata_Selector)(nil), // 3: envoy.extensions.filters.http.json_to_metadata.v3.JsonToMetadata.Selector (*JsonToMetadata_Rule)(nil), // 4: envoy.extensions.filters.http.json_to_metadata.v3.JsonToMetadata.Rule (*JsonToMetadata_MatchRules)(nil), // 5: envoy.extensions.filters.http.json_to_metadata.v3.JsonToMetadata.MatchRules - (*_struct.Value)(nil), // 6: google.protobuf.Value + (*structpb.Value)(nil), // 6: google.protobuf.Value (*v3.RegexMatcher)(nil), // 7: envoy.type.matcher.v3.RegexMatcher } var file_envoy_extensions_filters_http_json_to_metadata_v3_json_to_metadata_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go b/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go index 45f907be2..627bcf0f0 100755 --- a/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go +++ b/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go @@ -12,9 +12,9 @@ import ( v32 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" @@ -128,7 +128,7 @@ type JwtProvider struct { // // max_lifetime: // seconds: 86400 - MaxLifetime *duration.Duration `protobuf:"bytes,21,opt,name=max_lifetime,json=maxLifetime,proto3" json:"max_lifetime,omitempty"` + MaxLifetime *durationpb.Duration `protobuf:"bytes,21,opt,name=max_lifetime,json=maxLifetime,proto3" json:"max_lifetime,omitempty"` // `JSON Web Key Set (JWKS) `_ is needed to // validate signature of a JWT. This field specifies where to fetch JWKS. // @@ -364,7 +364,7 @@ func (x *JwtProvider) GetRequireExpiration() bool { return false } -func (x *JwtProvider) GetMaxLifetime() *duration.Duration { +func (x *JwtProvider) GetMaxLifetime() *durationpb.Duration { if x != nil { return x.MaxLifetime } @@ -602,7 +602,7 @@ type RemoteJwks struct { HttpUri *v31.HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri,proto3" json:"http_uri,omitempty"` // Duration after which the cached JWKS should be expired. If not specified, default cache // duration is 10 minutes. - CacheDuration *duration.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + CacheDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` // Fetch Jwks asynchronously in the main thread before the listener is activated. // Fetched Jwks can be used by all worker threads. // @@ -686,7 +686,7 @@ func (x *RemoteJwks) GetHttpUri() *v31.HttpUri { return nil } -func (x *RemoteJwks) GetCacheDuration() *duration.Duration { +func (x *RemoteJwks) GetCacheDuration() *durationpb.Duration { if x != nil { return x.CacheDuration } @@ -722,7 +722,7 @@ type JwksAsyncFetch struct { // Default is false. FastListener bool `protobuf:"varint,1,opt,name=fast_listener,json=fastListener,proto3" json:"fast_listener,omitempty"` // The duration to refetch after a failed fetch. If not specified, default is 1 second. - FailedRefetchDuration *duration.Duration `protobuf:"bytes,2,opt,name=failed_refetch_duration,json=failedRefetchDuration,proto3" json:"failed_refetch_duration,omitempty"` + FailedRefetchDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=failed_refetch_duration,json=failedRefetchDuration,proto3" json:"failed_refetch_duration,omitempty"` } func (x *JwksAsyncFetch) Reset() { @@ -764,7 +764,7 @@ func (x *JwksAsyncFetch) GetFastListener() bool { return false } -func (x *JwksAsyncFetch) GetFailedRefetchDuration() *duration.Duration { +func (x *JwksAsyncFetch) GetFailedRefetchDuration() *durationpb.Duration { if x != nil { return x.FailedRefetchDuration } @@ -2176,7 +2176,7 @@ var file_envoy_extensions_filters_http_jwt_authn_v3_config_proto_goTypes = []int nil, // 16: envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication.ProvidersEntry nil, // 17: envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication.RequirementMapEntry (*v3.StringMatcher)(nil), // 18: envoy.type.matcher.v3.StringMatcher - (*duration.Duration)(nil), // 19: google.protobuf.Duration + (*durationpb.Duration)(nil), // 19: google.protobuf.Duration (*v31.DataSource)(nil), // 20: envoy.config.core.v3.DataSource (*v31.HttpUri)(nil), // 21: envoy.config.core.v3.HttpUri (*v31.RetryPolicy)(nil), // 22: envoy.config.core.v3.RetryPolicy diff --git a/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go b/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go index 737f0d1ac..abcf04de6 100755 --- a/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go +++ b/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go @@ -12,9 +12,9 @@ import ( v32 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -120,7 +120,7 @@ type LocalRateLimit struct { // If set to false, default token bucket will only be consumed when there is // no matching descriptor. If set to true, default token bucket will always // be consumed. Default is true. - AlwaysConsumeDefaultTokenBucket *wrappers.BoolValue `protobuf:"bytes,14,opt,name=always_consume_default_token_bucket,json=alwaysConsumeDefaultTokenBucket,proto3" json:"always_consume_default_token_bucket,omitempty"` + AlwaysConsumeDefaultTokenBucket *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=always_consume_default_token_bucket,json=alwaysConsumeDefaultTokenBucket,proto3" json:"always_consume_default_token_bucket,omitempty"` // Specifies whether a “RESOURCE_EXHAUSTED“ gRPC code must be returned instead // of the default “UNAVAILABLE“ gRPC code for a rate limited gRPC call. The // HTTP code will be 200 for a gRPC response. @@ -243,7 +243,7 @@ func (x *LocalRateLimit) GetVhRateLimits() v32.VhRateLimitsOptions { return v32.VhRateLimitsOptions(0) } -func (x *LocalRateLimit) GetAlwaysConsumeDefaultTokenBucket() *wrappers.BoolValue { +func (x *LocalRateLimit) GetAlwaysConsumeDefaultTokenBucket() *wrapperspb.BoolValue { if x != nil { return x.AlwaysConsumeDefaultTokenBucket } @@ -398,7 +398,7 @@ var file_envoy_extensions_filters_http_local_ratelimit_v3_local_rate_limit_proto (*v32.LocalRateLimitDescriptor)(nil), // 5: envoy.extensions.common.ratelimit.v3.LocalRateLimitDescriptor (v32.XRateLimitHeadersRFCVersion)(0), // 6: envoy.extensions.common.ratelimit.v3.XRateLimitHeadersRFCVersion (v32.VhRateLimitsOptions)(0), // 7: envoy.extensions.common.ratelimit.v3.VhRateLimitsOptions - (*wrappers.BoolValue)(nil), // 8: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 8: google.protobuf.BoolValue } var file_envoy_extensions_filters_http_local_ratelimit_v3_local_rate_limit_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.http.local_ratelimit.v3.LocalRateLimit.status:type_name -> envoy.type.v3.HttpStatus diff --git a/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go b/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go index 1e6adf3cb..4c1d3ac56 100755 --- a/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go +++ b/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go @@ -13,10 +13,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" v32 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -215,12 +215,12 @@ type OAuth2Config struct { // If set to true, allows automatic access token refresh using the associated refresh token (see // `RFC 6749 section 6 `_), provided that the OAuth server supports that. // Default value is false. - UseRefreshToken *wrappers.BoolValue `protobuf:"bytes,12,opt,name=use_refresh_token,json=useRefreshToken,proto3" json:"use_refresh_token,omitempty"` + UseRefreshToken *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=use_refresh_token,json=useRefreshToken,proto3" json:"use_refresh_token,omitempty"` // The default lifetime in seconds of the access token, if omitted by the authorization server. // // If this value is not set, it will default to “0s“. In this case, the expiry must be set by // the authorization server or the OAuth flow will fail. - DefaultExpiresIn *duration.Duration `protobuf:"bytes,13,opt,name=default_expires_in,json=defaultExpiresIn,proto3" json:"default_expires_in,omitempty"` + DefaultExpiresIn *durationpb.Duration `protobuf:"bytes,13,opt,name=default_expires_in,json=defaultExpiresIn,proto3" json:"default_expires_in,omitempty"` // Any request that matches any of the provided matchers won't be redirected to OAuth server when tokens are not valid. // Automatic access token refresh will be performed for these requests, if enabled. // This behavior can be useful for AJAX requests. @@ -230,7 +230,7 @@ type OAuth2Config struct { // If this value is not set, it will default to “604800s“. In this case, the cookie with the refresh token will be expired // in a week. // This setting is only considered if “use_refresh_token“ is set to true, otherwise the authorization server expiration or “defaul_expires_in“ is used. - DefaultRefreshTokenExpiresIn *duration.Duration `protobuf:"bytes,15,opt,name=default_refresh_token_expires_in,json=defaultRefreshTokenExpiresIn,proto3" json:"default_refresh_token_expires_in,omitempty"` + DefaultRefreshTokenExpiresIn *durationpb.Duration `protobuf:"bytes,15,opt,name=default_refresh_token_expires_in,json=defaultRefreshTokenExpiresIn,proto3" json:"default_refresh_token_expires_in,omitempty"` } func (x *OAuth2Config) Reset() { @@ -342,14 +342,14 @@ func (x *OAuth2Config) GetAuthType() OAuth2Config_AuthType { return OAuth2Config_URL_ENCODED_BODY } -func (x *OAuth2Config) GetUseRefreshToken() *wrappers.BoolValue { +func (x *OAuth2Config) GetUseRefreshToken() *wrapperspb.BoolValue { if x != nil { return x.UseRefreshToken } return nil } -func (x *OAuth2Config) GetDefaultExpiresIn() *duration.Duration { +func (x *OAuth2Config) GetDefaultExpiresIn() *durationpb.Duration { if x != nil { return x.DefaultExpiresIn } @@ -363,7 +363,7 @@ func (x *OAuth2Config) GetDenyRedirectMatcher() []*v33.HeaderMatcher { return nil } -func (x *OAuth2Config) GetDefaultRefreshTokenExpiresIn() *duration.Duration { +func (x *OAuth2Config) GetDefaultRefreshTokenExpiresIn() *durationpb.Duration { if x != nil { return x.DefaultRefreshTokenExpiresIn } @@ -692,8 +692,8 @@ var file_envoy_extensions_filters_http_oauth2_v3_oauth_proto_goTypes = []interfa (*v31.HttpUri)(nil), // 6: envoy.config.core.v3.HttpUri (*v32.PathMatcher)(nil), // 7: envoy.type.matcher.v3.PathMatcher (*v33.HeaderMatcher)(nil), // 8: envoy.config.route.v3.HeaderMatcher - (*wrappers.BoolValue)(nil), // 9: google.protobuf.BoolValue - (*duration.Duration)(nil), // 10: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 9: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration } var file_envoy_extensions_filters_http_oauth2_v3_oauth_proto_depIdxs = []int32{ 5, // 0: envoy.extensions.filters.http.oauth2.v3.OAuth2Credentials.token_secret:type_name -> envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig diff --git a/envoy/extensions/filters/http/on_demand/v3/on_demand.pb.go b/envoy/extensions/filters/http/on_demand/v3/on_demand.pb.go index 4685220c7..04c227a19 100755 --- a/envoy/extensions/filters/http/on_demand/v3/on_demand.pb.go +++ b/envoy/extensions/filters/http/on_demand/v3/on_demand.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -36,7 +36,7 @@ type OnDemandCds struct { // xdstp:// resource locator for on-demand cluster collection. ResourcesLocator string `protobuf:"bytes,2,opt,name=resources_locator,json=resourcesLocator,proto3" json:"resources_locator,omitempty"` // The timeout for on demand cluster lookup. If not set, defaults to 5 seconds. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *OnDemandCds) Reset() { @@ -85,7 +85,7 @@ func (x *OnDemandCds) GetResourcesLocator() string { return "" } -func (x *OnDemandCds) GetTimeout() *duration.Duration { +func (x *OnDemandCds) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -275,11 +275,11 @@ func file_envoy_extensions_filters_http_on_demand_v3_on_demand_proto_rawDescGZIP var file_envoy_extensions_filters_http_on_demand_v3_on_demand_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_envoy_extensions_filters_http_on_demand_v3_on_demand_proto_goTypes = []interface{}{ - (*OnDemandCds)(nil), // 0: envoy.extensions.filters.http.on_demand.v3.OnDemandCds - (*OnDemand)(nil), // 1: envoy.extensions.filters.http.on_demand.v3.OnDemand - (*PerRouteConfig)(nil), // 2: envoy.extensions.filters.http.on_demand.v3.PerRouteConfig - (*v3.ConfigSource)(nil), // 3: envoy.config.core.v3.ConfigSource - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*OnDemandCds)(nil), // 0: envoy.extensions.filters.http.on_demand.v3.OnDemandCds + (*OnDemand)(nil), // 1: envoy.extensions.filters.http.on_demand.v3.OnDemand + (*PerRouteConfig)(nil), // 2: envoy.extensions.filters.http.on_demand.v3.PerRouteConfig + (*v3.ConfigSource)(nil), // 3: envoy.config.core.v3.ConfigSource + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration } var file_envoy_extensions_filters_http_on_demand_v3_on_demand_proto_depIdxs = []int32{ 3, // 0: envoy.extensions.filters.http.on_demand.v3.OnDemandCds.source:type_name -> envoy.config.core.v3.ConfigSource diff --git a/envoy/extensions/filters/http/rate_limit_quota/v3/rate_limit_quota.pb.go b/envoy/extensions/filters/http/rate_limit_quota/v3/rate_limit_quota.pb.go index 654d9fe41..30ab20ffd 100755 --- a/envoy/extensions/filters/http/rate_limit_quota/v3/rate_limit_quota.pb.go +++ b/envoy/extensions/filters/http/rate_limit_quota/v3/rate_limit_quota.pb.go @@ -13,11 +13,11 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v32 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" status "google.golang.org/genproto/googleapis/rpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -401,7 +401,7 @@ type RateLimitQuotaBucketSettings struct { // `. // // [#comment: 100000000 nanoseconds = 0.1 seconds] - ReportingInterval *duration.Duration `protobuf:"bytes,2,opt,name=reporting_interval,json=reportingInterval,proto3" json:"reporting_interval,omitempty"` + ReportingInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=reporting_interval,json=reportingInterval,proto3" json:"reporting_interval,omitempty"` // Customize the deny response to the requests over the rate limit. // If not set, the filter will be configured as if an empty message is set, // and will behave according to the defaults specified in :ref:`DenyResponseSettings @@ -461,7 +461,7 @@ func (x *RateLimitQuotaBucketSettings) GetBucketIdBuilder() *RateLimitQuotaBucke return nil } -func (x *RateLimitQuotaBucketSettings) GetReportingInterval() *duration.Duration { +func (x *RateLimitQuotaBucketSettings) GetReportingInterval() *durationpb.Duration { if x != nil { return x.ReportingInterval } @@ -582,7 +582,7 @@ type RateLimitQuotaBucketSettings_ExpiredAssignmentBehavior struct { // message. // // If not set, defaults to zero, and the bucket is abandoned immediately. - ExpiredAssignmentBehaviorTimeout *duration.Duration `protobuf:"bytes,1,opt,name=expired_assignment_behavior_timeout,json=expiredAssignmentBehaviorTimeout,proto3" json:"expired_assignment_behavior_timeout,omitempty"` + ExpiredAssignmentBehaviorTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=expired_assignment_behavior_timeout,json=expiredAssignmentBehaviorTimeout,proto3" json:"expired_assignment_behavior_timeout,omitempty"` // Types that are assignable to ExpiredAssignmentBehavior: // // *RateLimitQuotaBucketSettings_ExpiredAssignmentBehavior_FallbackRateLimit @@ -622,7 +622,7 @@ func (*RateLimitQuotaBucketSettings_ExpiredAssignmentBehavior) Descriptor() ([]b return file_envoy_extensions_filters_http_rate_limit_quota_v3_rate_limit_quota_proto_rawDescGZIP(), []int{2, 1} } -func (x *RateLimitQuotaBucketSettings_ExpiredAssignmentBehavior) GetExpiredAssignmentBehaviorTimeout() *duration.Duration { +func (x *RateLimitQuotaBucketSettings_ExpiredAssignmentBehavior) GetExpiredAssignmentBehaviorTimeout() *durationpb.Duration { if x != nil { return x.ExpiredAssignmentBehaviorTimeout } @@ -687,7 +687,7 @@ type RateLimitQuotaBucketSettings_DenyResponseSettings struct { HttpStatus *v32.HttpStatus `protobuf:"bytes,1,opt,name=http_status,json=httpStatus,proto3" json:"http_status,omitempty"` // HTTP response body used to deny for HTTP requests (gRPC excluded). // If not set, an empty body is returned. - HttpBody *wrappers.BytesValue `protobuf:"bytes,2,opt,name=http_body,json=httpBody,proto3" json:"http_body,omitempty"` + HttpBody *wrapperspb.BytesValue `protobuf:"bytes,2,opt,name=http_body,json=httpBody,proto3" json:"http_body,omitempty"` // Configure the deny response for gRPC requests over the rate limit. // Allows to specify the `RPC status code // `_, @@ -746,7 +746,7 @@ func (x *RateLimitQuotaBucketSettings_DenyResponseSettings) GetHttpStatus() *v32 return nil } -func (x *RateLimitQuotaBucketSettings_DenyResponseSettings) GetHttpBody() *wrappers.BytesValue { +func (x *RateLimitQuotaBucketSettings_DenyResponseSettings) GetHttpBody() *wrapperspb.BytesValue { if x != nil { return x.HttpBody } @@ -1224,10 +1224,10 @@ var file_envoy_extensions_filters_http_rate_limit_quota_v3_rate_limit_quota_prot (*v31.Matcher)(nil), // 11: xds.type.matcher.v3.Matcher (*v3.RuntimeFractionalPercent)(nil), // 12: envoy.config.core.v3.RuntimeFractionalPercent (*v3.HeaderValueOption)(nil), // 13: envoy.config.core.v3.HeaderValueOption - (*duration.Duration)(nil), // 14: google.protobuf.Duration + (*durationpb.Duration)(nil), // 14: google.protobuf.Duration (*v32.RateLimitStrategy)(nil), // 15: envoy.type.v3.RateLimitStrategy (*v32.HttpStatus)(nil), // 16: envoy.type.v3.HttpStatus - (*wrappers.BytesValue)(nil), // 17: google.protobuf.BytesValue + (*wrapperspb.BytesValue)(nil), // 17: google.protobuf.BytesValue (*status.Status)(nil), // 18: google.rpc.Status (*v3.TypedExtensionConfig)(nil), // 19: envoy.config.core.v3.TypedExtensionConfig } diff --git a/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go b/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go index cda581eb0..8e414d984 100755 --- a/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go +++ b/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go @@ -14,9 +14,9 @@ import ( v34 "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -262,7 +262,7 @@ type RateLimit struct { RequestType string `protobuf:"bytes,3,opt,name=request_type,json=requestType,proto3" json:"request_type,omitempty"` // The timeout in milliseconds for the rate limit service RPC. If not // set, this defaults to 20ms. - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // The filter's behaviour in case the rate limiting service does // not respond back. When it is set to true, Envoy will not allow traffic in case of // communication failure between rate limiting service and the proxy. @@ -377,7 +377,7 @@ func (x *RateLimit) GetRequestType() string { return "" } -func (x *RateLimit) GetTimeout() *duration.Duration { +func (x *RateLimit) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -1699,7 +1699,7 @@ var file_envoy_extensions_filters_http_ratelimit_v3_rate_limit_proto_goTypes = [ (*RateLimitConfig_Action_HeaderValueMatch)(nil), // 14: envoy.extensions.filters.http.ratelimit.v3.RateLimitConfig.Action.HeaderValueMatch (*RateLimitConfig_Action_MetaData)(nil), // 15: envoy.extensions.filters.http.ratelimit.v3.RateLimitConfig.Action.MetaData (*RateLimitConfig_Override_DynamicMetadata)(nil), // 16: envoy.extensions.filters.http.ratelimit.v3.RateLimitConfig.Override.DynamicMetadata - (*duration.Duration)(nil), // 17: google.protobuf.Duration + (*durationpb.Duration)(nil), // 17: google.protobuf.Duration (*v3.RateLimitServiceConfig)(nil), // 18: envoy.config.ratelimit.v3.RateLimitServiceConfig (*v31.HttpStatus)(nil), // 19: envoy.type.v3.HttpStatus (*v32.HeaderValueOption)(nil), // 20: envoy.config.core.v3.HeaderValueOption diff --git a/envoy/extensions/filters/http/router/v3/router.pb.go b/envoy/extensions/filters/http/router/v3/router.pb.go index 638d2cb30..0177e6b5f 100755 --- a/envoy/extensions/filters/http/router/v3/router.pb.go +++ b/envoy/extensions/filters/http/router/v3/router.pb.go @@ -12,10 +12,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -35,7 +35,7 @@ type Router struct { // Whether the router generates dynamic cluster statistics. Defaults to // true. Can be disabled in high performance scenarios. - DynamicStats *wrappers.BoolValue `protobuf:"bytes,1,opt,name=dynamic_stats,json=dynamicStats,proto3" json:"dynamic_stats,omitempty"` + DynamicStats *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=dynamic_stats,json=dynamicStats,proto3" json:"dynamic_stats,omitempty"` // Whether to start a child span for egress routed calls. This can be // useful in scenarios where other filters (auth, ratelimit, etc.) make // outbound calls and have child spans rooted at the same ingress @@ -141,7 +141,7 @@ func (*Router) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_http_router_v3_router_proto_rawDescGZIP(), []int{0} } -func (x *Router) GetDynamicStats() *wrappers.BoolValue { +func (x *Router) GetDynamicStats() *wrapperspb.BoolValue { if x != nil { return x.DynamicStats } @@ -221,7 +221,7 @@ type Router_UpstreamAccessLogOptions struct { // will flush access logs periodically at the specified interval. This is especially useful in the // case of long-lived requests, such as CONNECT and Websockets. // The interval must be at least 1 millisecond. - UpstreamLogFlushInterval *duration.Duration `protobuf:"bytes,2,opt,name=upstream_log_flush_interval,json=upstreamLogFlushInterval,proto3" json:"upstream_log_flush_interval,omitempty"` + UpstreamLogFlushInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=upstream_log_flush_interval,json=upstreamLogFlushInterval,proto3" json:"upstream_log_flush_interval,omitempty"` } func (x *Router_UpstreamAccessLogOptions) Reset() { @@ -263,7 +263,7 @@ func (x *Router_UpstreamAccessLogOptions) GetFlushUpstreamLogOnUpstreamStream() return false } -func (x *Router_UpstreamAccessLogOptions) GetUpstreamLogFlushInterval() *duration.Duration { +func (x *Router_UpstreamAccessLogOptions) GetUpstreamLogFlushInterval() *durationpb.Duration { if x != nil { return x.UpstreamLogFlushInterval } @@ -399,10 +399,10 @@ var file_envoy_extensions_filters_http_router_v3_router_proto_msgTypes = make([] var file_envoy_extensions_filters_http_router_v3_router_proto_goTypes = []interface{}{ (*Router)(nil), // 0: envoy.extensions.filters.http.router.v3.Router (*Router_UpstreamAccessLogOptions)(nil), // 1: envoy.extensions.filters.http.router.v3.Router.UpstreamAccessLogOptions - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue (*v3.AccessLog)(nil), // 3: envoy.config.accesslog.v3.AccessLog (*v31.HttpFilter)(nil), // 4: envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration } var file_envoy_extensions_filters_http_router_v3_router_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.router.v3.Router.dynamic_stats:type_name -> google.protobuf.BoolValue diff --git a/envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.go b/envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.go index 88df923d3..3c1f3a161 100755 --- a/envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.go +++ b/envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -40,11 +40,11 @@ type Metadata struct { // more information on how this value is merged with potentially existing // ones if “allow_overwrite“ is configured. Only one of “value“ and // “typed_value“ may be set. - Value *_struct.Struct `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` + Value *structpb.Struct `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` // The value to place at the namespace. If “allow_overwrite“, this will // overwrite any existing values in that namespace. Only one of “value“ and // “typed_value“ may be set. - TypedValue *any1.Any `protobuf:"bytes,4,opt,name=typed_value,json=typedValue,proto3" json:"typed_value,omitempty"` + TypedValue *anypb.Any `protobuf:"bytes,4,opt,name=typed_value,json=typedValue,proto3" json:"typed_value,omitempty"` } func (x *Metadata) Reset() { @@ -93,14 +93,14 @@ func (x *Metadata) GetAllowOverwrite() bool { return false } -func (x *Metadata) GetValue() *_struct.Struct { +func (x *Metadata) GetValue() *structpb.Struct { if x != nil { return x.Value } return nil } -func (x *Metadata) GetTypedValue() *any1.Any { +func (x *Metadata) GetTypedValue() *anypb.Any { if x != nil { return x.TypedValue } @@ -124,7 +124,7 @@ type Config struct { // This field is deprecated; please use “metadata“ as replacement. // // Deprecated: Marked as deprecated in envoy/extensions/filters/http/set_metadata/v3/set_metadata.proto. - Value *_struct.Struct `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *structpb.Struct `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` // Defines changes to be made to dynamic metadata. Metadata []*Metadata `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty"` } @@ -170,7 +170,7 @@ func (x *Config) GetMetadataNamespace() string { } // Deprecated: Marked as deprecated in envoy/extensions/filters/http/set_metadata/v3/set_metadata.proto. -func (x *Config) GetValue() *_struct.Struct { +func (x *Config) GetValue() *structpb.Struct { if x != nil { return x.Value } @@ -259,10 +259,10 @@ func file_envoy_extensions_filters_http_set_metadata_v3_set_metadata_proto_rawDe var file_envoy_extensions_filters_http_set_metadata_v3_set_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_extensions_filters_http_set_metadata_v3_set_metadata_proto_goTypes = []interface{}{ - (*Metadata)(nil), // 0: envoy.extensions.filters.http.set_metadata.v3.Metadata - (*Config)(nil), // 1: envoy.extensions.filters.http.set_metadata.v3.Config - (*_struct.Struct)(nil), // 2: google.protobuf.Struct - (*any1.Any)(nil), // 3: google.protobuf.Any + (*Metadata)(nil), // 0: envoy.extensions.filters.http.set_metadata.v3.Metadata + (*Config)(nil), // 1: envoy.extensions.filters.http.set_metadata.v3.Config + (*structpb.Struct)(nil), // 2: google.protobuf.Struct + (*anypb.Any)(nil), // 3: google.protobuf.Any } var file_envoy_extensions_filters_http_set_metadata_v3_set_metadata_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.http.set_metadata.v3.Metadata.value:type_name -> google.protobuf.Struct diff --git a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go index 483539b5b..bead4c632 100755 --- a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go +++ b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go @@ -9,9 +9,9 @@ package tls_inspectorv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -29,13 +29,13 @@ type TlsInspector struct { unknownFields protoimpl.UnknownFields // Populate “JA3“ fingerprint hash using data from the TLS Client Hello packet. Default is false. - EnableJa3Fingerprinting *wrappers.BoolValue `protobuf:"bytes,1,opt,name=enable_ja3_fingerprinting,json=enableJa3Fingerprinting,proto3" json:"enable_ja3_fingerprinting,omitempty"` + EnableJa3Fingerprinting *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enable_ja3_fingerprinting,json=enableJa3Fingerprinting,proto3" json:"enable_ja3_fingerprinting,omitempty"` // The size in bytes of the initial buffer requested by the tls_inspector. // If the filter needs to read additional bytes from the socket, the // filter will double the buffer up to it's default maximum of 64KiB. // If this size is not defined, defaults to maximum 64KiB that the // tls inspector will consume. - InitialReadBufferSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=initial_read_buffer_size,json=initialReadBufferSize,proto3" json:"initial_read_buffer_size,omitempty"` + InitialReadBufferSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=initial_read_buffer_size,json=initialReadBufferSize,proto3" json:"initial_read_buffer_size,omitempty"` } func (x *TlsInspector) Reset() { @@ -70,14 +70,14 @@ func (*TlsInspector) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_rawDescGZIP(), []int{0} } -func (x *TlsInspector) GetEnableJa3Fingerprinting() *wrappers.BoolValue { +func (x *TlsInspector) GetEnableJa3Fingerprinting() *wrapperspb.BoolValue { if x != nil { return x.EnableJa3Fingerprinting } return nil } -func (x *TlsInspector) GetInitialReadBufferSize() *wrappers.UInt32Value { +func (x *TlsInspector) GetInitialReadBufferSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialReadBufferSize } @@ -149,9 +149,9 @@ func file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto var file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_goTypes = []interface{}{ - (*TlsInspector)(nil), // 0: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*TlsInspector)(nil), // 0: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector.enable_ja3_fingerprinting:type_name -> google.protobuf.BoolValue diff --git a/envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.go b/envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.go index 364984a33..3642499ca 100755 --- a/envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.go +++ b/envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,12 +36,12 @@ type ConnectionLimit struct { // The max connections configuration to use for new incoming connections that are processed // by the filter's filter chain. When max_connection is reached, the incoming connection // will be closed after delay duration. - MaxConnections *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` + MaxConnections *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` // The delay configuration to use for rejecting the connection after some specified time duration // instead of immediately rejecting the connection. That way, a malicious user is not able to // retry as fast as possible which provides a better DoS protection for Envoy. If this is not present, // the connection will be closed immediately. - Delay *duration.Duration `protobuf:"bytes,3,opt,name=delay,proto3" json:"delay,omitempty"` + Delay *durationpb.Duration `protobuf:"bytes,3,opt,name=delay,proto3" json:"delay,omitempty"` // Runtime flag that controls whether the filter is enabled or not. If not specified, defaults // to enabled. RuntimeEnabled *v3.RuntimeFeatureFlag `protobuf:"bytes,4,opt,name=runtime_enabled,json=runtimeEnabled,proto3" json:"runtime_enabled,omitempty"` @@ -86,14 +86,14 @@ func (x *ConnectionLimit) GetStatPrefix() string { return "" } -func (x *ConnectionLimit) GetMaxConnections() *wrappers.UInt64Value { +func (x *ConnectionLimit) GetMaxConnections() *wrapperspb.UInt64Value { if x != nil { return x.MaxConnections } return nil } -func (x *ConnectionLimit) GetDelay() *duration.Duration { +func (x *ConnectionLimit) GetDelay() *durationpb.Duration { if x != nil { return x.Delay } @@ -175,10 +175,10 @@ func file_envoy_extensions_filters_network_connection_limit_v3_connection_limit_ var file_envoy_extensions_filters_network_connection_limit_v3_connection_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_filters_network_connection_limit_v3_connection_limit_proto_goTypes = []interface{}{ - (*ConnectionLimit)(nil), // 0: envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit - (*wrappers.UInt64Value)(nil), // 1: google.protobuf.UInt64Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*v3.RuntimeFeatureFlag)(nil), // 3: envoy.config.core.v3.RuntimeFeatureFlag + (*ConnectionLimit)(nil), // 0: envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit + (*wrapperspb.UInt64Value)(nil), // 1: google.protobuf.UInt64Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*v3.RuntimeFeatureFlag)(nil), // 3: envoy.config.core.v3.RuntimeFeatureFlag } var file_envoy_extensions_filters_network_connection_limit_v3_connection_limit_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit.max_connections:type_name -> google.protobuf.UInt64Value diff --git a/envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.go b/envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.go index 9e39e4488..a75c0e434 100755 --- a/envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.go +++ b/envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -324,7 +324,7 @@ type DubboFilter struct { 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. - Config *any1.Any `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` + Config *anypb.Any `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` } func (x *DubboFilter) Reset() { @@ -366,7 +366,7 @@ func (x *DubboFilter) GetName() string { return "" } -func (x *DubboFilter) GetConfig() *any1.Any { +func (x *DubboFilter) GetConfig() *anypb.Any { if x != nil { return x.Config } @@ -514,7 +514,7 @@ var file_envoy_extensions_filters_network_dubbo_proxy_v3_dubbo_proxy_proto_goTyp (*v3.ConfigSource)(nil), // 5: envoy.config.core.v3.ConfigSource (*RouteConfiguration)(nil), // 6: envoy.extensions.filters.network.dubbo_proxy.v3.RouteConfiguration (*MultipleRouteConfiguration)(nil), // 7: envoy.extensions.filters.network.dubbo_proxy.v3.MultipleRouteConfiguration - (*any1.Any)(nil), // 8: google.protobuf.Any + (*anypb.Any)(nil), // 8: google.protobuf.Any } var file_envoy_extensions_filters_network_dubbo_proxy_v3_dubbo_proxy_proto_depIdxs = []int32{ 5, // 0: envoy.extensions.filters.network.dubbo_proxy.v3.Drds.config_source:type_name -> envoy.config.core.v3.ConfigSource diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go index e305bc5ab..45639843b 100755 --- a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go +++ b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go @@ -17,11 +17,11 @@ import ( v34 "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3" v33 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -363,7 +363,7 @@ type HttpConnectionManager struct { // Whether the connection manager manipulates the :ref:`config_http_conn_man_headers_user-agent` // and :ref:`config_http_conn_man_headers_downstream-service-cluster` headers. See the linked // documentation for more information. Defaults to false. - AddUserAgent *wrappers.BoolValue `protobuf:"bytes,6,opt,name=add_user_agent,json=addUserAgent,proto3" json:"add_user_agent,omitempty"` + AddUserAgent *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=add_user_agent,json=addUserAgent,proto3" json:"add_user_agent,omitempty"` // Presence of the object defines whether the connection manager // emits :ref:`tracing ` data to the :ref:`configured tracing provider // `. @@ -396,7 +396,7 @@ type HttpConnectionManager struct { // The maximum request headers size for incoming connections. // If unconfigured, the default max request headers allowed is 60 KiB. // Requests that exceed this limit will receive a 431 response. - MaxRequestHeadersKb *wrappers.UInt32Value `protobuf:"bytes,29,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"` + MaxRequestHeadersKb *wrapperspb.UInt32Value `protobuf:"bytes,29,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"` // The stream idle timeout for connections managed by the connection manager. // If not specified, this defaults to 5 minutes. The default value was selected // so as not to interfere with any smaller configured timeouts that may have @@ -436,16 +436,16 @@ type HttpConnectionManager struct { // // A value of 0 will completely disable the connection manager stream idle // timeout, although per-route idle timeout overrides will continue to apply. - StreamIdleTimeout *duration.Duration `protobuf:"bytes,24,opt,name=stream_idle_timeout,json=streamIdleTimeout,proto3" json:"stream_idle_timeout,omitempty"` + StreamIdleTimeout *durationpb.Duration `protobuf:"bytes,24,opt,name=stream_idle_timeout,json=streamIdleTimeout,proto3" json:"stream_idle_timeout,omitempty"` // The amount of time that Envoy will wait for the entire request to be received. // The timer is activated when the request is initiated, and is disarmed when the last byte of the // request is sent upstream (i.e. all decoding filters have processed the request), OR when the // response is initiated. If not specified or set to 0, this timeout is disabled. - RequestTimeout *duration.Duration `protobuf:"bytes,28,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,28,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // The amount of time that Envoy will wait for the request headers to be received. The timer is // activated when the first byte of the headers is received, and is disarmed when the last byte of // the headers has been received. If not specified or set to 0, this timeout is disabled. - RequestHeadersTimeout *duration.Duration `protobuf:"bytes,41,opt,name=request_headers_timeout,json=requestHeadersTimeout,proto3" json:"request_headers_timeout,omitempty"` + RequestHeadersTimeout *durationpb.Duration `protobuf:"bytes,41,opt,name=request_headers_timeout,json=requestHeadersTimeout,proto3" json:"request_headers_timeout,omitempty"` // The time that Envoy will wait between sending an HTTP/2 “shutdown // notification” (GOAWAY frame with max stream ID) and a final GOAWAY frame. // This is used so that Envoy provides a grace period for new streams that @@ -455,7 +455,7 @@ type HttpConnectionManager struct { // both when a connection hits the idle timeout or during general server // draining. The default grace period is 5000 milliseconds (5 seconds) if this // option is not specified. - DrainTimeout *duration.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` + DrainTimeout *durationpb.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` // The delayed close timeout is for downstream connections managed by the HTTP connection manager. // It is defined as a grace period after connection close processing has been locally initiated // during which Envoy will wait for the peer to close (i.e., a TCP FIN/RST is received by Envoy @@ -488,7 +488,7 @@ type HttpConnectionManager struct { // A value of 0 will completely disable delayed close processing. When disabled, the downstream // connection's socket will be closed immediately after the write flush is completed or will // never close if the write flush does not complete. - DelayedCloseTimeout *duration.Duration `protobuf:"bytes,26,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"` + DelayedCloseTimeout *durationpb.Duration `protobuf:"bytes,26,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"` // Configuration for :ref:`HTTP access logs ` // emitted by the connection manager. AccessLog []*v31.AccessLog `protobuf:"bytes,13,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` @@ -501,7 +501,7 @@ type HttpConnectionManager struct { // are specified, the former (deprecated field) is ignored. // // Deprecated: Marked as deprecated in envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto. - AccessLogFlushInterval *duration.Duration `protobuf:"bytes,54,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` + AccessLogFlushInterval *durationpb.Duration `protobuf:"bytes,54,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` // .. attention:: // This field is deprecated in favor of // :ref:`flush_access_log_on_new_request @@ -521,7 +521,7 @@ type HttpConnectionManager struct { // :ref:`config_http_conn_man_headers_x-forwarded-for`, // :ref:`config_http_conn_man_headers_x-envoy-internal`, and // :ref:`config_http_conn_man_headers_x-envoy-external-address` for more information. - UseRemoteAddress *wrappers.BoolValue `protobuf:"bytes,14,opt,name=use_remote_address,json=useRemoteAddress,proto3" json:"use_remote_address,omitempty"` + UseRemoteAddress *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=use_remote_address,json=useRemoteAddress,proto3" json:"use_remote_address,omitempty"` // The number of additional ingress proxy hops from the right side of the // :ref:`config_http_conn_man_headers_x-forwarded-for` HTTP header to trust when // determining the origin client's IP address. The default is zero if this option @@ -576,7 +576,7 @@ type HttpConnectionManager struct { // ` header if it does not exist. This defaults to // true. Generating a random UUID4 is expensive so in high throughput scenarios where this feature // is not desired it can be disabled. - GenerateRequestId *wrappers.BoolValue `protobuf:"bytes,15,opt,name=generate_request_id,json=generateRequestId,proto3" json:"generate_request_id,omitempty"` + GenerateRequestId *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=generate_request_id,json=generateRequestId,proto3" json:"generate_request_id,omitempty"` // Whether the connection manager will keep the :ref:`x-request-id // ` header if passed for a request that is edge // (Edge request is the request from external clients to front Envoy) and not reset it, which @@ -631,7 +631,7 @@ type HttpConnectionManager struct { // [#comment:TODO: This field is ignored when the // :ref:`header validation configuration ` // is present.] - NormalizePath *wrappers.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"` + NormalizePath *wrapperspb.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 @@ -702,7 +702,7 @@ type HttpConnectionManager struct { // ` // “not“ the deprecated but similarly named :ref:`stream_error_on_invalid_http_messaging // ` - StreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,40,opt,name=stream_error_on_invalid_http_message,json=streamErrorOnInvalidHttpMessage,proto3" json:"stream_error_on_invalid_http_message,omitempty"` + StreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,40,opt,name=stream_error_on_invalid_http_message,json=streamErrorOnInvalidHttpMessage,proto3" json:"stream_error_on_invalid_http_message,omitempty"` // [#not-implemented-hide:] Path normalization configuration. This includes // configurations for transformations (e.g. RFC 3986 normalization or merge // adjacent slashes) and the policy to apply them. The policy determines @@ -758,7 +758,7 @@ type HttpConnectionManager struct { // Whether the HCM will add ProxyProtocolFilterState to the Connection lifetime filter state. Defaults to “true“. // This should be set to “false“ in cases where Envoy's view of the downstream address may not correspond to the // actual client address, for example, if there's another proxy in front of the Envoy. - AddProxyProtocolConnectionState *wrappers.BoolValue `protobuf:"bytes,53,opt,name=add_proxy_protocol_connection_state,json=addProxyProtocolConnectionState,proto3" json:"add_proxy_protocol_connection_state,omitempty"` + AddProxyProtocolConnectionState *wrapperspb.BoolValue `protobuf:"bytes,53,opt,name=add_proxy_protocol_connection_state,json=addProxyProtocolConnectionState,proto3" json:"add_proxy_protocol_connection_state,omitempty"` } func (x *HttpConnectionManager) Reset() { @@ -842,7 +842,7 @@ func (x *HttpConnectionManager) GetHttpFilters() []*HttpFilter { return nil } -func (x *HttpConnectionManager) GetAddUserAgent() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetAddUserAgent() *wrapperspb.BoolValue { if x != nil { return x.AddUserAgent } @@ -905,42 +905,42 @@ func (x *HttpConnectionManager) GetSchemeHeaderTransformation() *v3.SchemeHeader return nil } -func (x *HttpConnectionManager) GetMaxRequestHeadersKb() *wrappers.UInt32Value { +func (x *HttpConnectionManager) GetMaxRequestHeadersKb() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestHeadersKb } return nil } -func (x *HttpConnectionManager) GetStreamIdleTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetStreamIdleTimeout() *durationpb.Duration { if x != nil { return x.StreamIdleTimeout } return nil } -func (x *HttpConnectionManager) GetRequestTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } return nil } -func (x *HttpConnectionManager) GetRequestHeadersTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetRequestHeadersTimeout() *durationpb.Duration { if x != nil { return x.RequestHeadersTimeout } return nil } -func (x *HttpConnectionManager) GetDrainTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetDrainTimeout() *durationpb.Duration { if x != nil { return x.DrainTimeout } return nil } -func (x *HttpConnectionManager) GetDelayedCloseTimeout() *duration.Duration { +func (x *HttpConnectionManager) GetDelayedCloseTimeout() *durationpb.Duration { if x != nil { return x.DelayedCloseTimeout } @@ -955,7 +955,7 @@ func (x *HttpConnectionManager) GetAccessLog() []*v31.AccessLog { } // Deprecated: Marked as deprecated in envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto. -func (x *HttpConnectionManager) GetAccessLogFlushInterval() *duration.Duration { +func (x *HttpConnectionManager) GetAccessLogFlushInterval() *durationpb.Duration { if x != nil { return x.AccessLogFlushInterval } @@ -977,7 +977,7 @@ func (x *HttpConnectionManager) GetAccessLogOptions() *HttpConnectionManager_Hcm return nil } -func (x *HttpConnectionManager) GetUseRemoteAddress() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetUseRemoteAddress() *wrapperspb.BoolValue { if x != nil { return x.UseRemoteAddress } @@ -1026,7 +1026,7 @@ func (x *HttpConnectionManager) GetVia() string { return "" } -func (x *HttpConnectionManager) GetGenerateRequestId() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetGenerateRequestId() *wrapperspb.BoolValue { if x != nil { return x.GenerateRequestId } @@ -1082,7 +1082,7 @@ func (x *HttpConnectionManager) GetUpgradeConfigs() []*HttpConnectionManager_Upg return nil } -func (x *HttpConnectionManager) GetNormalizePath() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetNormalizePath() *wrapperspb.BoolValue { if x != nil { return x.NormalizePath } @@ -1138,7 +1138,7 @@ func (x *HttpConnectionManager) GetStripAnyHostPort() bool { return false } -func (x *HttpConnectionManager) GetStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.StreamErrorOnInvalidHttpMessage } @@ -1187,7 +1187,7 @@ func (x *HttpConnectionManager) GetAppendLocalOverload() bool { return false } -func (x *HttpConnectionManager) GetAddProxyProtocolConnectionState() *wrappers.BoolValue { +func (x *HttpConnectionManager) GetAddProxyProtocolConnectionState() *wrapperspb.BoolValue { if x != nil { return x.AddProxyProtocolConnectionState } @@ -1346,7 +1346,7 @@ type ResponseMapper struct { // Filter to determine if this mapper should apply. Filter *v31.AccessLogFilter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` // The new response status code if specified. - StatusCode *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` + StatusCode *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` // The new local reply body text if specified. It will be used in the “%LOCAL_REPLY_BODY%“ // command operator in the “body_format“. Body *v3.DataSource `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"` @@ -1397,7 +1397,7 @@ func (x *ResponseMapper) GetFilter() *v31.AccessLogFilter { return nil } -func (x *ResponseMapper) GetStatusCode() *wrappers.UInt32Value { +func (x *ResponseMapper) GetStatusCode() *wrapperspb.UInt32Value { if x != nil { return x.StatusCode } @@ -1784,7 +1784,7 @@ func (m *HttpFilter) GetConfigType() isHttpFilter_ConfigType { return nil } -func (x *HttpFilter) GetTypedConfig() *any1.Any { +func (x *HttpFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*HttpFilter_TypedConfig); ok { return x.TypedConfig } @@ -1824,7 +1824,7 @@ type HttpFilter_TypedConfig struct { // :ref:`ExtensionWithMatcher ` // with the desired HTTP filter. // [#extension-category: envoy.filters.http] - TypedConfig *any1.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,4,opt,name=typed_config,json=typedConfig,proto3,oneof"` } type HttpFilter_ConfigDiscovery struct { @@ -1849,7 +1849,7 @@ type RequestIDExtension struct { unknownFields protoimpl.UnknownFields // Request ID extension specific configuration. - TypedConfig *any1.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,1,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *RequestIDExtension) Reset() { @@ -1884,7 +1884,7 @@ func (*RequestIDExtension) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_rawDescGZIP(), []int{8} } -func (x *RequestIDExtension) GetTypedConfig() *any1.Any { +func (x *RequestIDExtension) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -1977,7 +1977,7 @@ type HttpConnectionManager_Tracing struct { // Maximum length of the request path to extract and include in the HttpUrl tag. Used to // truncate lengthy request paths to meet the needs of a tracing backend. // Default: 256 - MaxPathTagLength *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_path_tag_length,json=maxPathTagLength,proto3" json:"max_path_tag_length,omitempty"` + MaxPathTagLength *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_path_tag_length,json=maxPathTagLength,proto3" json:"max_path_tag_length,omitempty"` // A list of custom tags with unique tag name to create tags for the active span. CustomTags []*v34.CustomTag `protobuf:"bytes,8,rep,name=custom_tags,json=customTags,proto3" json:"custom_tags,omitempty"` // Configuration for an external tracing provider. @@ -2011,7 +2011,7 @@ type HttpConnectionManager_Tracing struct { // this flag should be set to true. // // The default value is false for now for backward compatibility. - SpawnUpstreamSpan *wrappers.BoolValue `protobuf:"bytes,10,opt,name=spawn_upstream_span,json=spawnUpstreamSpan,proto3" json:"spawn_upstream_span,omitempty"` + SpawnUpstreamSpan *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=spawn_upstream_span,json=spawnUpstreamSpan,proto3" json:"spawn_upstream_span,omitempty"` } func (x *HttpConnectionManager_Tracing) Reset() { @@ -2074,7 +2074,7 @@ func (x *HttpConnectionManager_Tracing) GetVerbose() bool { return false } -func (x *HttpConnectionManager_Tracing) GetMaxPathTagLength() *wrappers.UInt32Value { +func (x *HttpConnectionManager_Tracing) GetMaxPathTagLength() *wrapperspb.UInt32Value { if x != nil { return x.MaxPathTagLength } @@ -2095,7 +2095,7 @@ func (x *HttpConnectionManager_Tracing) GetProvider() *v35.Tracing_Http { return nil } -func (x *HttpConnectionManager_Tracing) GetSpawnUpstreamSpan() *wrappers.BoolValue { +func (x *HttpConnectionManager_Tracing) GetSpawnUpstreamSpan() *wrapperspb.BoolValue { if x != nil { return x.SpawnUpstreamSpan } @@ -2167,7 +2167,7 @@ type HttpConnectionManager_SetCurrentClientCertDetails struct { unknownFields protoimpl.UnknownFields // Whether to forward the subject of the client cert. Defaults to false. - Subject *wrappers.BoolValue `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"` + Subject *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"` // Whether to forward the entire client cert in URL encoded PEM format. This will appear in the // XFCC header comma separated from other values with the value Cert="PEM". // Defaults to false. @@ -2217,7 +2217,7 @@ func (*HttpConnectionManager_SetCurrentClientCertDetails) Descriptor() ([]byte, return file_envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_rawDescGZIP(), []int{0, 2} } -func (x *HttpConnectionManager_SetCurrentClientCertDetails) GetSubject() *wrappers.BoolValue { +func (x *HttpConnectionManager_SetCurrentClientCertDetails) GetSubject() *wrapperspb.BoolValue { if x != nil { return x.Subject } @@ -2283,7 +2283,7 @@ type HttpConnectionManager_UpgradeConfig struct { // This can be overridden on a per-route basis with :ref:`cluster // ` as documented in the // :ref:`upgrade documentation `. - Enabled *wrappers.BoolValue `protobuf:"bytes,3,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=enabled,proto3" json:"enabled,omitempty"` } func (x *HttpConnectionManager_UpgradeConfig) Reset() { @@ -2332,7 +2332,7 @@ func (x *HttpConnectionManager_UpgradeConfig) GetFilters() []*HttpFilter { return nil } -func (x *HttpConnectionManager_UpgradeConfig) GetEnabled() *wrappers.BoolValue { +func (x *HttpConnectionManager_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -2581,7 +2581,7 @@ type HttpConnectionManager_HcmAccessLogOptions struct { // “requestComplete()“ method of “StreamInfo“ in access log filters, or through the “%DURATION%“ substitution // string. // The interval must be at least 1 millisecond. - AccessLogFlushInterval *duration.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` + AccessLogFlushInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` // If set to true, HCM will flush an access log when a new HTTP request is received, after request // headers have been evaluated, before iterating through the HTTP filter chain. // This log record, if enabled, does not depend on periodic log records or request completion log. @@ -2625,7 +2625,7 @@ func (*HttpConnectionManager_HcmAccessLogOptions) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_rawDescGZIP(), []int{0, 6} } -func (x *HttpConnectionManager_HcmAccessLogOptions) GetAccessLogFlushInterval() *duration.Duration { +func (x *HttpConnectionManager_HcmAccessLogOptions) GetAccessLogFlushInterval() *durationpb.Duration { if x != nil { return x.AccessLogFlushInterval } @@ -3857,14 +3857,14 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec (*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor)(nil), // 24: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor (*ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement)(nil), // 25: envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement (*v32.RouteConfiguration)(nil), // 26: envoy.config.route.v3.RouteConfiguration - (*wrappers.BoolValue)(nil), // 27: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 27: google.protobuf.BoolValue (*v3.HttpProtocolOptions)(nil), // 28: envoy.config.core.v3.HttpProtocolOptions (*v3.Http1ProtocolOptions)(nil), // 29: envoy.config.core.v3.Http1ProtocolOptions (*v3.Http2ProtocolOptions)(nil), // 30: envoy.config.core.v3.Http2ProtocolOptions (*v3.Http3ProtocolOptions)(nil), // 31: envoy.config.core.v3.Http3ProtocolOptions (*v3.SchemeHeaderTransformation)(nil), // 32: envoy.config.core.v3.SchemeHeaderTransformation - (*wrappers.UInt32Value)(nil), // 33: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 34: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 33: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 34: google.protobuf.Duration (*v31.AccessLog)(nil), // 35: envoy.config.accesslog.v3.AccessLog (*v3.TypedExtensionConfig)(nil), // 36: envoy.config.core.v3.TypedExtensionConfig (*v3.SubstitutionFormatString)(nil), // 37: envoy.config.core.v3.SubstitutionFormatString @@ -3873,7 +3873,7 @@ var file_envoy_extensions_filters_network_http_connection_manager_v3_http_connec (*v3.HeaderValueOption)(nil), // 40: envoy.config.core.v3.HeaderValueOption (*v3.ConfigSource)(nil), // 41: envoy.config.core.v3.ConfigSource (*v32.ScopedRouteConfiguration)(nil), // 42: envoy.config.route.v3.ScopedRouteConfiguration - (*any1.Any)(nil), // 43: google.protobuf.Any + (*anypb.Any)(nil), // 43: google.protobuf.Any (*v3.ExtensionConfigSource)(nil), // 44: envoy.config.core.v3.ExtensionConfigSource (*v33.Percent)(nil), // 45: envoy.type.v3.Percent (*v34.CustomTag)(nil), // 46: envoy.type.tracing.v3.CustomTag diff --git a/envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.go b/envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.go index a4834ff6c..42d68689d 100755 --- a/envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.go +++ b/envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.go @@ -11,9 +11,9 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -39,7 +39,7 @@ type RateLimit struct { Descriptors []*v3.RateLimitDescriptor `protobuf:"bytes,3,rep,name=descriptors,proto3" json:"descriptors,omitempty"` // The timeout in milliseconds for the rate limit service RPC. If not // set, this defaults to 20ms. - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // The filter's behaviour in case the rate limiting service does // not respond back. When it is set to true, Envoy will not allow traffic in case of // communication failure between rate limiting service and the proxy. @@ -104,7 +104,7 @@ func (x *RateLimit) GetDescriptors() []*v3.RateLimitDescriptor { return nil } -func (x *RateLimit) GetTimeout() *duration.Duration { +func (x *RateLimit) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -208,7 +208,7 @@ var file_envoy_extensions_filters_network_ratelimit_v3_rate_limit_proto_msgTypes var file_envoy_extensions_filters_network_ratelimit_v3_rate_limit_proto_goTypes = []interface{}{ (*RateLimit)(nil), // 0: envoy.extensions.filters.network.ratelimit.v3.RateLimit (*v3.RateLimitDescriptor)(nil), // 1: envoy.extensions.common.ratelimit.v3.RateLimitDescriptor - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration (*v31.RateLimitServiceConfig)(nil), // 3: envoy.config.ratelimit.v3.RateLimitServiceConfig } var file_envoy_extensions_filters_network_ratelimit_v3_rate_limit_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.go b/envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.go index ce5d6380b..15c662b90 100755 --- a/envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.go +++ b/envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.go @@ -12,10 +12,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -413,7 +413,7 @@ type RedisProxy_ConnPoolSettings struct { // The only exception to this behavior is when a connection to a backend is not yet established. // In that case, the connect timeout on the cluster will govern the timeout until the connection // is ready. - OpTimeout *duration.Duration `protobuf:"bytes,1,opt,name=op_timeout,json=opTimeout,proto3" json:"op_timeout,omitempty"` + OpTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=op_timeout,json=opTimeout,proto3" json:"op_timeout,omitempty"` // Use hash tagging on every redis key to guarantee that keys with the same hash tag will be // forwarded to the same upstream. The hash key used for determining the upstream in a // consistent hash ring configuration will be computed from the hash tagged key instead of the @@ -454,13 +454,13 @@ 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 *duration.Duration `protobuf:"bytes,5,opt,name=buffer_flush_timeout,json=bufferFlushTimeout,proto3" json:"buffer_flush_timeout,omitempty"` + BufferFlushTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=buffer_flush_timeout,json=bufferFlushTimeout,proto3" 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 *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=max_upstream_unknown_connections,json=maxUpstreamUnknownConnections,proto3" json:"max_upstream_unknown_connections,omitempty"` + MaxUpstreamUnknownConnections *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=max_upstream_unknown_connections,json=maxUpstreamUnknownConnections,proto3" json:"max_upstream_unknown_connections,omitempty"` // Enable per-command statistics per upstream cluster, in addition to the filter level aggregate // count. These commands are measured in microseconds. EnableCommandStats bool `protobuf:"varint,8,opt,name=enable_command_stats,json=enableCommandStats,proto3" json:"enable_command_stats,omitempty"` @@ -504,7 +504,7 @@ func (*RedisProxy_ConnPoolSettings) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_network_redis_proxy_v3_redis_proxy_proto_rawDescGZIP(), []int{0, 0} } -func (x *RedisProxy_ConnPoolSettings) GetOpTimeout() *duration.Duration { +func (x *RedisProxy_ConnPoolSettings) GetOpTimeout() *durationpb.Duration { if x != nil { return x.OpTimeout } @@ -539,14 +539,14 @@ func (x *RedisProxy_ConnPoolSettings) GetMaxBufferSizeBeforeFlush() uint32 { return 0 } -func (x *RedisProxy_ConnPoolSettings) GetBufferFlushTimeout() *duration.Duration { +func (x *RedisProxy_ConnPoolSettings) GetBufferFlushTimeout() *durationpb.Duration { if x != nil { return x.BufferFlushTimeout } return nil } -func (x *RedisProxy_ConnPoolSettings) GetMaxUpstreamUnknownConnections() *wrappers.UInt32Value { +func (x *RedisProxy_ConnPoolSettings) GetMaxUpstreamUnknownConnections() *wrapperspb.UInt32Value { if x != nil { return x.MaxUpstreamUnknownConnections } @@ -652,7 +652,7 @@ type RedisProxy_RedisFault struct { // Percentage of requests fault applies to. FaultEnabled *v3.RuntimeFractionalPercent `protobuf:"bytes,2,opt,name=fault_enabled,json=faultEnabled,proto3" json:"fault_enabled,omitempty"` // Delay for all faults. If not set, defaults to zero - Delay *duration.Duration `protobuf:"bytes,3,opt,name=delay,proto3" json:"delay,omitempty"` + Delay *durationpb.Duration `protobuf:"bytes,3,opt,name=delay,proto3" json:"delay,omitempty"` // Commands fault is restricted to, if any. If not set, fault applies to all commands // other than auth and ping (due to special handling of those commands in Envoy). Commands []string `protobuf:"bytes,4,rep,name=commands,proto3" json:"commands,omitempty"` @@ -704,7 +704,7 @@ func (x *RedisProxy_RedisFault) GetFaultEnabled() *v3.RuntimeFractionalPercent { return nil } -func (x *RedisProxy_RedisFault) GetDelay() *duration.Duration { +func (x *RedisProxy_RedisFault) GetDelay() *durationpb.Duration { if x != nil { return x.Delay } @@ -1304,9 +1304,9 @@ var file_envoy_extensions_filters_network_redis_proxy_v3_redis_proxy_proto_goTyp (*RedisProxy_PrefixRoutes_Route_RequestMirrorPolicy)(nil), // 9: envoy.extensions.filters.network.redis_proxy.v3.RedisProxy.PrefixRoutes.Route.RequestMirrorPolicy (*RedisProxy_PrefixRoutes_Route_ReadCommandPolicy)(nil), // 10: envoy.extensions.filters.network.redis_proxy.v3.RedisProxy.PrefixRoutes.Route.ReadCommandPolicy (*v3.DataSource)(nil), // 11: envoy.config.core.v3.DataSource - (*duration.Duration)(nil), // 12: google.protobuf.Duration + (*durationpb.Duration)(nil), // 12: google.protobuf.Duration (*v31.DnsCacheConfig)(nil), // 13: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig - (*wrappers.UInt32Value)(nil), // 14: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 14: google.protobuf.UInt32Value (*v3.RuntimeFractionalPercent)(nil), // 15: envoy.config.core.v3.RuntimeFractionalPercent } var file_envoy_extensions_filters_network_redis_proxy_v3_redis_proxy_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.go b/envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.go index 0e997a298..698deaa01 100755 --- a/envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.go +++ b/envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.go @@ -13,10 +13,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v32 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -63,22 +63,22 @@ type TcpProxy struct { // // Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP // FIN packets, etc. - IdleTimeout *duration.Duration `protobuf:"bytes,8,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // [#not-implemented-hide:] The idle timeout for connections managed by the TCP proxy // filter. The idle timeout is defined as the period in which there is no // active traffic. If not set, there is no idle timeout. When the idle timeout // is reached the connection will be closed. The distinction between // downstream_idle_timeout/upstream_idle_timeout provides a means to set // timeout based on the last byte sent on the downstream/upstream connection. - DownstreamIdleTimeout *duration.Duration `protobuf:"bytes,3,opt,name=downstream_idle_timeout,json=downstreamIdleTimeout,proto3" json:"downstream_idle_timeout,omitempty"` + DownstreamIdleTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=downstream_idle_timeout,json=downstreamIdleTimeout,proto3" json:"downstream_idle_timeout,omitempty"` // [#not-implemented-hide:] - UpstreamIdleTimeout *duration.Duration `protobuf:"bytes,4,opt,name=upstream_idle_timeout,json=upstreamIdleTimeout,proto3" json:"upstream_idle_timeout,omitempty"` + UpstreamIdleTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=upstream_idle_timeout,json=upstreamIdleTimeout,proto3" json:"upstream_idle_timeout,omitempty"` // Configuration for :ref:`access logs ` // emitted by the this tcp_proxy. AccessLog []*v31.AccessLog `protobuf:"bytes,5,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` // The maximum number of unsuccessful connection attempts that will be made before // giving up. If the parameter is not specified, 1 connection attempt will be made. - MaxConnectAttempts *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` + MaxConnectAttempts *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` // Optional configuration for TCP proxy hash policy. If hash_policy is not set, the hash-based // load balancing algorithms will select a host randomly. Currently the number of hash policies is // limited to 1. @@ -91,7 +91,7 @@ type TcpProxy struct { // The maximum duration of a connection. The duration is defined as the period since a connection // was established. If not set, there is no max duration. When max_downstream_connection_duration // is reached the connection will be closed. Duration must be at least 1ms. - MaxDownstreamConnectionDuration *duration.Duration `protobuf:"bytes,13,opt,name=max_downstream_connection_duration,json=maxDownstreamConnectionDuration,proto3" json:"max_downstream_connection_duration,omitempty"` + MaxDownstreamConnectionDuration *durationpb.Duration `protobuf:"bytes,13,opt,name=max_downstream_connection_duration,json=maxDownstreamConnectionDuration,proto3" json:"max_downstream_connection_duration,omitempty"` // .. attention:: // This field is deprecated in favor of // :ref:`access_log_flush_interval @@ -101,7 +101,7 @@ type TcpProxy struct { // are specified, the former (deprecated field) is ignored. // // Deprecated: Marked as deprecated in envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.proto. - AccessLogFlushInterval *duration.Duration `protobuf:"bytes,15,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` + AccessLogFlushInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` // .. attention:: // This field is deprecated in favor of // :ref:`flush_access_log_on_connected @@ -190,21 +190,21 @@ func (x *TcpProxy) GetMetadataMatch() *v3.Metadata { return nil } -func (x *TcpProxy) GetIdleTimeout() *duration.Duration { +func (x *TcpProxy) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *TcpProxy) GetDownstreamIdleTimeout() *duration.Duration { +func (x *TcpProxy) GetDownstreamIdleTimeout() *durationpb.Duration { if x != nil { return x.DownstreamIdleTimeout } return nil } -func (x *TcpProxy) GetUpstreamIdleTimeout() *duration.Duration { +func (x *TcpProxy) GetUpstreamIdleTimeout() *durationpb.Duration { if x != nil { return x.UpstreamIdleTimeout } @@ -218,7 +218,7 @@ func (x *TcpProxy) GetAccessLog() []*v31.AccessLog { return nil } -func (x *TcpProxy) GetMaxConnectAttempts() *wrappers.UInt32Value { +func (x *TcpProxy) GetMaxConnectAttempts() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectAttempts } @@ -239,7 +239,7 @@ func (x *TcpProxy) GetTunnelingConfig() *TcpProxy_TunnelingConfig { return nil } -func (x *TcpProxy) GetMaxDownstreamConnectionDuration() *duration.Duration { +func (x *TcpProxy) GetMaxDownstreamConnectionDuration() *durationpb.Duration { if x != nil { return x.MaxDownstreamConnectionDuration } @@ -247,7 +247,7 @@ func (x *TcpProxy) GetMaxDownstreamConnectionDuration() *duration.Duration { } // Deprecated: Marked as deprecated in envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.proto. -func (x *TcpProxy) GetAccessLogFlushInterval() *duration.Duration { +func (x *TcpProxy) GetAccessLogFlushInterval() *durationpb.Duration { if x != nil { return x.AccessLogFlushInterval } @@ -480,7 +480,7 @@ type TcpProxy_OnDemand struct { // The timeout for on demand cluster lookup. If the CDS cannot return the required cluster, // the downstream request will be closed with the error code detail NO_CLUSTER_FOUND. // [#not-implemented-hide:] - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *TcpProxy_OnDemand) Reset() { @@ -529,7 +529,7 @@ func (x *TcpProxy_OnDemand) GetResourcesLocator() string { return "" } -func (x *TcpProxy_OnDemand) GetTimeout() *duration.Duration { +func (x *TcpProxy_OnDemand) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -545,7 +545,7 @@ type TcpProxy_TcpAccessLogOptions struct { // is closed by default. If this field is set, the TCP proxy will flush access log periodically with // the specified interval. // The interval must be at least 1ms. - AccessLogFlushInterval *duration.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` + AccessLogFlushInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` // If set to true, access log will be flushed when the TCP proxy has successfully established a // connection with the upstream. If the connection failed, the access log will not be flushed. FlushAccessLogOnConnected bool `protobuf:"varint,2,opt,name=flush_access_log_on_connected,json=flushAccessLogOnConnected,proto3" json:"flush_access_log_on_connected,omitempty"` @@ -583,7 +583,7 @@ func (*TcpProxy_TcpAccessLogOptions) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_network_tcp_proxy_v3_tcp_proxy_proto_rawDescGZIP(), []int{0, 3} } -func (x *TcpProxy_TcpAccessLogOptions) GetAccessLogFlushInterval() *duration.Duration { +func (x *TcpProxy_TcpAccessLogOptions) GetAccessLogFlushInterval() *durationpb.Duration { if x != nil { return x.AccessLogFlushInterval } @@ -906,9 +906,9 @@ var file_envoy_extensions_filters_network_tcp_proxy_v3_tcp_proxy_proto_goTypes = (*TcpProxy_TcpAccessLogOptions)(nil), // 4: envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy.TcpAccessLogOptions (*TcpProxy_WeightedCluster_ClusterWeight)(nil), // 5: envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy.WeightedCluster.ClusterWeight (*v3.Metadata)(nil), // 6: envoy.config.core.v3.Metadata - (*duration.Duration)(nil), // 7: google.protobuf.Duration + (*durationpb.Duration)(nil), // 7: google.protobuf.Duration (*v31.AccessLog)(nil), // 8: envoy.config.accesslog.v3.AccessLog - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value (*v32.HashPolicy)(nil), // 10: envoy.type.v3.HashPolicy (*v3.HeaderValueOption)(nil), // 11: envoy.config.core.v3.HeaderValueOption (*v3.ConfigSource)(nil), // 12: envoy.config.core.v3.ConfigSource diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.go b/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.go index 6d5d64f76..af6e9fa7c 100755 --- a/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.go +++ b/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -44,7 +44,7 @@ type RateLimit struct { Stage uint32 `protobuf:"varint,2,opt,name=stage,proto3" json:"stage,omitempty"` // The timeout in milliseconds for the rate limit service RPC. If not // set, this defaults to 20ms. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // The filter's behaviour in case the rate limiting service does // not respond back. When it is set to true, Envoy will not allow traffic in case of // communication failure between rate limiting service and the proxy. @@ -102,7 +102,7 @@ func (x *RateLimit) GetStage() uint32 { return 0 } -func (x *RateLimit) GetTimeout() *duration.Duration { +func (x *RateLimit) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -200,7 +200,7 @@ func file_envoy_extensions_filters_network_thrift_proxy_filters_ratelimit_v3_rat var file_envoy_extensions_filters_network_thrift_proxy_filters_ratelimit_v3_rate_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_filters_network_thrift_proxy_filters_ratelimit_v3_rate_limit_proto_goTypes = []interface{}{ (*RateLimit)(nil), // 0: envoy.extensions.filters.network.thrift_proxy.filters.ratelimit.v3.RateLimit - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration (*v3.RateLimitServiceConfig)(nil), // 2: envoy.config.ratelimit.v3.RateLimitServiceConfig } var file_envoy_extensions_filters_network_thrift_proxy_filters_ratelimit_v3_rate_limit_proto_depIdxs = []int32{ diff --git a/envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.go b/envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.go index 5f5bac7dc..418113154 100755 --- a/envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.go +++ b/envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.go @@ -8,9 +8,9 @@ package routerv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -28,7 +28,7 @@ type Router struct { unknownFields protoimpl.UnknownFields // Close downstream connection in case of routing or upstream connection problem. Default: true - CloseDownstreamOnUpstreamError *wrappers.BoolValue `protobuf:"bytes,1,opt,name=close_downstream_on_upstream_error,json=closeDownstreamOnUpstreamError,proto3" json:"close_downstream_on_upstream_error,omitempty"` + CloseDownstreamOnUpstreamError *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=close_downstream_on_upstream_error,json=closeDownstreamOnUpstreamError,proto3" json:"close_downstream_on_upstream_error,omitempty"` } func (x *Router) Reset() { @@ -63,7 +63,7 @@ func (*Router) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_network_thrift_proxy_router_v3_router_proto_rawDescGZIP(), []int{0} } -func (x *Router) GetCloseDownstreamOnUpstreamError() *wrappers.BoolValue { +func (x *Router) GetCloseDownstreamOnUpstreamError() *wrapperspb.BoolValue { if x != nil { return x.CloseDownstreamOnUpstreamError } @@ -127,8 +127,8 @@ func file_envoy_extensions_filters_network_thrift_proxy_router_v3_router_proto_r var file_envoy_extensions_filters_network_thrift_proxy_router_v3_router_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_filters_network_thrift_proxy_router_v3_router_proto_goTypes = []interface{}{ - (*Router)(nil), // 0: envoy.extensions.filters.network.thrift_proxy.router.v3.Router - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue + (*Router)(nil), // 0: envoy.extensions.filters.network.thrift_proxy.router.v3.Router + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue } var file_envoy_extensions_filters_network_thrift_proxy_router_v3_router_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.thrift_proxy.router.v3.Router.close_downstream_on_upstream_error:type_name -> google.protobuf.BoolValue diff --git a/envoy/extensions/filters/network/thrift_proxy/v3/route.pb.go b/envoy/extensions/filters/network/thrift_proxy/v3/route.pb.go index 9426e6d26..c4f149a0a 100755 --- a/envoy/extensions/filters/network/thrift_proxy/v3/route.pb.go +++ b/envoy/extensions/filters/network/thrift_proxy/v3/route.pb.go @@ -11,9 +11,9 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -52,7 +52,7 @@ type RouteConfiguration struct { // ` // option. Users may wish to override the default behavior in certain cases (for example when // using CDS with a static route table). - ValidateClusters *wrappers.BoolValue `protobuf:"bytes,3,opt,name=validate_clusters,json=validateClusters,proto3" json:"validate_clusters,omitempty"` + ValidateClusters *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=validate_clusters,json=validateClusters,proto3" json:"validate_clusters,omitempty"` } func (x *RouteConfiguration) Reset() { @@ -101,7 +101,7 @@ func (x *RouteConfiguration) GetRoutes() []*Route { return nil } -func (x *RouteConfiguration) GetValidateClusters() *wrappers.BoolValue { +func (x *RouteConfiguration) GetValidateClusters() *wrapperspb.BoolValue { if x != nil { return x.ValidateClusters } @@ -566,7 +566,7 @@ type WeightedCluster_ClusterWeight struct { // When a request matches the route, the choice of an upstream cluster is determined by its // weight. The sum of weights across all entries in the clusters array determines the total // weight. - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Optional endpoint metadata match criteria used by the subset load balancer. Only endpoints in // the upstream cluster with metadata matching what is set in this field, combined with what's // provided in :ref:`RouteAction's metadata_match @@ -615,7 +615,7 @@ func (x *WeightedCluster_ClusterWeight) GetName() string { return "" } -func (x *WeightedCluster_ClusterWeight) GetWeight() *wrappers.UInt32Value { +func (x *WeightedCluster_ClusterWeight) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -818,12 +818,12 @@ var file_envoy_extensions_filters_network_thrift_proxy_v3_route_proto_goTypes = (*WeightedCluster)(nil), // 4: envoy.extensions.filters.network.thrift_proxy.v3.WeightedCluster (*RouteAction_RequestMirrorPolicy)(nil), // 5: envoy.extensions.filters.network.thrift_proxy.v3.RouteAction.RequestMirrorPolicy (*WeightedCluster_ClusterWeight)(nil), // 6: envoy.extensions.filters.network.thrift_proxy.v3.WeightedCluster.ClusterWeight - (*wrappers.BoolValue)(nil), // 7: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 7: google.protobuf.BoolValue (*v3.HeaderMatcher)(nil), // 8: envoy.config.route.v3.HeaderMatcher (*v31.Metadata)(nil), // 9: envoy.config.core.v3.Metadata (*v3.RateLimit)(nil), // 10: envoy.config.route.v3.RateLimit (*v31.RuntimeFractionalPercent)(nil), // 11: envoy.config.core.v3.RuntimeFractionalPercent - (*wrappers.UInt32Value)(nil), // 12: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 12: google.protobuf.UInt32Value } var file_envoy_extensions_filters_network_thrift_proxy_v3_route_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.filters.network.thrift_proxy.v3.RouteConfiguration.routes:type_name -> envoy.extensions.filters.network.thrift_proxy.v3.Route diff --git a/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.go b/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.go index 29d678ae6..7ee1980ad 100755 --- a/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.go +++ b/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.go @@ -12,10 +12,10 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -243,7 +243,7 @@ type ThriftProxy struct { // fallback to decode the data. PayloadPassthrough bool `protobuf:"varint,6,opt,name=payload_passthrough,json=payloadPassthrough,proto3" json:"payload_passthrough,omitempty"` // Optional maximum requests for a single downstream connection. If not specified, there is no limit. - MaxRequestsPerConnection *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` + MaxRequestsPerConnection *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` // Configuration for :ref:`access logs ` // emitted by Thrift proxy. AccessLog []*v31.AccessLog `protobuf:"bytes,9,rep,name=access_log,json=accessLog,proto3" json:"access_log,omitempty"` @@ -336,7 +336,7 @@ func (x *ThriftProxy) GetPayloadPassthrough() bool { return false } -func (x *ThriftProxy) GetMaxRequestsPerConnection() *wrappers.UInt32Value { +func (x *ThriftProxy) GetMaxRequestsPerConnection() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestsPerConnection } @@ -425,7 +425,7 @@ func (m *ThriftFilter) GetConfigType() isThriftFilter_ConfigType { return nil } -func (x *ThriftFilter) GetTypedConfig() *any1.Any { +func (x *ThriftFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*ThriftFilter_TypedConfig); ok { return x.TypedConfig } @@ -437,7 +437,7 @@ type isThriftFilter_ConfigType interface { } type ThriftFilter_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*ThriftFilter_TypedConfig) isThriftFilter_ConfigType() {} @@ -683,17 +683,17 @@ func file_envoy_extensions_filters_network_thrift_proxy_v3_thrift_proxy_proto_ra var file_envoy_extensions_filters_network_thrift_proxy_v3_thrift_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_envoy_extensions_filters_network_thrift_proxy_v3_thrift_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_envoy_extensions_filters_network_thrift_proxy_v3_thrift_proxy_proto_goTypes = []interface{}{ - (TransportType)(0), // 0: envoy.extensions.filters.network.thrift_proxy.v3.TransportType - (ProtocolType)(0), // 1: envoy.extensions.filters.network.thrift_proxy.v3.ProtocolType - (*Trds)(nil), // 2: envoy.extensions.filters.network.thrift_proxy.v3.Trds - (*ThriftProxy)(nil), // 3: envoy.extensions.filters.network.thrift_proxy.v3.ThriftProxy - (*ThriftFilter)(nil), // 4: envoy.extensions.filters.network.thrift_proxy.v3.ThriftFilter - (*ThriftProtocolOptions)(nil), // 5: envoy.extensions.filters.network.thrift_proxy.v3.ThriftProtocolOptions - (*v3.ConfigSource)(nil), // 6: envoy.config.core.v3.ConfigSource - (*RouteConfiguration)(nil), // 7: envoy.extensions.filters.network.thrift_proxy.v3.RouteConfiguration - (*wrappers.UInt32Value)(nil), // 8: google.protobuf.UInt32Value - (*v31.AccessLog)(nil), // 9: envoy.config.accesslog.v3.AccessLog - (*any1.Any)(nil), // 10: google.protobuf.Any + (TransportType)(0), // 0: envoy.extensions.filters.network.thrift_proxy.v3.TransportType + (ProtocolType)(0), // 1: envoy.extensions.filters.network.thrift_proxy.v3.ProtocolType + (*Trds)(nil), // 2: envoy.extensions.filters.network.thrift_proxy.v3.Trds + (*ThriftProxy)(nil), // 3: envoy.extensions.filters.network.thrift_proxy.v3.ThriftProxy + (*ThriftFilter)(nil), // 4: envoy.extensions.filters.network.thrift_proxy.v3.ThriftFilter + (*ThriftProtocolOptions)(nil), // 5: envoy.extensions.filters.network.thrift_proxy.v3.ThriftProtocolOptions + (*v3.ConfigSource)(nil), // 6: envoy.config.core.v3.ConfigSource + (*RouteConfiguration)(nil), // 7: envoy.extensions.filters.network.thrift_proxy.v3.RouteConfiguration + (*wrapperspb.UInt32Value)(nil), // 8: google.protobuf.UInt32Value + (*v31.AccessLog)(nil), // 9: envoy.config.accesslog.v3.AccessLog + (*anypb.Any)(nil), // 10: google.protobuf.Any } var file_envoy_extensions_filters_network_thrift_proxy_v3_thrift_proxy_proto_depIdxs = []int32{ 6, // 0: envoy.extensions.filters.network.thrift_proxy.v3.Trds.config_source:type_name -> envoy.config.core.v3.ConfigSource diff --git a/envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.go b/envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.go index b05295955..1ca4a66da 100755 --- a/envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.go +++ b/envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.go @@ -9,10 +9,10 @@ package zookeeper_proxyv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -165,7 +165,7 @@ type ZooKeeperProxy struct { // https://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#Unsafe+Options // // if that is set. If it isn't, ZooKeeper's default is also 1Mb. - MaxPacketBytes *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_packet_bytes,json=maxPacketBytes,proto3" json:"max_packet_bytes,omitempty"` + MaxPacketBytes *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_packet_bytes,json=maxPacketBytes,proto3" json:"max_packet_bytes,omitempty"` // Whether to emit latency threshold metrics. If not set, it defaults to false. // If false, setting “default_latency_threshold“ and “latency_threshold_overrides“ will not have effect. EnableLatencyThresholdMetrics bool `protobuf:"varint,4,opt,name=enable_latency_threshold_metrics,json=enableLatencyThresholdMetrics,proto3" json:"enable_latency_threshold_metrics,omitempty"` @@ -174,7 +174,7 @@ type ZooKeeperProxy struct { // https://sre.google/workbook/implementing-slos/ // // If it is not set, the default value is 100 milliseconds. - DefaultLatencyThreshold *duration.Duration `protobuf:"bytes,5,opt,name=default_latency_threshold,json=defaultLatencyThreshold,proto3" json:"default_latency_threshold,omitempty"` + DefaultLatencyThreshold *durationpb.Duration `protobuf:"bytes,5,opt,name=default_latency_threshold,json=defaultLatencyThreshold,proto3" json:"default_latency_threshold,omitempty"` // List of latency threshold overrides for opcodes. // If the threshold override of one opcode is not set, it will fallback to the default latency // threshold. @@ -234,7 +234,7 @@ func (x *ZooKeeperProxy) GetAccessLog() string { return "" } -func (x *ZooKeeperProxy) GetMaxPacketBytes() *wrappers.UInt32Value { +func (x *ZooKeeperProxy) GetMaxPacketBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxPacketBytes } @@ -248,7 +248,7 @@ func (x *ZooKeeperProxy) GetEnableLatencyThresholdMetrics() bool { return false } -func (x *ZooKeeperProxy) GetDefaultLatencyThreshold() *duration.Duration { +func (x *ZooKeeperProxy) GetDefaultLatencyThreshold() *durationpb.Duration { if x != nil { return x.DefaultLatencyThreshold } @@ -293,7 +293,7 @@ type LatencyThresholdOverride struct { // https://github.com/apache/zookeeper/blob/master/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java Opcode LatencyThresholdOverride_Opcode `protobuf:"varint,1,opt,name=opcode,proto3,enum=envoy.extensions.filters.network.zookeeper_proxy.v3.LatencyThresholdOverride_Opcode" json:"opcode,omitempty"` // The latency threshold override of certain opcode. - Threshold *duration.Duration `protobuf:"bytes,2,opt,name=threshold,proto3" json:"threshold,omitempty"` + Threshold *durationpb.Duration `protobuf:"bytes,2,opt,name=threshold,proto3" json:"threshold,omitempty"` } func (x *LatencyThresholdOverride) Reset() { @@ -335,7 +335,7 @@ func (x *LatencyThresholdOverride) GetOpcode() LatencyThresholdOverride_Opcode { return LatencyThresholdOverride_Connect } -func (x *LatencyThresholdOverride) GetThreshold() *duration.Duration { +func (x *LatencyThresholdOverride) GetThreshold() *durationpb.Duration { if x != nil { return x.Threshold } @@ -487,8 +487,8 @@ var file_envoy_extensions_filters_network_zookeeper_proxy_v3_zookeeper_proxy_pro (LatencyThresholdOverride_Opcode)(0), // 0: envoy.extensions.filters.network.zookeeper_proxy.v3.LatencyThresholdOverride.Opcode (*ZooKeeperProxy)(nil), // 1: envoy.extensions.filters.network.zookeeper_proxy.v3.ZooKeeperProxy (*LatencyThresholdOverride)(nil), // 2: envoy.extensions.filters.network.zookeeper_proxy.v3.LatencyThresholdOverride - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration } var file_envoy_extensions_filters_network_zookeeper_proxy_v3_zookeeper_proxy_proto_depIdxs = []int32{ 3, // 0: envoy.extensions.filters.network.zookeeper_proxy.v3.ZooKeeperProxy.max_packet_bytes:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.go b/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.go index cadcd4ccd..d194b75de 100755 --- a/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.go +++ b/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.go @@ -12,9 +12,9 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/data/dns/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -201,7 +201,7 @@ type DnsFilterConfig_ClientContextConfig struct { // We allow 5s for the upstream resolution to complete, so the minimum // value here is 1. Note that the total latency for a failed query is the // number of retries multiplied by the resolver_timeout. - ResolverTimeout *duration.Duration `protobuf:"bytes,1,opt,name=resolver_timeout,json=resolverTimeout,proto3" json:"resolver_timeout,omitempty"` + ResolverTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=resolver_timeout,json=resolverTimeout,proto3" json:"resolver_timeout,omitempty"` // This field was used for `dns_resolution_config` in Envoy 1.19.0 and // 1.19.1. // Control planes that need to set this field for Envoy 1.19.0 and @@ -270,7 +270,7 @@ func (*DnsFilterConfig_ClientContextConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_udp_dns_filter_v3_dns_filter_proto_rawDescGZIP(), []int{0, 1} } -func (x *DnsFilterConfig_ClientContextConfig) GetResolverTimeout() *duration.Duration { +func (x *DnsFilterConfig_ClientContextConfig) GetResolverTimeout() *durationpb.Duration { if x != nil { return x.ResolverTimeout } @@ -429,7 +429,7 @@ var file_envoy_extensions_filters_udp_dns_filter_v3_dns_filter_proto_goTypes = [ (*DnsFilterConfig_ClientContextConfig)(nil), // 2: envoy.extensions.filters.udp.dns_filter.v3.DnsFilterConfig.ClientContextConfig (*v3.DnsTable)(nil), // 3: envoy.data.dns.v3.DnsTable (*v31.DataSource)(nil), // 4: envoy.config.core.v3.DataSource - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration (*v31.Address)(nil), // 6: envoy.config.core.v3.Address (*v31.DnsResolutionConfig)(nil), // 7: envoy.config.core.v3.DnsResolutionConfig (*v31.TypedExtensionConfig)(nil), // 8: envoy.config.core.v3.TypedExtensionConfig diff --git a/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go b/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go index 1251e3b85..7e90de596 100755 --- a/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go +++ b/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -130,11 +130,11 @@ type FilterConfig_BufferOptions struct { // If set, the filter will only buffer datagrams up to the requested limit, and will drop // new UDP datagrams if the buffer contains the max_buffered_datagrams value at the time // of a new datagram arrival. If not set, the default value is 1024 datagrams. - MaxBufferedDatagrams *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_buffered_datagrams,json=maxBufferedDatagrams,proto3" json:"max_buffered_datagrams,omitempty"` + MaxBufferedDatagrams *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_buffered_datagrams,json=maxBufferedDatagrams,proto3" json:"max_buffered_datagrams,omitempty"` // If set, the filter will only buffer datagrams up to the requested total buffered bytes limit, // and will drop new UDP datagrams if the buffer contains the max_buffered_datagrams value // at the time of a new datagram arrival. If not set, the default value is 16,384 (16KB). - MaxBufferedBytes *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=max_buffered_bytes,json=maxBufferedBytes,proto3" json:"max_buffered_bytes,omitempty"` + MaxBufferedBytes *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=max_buffered_bytes,json=maxBufferedBytes,proto3" json:"max_buffered_bytes,omitempty"` } func (x *FilterConfig_BufferOptions) Reset() { @@ -169,14 +169,14 @@ func (*FilterConfig_BufferOptions) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_udp_udp_proxy_session_dynamic_forward_proxy_v3_dynamic_forward_proxy_proto_rawDescGZIP(), []int{0, 0} } -func (x *FilterConfig_BufferOptions) GetMaxBufferedDatagrams() *wrappers.UInt32Value { +func (x *FilterConfig_BufferOptions) GetMaxBufferedDatagrams() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedDatagrams } return nil } -func (x *FilterConfig_BufferOptions) GetMaxBufferedBytes() *wrappers.UInt64Value { +func (x *FilterConfig_BufferOptions) GetMaxBufferedBytes() *wrapperspb.UInt64Value { if x != nil { return x.MaxBufferedBytes } @@ -276,8 +276,8 @@ var file_envoy_extensions_filters_udp_udp_proxy_session_dynamic_forward_proxy_v3 (*FilterConfig)(nil), // 0: envoy.extensions.filters.udp.udp_proxy.session.dynamic_forward_proxy.v3.FilterConfig (*FilterConfig_BufferOptions)(nil), // 1: envoy.extensions.filters.udp.udp_proxy.session.dynamic_forward_proxy.v3.FilterConfig.BufferOptions (*v3.DnsCacheConfig)(nil), // 2: envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value - (*wrappers.UInt64Value)(nil), // 4: google.protobuf.UInt64Value + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt64Value)(nil), // 4: google.protobuf.UInt64Value } var file_envoy_extensions_filters_udp_udp_proxy_session_dynamic_forward_proxy_v3_dynamic_forward_proxy_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.filters.udp.udp_proxy.session.dynamic_forward_proxy.v3.FilterConfig.dns_cache_config:type_name -> envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig diff --git a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go index e0a34f677..cf75ea5eb 100755 --- a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go +++ b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.go @@ -14,11 +14,11 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -46,7 +46,7 @@ type UdpProxyConfig struct { RouteSpecifier isUdpProxyConfig_RouteSpecifier `protobuf_oneof:"route_specifier"` // The idle timeout for sessions. Idle is defined as no datagrams between received or sent by // the session. The default if not specified is 1 minute. - IdleTimeout *duration.Duration `protobuf:"bytes,3,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Use the remote downstream IP address as the sender IP address when sending packets to upstream hosts. // This option requires Envoy to be run with the “CAP_NET_ADMIN“ capability on Linux. // And the IPv6 stack must be enabled on Linux kernel. @@ -151,7 +151,7 @@ func (x *UdpProxyConfig) GetMatcher() *v32.Matcher { return nil } -func (x *UdpProxyConfig) GetIdleTimeout() *duration.Duration { +func (x *UdpProxyConfig) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -393,7 +393,7 @@ func (m *UdpProxyConfig_SessionFilter) GetConfigType() isUdpProxyConfig_SessionF return nil } -func (x *UdpProxyConfig_SessionFilter) GetTypedConfig() *any1.Any { +func (x *UdpProxyConfig_SessionFilter) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*UdpProxyConfig_SessionFilter_TypedConfig); ok { return x.TypedConfig } @@ -407,7 +407,7 @@ type isUdpProxyConfig_SessionFilter_ConfigType interface { type UdpProxyConfig_SessionFilter_TypedConfig struct { // Filter specific configuration which depends on the filter being // instantiated. See the supported filters for further documentation. - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*UdpProxyConfig_SessionFilter_TypedConfig) isUdpProxyConfig_SessionFilter_ConfigType() {} @@ -433,7 +433,7 @@ type UdpProxyConfig_UdpTunnelingConfig struct { // Optional port value to add to the HTTP request URI. // This value can be overridden per-session by setting the required port value for // the filter state key “udp.connect.proxy_port“. - ProxyPort *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=proxy_port,json=proxyPort,proto3" json:"proxy_port,omitempty"` + ProxyPort *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=proxy_port,json=proxyPort,proto3" json:"proxy_port,omitempty"` // The target host to send in the synthesized CONNECT headers to the upstream proxy. // This field evaluates command operators if set, otherwise returns hostname as is. // @@ -528,7 +528,7 @@ func (x *UdpProxyConfig_UdpTunnelingConfig) GetProxyHost() string { return "" } -func (x *UdpProxyConfig_UdpTunnelingConfig) GetProxyPort() *wrappers.UInt32Value { +func (x *UdpProxyConfig_UdpTunnelingConfig) GetProxyPort() *wrapperspb.UInt32Value { if x != nil { return x.ProxyPort } @@ -608,7 +608,7 @@ type UdpProxyConfig_UdpAccessLogOptions struct { // the specified interval. // This field does not require on-tunnel-connected access logging enabled, and the other way around. // The interval must be at least 1ms. - AccessLogFlushInterval *duration.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` + AccessLogFlushInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` // If set to true and UDP tunneling is configured, access log will be flushed when the UDP proxy has successfully // established a connection tunnel with the upstream. If the connection failed, the access log will not be flushed. FlushAccessLogOnTunnelConnected bool `protobuf:"varint,2,opt,name=flush_access_log_on_tunnel_connected,json=flushAccessLogOnTunnelConnected,proto3" json:"flush_access_log_on_tunnel_connected,omitempty"` @@ -646,7 +646,7 @@ func (*UdpProxyConfig_UdpAccessLogOptions) Descriptor() ([]byte, []int) { return file_envoy_extensions_filters_udp_udp_proxy_v3_udp_proxy_proto_rawDescGZIP(), []int{0, 3} } -func (x *UdpProxyConfig_UdpAccessLogOptions) GetAccessLogFlushInterval() *duration.Duration { +func (x *UdpProxyConfig_UdpAccessLogOptions) GetAccessLogFlushInterval() *durationpb.Duration { if x != nil { return x.AccessLogFlushInterval } @@ -669,11 +669,11 @@ type UdpProxyConfig_UdpTunnelingConfig_BufferOptions struct { // If set, the filter will only buffer datagrams up to the requested limit, and will drop // new UDP datagrams if the buffer contains the max_buffered_datagrams value at the time // of a new datagram arrival. If not set, the default value is 1024 datagrams. - MaxBufferedDatagrams *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_buffered_datagrams,json=maxBufferedDatagrams,proto3" json:"max_buffered_datagrams,omitempty"` + MaxBufferedDatagrams *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_buffered_datagrams,json=maxBufferedDatagrams,proto3" json:"max_buffered_datagrams,omitempty"` // If set, the filter will only buffer datagrams up to the requested total buffered bytes limit, // and will drop new UDP datagrams if the buffer contains the max_buffered_datagrams value // at the time of a new datagram arrival. If not set, the default value is 16,384 (16KB). - MaxBufferedBytes *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=max_buffered_bytes,json=maxBufferedBytes,proto3" json:"max_buffered_bytes,omitempty"` + MaxBufferedBytes *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=max_buffered_bytes,json=maxBufferedBytes,proto3" json:"max_buffered_bytes,omitempty"` } func (x *UdpProxyConfig_UdpTunnelingConfig_BufferOptions) Reset() { @@ -708,14 +708,14 @@ func (*UdpProxyConfig_UdpTunnelingConfig_BufferOptions) Descriptor() ([]byte, [] return file_envoy_extensions_filters_udp_udp_proxy_v3_udp_proxy_proto_rawDescGZIP(), []int{0, 2, 0} } -func (x *UdpProxyConfig_UdpTunnelingConfig_BufferOptions) GetMaxBufferedDatagrams() *wrappers.UInt32Value { +func (x *UdpProxyConfig_UdpTunnelingConfig_BufferOptions) GetMaxBufferedDatagrams() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedDatagrams } return nil } -func (x *UdpProxyConfig_UdpTunnelingConfig_BufferOptions) GetMaxBufferedBytes() *wrappers.UInt64Value { +func (x *UdpProxyConfig_UdpTunnelingConfig_BufferOptions) GetMaxBufferedBytes() *wrapperspb.UInt64Value { if x != nil { return x.MaxBufferedBytes } @@ -729,7 +729,7 @@ type UdpProxyConfig_UdpTunnelingConfig_RetryOptions struct { // The maximum number of unsuccessful connection attempts that will be made before giving up. // If the parameter is not specified, 1 connection attempt will be made. - MaxConnectAttempts *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` + MaxConnectAttempts *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` } func (x *UdpProxyConfig_UdpTunnelingConfig_RetryOptions) Reset() { @@ -764,7 +764,7 @@ func (*UdpProxyConfig_UdpTunnelingConfig_RetryOptions) Descriptor() ([]byte, []i return file_envoy_extensions_filters_udp_udp_proxy_v3_udp_proxy_proto_rawDescGZIP(), []int{0, 2, 1} } -func (x *UdpProxyConfig_UdpTunnelingConfig_RetryOptions) GetMaxConnectAttempts() *wrappers.UInt32Value { +func (x *UdpProxyConfig_UdpTunnelingConfig_RetryOptions) GetMaxConnectAttempts() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectAttempts } @@ -1006,13 +1006,13 @@ var file_envoy_extensions_filters_udp_udp_proxy_v3_udp_proxy_proto_goTypes = []i (*UdpProxyConfig_UdpTunnelingConfig_BufferOptions)(nil), // 5: envoy.extensions.filters.udp.udp_proxy.v3.UdpProxyConfig.UdpTunnelingConfig.BufferOptions (*UdpProxyConfig_UdpTunnelingConfig_RetryOptions)(nil), // 6: envoy.extensions.filters.udp.udp_proxy.v3.UdpProxyConfig.UdpTunnelingConfig.RetryOptions (*v32.Matcher)(nil), // 7: xds.type.matcher.v3.Matcher - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration (*v3.UdpSocketConfig)(nil), // 9: envoy.config.core.v3.UdpSocketConfig (*v31.AccessLog)(nil), // 10: envoy.config.accesslog.v3.AccessLog - (*any1.Any)(nil), // 11: google.protobuf.Any - (*wrappers.UInt32Value)(nil), // 12: google.protobuf.UInt32Value + (*anypb.Any)(nil), // 11: google.protobuf.Any + (*wrapperspb.UInt32Value)(nil), // 12: google.protobuf.UInt32Value (*v3.HeaderValueOption)(nil), // 13: envoy.config.core.v3.HeaderValueOption - (*wrappers.UInt64Value)(nil), // 14: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 14: google.protobuf.UInt64Value } var file_envoy_extensions_filters_udp_udp_proxy_v3_udp_proxy_proto_depIdxs = []int32{ 7, // 0: envoy.extensions.filters.udp.udp_proxy.v3.UdpProxyConfig.matcher:type_name -> xds.type.matcher.v3.Matcher diff --git a/envoy/extensions/http/cache/file_system_http_cache/v3/file_system_http_cache.pb.go b/envoy/extensions/http/cache/file_system_http_cache/v3/file_system_http_cache.pb.go index 605f3563b..c62fa57fd 100755 --- a/envoy/extensions/http/cache/file_system_http_cache/v3/file_system_http_cache.pb.go +++ b/envoy/extensions/http/cache/file_system_http_cache/v3/file_system_http_cache.pb.go @@ -11,10 +11,10 @@ import ( _ "github.com/cncf/xds/go/xds/annotations/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/async_files/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -54,7 +54,7 @@ type FileSystemHttpCacheConfig struct { // and metadata, but does not include e.g. file system overhead and block size padding. // // If unset there is no limit except file system failure. - MaxCacheSizeBytes *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=max_cache_size_bytes,json=maxCacheSizeBytes,proto3" json:"max_cache_size_bytes,omitempty"` + MaxCacheSizeBytes *wrapperspb.UInt64Value `protobuf:"bytes,3,opt,name=max_cache_size_bytes,json=maxCacheSizeBytes,proto3" json:"max_cache_size_bytes,omitempty"` // The maximum size of a cache entry in bytes - larger responses will not be cached. // // This is measured as the file size for the cache entry, such that it includes @@ -63,11 +63,11 @@ type FileSystemHttpCacheConfig struct { // If unset there is no limit. // // [#not-implemented-hide:] - MaxIndividualCacheEntrySizeBytes *wrappers.UInt64Value `protobuf:"bytes,4,opt,name=max_individual_cache_entry_size_bytes,json=maxIndividualCacheEntrySizeBytes,proto3" json:"max_individual_cache_entry_size_bytes,omitempty"` + MaxIndividualCacheEntrySizeBytes *wrapperspb.UInt64Value `protobuf:"bytes,4,opt,name=max_individual_cache_entry_size_bytes,json=maxIndividualCacheEntrySizeBytes,proto3" json:"max_individual_cache_entry_size_bytes,omitempty"` // The maximum number of cache entries - when reached, cache eviction is triggered. // // If unset there is no limit. - MaxCacheEntryCount *wrappers.UInt64Value `protobuf:"bytes,5,opt,name=max_cache_entry_count,json=maxCacheEntryCount,proto3" json:"max_cache_entry_count,omitempty"` + MaxCacheEntryCount *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=max_cache_entry_count,json=maxCacheEntryCount,proto3" json:"max_cache_entry_count,omitempty"` // A number of folders into which to subdivide the cache. // // Setting this can help with performance in file systems where a large number of inodes @@ -104,7 +104,7 @@ type FileSystemHttpCacheConfig struct { // If unset, there will be no eviction passes except those triggered by cache limits. // // [#not-implemented-hide:] - MaxEvictionPeriod *duration.Duration `protobuf:"bytes,8,opt,name=max_eviction_period,json=maxEvictionPeriod,proto3" json:"max_eviction_period,omitempty"` + MaxEvictionPeriod *durationpb.Duration `protobuf:"bytes,8,opt,name=max_eviction_period,json=maxEvictionPeriod,proto3" json:"max_eviction_period,omitempty"` // The shortest amount of time between cache eviction passes. This can be used to reduce // eviction churn, if your cache max size can be flexible. If a cache eviction pass already // occurred more recently than this period when another would be triggered, that new @@ -118,7 +118,7 @@ type FileSystemHttpCacheConfig struct { // it's simpler not to. // // [#not-implemented-hide:] - MinEvictionPeriod *duration.Duration `protobuf:"bytes,9,opt,name=min_eviction_period,json=minEvictionPeriod,proto3" json:"min_eviction_period,omitempty"` + MinEvictionPeriod *durationpb.Duration `protobuf:"bytes,9,opt,name=min_eviction_period,json=minEvictionPeriod,proto3" json:"min_eviction_period,omitempty"` // If true, and the cache path does not exist, attempt to create the cache path, including // any missing directories leading up to it. On failure, the config is rejected. // @@ -174,21 +174,21 @@ func (x *FileSystemHttpCacheConfig) GetCachePath() string { return "" } -func (x *FileSystemHttpCacheConfig) GetMaxCacheSizeBytes() *wrappers.UInt64Value { +func (x *FileSystemHttpCacheConfig) GetMaxCacheSizeBytes() *wrapperspb.UInt64Value { if x != nil { return x.MaxCacheSizeBytes } return nil } -func (x *FileSystemHttpCacheConfig) GetMaxIndividualCacheEntrySizeBytes() *wrappers.UInt64Value { +func (x *FileSystemHttpCacheConfig) GetMaxIndividualCacheEntrySizeBytes() *wrapperspb.UInt64Value { if x != nil { return x.MaxIndividualCacheEntrySizeBytes } return nil } -func (x *FileSystemHttpCacheConfig) GetMaxCacheEntryCount() *wrappers.UInt64Value { +func (x *FileSystemHttpCacheConfig) GetMaxCacheEntryCount() *wrapperspb.UInt64Value { if x != nil { return x.MaxCacheEntryCount } @@ -209,14 +209,14 @@ func (x *FileSystemHttpCacheConfig) GetEvictFraction() float32 { return 0 } -func (x *FileSystemHttpCacheConfig) GetMaxEvictionPeriod() *duration.Duration { +func (x *FileSystemHttpCacheConfig) GetMaxEvictionPeriod() *durationpb.Duration { if x != nil { return x.MaxEvictionPeriod } return nil } -func (x *FileSystemHttpCacheConfig) GetMinEvictionPeriod() *duration.Duration { +func (x *FileSystemHttpCacheConfig) GetMinEvictionPeriod() *durationpb.Duration { if x != nil { return x.MinEvictionPeriod } @@ -335,8 +335,8 @@ var file_envoy_extensions_http_cache_file_system_http_cache_v3_file_system_http_ var file_envoy_extensions_http_cache_file_system_http_cache_v3_file_system_http_cache_proto_goTypes = []interface{}{ (*FileSystemHttpCacheConfig)(nil), // 0: envoy.extensions.http.cache.file_system_http_cache.v3.FileSystemHttpCacheConfig (*v3.AsyncFileManagerConfig)(nil), // 1: envoy.extensions.common.async_files.v3.AsyncFileManagerConfig - (*wrappers.UInt64Value)(nil), // 2: google.protobuf.UInt64Value - (*duration.Duration)(nil), // 3: google.protobuf.Duration + (*wrapperspb.UInt64Value)(nil), // 2: google.protobuf.UInt64Value + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration } var file_envoy_extensions_http_cache_file_system_http_cache_v3_file_system_http_cache_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.http.cache.file_system_http_cache.v3.FileSystemHttpCacheConfig.manager_config:type_name -> envoy.extensions.common.async_files.v3.AsyncFileManagerConfig diff --git a/envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.go b/envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.go index fd98a27d6..7270cf8db 100755 --- a/envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.go +++ b/envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/cncf/xds/go/xds/annotations/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -40,7 +40,7 @@ type LocalResponsePolicy struct { // the body of the local reply without formatting. BodyFormat *v3.SubstitutionFormatString `protobuf:"bytes,2,opt,name=body_format,json=bodyFormat,proto3" json:"body_format,omitempty"` // The new response status code if specified. - StatusCode *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` + StatusCode *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` // HTTP headers to add to the response. This allows the // response policy to append, to add or to override headers of // the original response for local body, or the custom response from the @@ -94,7 +94,7 @@ func (x *LocalResponsePolicy) GetBodyFormat() *v3.SubstitutionFormatString { return nil } -func (x *LocalResponsePolicy) GetStatusCode() *wrappers.UInt32Value { +func (x *LocalResponsePolicy) GetStatusCode() *wrapperspb.UInt32Value { if x != nil { return x.StatusCode } @@ -191,7 +191,7 @@ var file_envoy_extensions_http_custom_response_local_response_policy_v3_local_re (*LocalResponsePolicy)(nil), // 0: envoy.extensions.http.custom_response.local_response_policy.v3.LocalResponsePolicy (*v3.DataSource)(nil), // 1: envoy.config.core.v3.DataSource (*v3.SubstitutionFormatString)(nil), // 2: envoy.config.core.v3.SubstitutionFormatString - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value (*v3.HeaderValueOption)(nil), // 4: envoy.config.core.v3.HeaderValueOption } var file_envoy_extensions_http_custom_response_local_response_policy_v3_local_response_policy_proto_depIdxs = []int32{ diff --git a/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.go b/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.go index cb733f751..1c91cd8a8 100755 --- a/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.go +++ b/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.go @@ -12,9 +12,9 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -41,7 +41,7 @@ type RedirectPolicy struct { RedirectActionSpecifier isRedirectPolicy_RedirectActionSpecifier `protobuf_oneof:"redirect_action_specifier"` // The new response status code if specified. This is used to override the // status code of the response from the new upstream if it is not an error status. - StatusCode *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` + StatusCode *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"` // HTTP headers to add to the response. This allows the // response policy to append, to add or to override headers of // the original response for local body, or the custom response from the @@ -110,7 +110,7 @@ func (x *RedirectPolicy) GetRedirectAction() *v31.RedirectAction { return nil } -func (x *RedirectPolicy) GetStatusCode() *wrappers.UInt32Value { +func (x *RedirectPolicy) GetStatusCode() *wrapperspb.UInt32Value { if x != nil { return x.StatusCode } @@ -265,7 +265,7 @@ var file_envoy_extensions_http_custom_response_redirect_policy_v3_redirect_polic var file_envoy_extensions_http_custom_response_redirect_policy_v3_redirect_policy_proto_goTypes = []interface{}{ (*RedirectPolicy)(nil), // 0: envoy.extensions.http.custom_response.redirect_policy.v3.RedirectPolicy (*v31.RedirectAction)(nil), // 1: envoy.config.route.v3.RedirectAction - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value (*v3.HeaderValueOption)(nil), // 3: envoy.config.core.v3.HeaderValueOption (*v3.TypedExtensionConfig)(nil), // 4: envoy.config.core.v3.TypedExtensionConfig } diff --git a/envoy/extensions/key_value/file_based/v3/config.pb.go b/envoy/extensions/key_value/file_based/v3/config.pb.go index c99d0c9a8..03613862f 100755 --- a/envoy/extensions/key_value/file_based/v3/config.pb.go +++ b/envoy/extensions/key_value/file_based/v3/config.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/cncf/xds/go/xds/annotations/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,10 +36,10 @@ type FileBasedKeyValueStoreConfig struct { // values to. Filename string `protobuf:"bytes,1,opt,name=filename,proto3" json:"filename,omitempty"` // The interval at which the key value store should be flushed to the file. - FlushInterval *duration.Duration `protobuf:"bytes,2,opt,name=flush_interval,json=flushInterval,proto3" json:"flush_interval,omitempty"` + FlushInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=flush_interval,json=flushInterval,proto3" json:"flush_interval,omitempty"` // The maximum number of entries to cache, or 0 to allow for unlimited entries. // Defaults to 1000 if not present. - MaxEntries *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty"` + MaxEntries *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty"` } func (x *FileBasedKeyValueStoreConfig) Reset() { @@ -81,14 +81,14 @@ func (x *FileBasedKeyValueStoreConfig) GetFilename() string { return "" } -func (x *FileBasedKeyValueStoreConfig) GetFlushInterval() *duration.Duration { +func (x *FileBasedKeyValueStoreConfig) GetFlushInterval() *durationpb.Duration { if x != nil { return x.FlushInterval } return nil } -func (x *FileBasedKeyValueStoreConfig) GetMaxEntries() *wrappers.UInt32Value { +func (x *FileBasedKeyValueStoreConfig) GetMaxEntries() *wrapperspb.UInt32Value { if x != nil { return x.MaxEntries } @@ -156,8 +156,8 @@ func file_envoy_extensions_key_value_file_based_v3_config_proto_rawDescGZIP() [] var file_envoy_extensions_key_value_file_based_v3_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_key_value_file_based_v3_config_proto_goTypes = []interface{}{ (*FileBasedKeyValueStoreConfig)(nil), // 0: envoy.extensions.key_value.file_based.v3.FileBasedKeyValueStoreConfig - (*duration.Duration)(nil), // 1: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_envoy_extensions_key_value_file_based_v3_config_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.key_value.file_based.v3.FileBasedKeyValueStoreConfig.flush_interval:type_name -> google.protobuf.Duration diff --git a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go index cc9f1ff39..49af5a32c 100755 --- a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go +++ b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go @@ -9,10 +9,10 @@ package client_side_weighted_round_robinv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -50,31 +50,31 @@ type ClientSideWeightedRoundRobin struct { // Whether to enable out-of-band utilization reporting collection from // the endpoints. By default, per-request utilization reporting is used. - EnableOobLoadReport *wrappers.BoolValue `protobuf:"bytes,1,opt,name=enable_oob_load_report,json=enableOobLoadReport,proto3" json:"enable_oob_load_report,omitempty"` + EnableOobLoadReport *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enable_oob_load_report,json=enableOobLoadReport,proto3" json:"enable_oob_load_report,omitempty"` // Load reporting interval to request from the server. Note that the // server may not provide reports as frequently as the client requests. // Used only when enable_oob_load_report is true. Default is 10 seconds. - OobReportingPeriod *duration.Duration `protobuf:"bytes,2,opt,name=oob_reporting_period,json=oobReportingPeriod,proto3" json:"oob_reporting_period,omitempty"` + OobReportingPeriod *durationpb.Duration `protobuf:"bytes,2,opt,name=oob_reporting_period,json=oobReportingPeriod,proto3" json:"oob_reporting_period,omitempty"` // A given endpoint must report load metrics continuously for at least // this long before the endpoint weight will be used. This avoids // churn when the set of endpoint addresses changes. Takes effect // both immediately after we establish a connection to an endpoint and // after weight_expiration_period has caused us to stop using the most // recent load metrics. Default is 10 seconds. - BlackoutPeriod *duration.Duration `protobuf:"bytes,3,opt,name=blackout_period,json=blackoutPeriod,proto3" json:"blackout_period,omitempty"` + BlackoutPeriod *durationpb.Duration `protobuf:"bytes,3,opt,name=blackout_period,json=blackoutPeriod,proto3" json:"blackout_period,omitempty"` // If a given endpoint has not reported load metrics in this long, // then we stop using the reported weight. This ensures that we do // not continue to use very stale weights. Once we stop using a stale // value, if we later start seeing fresh reports again, the // blackout_period applies. Defaults to 3 minutes. - WeightExpirationPeriod *duration.Duration `protobuf:"bytes,4,opt,name=weight_expiration_period,json=weightExpirationPeriod,proto3" json:"weight_expiration_period,omitempty"` + WeightExpirationPeriod *durationpb.Duration `protobuf:"bytes,4,opt,name=weight_expiration_period,json=weightExpirationPeriod,proto3" json:"weight_expiration_period,omitempty"` // How often endpoint weights are recalculated. Values less than 100ms are // capped at 100ms. Default is 1 second. - WeightUpdatePeriod *duration.Duration `protobuf:"bytes,5,opt,name=weight_update_period,json=weightUpdatePeriod,proto3" json:"weight_update_period,omitempty"` + WeightUpdatePeriod *durationpb.Duration `protobuf:"bytes,5,opt,name=weight_update_period,json=weightUpdatePeriod,proto3" json:"weight_update_period,omitempty"` // The multiplier used to adjust endpoint weights with the error rate // calculated as eps/qps. Configuration is rejected if this value is negative. // Default is 1.0. - ErrorUtilizationPenalty *wrappers.FloatValue `protobuf:"bytes,6,opt,name=error_utilization_penalty,json=errorUtilizationPenalty,proto3" json:"error_utilization_penalty,omitempty"` + ErrorUtilizationPenalty *wrapperspb.FloatValue `protobuf:"bytes,6,opt,name=error_utilization_penalty,json=errorUtilizationPenalty,proto3" json:"error_utilization_penalty,omitempty"` } func (x *ClientSideWeightedRoundRobin) Reset() { @@ -109,42 +109,42 @@ func (*ClientSideWeightedRoundRobin) Descriptor() ([]byte, []int) { return file_envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_rawDescGZIP(), []int{0} } -func (x *ClientSideWeightedRoundRobin) GetEnableOobLoadReport() *wrappers.BoolValue { +func (x *ClientSideWeightedRoundRobin) GetEnableOobLoadReport() *wrapperspb.BoolValue { if x != nil { return x.EnableOobLoadReport } return nil } -func (x *ClientSideWeightedRoundRobin) GetOobReportingPeriod() *duration.Duration { +func (x *ClientSideWeightedRoundRobin) GetOobReportingPeriod() *durationpb.Duration { if x != nil { return x.OobReportingPeriod } return nil } -func (x *ClientSideWeightedRoundRobin) GetBlackoutPeriod() *duration.Duration { +func (x *ClientSideWeightedRoundRobin) GetBlackoutPeriod() *durationpb.Duration { if x != nil { return x.BlackoutPeriod } return nil } -func (x *ClientSideWeightedRoundRobin) GetWeightExpirationPeriod() *duration.Duration { +func (x *ClientSideWeightedRoundRobin) GetWeightExpirationPeriod() *durationpb.Duration { if x != nil { return x.WeightExpirationPeriod } return nil } -func (x *ClientSideWeightedRoundRobin) GetWeightUpdatePeriod() *duration.Duration { +func (x *ClientSideWeightedRoundRobin) GetWeightUpdatePeriod() *durationpb.Duration { if x != nil { return x.WeightUpdatePeriod } return nil } -func (x *ClientSideWeightedRoundRobin) GetErrorUtilizationPenalty() *wrappers.FloatValue { +func (x *ClientSideWeightedRoundRobin) GetErrorUtilizationPenalty() *wrapperspb.FloatValue { if x != nil { return x.ErrorUtilizationPenalty } @@ -243,9 +243,9 @@ func file_envoy_extensions_load_balancing_policies_client_side_weighted_round_ro var file_envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_goTypes = []interface{}{ (*ClientSideWeightedRoundRobin)(nil), // 0: envoy.extensions.load_balancing_policies.client_side_weighted_round_robin.v3.ClientSideWeightedRoundRobin - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.FloatValue)(nil), // 3: google.protobuf.FloatValue + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.FloatValue)(nil), // 3: google.protobuf.FloatValue } var file_envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_client_side_weighted_round_robin_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.load_balancing_policies.client_side_weighted_round_robin.v3.ClientSideWeightedRoundRobin.enable_oob_load_report:type_name -> google.protobuf.BoolValue diff --git a/envoy/extensions/load_balancing_policies/common/v3/common.pb.go b/envoy/extensions/load_balancing_policies/common/v3/common.pb.go index 99d4fbc36..ccc7eebfe 100755 --- a/envoy/extensions/load_balancing_policies/common/v3/common.pb.go +++ b/envoy/extensions/load_balancing_policies/common/v3/common.pb.go @@ -11,10 +11,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -118,7 +118,7 @@ type SlowStartConfig struct { // Represents the size of slow start window. // If set, the newly created host remains in slow start mode starting from its creation time // for the duration of slow start window. - SlowStartWindow *duration.Duration `protobuf:"bytes,1,opt,name=slow_start_window,json=slowStartWindow,proto3" json:"slow_start_window,omitempty"` + SlowStartWindow *durationpb.Duration `protobuf:"bytes,1,opt,name=slow_start_window,json=slowStartWindow,proto3" json:"slow_start_window,omitempty"` // This parameter controls the speed of traffic increase over the slow start window. Defaults to 1.0, // so that endpoint would get linearly increasing amount of traffic. // When increasing the value for this parameter, the speed of traffic ramp-up increases non-linearly. @@ -170,7 +170,7 @@ func (*SlowStartConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDescGZIP(), []int{1} } -func (x *SlowStartConfig) GetSlowStartWindow() *duration.Duration { +func (x *SlowStartConfig) GetSlowStartWindow() *durationpb.Duration { if x != nil { return x.SlowStartWindow } @@ -218,7 +218,7 @@ type ConsistentHashingLbConfig struct { // // This is an O(N) algorithm, unlike other load balancers. Using a lower “hash_balance_factor“ results in more hosts // being probed, so use a higher value if you require better performance. - HashBalanceFactor *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"` + HashBalanceFactor *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"` } func (x *ConsistentHashingLbConfig) Reset() { @@ -260,7 +260,7 @@ func (x *ConsistentHashingLbConfig) GetUseHostnameForHashing() bool { return false } -func (x *ConsistentHashingLbConfig) GetHashBalanceFactor() *wrappers.UInt32Value { +func (x *ConsistentHashingLbConfig) GetHashBalanceFactor() *wrapperspb.UInt32Value { if x != nil { return x.HashBalanceFactor } @@ -284,7 +284,7 @@ type LocalityLbConfig_ZoneAwareLbConfig struct { // even if zone aware routing is configured. If not specified, the default is 6. // * :ref:`runtime values `. // * :ref:`Zone aware routing support `. - MinClusterSize *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=min_cluster_size,json=minClusterSize,proto3" json:"min_cluster_size,omitempty"` + MinClusterSize *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=min_cluster_size,json=minClusterSize,proto3" json:"min_cluster_size,omitempty"` // If set to true, Envoy will not consider any hosts when the cluster is in :ref:`panic // mode`. Instead, the cluster will fail all // requests as if all hosts are unhealthy. This can help avoid potentially overwhelming a @@ -331,7 +331,7 @@ func (x *LocalityLbConfig_ZoneAwareLbConfig) GetRoutingEnabled() *v31.Percent { return nil } -func (x *LocalityLbConfig_ZoneAwareLbConfig) GetMinClusterSize() *wrappers.UInt64Value { +func (x *LocalityLbConfig_ZoneAwareLbConfig) GetMinClusterSize() *wrapperspb.UInt64Value { if x != nil { return x.MinClusterSize } @@ -503,11 +503,11 @@ var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_goTypes (*ConsistentHashingLbConfig)(nil), // 2: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig (*LocalityLbConfig_ZoneAwareLbConfig)(nil), // 3: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig (*LocalityLbConfig_LocalityWeightedLbConfig)(nil), // 4: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig - (*duration.Duration)(nil), // 5: google.protobuf.Duration + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration (*v3.RuntimeDouble)(nil), // 6: envoy.config.core.v3.RuntimeDouble (*v31.Percent)(nil), // 7: envoy.type.v3.Percent - (*wrappers.UInt32Value)(nil), // 8: google.protobuf.UInt32Value - (*wrappers.UInt64Value)(nil), // 9: google.protobuf.UInt64Value + (*wrapperspb.UInt32Value)(nil), // 8: google.protobuf.UInt32Value + (*wrapperspb.UInt64Value)(nil), // 9: google.protobuf.UInt64Value } var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_depIdxs = []int32{ 3, // 0: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.zone_aware_lb_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig diff --git a/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go b/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go index f6abf5f49..4b3987d4f 100755 --- a/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go +++ b/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.go @@ -12,9 +12,9 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -101,7 +101,7 @@ type LeastRequest struct { // The number of random healthy hosts from which the host with the fewest active requests will // be chosen. Defaults to 2 so that we perform two-choice selection if the field is not set. // Only applies to the “N_CHOICES“ selection method. - ChoiceCount *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"` + ChoiceCount *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"` // The following formula is used to calculate the dynamic weights when hosts have different load // balancing weights: // @@ -136,7 +136,7 @@ type LeastRequest struct { // Unused. Replaced by the `selection_method` enum for better extensibility. // // Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/least_request/v3/least_request.proto. - EnableFullScan *wrappers.BoolValue `protobuf:"bytes,5,opt,name=enable_full_scan,json=enableFullScan,proto3" json:"enable_full_scan,omitempty"` + EnableFullScan *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=enable_full_scan,json=enableFullScan,proto3" json:"enable_full_scan,omitempty"` // Method for selecting the host set from which to return the host with the fewest active requests. // // Defaults to “N_CHOICES“. @@ -175,7 +175,7 @@ func (*LeastRequest) Descriptor() ([]byte, []int) { return file_envoy_extensions_load_balancing_policies_least_request_v3_least_request_proto_rawDescGZIP(), []int{0} } -func (x *LeastRequest) GetChoiceCount() *wrappers.UInt32Value { +func (x *LeastRequest) GetChoiceCount() *wrapperspb.UInt32Value { if x != nil { return x.ChoiceCount } @@ -204,7 +204,7 @@ func (x *LeastRequest) GetLocalityLbConfig() *v31.LocalityLbConfig { } // Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/least_request/v3/least_request.proto. -func (x *LeastRequest) GetEnableFullScan() *wrappers.BoolValue { +func (x *LeastRequest) GetEnableFullScan() *wrapperspb.BoolValue { if x != nil { return x.EnableFullScan } @@ -320,11 +320,11 @@ var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request_proto_goTypes = []interface{}{ (LeastRequest_SelectionMethod)(0), // 0: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.SelectionMethod (*LeastRequest)(nil), // 1: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value (*v3.RuntimeDouble)(nil), // 3: envoy.config.core.v3.RuntimeDouble (*v31.SlowStartConfig)(nil), // 4: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig (*v31.LocalityLbConfig)(nil), // 5: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig - (*wrappers.BoolValue)(nil), // 6: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 6: google.protobuf.BoolValue } var file_envoy_extensions_load_balancing_policies_least_request_v3_least_request_proto_depIdxs = []int32{ 2, // 0: envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest.choice_count:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.go b/envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.go index 6a304f619..9f43fd587 100755 --- a/envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.go +++ b/envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,7 +36,7 @@ type Maglev struct { // Minimal disruption means that when the set of upstream hosts change, a connection will likely be sent to the same // upstream as it was before. Increasing the table size reduces the amount of disruption. // The table size must be prime number limited to 5000011. If it is not specified, the default is 65537. - TableSize *wrappers.UInt64Value `protobuf:"bytes,1,opt,name=table_size,json=tableSize,proto3" json:"table_size,omitempty"` + TableSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=table_size,json=tableSize,proto3" json:"table_size,omitempty"` // Common configuration for hashing-based load balancing policies. ConsistentHashingLbConfig *v3.ConsistentHashingLbConfig `protobuf:"bytes,2,opt,name=consistent_hashing_lb_config,json=consistentHashingLbConfig,proto3" json:"consistent_hashing_lb_config,omitempty"` // Enable locality weighted load balancing for maglev lb explicitly. @@ -75,7 +75,7 @@ func (*Maglev) Descriptor() ([]byte, []int) { return file_envoy_extensions_load_balancing_policies_maglev_v3_maglev_proto_rawDescGZIP(), []int{0} } -func (x *Maglev) GetTableSize() *wrappers.UInt64Value { +func (x *Maglev) GetTableSize() *wrapperspb.UInt64Value { if x != nil { return x.TableSize } @@ -170,7 +170,7 @@ func file_envoy_extensions_load_balancing_policies_maglev_v3_maglev_proto_rawDes var file_envoy_extensions_load_balancing_policies_maglev_v3_maglev_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_load_balancing_policies_maglev_v3_maglev_proto_goTypes = []interface{}{ (*Maglev)(nil), // 0: envoy.extensions.load_balancing_policies.maglev.v3.Maglev - (*wrappers.UInt64Value)(nil), // 1: google.protobuf.UInt64Value + (*wrapperspb.UInt64Value)(nil), // 1: google.protobuf.UInt64Value (*v3.ConsistentHashingLbConfig)(nil), // 2: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig (*v3.LocalityLbConfig_LocalityWeightedLbConfig)(nil), // 3: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig } diff --git a/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go b/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go index dd495da16..8f03bed3e 100755 --- a/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go +++ b/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.go @@ -11,9 +11,9 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -96,11 +96,11 @@ type RingHash struct { // provided host) the better the request distribution will reflect the desired weights. Defaults // to 1024 entries, and limited to 8M entries. See also // :ref:`maximum_ring_size`. - MinimumRingSize *wrappers.UInt64Value `protobuf:"bytes,2,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` + MinimumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"` // Maximum hash ring size. Defaults to 8M entries, and limited to 8M entries, but can be lowered // to further constrain resource use. See also // :ref:`minimum_ring_size`. - MaximumRingSize *wrappers.UInt64Value `protobuf:"bytes,3,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"` + MaximumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,3,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"` // If set to “true“, the cluster will use hostname instead of the resolved // address as the key to consistently hash to an upstream host. Only valid for StrictDNS clusters with hostnames which resolve to a single IP address. // @@ -134,7 +134,7 @@ type RingHash struct { // ` instead. // // Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto. - HashBalanceFactor *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"` + HashBalanceFactor *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=hash_balance_factor,json=hashBalanceFactor,proto3" json:"hash_balance_factor,omitempty"` // Common configuration for hashing-based load balancing policies. ConsistentHashingLbConfig *v3.ConsistentHashingLbConfig `protobuf:"bytes,6,opt,name=consistent_hashing_lb_config,json=consistentHashingLbConfig,proto3" json:"consistent_hashing_lb_config,omitempty"` // Enable locality weighted load balancing for ring hash lb explicitly. @@ -180,14 +180,14 @@ func (x *RingHash) GetHashFunction() RingHash_HashFunction { return RingHash_DEFAULT_HASH } -func (x *RingHash) GetMinimumRingSize() *wrappers.UInt64Value { +func (x *RingHash) GetMinimumRingSize() *wrapperspb.UInt64Value { if x != nil { return x.MinimumRingSize } return nil } -func (x *RingHash) GetMaximumRingSize() *wrappers.UInt64Value { +func (x *RingHash) GetMaximumRingSize() *wrapperspb.UInt64Value { if x != nil { return x.MaximumRingSize } @@ -203,7 +203,7 @@ func (x *RingHash) GetUseHostnameForHashing() bool { } // Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto. -func (x *RingHash) GetHashBalanceFactor() *wrappers.UInt32Value { +func (x *RingHash) GetHashBalanceFactor() *wrapperspb.UInt32Value { if x != nil { return x.HashBalanceFactor } @@ -333,8 +333,8 @@ var file_envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_m var file_envoy_extensions_load_balancing_policies_ring_hash_v3_ring_hash_proto_goTypes = []interface{}{ (RingHash_HashFunction)(0), // 0: envoy.extensions.load_balancing_policies.ring_hash.v3.RingHash.HashFunction (*RingHash)(nil), // 1: envoy.extensions.load_balancing_policies.ring_hash.v3.RingHash - (*wrappers.UInt64Value)(nil), // 2: google.protobuf.UInt64Value - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt64Value)(nil), // 2: google.protobuf.UInt64Value + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value (*v3.ConsistentHashingLbConfig)(nil), // 4: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig (*v3.LocalityLbConfig_LocalityWeightedLbConfig)(nil), // 5: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig } diff --git a/envoy/extensions/load_balancing_policies/subset/v3/subset.pb.go b/envoy/extensions/load_balancing_policies/subset/v3/subset.pb.go index 347acff60..bec4f2670 100755 --- a/envoy/extensions/load_balancing_policies/subset/v3/subset.pb.go +++ b/envoy/extensions/load_balancing_policies/subset/v3/subset.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -251,7 +251,7 @@ type Subset struct { // namespace. It is valid for no hosts to match, in which case the behavior // is the same as a fallback_policy of // :ref:`NO_FALLBACK`. - DefaultSubset *_struct.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"` + DefaultSubset *structpb.Struct `protobuf:"bytes,2,opt,name=default_subset,json=defaultSubset,proto3" json:"default_subset,omitempty"` // For each entry, LbEndpoint.Metadata's // “envoy.lb“ namespace is traversed and a subset is created for each unique // combination of key and value. For example: @@ -386,7 +386,7 @@ func (x *Subset) GetFallbackPolicy() Subset_LbSubsetFallbackPolicy { return Subset_NO_FALLBACK } -func (x *Subset) GetDefaultSubset() *_struct.Struct { +func (x *Subset) GetDefaultSubset() *structpb.Struct { if x != nil { return x.DefaultSubset } @@ -688,7 +688,7 @@ var file_envoy_extensions_load_balancing_policies_subset_v3_subset_proto_goTypes (Subset_LbSubsetSelector_LbSubsetSelectorFallbackPolicy)(0), // 2: envoy.extensions.load_balancing_policies.subset.v3.Subset.LbSubsetSelector.LbSubsetSelectorFallbackPolicy (*Subset)(nil), // 3: envoy.extensions.load_balancing_policies.subset.v3.Subset (*Subset_LbSubsetSelector)(nil), // 4: envoy.extensions.load_balancing_policies.subset.v3.Subset.LbSubsetSelector - (*_struct.Struct)(nil), // 5: google.protobuf.Struct + (*structpb.Struct)(nil), // 5: google.protobuf.Struct (*v3.LoadBalancingPolicy)(nil), // 6: envoy.config.cluster.v3.LoadBalancingPolicy } var file_envoy_extensions_load_balancing_policies_subset_v3_subset_proto_depIdxs = []int32{ diff --git a/envoy/extensions/outlier_detection_monitors/consecutive_errors/v3/consecutive_errors.pb.go b/envoy/extensions/outlier_detection_monitors/consecutive_errors/v3/consecutive_errors.pb.go index bb11b51d9..f54947fba 100755 --- a/envoy/extensions/outlier_detection_monitors/consecutive_errors/v3/consecutive_errors.pb.go +++ b/envoy/extensions/outlier_detection_monitors/consecutive_errors/v3/consecutive_errors.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/outlier_detection_monitors/common/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,9 +36,9 @@ type ConsecutiveErrors struct { // Monitor name. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The number of consecutive errors before ejection occurs. - Threshold *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=threshold,proto3" json:"threshold,omitempty"` + Threshold *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=threshold,proto3" json:"threshold,omitempty"` // The % chance that a host is actually ejected. Defaults to 100. - Enforcing *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=enforcing,proto3" json:"enforcing,omitempty"` + Enforcing *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=enforcing,proto3" json:"enforcing,omitempty"` // Error buckets. ErrorBuckets *v3.ErrorBuckets `protobuf:"bytes,4,opt,name=error_buckets,json=errorBuckets,proto3" json:"error_buckets,omitempty"` } @@ -82,14 +82,14 @@ func (x *ConsecutiveErrors) GetName() string { return "" } -func (x *ConsecutiveErrors) GetThreshold() *wrappers.UInt32Value { +func (x *ConsecutiveErrors) GetThreshold() *wrapperspb.UInt32Value { if x != nil { return x.Threshold } return nil } -func (x *ConsecutiveErrors) GetEnforcing() *wrappers.UInt32Value { +func (x *ConsecutiveErrors) GetEnforcing() *wrapperspb.UInt32Value { if x != nil { return x.Enforcing } @@ -176,9 +176,9 @@ func file_envoy_extensions_outlier_detection_monitors_consecutive_errors_v3_cons var file_envoy_extensions_outlier_detection_monitors_consecutive_errors_v3_consecutive_errors_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_outlier_detection_monitors_consecutive_errors_v3_consecutive_errors_proto_goTypes = []interface{}{ - (*ConsecutiveErrors)(nil), // 0: envoy.extensions.outlier_detection_monitors.consecutive_errors.v3.ConsecutiveErrors - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*v3.ErrorBuckets)(nil), // 2: envoy.extensions.outlier_detection_monitors.common.v3.ErrorBuckets + (*ConsecutiveErrors)(nil), // 0: envoy.extensions.outlier_detection_monitors.consecutive_errors.v3.ConsecutiveErrors + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*v3.ErrorBuckets)(nil), // 2: envoy.extensions.outlier_detection_monitors.common.v3.ErrorBuckets } var file_envoy_extensions_outlier_detection_monitors_consecutive_errors_v3_consecutive_errors_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.outlier_detection_monitors.consecutive_errors.v3.ConsecutiveErrors.threshold:type_name -> google.protobuf.UInt32Value diff --git a/envoy/extensions/request_id/uuid/v3/uuid.pb.go b/envoy/extensions/request_id/uuid/v3/uuid.pb.go index 1d7d53a33..3209424e0 100755 --- a/envoy/extensions/request_id/uuid/v3/uuid.pb.go +++ b/envoy/extensions/request_id/uuid/v3/uuid.pb.go @@ -8,9 +8,9 @@ package uuidv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -51,11 +51,11 @@ type UuidRequestIdConfig struct { // modification to the UUID will be performed. It is important to note that if disabled, // stable sampling of traces, access logs, etc. will no longer work and only random sampling will // be possible. - PackTraceReason *wrappers.BoolValue `protobuf:"bytes,1,opt,name=pack_trace_reason,json=packTraceReason,proto3" json:"pack_trace_reason,omitempty"` + PackTraceReason *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=pack_trace_reason,json=packTraceReason,proto3" json:"pack_trace_reason,omitempty"` // Set whether to use :ref:`x-request-id` for sampling or not. // This defaults to true. See the :ref:`context propagation ` // overview for more information. - UseRequestIdForTraceSampling *wrappers.BoolValue `protobuf:"bytes,2,opt,name=use_request_id_for_trace_sampling,json=useRequestIdForTraceSampling,proto3" json:"use_request_id_for_trace_sampling,omitempty"` + UseRequestIdForTraceSampling *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=use_request_id_for_trace_sampling,json=useRequestIdForTraceSampling,proto3" json:"use_request_id_for_trace_sampling,omitempty"` } func (x *UuidRequestIdConfig) Reset() { @@ -90,14 +90,14 @@ func (*UuidRequestIdConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_request_id_uuid_v3_uuid_proto_rawDescGZIP(), []int{0} } -func (x *UuidRequestIdConfig) GetPackTraceReason() *wrappers.BoolValue { +func (x *UuidRequestIdConfig) GetPackTraceReason() *wrapperspb.BoolValue { if x != nil { return x.PackTraceReason } return nil } -func (x *UuidRequestIdConfig) GetUseRequestIdForTraceSampling() *wrappers.BoolValue { +func (x *UuidRequestIdConfig) GetUseRequestIdForTraceSampling() *wrapperspb.BoolValue { if x != nil { return x.UseRequestIdForTraceSampling } @@ -155,8 +155,8 @@ func file_envoy_extensions_request_id_uuid_v3_uuid_proto_rawDescGZIP() []byte { var file_envoy_extensions_request_id_uuid_v3_uuid_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_request_id_uuid_v3_uuid_proto_goTypes = []interface{}{ - (*UuidRequestIdConfig)(nil), // 0: envoy.extensions.request_id.uuid.v3.UuidRequestIdConfig - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue + (*UuidRequestIdConfig)(nil), // 0: envoy.extensions.request_id.uuid.v3.UuidRequestIdConfig + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue } var file_envoy_extensions_request_id_uuid_v3_uuid_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.request_id.uuid.v3.UuidRequestIdConfig.pack_trace_reason:type_name -> google.protobuf.BoolValue diff --git a/envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.go b/envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.go index ad6f24679..e454fb670 100755 --- a/envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.go +++ b/envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -42,7 +42,7 @@ type GraphiteStatsdSink struct { // size should not exceed your network's MTU. // // Note that this value may not be respected if smaller than a single metric. - MaxBytesPerDatagram *wrappers.UInt64Value `protobuf:"bytes,4,opt,name=max_bytes_per_datagram,json=maxBytesPerDatagram,proto3" json:"max_bytes_per_datagram,omitempty"` + MaxBytesPerDatagram *wrapperspb.UInt64Value `protobuf:"bytes,4,opt,name=max_bytes_per_datagram,json=maxBytesPerDatagram,proto3" json:"max_bytes_per_datagram,omitempty"` } func (x *GraphiteStatsdSink) Reset() { @@ -98,7 +98,7 @@ func (x *GraphiteStatsdSink) GetPrefix() string { return "" } -func (x *GraphiteStatsdSink) GetMaxBytesPerDatagram() *wrappers.UInt64Value { +func (x *GraphiteStatsdSink) GetMaxBytesPerDatagram() *wrapperspb.UInt64Value { if x != nil { return x.MaxBytesPerDatagram } @@ -179,9 +179,9 @@ func file_envoy_extensions_stat_sinks_graphite_statsd_v3_graphite_statsd_proto_r var file_envoy_extensions_stat_sinks_graphite_statsd_v3_graphite_statsd_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_stat_sinks_graphite_statsd_v3_graphite_statsd_proto_goTypes = []interface{}{ - (*GraphiteStatsdSink)(nil), // 0: envoy.extensions.stat_sinks.graphite_statsd.v3.GraphiteStatsdSink - (*v3.Address)(nil), // 1: envoy.config.core.v3.Address - (*wrappers.UInt64Value)(nil), // 2: google.protobuf.UInt64Value + (*GraphiteStatsdSink)(nil), // 0: envoy.extensions.stat_sinks.graphite_statsd.v3.GraphiteStatsdSink + (*v3.Address)(nil), // 1: envoy.config.core.v3.Address + (*wrapperspb.UInt64Value)(nil), // 2: google.protobuf.UInt64Value } var file_envoy_extensions_stat_sinks_graphite_statsd_v3_graphite_statsd_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.stat_sinks.graphite_statsd.v3.GraphiteStatsdSink.address:type_name -> envoy.config.core.v3.Address diff --git a/envoy/extensions/stat_sinks/open_telemetry/v3/open_telemetry.pb.go b/envoy/extensions/stat_sinks/open_telemetry/v3/open_telemetry.pb.go index d4ef03253..f42ae1a70 100755 --- a/envoy/extensions/stat_sinks/open_telemetry/v3/open_telemetry.pb.go +++ b/envoy/extensions/stat_sinks/open_telemetry/v3/open_telemetry.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -43,10 +43,10 @@ type SinkConfig struct { // If set to true, metrics will have their tags emitted as OTLP attributes, which may // contain values used by the tag extractor or additional tags added during stats creation. // Otherwise, no attributes will be associated with the export message. Default value is true. - EmitTagsAsAttributes *wrappers.BoolValue `protobuf:"bytes,4,opt,name=emit_tags_as_attributes,json=emitTagsAsAttributes,proto3" json:"emit_tags_as_attributes,omitempty"` + EmitTagsAsAttributes *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=emit_tags_as_attributes,json=emitTagsAsAttributes,proto3" json:"emit_tags_as_attributes,omitempty"` // If set to true, metric names will be represented as the tag extracted name instead // of the full metric name. Default value is true. - UseTagExtractedName *wrappers.BoolValue `protobuf:"bytes,5,opt,name=use_tag_extracted_name,json=useTagExtractedName,proto3" json:"use_tag_extracted_name,omitempty"` + UseTagExtractedName *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=use_tag_extracted_name,json=useTagExtractedName,proto3" json:"use_tag_extracted_name,omitempty"` // If set, emitted stats names will be prepended with a prefix, so full stat name will be // .. For example, if the stat name is "foo.bar" and prefix is // "pre", the full stat name will be "pre.foo.bar". If this field is not set, there is no @@ -114,14 +114,14 @@ func (x *SinkConfig) GetReportHistogramsAsDeltas() bool { return false } -func (x *SinkConfig) GetEmitTagsAsAttributes() *wrappers.BoolValue { +func (x *SinkConfig) GetEmitTagsAsAttributes() *wrapperspb.BoolValue { if x != nil { return x.EmitTagsAsAttributes } return nil } -func (x *SinkConfig) GetUseTagExtractedName() *wrappers.BoolValue { +func (x *SinkConfig) GetUseTagExtractedName() *wrapperspb.BoolValue { if x != nil { return x.UseTagExtractedName } @@ -221,9 +221,9 @@ func file_envoy_extensions_stat_sinks_open_telemetry_v3_open_telemetry_proto_raw var file_envoy_extensions_stat_sinks_open_telemetry_v3_open_telemetry_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_stat_sinks_open_telemetry_v3_open_telemetry_proto_goTypes = []interface{}{ - (*SinkConfig)(nil), // 0: envoy.extensions.stat_sinks.open_telemetry.v3.SinkConfig - (*v3.GrpcService)(nil), // 1: envoy.config.core.v3.GrpcService - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*SinkConfig)(nil), // 0: envoy.extensions.stat_sinks.open_telemetry.v3.SinkConfig + (*v3.GrpcService)(nil), // 1: envoy.config.core.v3.GrpcService + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_envoy_extensions_stat_sinks_open_telemetry_v3_open_telemetry_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.stat_sinks.open_telemetry.v3.SinkConfig.grpc_service:type_name -> envoy.config.core.v3.GrpcService diff --git a/envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.go b/envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.go index 247d1d50e..22a45b5f5 100755 --- a/envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.go +++ b/envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -33,7 +33,7 @@ type QuicDownstreamTransport struct { DownstreamTlsContext *v3.DownstreamTlsContext `protobuf:"bytes,1,opt,name=downstream_tls_context,json=downstreamTlsContext,proto3" json:"downstream_tls_context,omitempty"` // If false, QUIC will tell TLS to reject any early data and to stop issuing 0-RTT credentials with resumption session tickets. This will prevent clients from sending 0-RTT requests. // Default to true. - EnableEarlyData *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enable_early_data,json=enableEarlyData,proto3" json:"enable_early_data,omitempty"` + EnableEarlyData *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enable_early_data,json=enableEarlyData,proto3" json:"enable_early_data,omitempty"` } func (x *QuicDownstreamTransport) Reset() { @@ -75,7 +75,7 @@ func (x *QuicDownstreamTransport) GetDownstreamTlsContext() *v3.DownstreamTlsCon return nil } -func (x *QuicDownstreamTransport) GetEnableEarlyData() *wrappers.BoolValue { +func (x *QuicDownstreamTransport) GetEnableEarlyData() *wrapperspb.BoolValue { if x != nil { return x.EnableEarlyData } @@ -204,7 +204,7 @@ var file_envoy_extensions_transport_sockets_quic_v3_quic_transport_proto_goTypes (*QuicDownstreamTransport)(nil), // 0: envoy.extensions.transport_sockets.quic.v3.QuicDownstreamTransport (*QuicUpstreamTransport)(nil), // 1: envoy.extensions.transport_sockets.quic.v3.QuicUpstreamTransport (*v3.DownstreamTlsContext)(nil), // 2: envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue (*v3.UpstreamTlsContext)(nil), // 4: envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext } var file_envoy_extensions_transport_sockets_quic_v3_quic_transport_proto_depIdxs = []int32{ diff --git a/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.go b/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.go index aab25b833..80ce89e62 100755 --- a/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.go +++ b/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -40,7 +40,7 @@ type Config struct { TransportSocket *v3.TransportSocket `protobuf:"bytes,1,opt,name=transport_socket,json=transportSocket,proto3" json:"transport_socket,omitempty"` // Period to update stats while the connection is open. If unset, updates only happen when the // connection is closed. Stats are always updated one final time when the connection is closed. - UpdatePeriod *duration.Duration `protobuf:"bytes,2,opt,name=update_period,json=updatePeriod,proto3" json:"update_period,omitempty"` + UpdatePeriod *durationpb.Duration `protobuf:"bytes,2,opt,name=update_period,json=updatePeriod,proto3" json:"update_period,omitempty"` } func (x *Config) Reset() { @@ -82,7 +82,7 @@ func (x *Config) GetTransportSocket() *v3.TransportSocket { return nil } -func (x *Config) GetUpdatePeriod() *duration.Duration { +func (x *Config) GetUpdatePeriod() *durationpb.Duration { if x != nil { return x.UpdatePeriod } @@ -147,9 +147,9 @@ func file_envoy_extensions_transport_sockets_tcp_stats_v3_tcp_stats_proto_rawDes var file_envoy_extensions_transport_sockets_tcp_stats_v3_tcp_stats_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_transport_sockets_tcp_stats_v3_tcp_stats_proto_goTypes = []interface{}{ - (*Config)(nil), // 0: envoy.extensions.transport_sockets.tcp_stats.v3.Config - (*v3.TransportSocket)(nil), // 1: envoy.config.core.v3.TransportSocket - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*Config)(nil), // 0: envoy.extensions.transport_sockets.tcp_stats.v3.Config + (*v3.TransportSocket)(nil), // 1: envoy.config.core.v3.TransportSocket + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_envoy_extensions_transport_sockets_tcp_stats_v3_tcp_stats_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.transport_sockets.tcp_stats.v3.Config.transport_socket:type_name -> envoy.config.core.v3.TransportSocket diff --git a/envoy/extensions/transport_sockets/tls/v3/common.pb.go b/envoy/extensions/transport_sockets/tls/v3/common.pb.go index a65aa0dc4..38a5c6b00 100755 --- a/envoy/extensions/transport_sockets/tls/v3/common.pb.go +++ b/envoy/extensions/transport_sockets/tls/v3/common.pb.go @@ -12,10 +12,10 @@ import ( v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -447,7 +447,7 @@ func (m *PrivateKeyProvider) GetConfigType() isPrivateKeyProvider_ConfigType { return nil } -func (x *PrivateKeyProvider) GetTypedConfig() *any1.Any { +func (x *PrivateKeyProvider) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*PrivateKeyProvider_TypedConfig); ok { return x.TypedConfig } @@ -466,7 +466,7 @@ type isPrivateKeyProvider_ConfigType interface { } type PrivateKeyProvider_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*PrivateKeyProvider_TypedConfig) isPrivateKeyProvider_ConfigType() {} @@ -969,7 +969,7 @@ type CertificateValidationContext struct { // Deprecated: Marked as deprecated in envoy/extensions/transport_sockets/tls/v3/common.proto. MatchSubjectAltNames []*v31.StringMatcher `protobuf:"bytes,9,rep,name=match_subject_alt_names,json=matchSubjectAltNames,proto3" json:"match_subject_alt_names,omitempty"` // [#not-implemented-hide:] Must present signed certificate time-stamp. - RequireSignedCertificateTimestamp *wrappers.BoolValue `protobuf:"bytes,6,opt,name=require_signed_certificate_timestamp,json=requireSignedCertificateTimestamp,proto3" json:"require_signed_certificate_timestamp,omitempty"` + RequireSignedCertificateTimestamp *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=require_signed_certificate_timestamp,json=requireSignedCertificateTimestamp,proto3" json:"require_signed_certificate_timestamp,omitempty"` // An optional `certificate revocation list // `_ // (in PEM format). If specified, Envoy will verify that the presented peer @@ -1006,7 +1006,7 @@ type CertificateValidationContext struct { // This matches the semantics of “SSL_CTX_set_verify_depth“ in OpenSSL 1.0.x and older versions of BoringSSL. It differs from “SSL_CTX_set_verify_depth“ // in OpenSSL 1.1.x and newer versions of BoringSSL in that the trust anchor is included. // Trusted issues are specified by setting :ref:`trusted_ca ` - MaxVerifyDepth *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=max_verify_depth,json=maxVerifyDepth,proto3" json:"max_verify_depth,omitempty"` + MaxVerifyDepth *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=max_verify_depth,json=maxVerifyDepth,proto3" json:"max_verify_depth,omitempty"` } func (x *CertificateValidationContext) Reset() { @@ -1091,7 +1091,7 @@ func (x *CertificateValidationContext) GetMatchSubjectAltNames() []*v31.StringMa return nil } -func (x *CertificateValidationContext) GetRequireSignedCertificateTimestamp() *wrappers.BoolValue { +func (x *CertificateValidationContext) GetRequireSignedCertificateTimestamp() *wrapperspb.BoolValue { if x != nil { return x.RequireSignedCertificateTimestamp } @@ -1133,7 +1133,7 @@ func (x *CertificateValidationContext) GetOnlyVerifyLeafCertCrl() bool { return false } -func (x *CertificateValidationContext) GetMaxVerifyDepth() *wrappers.UInt32Value { +func (x *CertificateValidationContext) GetMaxVerifyDepth() *wrapperspb.UInt32Value { if x != nil { return x.MaxVerifyDepth } @@ -1436,13 +1436,13 @@ var file_envoy_extensions_transport_sockets_tls_v3_common_proto_goTypes = []inte (*CertificateProviderPluginInstance)(nil), // 7: envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance (*SubjectAltNameMatcher)(nil), // 8: envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher (*CertificateValidationContext)(nil), // 9: envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext - (*any1.Any)(nil), // 10: google.protobuf.Any + (*anypb.Any)(nil), // 10: google.protobuf.Any (*v3.DataSource)(nil), // 11: envoy.config.core.v3.DataSource (*v3.WatchedDirectory)(nil), // 12: envoy.config.core.v3.WatchedDirectory (*v31.StringMatcher)(nil), // 13: envoy.type.matcher.v3.StringMatcher - (*wrappers.BoolValue)(nil), // 14: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 14: google.protobuf.BoolValue (*v3.TypedExtensionConfig)(nil), // 15: envoy.config.core.v3.TypedExtensionConfig - (*wrappers.UInt32Value)(nil), // 16: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 16: google.protobuf.UInt32Value } var file_envoy_extensions_transport_sockets_tls_v3_common_proto_depIdxs = []int32{ 0, // 0: envoy.extensions.transport_sockets.tls.v3.TlsParameters.tls_minimum_protocol_version:type_name -> envoy.extensions.transport_sockets.tls.v3.TlsParameters.TlsProtocol diff --git a/envoy/extensions/transport_sockets/tls/v3/tls.pb.go b/envoy/extensions/transport_sockets/tls/v3/tls.pb.go index 5a23983f3..1a334c8f1 100755 --- a/envoy/extensions/transport_sockets/tls/v3/tls.pb.go +++ b/envoy/extensions/transport_sockets/tls/v3/tls.pb.go @@ -11,10 +11,10 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -115,13 +115,13 @@ type UpstreamTlsContext struct { // for TLSv1.2 and older) to store for the purpose of session resumption. // // Defaults to 1, setting this to 0 disables session resumption. - MaxSessionKeys *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_session_keys,json=maxSessionKeys,proto3" json:"max_session_keys,omitempty"` + MaxSessionKeys *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_session_keys,json=maxSessionKeys,proto3" json:"max_session_keys,omitempty"` // This field is used to control the enforcement, whereby the handshake will fail if the keyUsage extension // is present and incompatible with the TLS usage. Currently, the default value is false (i.e., enforcement off) // but it is expected to be changed to true by default in a future release. // “ssl.was_key_usage_invalid“ in :ref:`listener metrics ` will be set for certificate // configurations that would fail if this option were set to true. - EnforceRsaKeyUsage *wrappers.BoolValue `protobuf:"bytes,5,opt,name=enforce_rsa_key_usage,json=enforceRsaKeyUsage,proto3" json:"enforce_rsa_key_usage,omitempty"` + EnforceRsaKeyUsage *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=enforce_rsa_key_usage,json=enforceRsaKeyUsage,proto3" json:"enforce_rsa_key_usage,omitempty"` } func (x *UpstreamTlsContext) Reset() { @@ -177,14 +177,14 @@ func (x *UpstreamTlsContext) GetAllowRenegotiation() bool { return false } -func (x *UpstreamTlsContext) GetMaxSessionKeys() *wrappers.UInt32Value { +func (x *UpstreamTlsContext) GetMaxSessionKeys() *wrapperspb.UInt32Value { if x != nil { return x.MaxSessionKeys } return nil } -func (x *UpstreamTlsContext) GetEnforceRsaKeyUsage() *wrappers.BoolValue { +func (x *UpstreamTlsContext) GetEnforceRsaKeyUsage() *wrapperspb.BoolValue { if x != nil { return x.EnforceRsaKeyUsage } @@ -201,10 +201,10 @@ type DownstreamTlsContext struct { CommonTlsContext *CommonTlsContext `protobuf:"bytes,1,opt,name=common_tls_context,json=commonTlsContext,proto3" json:"common_tls_context,omitempty"` // If specified, Envoy will reject connections without a valid client // certificate. - RequireClientCertificate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=require_client_certificate,json=requireClientCertificate,proto3" json:"require_client_certificate,omitempty"` + RequireClientCertificate *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=require_client_certificate,json=requireClientCertificate,proto3" json:"require_client_certificate,omitempty"` // If specified, Envoy will reject connections without a valid and matching SNI. // [#not-implemented-hide:] - RequireSni *wrappers.BoolValue `protobuf:"bytes,3,opt,name=require_sni,json=requireSni,proto3" json:"require_sni,omitempty"` + RequireSni *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=require_sni,json=requireSni,proto3" json:"require_sni,omitempty"` // Types that are assignable to SessionTicketKeysType: // // *DownstreamTlsContext_SessionTicketKeys @@ -217,7 +217,7 @@ type DownstreamTlsContext struct { // If specified, “session_timeout“ will change the maximum lifetime (in seconds) of the TLS session. // Currently this value is used as a hint for the `TLS session ticket lifetime (for TLSv1.2) `_. // Only seconds can be specified (fractional seconds are ignored). - SessionTimeout *duration.Duration `protobuf:"bytes,6,opt,name=session_timeout,json=sessionTimeout,proto3" json:"session_timeout,omitempty"` + SessionTimeout *durationpb.Duration `protobuf:"bytes,6,opt,name=session_timeout,json=sessionTimeout,proto3" json:"session_timeout,omitempty"` // Config for whether to use certificates if they do not have // an accompanying OCSP response or if the response expires at runtime. // Defaults to LENIENT_STAPLING @@ -225,7 +225,7 @@ type DownstreamTlsContext struct { // Multiple certificates are allowed in Downstream transport socket to serve different SNI. // If the client provides SNI but no such cert matched, it will decide to full scan certificates or not based on this config. // Defaults to false. See more details in :ref:`Multiple TLS certificates `. - FullScanCertsOnSniMismatch *wrappers.BoolValue `protobuf:"bytes,9,opt,name=full_scan_certs_on_sni_mismatch,json=fullScanCertsOnSniMismatch,proto3" json:"full_scan_certs_on_sni_mismatch,omitempty"` + FullScanCertsOnSniMismatch *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=full_scan_certs_on_sni_mismatch,json=fullScanCertsOnSniMismatch,proto3" json:"full_scan_certs_on_sni_mismatch,omitempty"` } func (x *DownstreamTlsContext) Reset() { @@ -267,14 +267,14 @@ func (x *DownstreamTlsContext) GetCommonTlsContext() *CommonTlsContext { return nil } -func (x *DownstreamTlsContext) GetRequireClientCertificate() *wrappers.BoolValue { +func (x *DownstreamTlsContext) GetRequireClientCertificate() *wrapperspb.BoolValue { if x != nil { return x.RequireClientCertificate } return nil } -func (x *DownstreamTlsContext) GetRequireSni() *wrappers.BoolValue { +func (x *DownstreamTlsContext) GetRequireSni() *wrapperspb.BoolValue { if x != nil { return x.RequireSni } @@ -316,7 +316,7 @@ func (x *DownstreamTlsContext) GetDisableStatefulSessionResumption() bool { return false } -func (x *DownstreamTlsContext) GetSessionTimeout() *duration.Duration { +func (x *DownstreamTlsContext) GetSessionTimeout() *durationpb.Duration { if x != nil { return x.SessionTimeout } @@ -330,7 +330,7 @@ func (x *DownstreamTlsContext) GetOcspStaplePolicy() DownstreamTlsContext_OcspSt return DownstreamTlsContext_LENIENT_STAPLING } -func (x *DownstreamTlsContext) GetFullScanCertsOnSniMismatch() *wrappers.BoolValue { +func (x *DownstreamTlsContext) GetFullScanCertsOnSniMismatch() *wrapperspb.BoolValue { if x != nil { return x.FullScanCertsOnSniMismatch } @@ -1335,11 +1335,11 @@ var file_envoy_extensions_transport_sockets_tls_v3_tls_proto_goTypes = []interfa (*CommonTlsContext_CertificateProvider)(nil), // 5: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider (*CommonTlsContext_CertificateProviderInstance)(nil), // 6: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance (*CommonTlsContext_CombinedCertificateValidationContext)(nil), // 7: envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext - (*wrappers.UInt32Value)(nil), // 8: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 9: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 8: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 9: google.protobuf.BoolValue (*TlsSessionTicketKeys)(nil), // 10: envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys (*SdsSecretConfig)(nil), // 11: envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig - (*duration.Duration)(nil), // 12: google.protobuf.Duration + (*durationpb.Duration)(nil), // 12: google.protobuf.Duration (*v3.CidrRange)(nil), // 13: envoy.config.core.v3.CidrRange (*TlsParameters)(nil), // 14: envoy.extensions.transport_sockets.tls.v3.TlsParameters (*TlsCertificate)(nil), // 15: envoy.extensions.transport_sockets.tls.v3.TlsCertificate diff --git a/envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.go b/envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.go index 0520325eb..f12cfebf4 100755 --- a/envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.go +++ b/envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.go @@ -8,9 +8,9 @@ package tcpv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -37,7 +37,7 @@ type TcpProtocolOptions struct { // // Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP // FIN packets, etc. - IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` } func (x *TcpProtocolOptions) Reset() { @@ -72,7 +72,7 @@ func (*TcpProtocolOptions) Descriptor() ([]byte, []int) { return file_envoy_extensions_upstreams_tcp_v3_tcp_protocol_options_proto_rawDescGZIP(), []int{0} } -func (x *TcpProtocolOptions) GetIdleTimeout() *duration.Duration { +func (x *TcpProtocolOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -125,8 +125,8 @@ func file_envoy_extensions_upstreams_tcp_v3_tcp_protocol_options_proto_rawDescGZ var file_envoy_extensions_upstreams_tcp_v3_tcp_protocol_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_upstreams_tcp_v3_tcp_protocol_options_proto_goTypes = []interface{}{ - (*TcpProtocolOptions)(nil), // 0: envoy.extensions.upstreams.tcp.v3.TcpProtocolOptions - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*TcpProtocolOptions)(nil), // 0: envoy.extensions.upstreams.tcp.v3.TcpProtocolOptions + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_extensions_upstreams_tcp_v3_tcp_protocol_options_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.upstreams.tcp.v3.TcpProtocolOptions.idle_timeout:type_name -> google.protobuf.Duration diff --git a/envoy/extensions/wasm/v3/wasm.pb.go b/envoy/extensions/wasm/v3/wasm.pb.go index a31a41f5c..474b56dcc 100755 --- a/envoy/extensions/wasm/v3/wasm.pb.go +++ b/envoy/extensions/wasm/v3/wasm.pb.go @@ -9,9 +9,9 @@ package wasmv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -168,7 +168,7 @@ type VmConfig struct { // (proxy_on_start). “google.protobuf.Struct“ is serialized as JSON before // passing it to the plugin. “google.protobuf.BytesValue“ and // “google.protobuf.StringValue“ are passed directly without the wrapper. - Configuration *any1.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` + Configuration *anypb.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` // Allow the wasm file to include pre-compiled code on VMs which support it. // Warning: this should only be enable for trusted sources as the precompiled code is not // verified. @@ -238,7 +238,7 @@ func (x *VmConfig) GetCode() *v3.AsyncDataSource { return nil } -func (x *VmConfig) GetConfiguration() *any1.Any { +func (x *VmConfig) GetConfiguration() *anypb.Any { if x != nil { return x.Configuration } @@ -350,7 +350,7 @@ type PluginConfig struct { // “google.protobuf.Struct“ is serialized as JSON before // passing it to the plugin. “google.protobuf.BytesValue“ and // “google.protobuf.StringValue“ are passed directly without the wrapper. - Configuration *any1.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` + Configuration *anypb.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` // If there is a fatal error on the VM (e.g. exception, abort(), on_start or on_configure return false), // then all plugins associated with the VM will either fail closed (by default), e.g. by returning an HTTP 503 error, // or fail open (if 'fail_open' is set to true) by bypassing the filter. Note: when on_start or on_configure return false @@ -421,7 +421,7 @@ func (x *PluginConfig) GetVmConfig() *VmConfig { return nil } -func (x *PluginConfig) GetConfiguration() *any1.Any { +func (x *PluginConfig) GetConfiguration() *anypb.Any { if x != nil { return x.Configuration } @@ -644,7 +644,7 @@ var file_envoy_extensions_wasm_v3_wasm_proto_goTypes = []interface{}{ nil, // 6: envoy.extensions.wasm.v3.CapabilityRestrictionConfig.AllowedCapabilitiesEntry nil, // 7: envoy.extensions.wasm.v3.EnvironmentVariables.KeyValuesEntry (*v3.AsyncDataSource)(nil), // 8: envoy.config.core.v3.AsyncDataSource - (*any1.Any)(nil), // 9: google.protobuf.Any + (*anypb.Any)(nil), // 9: google.protobuf.Any } var file_envoy_extensions_wasm_v3_wasm_proto_depIdxs = []int32{ 6, // 0: envoy.extensions.wasm.v3.CapabilityRestrictionConfig.allowed_capabilities:type_name -> envoy.extensions.wasm.v3.CapabilityRestrictionConfig.AllowedCapabilitiesEntry diff --git a/envoy/extensions/watchdog/profile_action/v3/profile_action.pb.go b/envoy/extensions/watchdog/profile_action/v3/profile_action.pb.go index 797be52e2..d8eb923a3 100755 --- a/envoy/extensions/watchdog/profile_action/v3/profile_action.pb.go +++ b/envoy/extensions/watchdog/profile_action/v3/profile_action.pb.go @@ -9,9 +9,9 @@ package profile_actionv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -30,7 +30,7 @@ type ProfileActionConfig struct { unknownFields protoimpl.UnknownFields // How long the profile should last. If not set defaults to 5 seconds. - ProfileDuration *duration.Duration `protobuf:"bytes,1,opt,name=profile_duration,json=profileDuration,proto3" json:"profile_duration,omitempty"` + ProfileDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=profile_duration,json=profileDuration,proto3" json:"profile_duration,omitempty"` // File path to the directory to output profiles. ProfilePath string `protobuf:"bytes,2,opt,name=profile_path,json=profilePath,proto3" json:"profile_path,omitempty"` // Limits the max number of profiles that can be generated by this action @@ -71,7 +71,7 @@ func (*ProfileActionConfig) Descriptor() ([]byte, []int) { return file_envoy_extensions_watchdog_profile_action_v3_profile_action_proto_rawDescGZIP(), []int{0} } -func (x *ProfileActionConfig) GetProfileDuration() *duration.Duration { +func (x *ProfileActionConfig) GetProfileDuration() *durationpb.Duration { if x != nil { return x.ProfileDuration } @@ -148,7 +148,7 @@ func file_envoy_extensions_watchdog_profile_action_v3_profile_action_proto_rawDe var file_envoy_extensions_watchdog_profile_action_v3_profile_action_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_extensions_watchdog_profile_action_v3_profile_action_proto_goTypes = []interface{}{ (*ProfileActionConfig)(nil), // 0: envoy.extensions.watchdog.profile_action.v3.ProfileActionConfig - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_extensions_watchdog_profile_action_v3_profile_action_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.watchdog.profile_action.v3.ProfileActionConfig.profile_duration:type_name -> google.protobuf.Duration diff --git a/envoy/service/auth/v2/attribute_context.pb.go b/envoy/service/auth/v2/attribute_context.pb.go index 5d1837e64..6b1c96ecf 100755 --- a/envoy/service/auth/v2/attribute_context.pb.go +++ b/envoy/service/auth/v2/attribute_context.pb.go @@ -9,9 +9,9 @@ package authv2 import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -244,7 +244,7 @@ type AttributeContext_Request struct { unknownFields protoimpl.UnknownFields // The timestamp when the proxy receives the first byte of the request. - Time *timestamp.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` + Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` // Represents an HTTP request or an HTTP-like request. Http *AttributeContext_HttpRequest `protobuf:"bytes,2,opt,name=http,proto3" json:"http,omitempty"` } @@ -281,7 +281,7 @@ func (*AttributeContext_Request) Descriptor() ([]byte, []int) { return file_envoy_service_auth_v2_attribute_context_proto_rawDescGZIP(), []int{0, 1} } -func (x *AttributeContext_Request) GetTime() *timestamp.Timestamp { +func (x *AttributeContext_Request) GetTime() *timestamppb.Timestamp { if x != nil { return x.Time } @@ -581,7 +581,7 @@ var file_envoy_service_auth_v2_attribute_context_proto_goTypes = []interface{}{ nil, // 6: envoy.service.auth.v2.AttributeContext.HttpRequest.HeadersEntry (*core.Metadata)(nil), // 7: envoy.api.v2.core.Metadata (*core.Address)(nil), // 8: envoy.api.v2.core.Address - (*timestamp.Timestamp)(nil), // 9: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp } var file_envoy_service_auth_v2_attribute_context_proto_depIdxs = []int32{ 1, // 0: envoy.service.auth.v2.AttributeContext.source:type_name -> envoy.service.auth.v2.AttributeContext.Peer diff --git a/envoy/service/auth/v3/attribute_context.pb.go b/envoy/service/auth/v3/attribute_context.pb.go index ad8bd4ab9..8995335b3 100755 --- a/envoy/service/auth/v3/attribute_context.pb.go +++ b/envoy/service/auth/v3/attribute_context.pb.go @@ -9,9 +9,9 @@ package authv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -265,7 +265,7 @@ type AttributeContext_Request struct { unknownFields protoimpl.UnknownFields // The timestamp when the proxy receives the first byte of the request. - Time *timestamp.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` + Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` // Represents an HTTP request or an HTTP-like request. Http *AttributeContext_HttpRequest `protobuf:"bytes,2,opt,name=http,proto3" json:"http,omitempty"` } @@ -302,7 +302,7 @@ func (*AttributeContext_Request) Descriptor() ([]byte, []int) { return file_envoy_service_auth_v3_attribute_context_proto_rawDescGZIP(), []int{0, 1} } -func (x *AttributeContext_Request) GetTime() *timestamp.Timestamp { +func (x *AttributeContext_Request) GetTime() *timestamppb.Timestamp { if x != nil { return x.Time } @@ -693,7 +693,7 @@ var file_envoy_service_auth_v3_attribute_context_proto_goTypes = []interface{}{ nil, // 7: envoy.service.auth.v3.AttributeContext.HttpRequest.HeadersEntry (*v3.Metadata)(nil), // 8: envoy.config.core.v3.Metadata (*v3.Address)(nil), // 9: envoy.config.core.v3.Address - (*timestamp.Timestamp)(nil), // 10: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp } var file_envoy_service_auth_v3_attribute_context_proto_depIdxs = []int32{ 1, // 0: envoy.service.auth.v3.AttributeContext.source:type_name -> envoy.service.auth.v3.AttributeContext.Peer diff --git a/envoy/service/auth/v3/external_auth.pb.go b/envoy/service/auth/v3/external_auth.pb.go index 82d159983..704dc1276 100755 --- a/envoy/service/auth/v3/external_auth.pb.go +++ b/envoy/service/auth/v3/external_auth.pb.go @@ -12,13 +12,13 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" - _struct "github.com/golang/protobuf/ptypes/struct" status "google.golang.org/genproto/googleapis/rpc/status" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status1 "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -186,7 +186,7 @@ type OkHttpResponse struct { // `. // // Deprecated: Marked as deprecated in envoy/service/auth/v3/external_auth.proto. - DynamicMetadata *_struct.Struct `protobuf:"bytes,3,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` + DynamicMetadata *structpb.Struct `protobuf:"bytes,3,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` // This field allows the authorization service to send HTTP response headers // to the downstream client on success. Note that the :ref:`append field in HeaderValueOption ` // defaults to false when used in this message. @@ -247,7 +247,7 @@ func (x *OkHttpResponse) GetHeadersToRemove() []string { } // Deprecated: Marked as deprecated in envoy/service/auth/v3/external_auth.proto. -func (x *OkHttpResponse) GetDynamicMetadata() *_struct.Struct { +func (x *OkHttpResponse) GetDynamicMetadata() *structpb.Struct { if x != nil { return x.DynamicMetadata } @@ -300,7 +300,7 @@ type CheckResponse struct { // // - :ref:`envoy.filters.http.ext_authz ` for HTTP filter. // - :ref:`envoy.filters.network.ext_authz ` for network filter. - DynamicMetadata *_struct.Struct `protobuf:"bytes,4,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` + DynamicMetadata *structpb.Struct `protobuf:"bytes,4,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` } func (x *CheckResponse) Reset() { @@ -363,7 +363,7 @@ func (x *CheckResponse) GetOkResponse() *OkHttpResponse { return nil } -func (x *CheckResponse) GetDynamicMetadata() *_struct.Struct { +func (x *CheckResponse) GetDynamicMetadata() *structpb.Struct { if x != nil { return x.DynamicMetadata } @@ -526,7 +526,7 @@ var file_envoy_service_auth_v3_external_auth_proto_goTypes = []interface{}{ (*AttributeContext)(nil), // 4: envoy.service.auth.v3.AttributeContext (*v3.HttpStatus)(nil), // 5: envoy.type.v3.HttpStatus (*v31.HeaderValueOption)(nil), // 6: envoy.config.core.v3.HeaderValueOption - (*_struct.Struct)(nil), // 7: google.protobuf.Struct + (*structpb.Struct)(nil), // 7: google.protobuf.Struct (*v31.QueryParameter)(nil), // 8: envoy.config.core.v3.QueryParameter (*status.Status)(nil), // 9: google.rpc.Status } diff --git a/envoy/service/discovery/v2/hds.pb.go b/envoy/service/discovery/v2/hds.pb.go index c529f142b..8a4e96eba 100755 --- a/envoy/service/discovery/v2/hds.pb.go +++ b/envoy/service/discovery/v2/hds.pb.go @@ -11,13 +11,13 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" - duration "github.com/golang/protobuf/ptypes/duration" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -498,7 +498,7 @@ type HealthCheckSpecifier struct { ClusterHealthChecks []*ClusterHealthCheck `protobuf:"bytes,1,rep,name=cluster_health_checks,json=clusterHealthChecks,proto3" json:"cluster_health_checks,omitempty"` // The default is 1 second. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` } func (x *HealthCheckSpecifier) Reset() { @@ -540,7 +540,7 @@ func (x *HealthCheckSpecifier) GetClusterHealthChecks() []*ClusterHealthCheck { return nil } -func (x *HealthCheckSpecifier) GetInterval() *duration.Duration { +func (x *HealthCheckSpecifier) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } @@ -721,7 +721,7 @@ var file_envoy_service_discovery_v2_hds_proto_goTypes = []interface{}{ (core.HealthStatus)(0), // 11: envoy.api.v2.core.HealthStatus (*core.Locality)(nil), // 12: envoy.api.v2.core.Locality (*core.HealthCheck)(nil), // 13: envoy.api.v2.core.HealthCheck - (*duration.Duration)(nil), // 14: google.protobuf.Duration + (*durationpb.Duration)(nil), // 14: google.protobuf.Duration } var file_envoy_service_discovery_v2_hds_proto_depIdxs = []int32{ 0, // 0: envoy.service.discovery.v2.Capability.health_check_protocols:type_name -> envoy.service.discovery.v2.Capability.Protocol diff --git a/envoy/service/discovery/v2/rtds.pb.go b/envoy/service/discovery/v2/rtds.pb.go index 1e8d8e05f..a6b6cb148 100755 --- a/envoy/service/discovery/v2/rtds.pb.go +++ b/envoy/service/discovery/v2/rtds.pb.go @@ -12,13 +12,13 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -78,8 +78,8 @@ type Runtime struct { // Runtime resource name. This makes the Runtime a self-describing xDS // resource. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Layer *_struct.Struct `protobuf:"bytes,2,opt,name=layer,proto3" json:"layer,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Layer *structpb.Struct `protobuf:"bytes,2,opt,name=layer,proto3" json:"layer,omitempty"` } func (x *Runtime) Reset() { @@ -121,7 +121,7 @@ func (x *Runtime) GetName() string { return "" } -func (x *Runtime) GetLayer() *_struct.Struct { +func (x *Runtime) GetLayer() *structpb.Struct { if x != nil { return x.Layer } @@ -208,7 +208,7 @@ var file_envoy_service_discovery_v2_rtds_proto_msgTypes = make([]protoimpl.Messa var file_envoy_service_discovery_v2_rtds_proto_goTypes = []interface{}{ (*RtdsDummy)(nil), // 0: envoy.service.discovery.v2.RtdsDummy (*Runtime)(nil), // 1: envoy.service.discovery.v2.Runtime - (*_struct.Struct)(nil), // 2: google.protobuf.Struct + (*structpb.Struct)(nil), // 2: google.protobuf.Struct (*v2.DiscoveryRequest)(nil), // 3: envoy.api.v2.DiscoveryRequest (*v2.DeltaDiscoveryRequest)(nil), // 4: envoy.api.v2.DeltaDiscoveryRequest (*v2.DiscoveryResponse)(nil), // 5: envoy.api.v2.DiscoveryResponse diff --git a/envoy/service/discovery/v3/discovery.pb.go b/envoy/service/discovery/v3/discovery.pb.go index 7811db950..89c045e79 100755 --- a/envoy/service/discovery/v3/discovery.pb.go +++ b/envoy/service/discovery/v3/discovery.pb.go @@ -10,11 +10,11 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" status "google.golang.org/genproto/googleapis/rpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -286,7 +286,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 []*any1.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` + Resources []*anypb.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` // [#not-implemented-hide:] // Canary is used to support two Envoy command line flags: // @@ -357,7 +357,7 @@ func (x *DiscoveryResponse) GetVersionInfo() string { return "" } -func (x *DiscoveryResponse) GetResources() []*any1.Any { +func (x *DiscoveryResponse) GetResources() []*anypb.Any { if x != nil { return x.Resources } @@ -838,7 +838,7 @@ type Resource struct { // resources. Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // The resource being tracked. - Resource *any1.Any `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` + Resource *anypb.Any `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` // Time-to-live value for the resource. For each resource, a timer is started. The timer is // reset each time the resource is received with a new TTL. If the resource is received with // no TTL set, the timer is removed for the resource. Upon expiration of the timer, the @@ -852,7 +852,7 @@ type Resource struct { // a management server failure. For example, the feature may be used for fault injection // testing where the fault injection should be terminated in the event that Envoy loses contact // with the management server. - Ttl *duration.Duration `protobuf:"bytes,6,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,6,opt,name=ttl,proto3" json:"ttl,omitempty"` // Cache control properties for the resource. // [#not-implemented-hide:] CacheControl *Resource_CacheControl `protobuf:"bytes,7,opt,name=cache_control,json=cacheControl,proto3" json:"cache_control,omitempty"` @@ -921,14 +921,14 @@ func (x *Resource) GetVersion() string { return "" } -func (x *Resource) GetResource() *any1.Any { +func (x *Resource) GetResource() *anypb.Any { if x != nil { return x.Resource } return nil } -func (x *Resource) GetTtl() *duration.Duration { +func (x *Resource) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -1472,9 +1472,9 @@ var file_envoy_service_discovery_v3_discovery_proto_goTypes = []interface{}{ (*Resource_CacheControl)(nil), // 13: envoy.service.discovery.v3.Resource.CacheControl (*v3.Node)(nil), // 14: envoy.config.core.v3.Node (*status.Status)(nil), // 15: google.rpc.Status - (*any1.Any)(nil), // 16: google.protobuf.Any + (*anypb.Any)(nil), // 16: google.protobuf.Any (*v3.ControlPlane)(nil), // 17: envoy.config.core.v3.ControlPlane - (*duration.Duration)(nil), // 18: google.protobuf.Duration + (*durationpb.Duration)(nil), // 18: google.protobuf.Duration (*v3.Metadata)(nil), // 19: envoy.config.core.v3.Metadata } var file_envoy_service_discovery_v3_discovery_proto_depIdxs = []int32{ diff --git a/envoy/service/event_reporting/v2alpha/event_reporting_service.pb.go b/envoy/service/event_reporting/v2alpha/event_reporting_service.pb.go index 08cfaf4dd..ce22bf2a8 100755 --- a/envoy/service/event_reporting/v2alpha/event_reporting_service.pb.go +++ b/envoy/service/event_reporting/v2alpha/event_reporting_service.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -46,7 +46,7 @@ type StreamEventsRequest struct { // // * :ref:`HealthCheckEvent ` // * :ref:`OutlierDetectionEvent ` - Events []*any1.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` + Events []*anypb.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` } func (x *StreamEventsRequest) Reset() { @@ -88,7 +88,7 @@ func (x *StreamEventsRequest) GetIdentifier() *StreamEventsRequest_Identifier { return nil } -func (x *StreamEventsRequest) GetEvents() []*any1.Any { +func (x *StreamEventsRequest) GetEvents() []*anypb.Any { if x != nil { return x.Events } @@ -266,7 +266,7 @@ var file_envoy_service_event_reporting_v2alpha_event_reporting_service_proto_goT (*StreamEventsRequest)(nil), // 0: envoy.service.event_reporting.v2alpha.StreamEventsRequest (*StreamEventsResponse)(nil), // 1: envoy.service.event_reporting.v2alpha.StreamEventsResponse (*StreamEventsRequest_Identifier)(nil), // 2: envoy.service.event_reporting.v2alpha.StreamEventsRequest.Identifier - (*any1.Any)(nil), // 3: google.protobuf.Any + (*anypb.Any)(nil), // 3: google.protobuf.Any (*core.Node)(nil), // 4: envoy.api.v2.core.Node } var file_envoy_service_event_reporting_v2alpha_event_reporting_service_proto_depIdxs = []int32{ diff --git a/envoy/service/event_reporting/v3/event_reporting_service.pb.go b/envoy/service/event_reporting/v3/event_reporting_service.pb.go index bba4eeb4d..0dd49f6e1 100755 --- a/envoy/service/event_reporting/v3/event_reporting_service.pb.go +++ b/envoy/service/event_reporting/v3/event_reporting_service.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -46,7 +46,7 @@ type StreamEventsRequest struct { // // * :ref:`HealthCheckEvent ` // * :ref:`OutlierDetectionEvent ` - Events []*any1.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` + Events []*anypb.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"` } func (x *StreamEventsRequest) Reset() { @@ -88,7 +88,7 @@ func (x *StreamEventsRequest) GetIdentifier() *StreamEventsRequest_Identifier { return nil } -func (x *StreamEventsRequest) GetEvents() []*any1.Any { +func (x *StreamEventsRequest) GetEvents() []*anypb.Any { if x != nil { return x.Events } @@ -276,7 +276,7 @@ var file_envoy_service_event_reporting_v3_event_reporting_service_proto_goTypes (*StreamEventsRequest)(nil), // 0: envoy.service.event_reporting.v3.StreamEventsRequest (*StreamEventsResponse)(nil), // 1: envoy.service.event_reporting.v3.StreamEventsResponse (*StreamEventsRequest_Identifier)(nil), // 2: envoy.service.event_reporting.v3.StreamEventsRequest.Identifier - (*any1.Any)(nil), // 3: google.protobuf.Any + (*anypb.Any)(nil), // 3: google.protobuf.Any (*v3.Node)(nil), // 4: envoy.config.core.v3.Node } var file_envoy_service_event_reporting_v3_event_reporting_service_proto_depIdxs = []int32{ diff --git a/envoy/service/ext_proc/v3/external_processor.pb.go b/envoy/service/ext_proc/v3/external_processor.pb.go index e74239871..2c3076625 100755 --- a/envoy/service/ext_proc/v3/external_processor.pb.go +++ b/envoy/service/ext_proc/v3/external_processor.pb.go @@ -14,13 +14,13 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_proc/v3" v32 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -131,7 +131,7 @@ type ProcessingRequest struct { // or “response_attributes“ list in the configuration. Each entry // in the list is populated from the standard // :ref:`attributes ` supported across Envoy. - Attributes map[string]*_struct.Struct `protobuf:"bytes,9,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Attributes map[string]*structpb.Struct `protobuf:"bytes,9,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *ProcessingRequest) Reset() { @@ -229,7 +229,7 @@ func (x *ProcessingRequest) GetMetadataContext() *v3.Metadata { return nil } -func (x *ProcessingRequest) GetAttributes() map[string]*_struct.Struct { +func (x *ProcessingRequest) GetAttributes() map[string]*structpb.Struct { if x != nil { return x.Attributes } @@ -317,7 +317,7 @@ type ProcessingResponse struct { // Optional metadata that will be emitted as dynamic metadata to be consumed by // following filters. This metadata will be placed in the namespace(s) specified by the top-level // field name(s) of the struct. - DynamicMetadata *_struct.Struct `protobuf:"bytes,8,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` + DynamicMetadata *structpb.Struct `protobuf:"bytes,8,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` // Override how parts of the HTTP request and response are processed // for the duration of this particular request/response only. Servers // may use this to intelligently control how requests are processed @@ -342,7 +342,7 @@ type ProcessingResponse struct { // :ref:`max_message_timeout ` // Such message can be sent at most once in a particular Envoy ext_proc filter processing state. // To enable this API, one has to set “max_message_timeout“ to a number >= 1ms. - OverrideMessageTimeout *duration.Duration `protobuf:"bytes,10,opt,name=override_message_timeout,json=overrideMessageTimeout,proto3" json:"override_message_timeout,omitempty"` + OverrideMessageTimeout *durationpb.Duration `protobuf:"bytes,10,opt,name=override_message_timeout,json=overrideMessageTimeout,proto3" json:"override_message_timeout,omitempty"` } func (x *ProcessingResponse) Reset() { @@ -433,7 +433,7 @@ func (x *ProcessingResponse) GetImmediateResponse() *ImmediateResponse { return nil } -func (x *ProcessingResponse) GetDynamicMetadata() *_struct.Struct { +func (x *ProcessingResponse) GetDynamicMetadata() *structpb.Struct { if x != nil { return x.DynamicMetadata } @@ -447,7 +447,7 @@ func (x *ProcessingResponse) GetModeOverride() *v31.ProcessingMode { return nil } -func (x *ProcessingResponse) GetOverrideMessageTimeout() *duration.Duration { +func (x *ProcessingResponse) GetOverrideMessageTimeout() *durationpb.Duration { if x != nil { return x.OverrideMessageTimeout } @@ -541,7 +541,7 @@ type HttpHeaders struct { // field. // // Deprecated: Marked as deprecated in envoy/service/ext_proc/v3/external_processor.proto. - Attributes map[string]*_struct.Struct `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Attributes map[string]*structpb.Struct `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // If true, then there is no message body associated with this // request or response. EndOfStream bool `protobuf:"varint,3,opt,name=end_of_stream,json=endOfStream,proto3" json:"end_of_stream,omitempty"` @@ -587,7 +587,7 @@ func (x *HttpHeaders) GetHeaders() *v3.HeaderMap { } // Deprecated: Marked as deprecated in envoy/service/ext_proc/v3/external_processor.proto. -func (x *HttpHeaders) GetAttributes() map[string]*_struct.Struct { +func (x *HttpHeaders) GetAttributes() map[string]*structpb.Struct { if x != nil { return x.Attributes } @@ -1549,9 +1549,9 @@ var file_envoy_service_ext_proc_v3_external_processor_proto_goTypes = []interfac nil, // 14: envoy.service.ext_proc.v3.ProcessingRequest.AttributesEntry nil, // 15: envoy.service.ext_proc.v3.HttpHeaders.AttributesEntry (*v3.Metadata)(nil), // 16: envoy.config.core.v3.Metadata - (*_struct.Struct)(nil), // 17: google.protobuf.Struct + (*structpb.Struct)(nil), // 17: google.protobuf.Struct (*v31.ProcessingMode)(nil), // 18: envoy.extensions.filters.http.ext_proc.v3.ProcessingMode - (*duration.Duration)(nil), // 19: google.protobuf.Duration + (*durationpb.Duration)(nil), // 19: google.protobuf.Duration (*v3.HeaderMap)(nil), // 20: envoy.config.core.v3.HeaderMap (*v32.HttpStatus)(nil), // 21: envoy.type.v3.HttpStatus (*v3.HeaderValueOption)(nil), // 22: envoy.config.core.v3.HeaderValueOption diff --git a/envoy/service/health/v3/hds.pb.go b/envoy/service/health/v3/hds.pb.go index 263c00256..696d94b88 100755 --- a/envoy/service/health/v3/hds.pb.go +++ b/envoy/service/health/v3/hds.pb.go @@ -13,13 +13,13 @@ import ( v32 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - duration "github.com/golang/protobuf/ptypes/duration" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -648,7 +648,7 @@ type HealthCheckSpecifier struct { ClusterHealthChecks []*ClusterHealthCheck `protobuf:"bytes,1,rep,name=cluster_health_checks,json=clusterHealthChecks,proto3" json:"cluster_health_checks,omitempty"` // The default is 1 second. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` } func (x *HealthCheckSpecifier) Reset() { @@ -690,7 +690,7 @@ func (x *HealthCheckSpecifier) GetClusterHealthChecks() []*ClusterHealthCheck { return nil } -func (x *HealthCheckSpecifier) GetInterval() *duration.Duration { +func (x *HealthCheckSpecifier) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } @@ -990,7 +990,7 @@ var file_envoy_service_health_v3_hds_proto_goTypes = []interface{}{ (*v3.HealthCheck)(nil), // 16: envoy.config.core.v3.HealthCheck (*v32.Cluster_TransportSocketMatch)(nil), // 17: envoy.config.cluster.v3.Cluster.TransportSocketMatch (*v3.BindConfig)(nil), // 18: envoy.config.core.v3.BindConfig - (*duration.Duration)(nil), // 19: google.protobuf.Duration + (*durationpb.Duration)(nil), // 19: google.protobuf.Duration } var file_envoy_service_health_v3_hds_proto_depIdxs = []int32{ 0, // 0: envoy.service.health.v3.Capability.health_check_protocols:type_name -> envoy.service.health.v3.Capability.Protocol diff --git a/envoy/service/load_stats/v2/lrs.pb.go b/envoy/service/load_stats/v2/lrs.pb.go index 4a5a53a56..ca8645a90 100755 --- a/envoy/service/load_stats/v2/lrs.pb.go +++ b/envoy/service/load_stats/v2/lrs.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" - duration "github.com/golang/protobuf/ptypes/duration" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -109,7 +109,7 @@ type LoadStatsResponse struct { // *LoadStatsResponse* will also be accumulated and billed to the cluster. This avoids a period // of inobservability that might otherwise exists between the messages. New clusters are not // subject to this consideration. - LoadReportingInterval *duration.Duration `protobuf:"bytes,2,opt,name=load_reporting_interval,json=loadReportingInterval,proto3" json:"load_reporting_interval,omitempty"` + LoadReportingInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=load_reporting_interval,json=loadReportingInterval,proto3" json:"load_reporting_interval,omitempty"` // Set to *true* if the management server supports endpoint granularity // report. ReportEndpointGranularity bool `protobuf:"varint,3,opt,name=report_endpoint_granularity,json=reportEndpointGranularity,proto3" json:"report_endpoint_granularity,omitempty"` @@ -161,7 +161,7 @@ func (x *LoadStatsResponse) GetSendAllClusters() bool { return false } -func (x *LoadStatsResponse) GetLoadReportingInterval() *duration.Duration { +func (x *LoadStatsResponse) GetLoadReportingInterval() *durationpb.Duration { if x != nil { return x.LoadReportingInterval } @@ -254,7 +254,7 @@ var file_envoy_service_load_stats_v2_lrs_proto_goTypes = []interface{}{ (*LoadStatsResponse)(nil), // 1: envoy.service.load_stats.v2.LoadStatsResponse (*core.Node)(nil), // 2: envoy.api.v2.core.Node (*endpoint.ClusterStats)(nil), // 3: envoy.api.v2.endpoint.ClusterStats - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration } var file_envoy_service_load_stats_v2_lrs_proto_depIdxs = []int32{ 2, // 0: envoy.service.load_stats.v2.LoadStatsRequest.node:type_name -> envoy.api.v2.core.Node diff --git a/envoy/service/load_stats/v3/lrs.pb.go b/envoy/service/load_stats/v3/lrs.pb.go index 5877a422d..672f990b8 100755 --- a/envoy/service/load_stats/v3/lrs.pb.go +++ b/envoy/service/load_stats/v3/lrs.pb.go @@ -11,12 +11,12 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v31 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - duration "github.com/golang/protobuf/ptypes/duration" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -108,7 +108,7 @@ type LoadStatsResponse struct { // “LoadStatsResponse“ will also be accumulated and billed to the cluster. This avoids a period // of inobservability that might otherwise exists between the messages. New clusters are not // subject to this consideration. - LoadReportingInterval *duration.Duration `protobuf:"bytes,2,opt,name=load_reporting_interval,json=loadReportingInterval,proto3" json:"load_reporting_interval,omitempty"` + LoadReportingInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=load_reporting_interval,json=loadReportingInterval,proto3" json:"load_reporting_interval,omitempty"` // Set to “true“ if the management server supports endpoint granularity // report. ReportEndpointGranularity bool `protobuf:"varint,3,opt,name=report_endpoint_granularity,json=reportEndpointGranularity,proto3" json:"report_endpoint_granularity,omitempty"` @@ -160,7 +160,7 @@ func (x *LoadStatsResponse) GetSendAllClusters() bool { return false } -func (x *LoadStatsResponse) GetLoadReportingInterval() *duration.Duration { +func (x *LoadStatsResponse) GetLoadReportingInterval() *durationpb.Duration { if x != nil { return x.LoadReportingInterval } @@ -258,11 +258,11 @@ func file_envoy_service_load_stats_v3_lrs_proto_rawDescGZIP() []byte { var file_envoy_service_load_stats_v3_lrs_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_envoy_service_load_stats_v3_lrs_proto_goTypes = []interface{}{ - (*LoadStatsRequest)(nil), // 0: envoy.service.load_stats.v3.LoadStatsRequest - (*LoadStatsResponse)(nil), // 1: envoy.service.load_stats.v3.LoadStatsResponse - (*v3.Node)(nil), // 2: envoy.config.core.v3.Node - (*v31.ClusterStats)(nil), // 3: envoy.config.endpoint.v3.ClusterStats - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*LoadStatsRequest)(nil), // 0: envoy.service.load_stats.v3.LoadStatsRequest + (*LoadStatsResponse)(nil), // 1: envoy.service.load_stats.v3.LoadStatsResponse + (*v3.Node)(nil), // 2: envoy.config.core.v3.Node + (*v31.ClusterStats)(nil), // 3: envoy.config.endpoint.v3.ClusterStats + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration } var file_envoy_service_load_stats_v3_lrs_proto_depIdxs = []int32{ 2, // 0: envoy.service.load_stats.v3.LoadStatsRequest.node:type_name -> envoy.config.core.v3.Node diff --git a/envoy/service/rate_limit_quota/v3/rlqs.pb.go b/envoy/service/rate_limit_quota/v3/rlqs.pb.go index b31d71ba3..abe3bb2bf 100755 --- a/envoy/service/rate_limit_quota/v3/rlqs.pb.go +++ b/envoy/service/rate_limit_quota/v3/rlqs.pb.go @@ -12,12 +12,12 @@ import ( _ "github.com/cncf/xds/go/xds/annotations/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -225,7 +225,7 @@ type RateLimitQuotaUsageReports_BucketQuotaUsage struct { // “BucketId“ for which request quota usage is reported. BucketId *BucketId `protobuf:"bytes,1,opt,name=bucket_id,json=bucketId,proto3" json:"bucket_id,omitempty"` // Time elapsed since the last report. - TimeElapsed *duration.Duration `protobuf:"bytes,2,opt,name=time_elapsed,json=timeElapsed,proto3" json:"time_elapsed,omitempty"` + TimeElapsed *durationpb.Duration `protobuf:"bytes,2,opt,name=time_elapsed,json=timeElapsed,proto3" json:"time_elapsed,omitempty"` // Requests the data plane has allowed through. NumRequestsAllowed uint64 `protobuf:"varint,3,opt,name=num_requests_allowed,json=numRequestsAllowed,proto3" json:"num_requests_allowed,omitempty"` // Requests throttled. @@ -271,7 +271,7 @@ func (x *RateLimitQuotaUsageReports_BucketQuotaUsage) GetBucketId() *BucketId { return nil } -func (x *RateLimitQuotaUsageReports_BucketQuotaUsage) GetTimeElapsed() *duration.Duration { +func (x *RateLimitQuotaUsageReports_BucketQuotaUsage) GetTimeElapsed() *durationpb.Duration { if x != nil { return x.TimeElapsed } @@ -459,7 +459,7 @@ type RateLimitQuotaResponse_BucketAction_QuotaAssignmentAction struct { // the assignment. While expiring the assignment just transitions the bucket to // the "expired assignment" state; abandoning the assignment completely erases // the bucket from the data plane memory, and stops the usage reports. - AssignmentTimeToLive *duration.Duration `protobuf:"bytes,2,opt,name=assignment_time_to_live,json=assignmentTimeToLive,proto3" json:"assignment_time_to_live,omitempty"` + AssignmentTimeToLive *durationpb.Duration `protobuf:"bytes,2,opt,name=assignment_time_to_live,json=assignmentTimeToLive,proto3" json:"assignment_time_to_live,omitempty"` // Configures the local rate limiter for the request matched to the bucket. // If not set, allow all requests. RateLimitStrategy *v3.RateLimitStrategy `protobuf:"bytes,3,opt,name=rate_limit_strategy,json=rateLimitStrategy,proto3" json:"rate_limit_strategy,omitempty"` @@ -497,7 +497,7 @@ func (*RateLimitQuotaResponse_BucketAction_QuotaAssignmentAction) Descriptor() ( return file_envoy_service_rate_limit_quota_v3_rlqs_proto_rawDescGZIP(), []int{1, 0, 0} } -func (x *RateLimitQuotaResponse_BucketAction_QuotaAssignmentAction) GetAssignmentTimeToLive() *duration.Duration { +func (x *RateLimitQuotaResponse_BucketAction_QuotaAssignmentAction) GetAssignmentTimeToLive() *durationpb.Duration { if x != nil { return x.AssignmentTimeToLive } @@ -733,7 +733,7 @@ var file_envoy_service_rate_limit_quota_v3_rlqs_proto_goTypes = []interface{}{ (*RateLimitQuotaResponse_BucketAction_QuotaAssignmentAction)(nil), // 5: envoy.service.rate_limit_quota.v3.RateLimitQuotaResponse.BucketAction.QuotaAssignmentAction (*RateLimitQuotaResponse_BucketAction_AbandonAction)(nil), // 6: envoy.service.rate_limit_quota.v3.RateLimitQuotaResponse.BucketAction.AbandonAction nil, // 7: envoy.service.rate_limit_quota.v3.BucketId.BucketEntry - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration (*v3.RateLimitStrategy)(nil), // 9: envoy.type.v3.RateLimitStrategy } var file_envoy_service_rate_limit_quota_v3_rlqs_proto_depIdxs = []int32{ diff --git a/envoy/service/ratelimit/v3/rls.pb.go b/envoy/service/ratelimit/v3/rls.pb.go index d364b170e..52b0668e2 100755 --- a/envoy/service/ratelimit/v3/rls.pb.go +++ b/envoy/service/ratelimit/v3/rls.pb.go @@ -12,14 +12,14 @@ import ( v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -257,7 +257,7 @@ type RateLimitResponse struct { // - :ref:`envoy.filters.http.ratelimit ` for HTTP filter. // - :ref:`envoy.filters.network.ratelimit ` for network filter. // - :ref:`envoy.filters.thrift.rate_limit ` for Thrift filter. - DynamicMetadata *_struct.Struct `protobuf:"bytes,6,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` + DynamicMetadata *structpb.Struct `protobuf:"bytes,6,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` // Quota is available for a request if its entire descriptor set has cached quota available. // This is a union of all descriptors in the descriptor set. Clients can use the quota for future matches if and only if the descriptor set matches what was sent in the request that originated this response. // @@ -339,7 +339,7 @@ func (x *RateLimitResponse) GetRawBody() []byte { return nil } -func (x *RateLimitResponse) GetDynamicMetadata() *_struct.Struct { +func (x *RateLimitResponse) GetDynamicMetadata() *structpb.Struct { if x != nil { return x.DynamicMetadata } @@ -497,7 +497,7 @@ func (m *RateLimitResponse_Quota) GetExpirationSpecifier() isRateLimitResponse_Q return nil } -func (x *RateLimitResponse_Quota) GetValidUntil() *timestamp.Timestamp { +func (x *RateLimitResponse_Quota) GetValidUntil() *timestamppb.Timestamp { if x, ok := x.GetExpirationSpecifier().(*RateLimitResponse_Quota_ValidUntil); ok { return x.ValidUntil } @@ -517,7 +517,7 @@ type isRateLimitResponse_Quota_ExpirationSpecifier interface { type RateLimitResponse_Quota_ValidUntil struct { // Point in time at which the quota expires. - ValidUntil *timestamp.Timestamp `protobuf:"bytes,2,opt,name=valid_until,json=validUntil,proto3,oneof"` + ValidUntil *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=valid_until,json=validUntil,proto3,oneof"` } func (*RateLimitResponse_Quota_ValidUntil) isRateLimitResponse_Quota_ExpirationSpecifier() {} @@ -535,7 +535,7 @@ type RateLimitResponse_DescriptorStatus struct { // The limit remaining in the current time unit. LimitRemaining uint32 `protobuf:"varint,3,opt,name=limit_remaining,json=limitRemaining,proto3" json:"limit_remaining,omitempty"` // Duration until reset of the current limit window. - DurationUntilReset *duration.Duration `protobuf:"bytes,4,opt,name=duration_until_reset,json=durationUntilReset,proto3" json:"duration_until_reset,omitempty"` + DurationUntilReset *durationpb.Duration `protobuf:"bytes,4,opt,name=duration_until_reset,json=durationUntilReset,proto3" json:"duration_until_reset,omitempty"` // Quota is available for a request if its descriptor set has cached quota available for all // descriptors. // This is for each individual descriptor in the descriptor set. The client will perform matches for each individual descriptor against available per-descriptor quota. @@ -617,7 +617,7 @@ func (x *RateLimitResponse_DescriptorStatus) GetLimitRemaining() uint32 { return 0 } -func (x *RateLimitResponse_DescriptorStatus) GetDurationUntilReset() *duration.Duration { +func (x *RateLimitResponse_DescriptorStatus) GetDurationUntilReset() *durationpb.Duration { if x != nil { return x.DurationUntilReset } @@ -811,9 +811,9 @@ var file_envoy_service_ratelimit_v3_rls_proto_goTypes = []interface{}{ (*RateLimitResponse_DescriptorStatus)(nil), // 6: envoy.service.ratelimit.v3.RateLimitResponse.DescriptorStatus (*v3.RateLimitDescriptor)(nil), // 7: envoy.extensions.common.ratelimit.v3.RateLimitDescriptor (*v31.HeaderValue)(nil), // 8: envoy.config.core.v3.HeaderValue - (*_struct.Struct)(nil), // 9: google.protobuf.Struct - (*timestamp.Timestamp)(nil), // 10: google.protobuf.Timestamp - (*duration.Duration)(nil), // 11: google.protobuf.Duration + (*structpb.Struct)(nil), // 9: google.protobuf.Struct + (*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 11: google.protobuf.Duration } var file_envoy_service_ratelimit_v3_rls_proto_depIdxs = []int32{ 7, // 0: envoy.service.ratelimit.v3.RateLimitRequest.descriptors:type_name -> envoy.extensions.common.ratelimit.v3.RateLimitDescriptor diff --git a/envoy/service/runtime/v3/rtds.pb.go b/envoy/service/runtime/v3/rtds.pb.go index a24a24dc7..056b6fc9a 100755 --- a/envoy/service/runtime/v3/rtds.pb.go +++ b/envoy/service/runtime/v3/rtds.pb.go @@ -12,13 +12,13 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -78,8 +78,8 @@ type Runtime struct { // Runtime resource name. This makes the Runtime a self-describing xDS // resource. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Layer *_struct.Struct `protobuf:"bytes,2,opt,name=layer,proto3" json:"layer,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Layer *structpb.Struct `protobuf:"bytes,2,opt,name=layer,proto3" json:"layer,omitempty"` } func (x *Runtime) Reset() { @@ -121,7 +121,7 @@ func (x *Runtime) GetName() string { return "" } -func (x *Runtime) GetLayer() *_struct.Struct { +func (x *Runtime) GetLayer() *structpb.Struct { if x != nil { return x.Layer } @@ -217,7 +217,7 @@ var file_envoy_service_runtime_v3_rtds_proto_msgTypes = make([]protoimpl.Message var file_envoy_service_runtime_v3_rtds_proto_goTypes = []interface{}{ (*RtdsDummy)(nil), // 0: envoy.service.runtime.v3.RtdsDummy (*Runtime)(nil), // 1: envoy.service.runtime.v3.Runtime - (*_struct.Struct)(nil), // 2: google.protobuf.Struct + (*structpb.Struct)(nil), // 2: google.protobuf.Struct (*v3.DiscoveryRequest)(nil), // 3: envoy.service.discovery.v3.DiscoveryRequest (*v3.DeltaDiscoveryRequest)(nil), // 4: envoy.service.discovery.v3.DeltaDiscoveryRequest (*v3.DiscoveryResponse)(nil), // 5: envoy.service.discovery.v3.DiscoveryResponse diff --git a/envoy/service/status/v3/csds.pb.go b/envoy/service/status/v3/csds.pb.go index ca1712c0e..8eca7236a 100755 --- a/envoy/service/status/v3/csds.pb.go +++ b/envoy/service/status/v3/csds.pb.go @@ -13,14 +13,14 @@ import ( _ "github.com/envoyproxy/go-control-plane/envoy/annotations" v31 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3" - any1 "github.com/golang/protobuf/ptypes/any" - timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -531,9 +531,9 @@ type ClientConfig_GenericXdsConfig struct { // static bootstrap listeners, this field will be "" VersionInfo string `protobuf:"bytes,3,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The xDS resource config. Actual content depends on the type - XdsConfig *any1.Any `protobuf:"bytes,4,opt,name=xds_config,json=xdsConfig,proto3" json:"xds_config,omitempty"` + XdsConfig *anypb.Any `protobuf:"bytes,4,opt,name=xds_config,json=xdsConfig,proto3" json:"xds_config,omitempty"` // Timestamp when the xDS resource was last updated - LastUpdated *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` + LastUpdated *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` // Per xDS resource config status. It is generated by management servers. // It will not be present if the CSDS server is an xDS client. ConfigStatus ConfigStatus `protobuf:"varint,6,opt,name=config_status,json=configStatus,proto3,enum=envoy.service.status.v3.ConfigStatus" json:"config_status,omitempty"` @@ -604,14 +604,14 @@ func (x *ClientConfig_GenericXdsConfig) GetVersionInfo() string { return "" } -func (x *ClientConfig_GenericXdsConfig) GetXdsConfig() *any1.Any { +func (x *ClientConfig_GenericXdsConfig) GetXdsConfig() *anypb.Any { if x != nil { return x.XdsConfig } return nil } -func (x *ClientConfig_GenericXdsConfig) GetLastUpdated() *timestamp.Timestamp { +func (x *ClientConfig_GenericXdsConfig) GetLastUpdated() *timestamppb.Timestamp { if x != nil { return x.LastUpdated } @@ -858,8 +858,8 @@ var file_envoy_service_status_v3_csds_proto_goTypes = []interface{}{ (*v32.RoutesConfigDump)(nil), // 11: envoy.admin.v3.RoutesConfigDump (*v32.ScopedRoutesConfigDump)(nil), // 12: envoy.admin.v3.ScopedRoutesConfigDump (*v32.EndpointsConfigDump)(nil), // 13: envoy.admin.v3.EndpointsConfigDump - (*any1.Any)(nil), // 14: google.protobuf.Any - (*timestamp.Timestamp)(nil), // 15: google.protobuf.Timestamp + (*anypb.Any)(nil), // 14: google.protobuf.Any + (*timestamppb.Timestamp)(nil), // 15: google.protobuf.Timestamp (v32.ClientResourceStatus)(0), // 16: envoy.admin.v3.ClientResourceStatus (*v32.UpdateFailureState)(nil), // 17: envoy.admin.v3.UpdateFailureState } diff --git a/envoy/service/tap/v2alpha/common.pb.go b/envoy/service/tap/v2alpha/common.pb.go index f9bf796ab..d61aec9b7 100755 --- a/envoy/service/tap/v2alpha/common.pb.go +++ b/envoy/service/tap/v2alpha/common.pb.go @@ -11,9 +11,9 @@ import ( 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" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -422,12 +422,12 @@ type OutputConfig struct { // truncation. If truncation occurs, the :ref:`truncated // ` field will be set. If not specified, the // default is 1KiB. - MaxBufferedRxBytes *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_buffered_rx_bytes,json=maxBufferedRxBytes,proto3" json:"max_buffered_rx_bytes,omitempty"` + MaxBufferedRxBytes *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_buffered_rx_bytes,json=maxBufferedRxBytes,proto3" json:"max_buffered_rx_bytes,omitempty"` // For buffered tapping, the maximum amount of transmitted body that will be buffered prior to // truncation. If truncation occurs, the :ref:`truncated // ` field will be set. If not specified, the // default is 1KiB. - MaxBufferedTxBytes *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_buffered_tx_bytes,json=maxBufferedTxBytes,proto3" json:"max_buffered_tx_bytes,omitempty"` + MaxBufferedTxBytes *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_buffered_tx_bytes,json=maxBufferedTxBytes,proto3" json:"max_buffered_tx_bytes,omitempty"` // Indicates whether taps produce a single buffered message per tap, or multiple streamed // messages per tap in the emitted :ref:`TraceWrapper // ` messages. Note that streamed tapping does not @@ -476,14 +476,14 @@ func (x *OutputConfig) GetSinks() []*OutputSink { return nil } -func (x *OutputConfig) GetMaxBufferedRxBytes() *wrappers.UInt32Value { +func (x *OutputConfig) GetMaxBufferedRxBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedRxBytes } return nil } -func (x *OutputConfig) GetMaxBufferedTxBytes() *wrappers.UInt32Value { +func (x *OutputConfig) GetMaxBufferedTxBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedTxBytes } @@ -1009,7 +1009,7 @@ var file_envoy_service_tap_v2alpha_common_proto_goTypes = []interface{}{ (*MatchPredicate_MatchSet)(nil), // 9: envoy.service.tap.v2alpha.MatchPredicate.MatchSet (*core.RuntimeFractionalPercent)(nil), // 10: envoy.api.v2.core.RuntimeFractionalPercent (*route.HeaderMatcher)(nil), // 11: envoy.api.v2.route.HeaderMatcher - (*wrappers.UInt32Value)(nil), // 12: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 12: google.protobuf.UInt32Value (*core.GrpcService)(nil), // 13: envoy.api.v2.core.GrpcService } var file_envoy_service_tap_v2alpha_common_proto_depIdxs = []int32{ diff --git a/envoy/type/http/v3/cookie.pb.go b/envoy/type/http/v3/cookie.pb.go index dcb9e7977..a5149dc26 100755 --- a/envoy/type/http/v3/cookie.pb.go +++ b/envoy/type/http/v3/cookie.pb.go @@ -9,9 +9,9 @@ package httpv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -34,7 +34,7 @@ type Cookie struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Duration of cookie. This will be used to set the expiry time of a new cookie when it is // generated. Set this to 0s to use a session cookie and disable cookie expiration. - Ttl *duration.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` // Path of cookie. This will be used to set the path of a new cookie when it is generated. // If no path is specified here, no path will be set for the cookie. Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` @@ -79,7 +79,7 @@ func (x *Cookie) GetName() string { return "" } -func (x *Cookie) GetTtl() *duration.Duration { +func (x *Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -137,8 +137,8 @@ func file_envoy_type_http_v3_cookie_proto_rawDescGZIP() []byte { var file_envoy_type_http_v3_cookie_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_type_http_v3_cookie_proto_goTypes = []interface{}{ - (*Cookie)(nil), // 0: envoy.type.http.v3.Cookie - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*Cookie)(nil), // 0: envoy.type.http.v3.Cookie + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_type_http_v3_cookie_proto_depIdxs = []int32{ 1, // 0: envoy.type.http.v3.Cookie.ttl:type_name -> google.protobuf.Duration diff --git a/envoy/type/matcher/regex.pb.go b/envoy/type/matcher/regex.pb.go index 4b5ad876d..382cda0e9 100755 --- a/envoy/type/matcher/regex.pb.go +++ b/envoy/type/matcher/regex.pb.go @@ -9,9 +9,9 @@ package matcher import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -203,7 +203,7 @@ type RegexMatcher_GoogleRE2 struct { // instead of being done by each individual client. // // Deprecated: Marked as deprecated in envoy/type/matcher/regex.proto. - MaxProgramSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"` + MaxProgramSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"` } func (x *RegexMatcher_GoogleRE2) Reset() { @@ -239,7 +239,7 @@ func (*RegexMatcher_GoogleRE2) Descriptor() ([]byte, []int) { } // Deprecated: Marked as deprecated in envoy/type/matcher/regex.proto. -func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrappers.UInt32Value { +func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxProgramSize } @@ -308,7 +308,7 @@ var file_envoy_type_matcher_regex_proto_goTypes = []interface{}{ (*RegexMatcher)(nil), // 0: envoy.type.matcher.RegexMatcher (*RegexMatchAndSubstitute)(nil), // 1: envoy.type.matcher.RegexMatchAndSubstitute (*RegexMatcher_GoogleRE2)(nil), // 2: envoy.type.matcher.RegexMatcher.GoogleRE2 - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value } var file_envoy_type_matcher_regex_proto_depIdxs = []int32{ 2, // 0: envoy.type.matcher.RegexMatcher.google_re2:type_name -> envoy.type.matcher.RegexMatcher.GoogleRE2 diff --git a/envoy/type/matcher/v3/regex.pb.go b/envoy/type/matcher/v3/regex.pb.go index 5c737e96c..7560049a4 100755 --- a/envoy/type/matcher/v3/regex.pb.go +++ b/envoy/type/matcher/v3/regex.pb.go @@ -10,9 +10,9 @@ import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/go-control-plane/envoy/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -213,7 +213,7 @@ type RegexMatcher_GoogleRE2 struct { // global ``re2.max_program_size.error_level`` runtime value. // // Deprecated: Marked as deprecated in envoy/type/matcher/v3/regex.proto. - MaxProgramSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"` + MaxProgramSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"` } func (x *RegexMatcher_GoogleRE2) Reset() { @@ -249,7 +249,7 @@ func (*RegexMatcher_GoogleRE2) Descriptor() ([]byte, []int) { } // Deprecated: Marked as deprecated in envoy/type/matcher/v3/regex.proto. -func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrappers.UInt32Value { +func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxProgramSize } @@ -335,7 +335,7 @@ var file_envoy_type_matcher_v3_regex_proto_goTypes = []interface{}{ (*RegexMatcher)(nil), // 0: envoy.type.matcher.v3.RegexMatcher (*RegexMatchAndSubstitute)(nil), // 1: envoy.type.matcher.v3.RegexMatchAndSubstitute (*RegexMatcher_GoogleRE2)(nil), // 2: envoy.type.matcher.v3.RegexMatcher.GoogleRE2 - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value } var file_envoy_type_matcher_v3_regex_proto_depIdxs = []int32{ 2, // 0: envoy.type.matcher.v3.RegexMatcher.google_re2:type_name -> envoy.type.matcher.v3.RegexMatcher.GoogleRE2 diff --git a/envoy/type/token_bucket.pb.go b/envoy/type/token_bucket.pb.go index 08869168f..bed12bdfb 100755 --- a/envoy/type/token_bucket.pb.go +++ b/envoy/type/token_bucket.pb.go @@ -9,10 +9,10 @@ package _type import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -35,11 +35,11 @@ type TokenBucket struct { MaxTokens uint32 `protobuf:"varint,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` // The number of tokens added to the bucket during each fill interval. If not specified, defaults // to a single token. - TokensPerFill *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"` + TokensPerFill *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"` // The fill interval that tokens are added to the bucket. During each fill interval // `tokens_per_fill` are added to the bucket. The bucket will never contain more than // `max_tokens` tokens. - FillInterval *duration.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` + FillInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` } func (x *TokenBucket) Reset() { @@ -81,14 +81,14 @@ func (x *TokenBucket) GetMaxTokens() uint32 { return 0 } -func (x *TokenBucket) GetTokensPerFill() *wrappers.UInt32Value { +func (x *TokenBucket) GetTokensPerFill() *wrapperspb.UInt32Value { if x != nil { return x.TokensPerFill } return nil } -func (x *TokenBucket) GetFillInterval() *duration.Duration { +func (x *TokenBucket) GetFillInterval() *durationpb.Duration { if x != nil { return x.FillInterval } @@ -145,9 +145,9 @@ func file_envoy_type_token_bucket_proto_rawDescGZIP() []byte { var file_envoy_type_token_bucket_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_type_token_bucket_proto_goTypes = []interface{}{ - (*TokenBucket)(nil), // 0: envoy.type.TokenBucket - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*TokenBucket)(nil), // 0: envoy.type.TokenBucket + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_envoy_type_token_bucket_proto_depIdxs = []int32{ 1, // 0: envoy.type.TokenBucket.tokens_per_fill:type_name -> google.protobuf.UInt32Value diff --git a/envoy/type/v3/token_bucket.pb.go b/envoy/type/v3/token_bucket.pb.go index 64b9b6463..8367ffc42 100755 --- a/envoy/type/v3/token_bucket.pb.go +++ b/envoy/type/v3/token_bucket.pb.go @@ -9,10 +9,10 @@ package typev3 import ( _ "github.com/cncf/xds/go/udpa/annotations" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -35,11 +35,11 @@ type TokenBucket struct { MaxTokens uint32 `protobuf:"varint,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` // The number of tokens added to the bucket during each fill interval. If not specified, defaults // to a single token. - TokensPerFill *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"` + TokensPerFill *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"` // The fill interval that tokens are added to the bucket. During each fill interval // “tokens_per_fill“ are added to the bucket. The bucket will never contain more than // “max_tokens“ tokens. - FillInterval *duration.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` + FillInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` } func (x *TokenBucket) Reset() { @@ -81,14 +81,14 @@ func (x *TokenBucket) GetMaxTokens() uint32 { return 0 } -func (x *TokenBucket) GetTokensPerFill() *wrappers.UInt32Value { +func (x *TokenBucket) GetTokensPerFill() *wrapperspb.UInt32Value { if x != nil { return x.TokensPerFill } return nil } -func (x *TokenBucket) GetFillInterval() *duration.Duration { +func (x *TokenBucket) GetFillInterval() *durationpb.Duration { if x != nil { return x.FillInterval } @@ -150,9 +150,9 @@ func file_envoy_type_v3_token_bucket_proto_rawDescGZIP() []byte { var file_envoy_type_v3_token_bucket_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_type_v3_token_bucket_proto_goTypes = []interface{}{ - (*TokenBucket)(nil), // 0: envoy.type.v3.TokenBucket - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration + (*TokenBucket)(nil), // 0: envoy.type.v3.TokenBucket + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_envoy_type_v3_token_bucket_proto_depIdxs = []int32{ 1, // 0: envoy.type.v3.TokenBucket.tokens_per_fill:type_name -> google.protobuf.UInt32Value diff --git a/envoy/watchdog/v3/abort_action.pb.go b/envoy/watchdog/v3/abort_action.pb.go index 7ccacd1fc..ed08e304d 100755 --- a/envoy/watchdog/v3/abort_action.pb.go +++ b/envoy/watchdog/v3/abort_action.pb.go @@ -8,9 +8,9 @@ package watchdogv3 import ( _ "github.com/cncf/xds/go/udpa/annotations" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" reflect "reflect" sync "sync" ) @@ -35,7 +35,7 @@ type AbortActionConfig struct { // How long to wait for the thread to respond to the thread kill function // before killing the process from this action. This is a blocking action. // By default this is 5 seconds. - WaitDuration *duration.Duration `protobuf:"bytes,1,opt,name=wait_duration,json=waitDuration,proto3" json:"wait_duration,omitempty"` + WaitDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=wait_duration,json=waitDuration,proto3" json:"wait_duration,omitempty"` } func (x *AbortActionConfig) Reset() { @@ -70,7 +70,7 @@ func (*AbortActionConfig) Descriptor() ([]byte, []int) { return file_envoy_watchdog_v3_abort_action_proto_rawDescGZIP(), []int{0} } -func (x *AbortActionConfig) GetWaitDuration() *duration.Duration { +func (x *AbortActionConfig) GetWaitDuration() *durationpb.Duration { if x != nil { return x.WaitDuration } @@ -118,8 +118,8 @@ func file_envoy_watchdog_v3_abort_action_proto_rawDescGZIP() []byte { var file_envoy_watchdog_v3_abort_action_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_envoy_watchdog_v3_abort_action_proto_goTypes = []interface{}{ - (*AbortActionConfig)(nil), // 0: envoy.watchdog.v3.AbortActionConfig - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*AbortActionConfig)(nil), // 0: envoy.watchdog.v3.AbortActionConfig + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_envoy_watchdog_v3_abort_action_proto_depIdxs = []int32{ 1, // 0: envoy.watchdog.v3.AbortActionConfig.wait_duration:type_name -> google.protobuf.Duration