From 2c7d4a81a1d5dde9dc74d117a23b08ed9644adf2 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Mon, 9 Dec 2019 21:44:55 +0000 Subject: [PATCH] protoxform: format options generically (#9251) Instead of formatting options heuristically, which will erase new annotations without changing protoxform, use proto descriptor to format options, and enforce its order as well. Risk Level: Low Testing: CI Docs Changes: N/A Release Notes: N/A Signed-off-by: Lizan Zhou Mirrored from https://github.com/envoyproxy/envoy @ dfe687d49574ef7eb1bf84867bf571e805a2bf97 --- envoy/admin/v2alpha/certs.proto | 2 +- envoy/admin/v2alpha/clusters.proto | 2 +- envoy/admin/v2alpha/config_dump.proto | 2 +- envoy/admin/v2alpha/listeners.proto | 2 +- envoy/admin/v2alpha/memory.proto | 2 +- envoy/admin/v2alpha/metrics.proto | 2 +- envoy/admin/v2alpha/mutex_stats.proto | 2 +- envoy/admin/v2alpha/server_info.proto | 2 +- envoy/admin/v2alpha/tap.proto | 2 +- envoy/admin/v3alpha/certs.proto | 2 +- envoy/admin/v3alpha/clusters.proto | 2 +- envoy/admin/v3alpha/config_dump.proto | 2 +- envoy/admin/v3alpha/listeners.proto | 2 +- envoy/admin/v3alpha/memory.proto | 2 +- envoy/admin/v3alpha/metrics.proto | 2 +- envoy/admin/v3alpha/mutex_stats.proto | 2 +- envoy/admin/v3alpha/server_info.proto | 2 +- envoy/admin/v3alpha/tap.proto | 2 +- envoy/api/v2/auth/cert.proto | 2 +- envoy/api/v2/cds.proto | 8 +++----- envoy/api/v2/cluster/circuit_breaker.proto | 2 +- envoy/api/v2/cluster/filter.proto | 2 +- envoy/api/v2/cluster/outlier_detection.proto | 2 +- envoy/api/v2/core/address.proto | 2 +- envoy/api/v2/core/base.proto | 2 +- envoy/api/v2/core/config_source.proto | 2 +- envoy/api/v2/core/grpc_service.proto | 2 +- envoy/api/v2/core/health_check.proto | 2 +- envoy/api/v2/core/http_uri.proto | 2 +- envoy/api/v2/core/protocol.proto | 2 +- envoy/api/v2/discovery.proto | 2 +- envoy/api/v2/eds.proto | 8 +++----- envoy/api/v2/endpoint/endpoint.proto | 2 +- envoy/api/v2/endpoint/load_report.proto | 2 +- envoy/api/v2/lds.proto | 8 +++----- envoy/api/v2/listener/listener.proto | 2 +- envoy/api/v2/listener/quic_config.proto | 2 +- envoy/api/v2/listener/udp_listener_config.proto | 2 +- envoy/api/v2/ratelimit/ratelimit.proto | 2 +- envoy/api/v2/rds.proto | 8 +++----- envoy/api/v2/route/route.proto | 10 +++++----- envoy/api/v2/srds.proto | 8 +++----- envoy/api/v3alpha/auth/cert.proto | 2 +- envoy/api/v3alpha/cds.proto | 8 +++----- envoy/api/v3alpha/cluster/circuit_breaker.proto | 2 +- envoy/api/v3alpha/cluster/filter.proto | 2 +- envoy/api/v3alpha/cluster/outlier_detection.proto | 2 +- envoy/api/v3alpha/core/address.proto | 2 +- envoy/api/v3alpha/core/base.proto | 2 +- envoy/api/v3alpha/core/config_source.proto | 2 +- envoy/api/v3alpha/core/grpc_service.proto | 2 +- envoy/api/v3alpha/core/health_check.proto | 2 +- envoy/api/v3alpha/core/http_uri.proto | 2 +- envoy/api/v3alpha/core/protocol.proto | 2 +- envoy/api/v3alpha/discovery.proto | 2 +- envoy/api/v3alpha/eds.proto | 8 +++----- envoy/api/v3alpha/endpoint/endpoint.proto | 2 +- envoy/api/v3alpha/endpoint/load_report.proto | 2 +- envoy/api/v3alpha/lds.proto | 8 +++----- envoy/api/v3alpha/listener/listener.proto | 2 +- envoy/api/v3alpha/listener/quic_config.proto | 2 +- envoy/api/v3alpha/listener/udp_listener_config.proto | 2 +- envoy/api/v3alpha/ratelimit/ratelimit.proto | 2 +- envoy/api/v3alpha/rds.proto | 8 +++----- envoy/api/v3alpha/route/route.proto | 2 +- envoy/api/v3alpha/srds.proto | 8 +++----- envoy/config/accesslog/v2/als.proto | 2 +- envoy/config/accesslog/v2/file.proto | 2 +- envoy/config/accesslog/v3alpha/als.proto | 2 +- envoy/config/accesslog/v3alpha/file.proto | 2 +- envoy/config/bootstrap/v2/bootstrap.proto | 2 +- envoy/config/bootstrap/v3alpha/bootstrap.proto | 2 +- envoy/config/cluster/aggregate/v2alpha/cluster.proto | 2 +- .../dynamic_forward_proxy/v2alpha/cluster.proto | 2 +- .../dynamic_forward_proxy/v3alpha/cluster.proto | 2 +- envoy/config/cluster/redis/redis_cluster.proto | 2 +- .../dynamic_forward_proxy/v2alpha/dns_cache.proto | 2 +- .../dynamic_forward_proxy/v3alpha/dns_cache.proto | 2 +- envoy/config/common/tap/v2alpha/common.proto | 2 +- envoy/config/common/tap/v3alpha/common.proto | 2 +- envoy/config/filter/accesslog/v2/accesslog.proto | 2 +- envoy/config/filter/accesslog/v3alpha/accesslog.proto | 2 +- envoy/config/filter/dubbo/router/v2alpha1/router.proto | 2 +- envoy/config/filter/fault/v2/fault.proto | 2 +- envoy/config/filter/fault/v3alpha/fault.proto | 2 +- .../v2alpha/adaptive_concurrency.proto | 2 +- .../v3alpha/adaptive_concurrency.proto | 2 +- envoy/config/filter/http/buffer/v2/buffer.proto | 2 +- envoy/config/filter/http/csrf/v2/csrf.proto | 2 +- envoy/config/filter/http/csrf/v3alpha/csrf.proto | 2 +- .../v2alpha/dynamic_forward_proxy.proto | 2 +- .../v3alpha/dynamic_forward_proxy.proto | 2 +- envoy/config/filter/http/ext_authz/v2/ext_authz.proto | 2 +- .../filter/http/ext_authz/v3alpha/ext_authz.proto | 2 +- envoy/config/filter/http/fault/v2/fault.proto | 2 +- envoy/config/filter/http/fault/v3alpha/fault.proto | 2 +- .../grpc_http1_reverse_bridge/v2alpha1/config.proto | 2 +- .../config/filter/http/grpc_stats/v2alpha/config.proto | 2 +- envoy/config/filter/http/gzip/v2/gzip.proto | 2 +- .../header_to_metadata/v2/header_to_metadata.proto | 2 +- .../filter/http/health_check/v2/health_check.proto | 2 +- .../http/health_check/v3alpha/health_check.proto | 2 +- .../config/filter/http/ip_tagging/v2/ip_tagging.proto | 2 +- .../filter/http/ip_tagging/v3alpha/ip_tagging.proto | 2 +- .../config/filter/http/jwt_authn/v2alpha/config.proto | 2 +- .../config/filter/http/jwt_authn/v3alpha/config.proto | 2 +- envoy/config/filter/http/lua/v2/lua.proto | 2 +- .../http/original_src/v2alpha1/original_src.proto | 2 +- .../config/filter/http/rate_limit/v2/rate_limit.proto | 2 +- .../filter/http/rate_limit/v3alpha/rate_limit.proto | 2 +- envoy/config/filter/http/rbac/v2/rbac.proto | 2 +- envoy/config/filter/http/rbac/v3alpha/rbac.proto | 2 +- envoy/config/filter/http/router/v2/router.proto | 2 +- envoy/config/filter/http/router/v3alpha/router.proto | 2 +- envoy/config/filter/http/squash/v2/squash.proto | 2 +- envoy/config/filter/http/tap/v2alpha/tap.proto | 2 +- envoy/config/filter/http/tap/v3alpha/tap.proto | 2 +- .../config/filter/http/transcoder/v2/transcoder.proto | 2 +- .../listener/original_src/v2alpha1/original_src.proto | 2 +- .../network/client_ssl_auth/v2/client_ssl_auth.proto | 2 +- .../client_ssl_auth/v3alpha/client_ssl_auth.proto | 2 +- .../network/dubbo_proxy/v2alpha1/dubbo_proxy.proto | 2 +- .../filter/network/dubbo_proxy/v2alpha1/route.proto | 2 +- .../network/dubbo_proxy/v3alpha/dubbo_proxy.proto | 2 +- .../filter/network/dubbo_proxy/v3alpha/route.proto | 2 +- .../config/filter/network/ext_authz/v2/ext_authz.proto | 2 +- .../filter/network/ext_authz/v3alpha/ext_authz.proto | 2 +- .../v2/http_connection_manager.proto | 4 ++-- .../v3alpha/http_connection_manager.proto | 2 +- .../filter/network/mongo_proxy/v2/mongo_proxy.proto | 2 +- .../network/mongo_proxy/v3alpha/mongo_proxy.proto | 2 +- .../network/mysql_proxy/v1alpha1/mysql_proxy.proto | 2 +- .../filter/network/rate_limit/v2/rate_limit.proto | 2 +- .../filter/network/rate_limit/v3alpha/rate_limit.proto | 2 +- envoy/config/filter/network/rbac/v2/rbac.proto | 2 +- envoy/config/filter/network/rbac/v3alpha/rbac.proto | 2 +- .../filter/network/redis_proxy/v2/redis_proxy.proto | 2 +- .../network/redis_proxy/v3alpha/redis_proxy.proto | 2 +- .../config/filter/network/tcp_proxy/v2/tcp_proxy.proto | 2 +- .../filter/network/tcp_proxy/v3alpha/tcp_proxy.proto | 2 +- .../filter/network/thrift_proxy/v2alpha1/route.proto | 2 +- .../network/thrift_proxy/v2alpha1/thrift_proxy.proto | 2 +- .../filter/network/thrift_proxy/v3alpha/route.proto | 2 +- .../network/thrift_proxy/v3alpha/thrift_proxy.proto | 2 +- .../zookeeper_proxy/v1alpha1/zookeeper_proxy.proto | 2 +- .../filter/thrift/rate_limit/v2alpha1/rate_limit.proto | 2 +- .../filter/thrift/rate_limit/v3alpha/rate_limit.proto | 2 +- .../config/filter/thrift/router/v2alpha1/router.proto | 2 +- .../filter/udp/udp_proxy/v2alpha/udp_proxy.proto | 2 +- envoy/config/grpc_credential/v2alpha/aws_iam.proto | 2 +- .../grpc_credential/v2alpha/file_based_metadata.proto | 2 +- envoy/config/grpc_credential/v3alpha/aws_iam.proto | 2 +- .../grpc_credential/v3alpha/file_based_metadata.proto | 2 +- envoy/config/health_checker/redis/v2/redis.proto | 2 +- envoy/config/listener/v2/api_listener.proto | 2 +- envoy/config/metrics/v2/metrics_service.proto | 2 +- envoy/config/metrics/v2/stats.proto | 2 +- envoy/config/metrics/v3alpha/metrics_service.proto | 2 +- envoy/config/metrics/v3alpha/stats.proto | 2 +- envoy/config/overload/v2alpha/overload.proto | 2 +- envoy/config/overload/v3alpha/overload.proto | 2 +- envoy/config/ratelimit/v2/rls.proto | 2 +- envoy/config/ratelimit/v3alpha/rls.proto | 2 +- envoy/config/rbac/v2/rbac.proto | 2 +- envoy/config/rbac/v3alpha/rbac.proto | 2 +- .../fixed_heap/v2alpha/fixed_heap.proto | 2 +- .../injected_resource/v2alpha/injected_resource.proto | 2 +- .../previous_priorities_config.proto | 2 +- envoy/config/trace/v2/trace.proto | 2 +- envoy/config/trace/v3alpha/trace.proto | 2 +- envoy/config/transport_socket/alts/v2alpha/alts.proto | 2 +- envoy/config/transport_socket/tap/v2alpha/tap.proto | 2 +- envoy/config/transport_socket/tap/v3alpha/tap.proto | 2 +- envoy/data/accesslog/v2/accesslog.proto | 2 +- envoy/data/accesslog/v3alpha/accesslog.proto | 2 +- .../data/cluster/v2alpha/outlier_detection_event.proto | 2 +- envoy/data/core/v2alpha/health_check_event.proto | 2 +- envoy/data/core/v3alpha/health_check_event.proto | 2 +- envoy/data/tap/v2alpha/common.proto | 2 +- envoy/data/tap/v2alpha/http.proto | 2 +- envoy/data/tap/v2alpha/transport.proto | 2 +- envoy/data/tap/v2alpha/wrapper.proto | 2 +- envoy/data/tap/v3alpha/common.proto | 2 +- envoy/data/tap/v3alpha/http.proto | 2 +- envoy/data/tap/v3alpha/transport.proto | 2 +- envoy/data/tap/v3alpha/wrapper.proto | 2 +- envoy/service/accesslog/v2/als.proto | 2 +- envoy/service/accesslog/v3alpha/als.proto | 2 +- envoy/service/auth/v2/attribute_context.proto | 2 +- envoy/service/auth/v2/external_auth.proto | 2 +- envoy/service/auth/v3alpha/attribute_context.proto | 2 +- envoy/service/auth/v3alpha/external_auth.proto | 2 +- envoy/service/discovery/v2/ads.proto | 2 +- envoy/service/discovery/v2/hds.proto | 8 +++----- envoy/service/discovery/v2/rtds.proto | 8 +++----- envoy/service/discovery/v2/sds.proto | 8 +++----- envoy/service/discovery/v3alpha/ads.proto | 2 +- envoy/service/discovery/v3alpha/hds.proto | 8 +++----- envoy/service/discovery/v3alpha/rtds.proto | 8 +++----- envoy/service/discovery/v3alpha/sds.proto | 8 +++----- envoy/service/load_stats/v2/lrs.proto | 2 +- envoy/service/load_stats/v3alpha/lrs.proto | 2 +- envoy/service/metrics/v2/metrics_service.proto | 2 +- envoy/service/metrics/v3alpha/metrics_service.proto | 2 +- envoy/service/ratelimit/v2/rls.proto | 2 +- envoy/service/ratelimit/v3alpha/rls.proto | 2 +- envoy/service/tap/v2alpha/common.proto | 2 +- envoy/service/tap/v2alpha/tap.proto | 2 +- envoy/service/tap/v2alpha/tapds.proto | 8 +++----- envoy/service/tap/v3alpha/common.proto | 2 +- envoy/service/tap/v3alpha/tap.proto | 2 +- envoy/service/tap/v3alpha/tapds.proto | 8 +++----- envoy/service/trace/v2/trace_service.proto | 2 +- envoy/service/trace/v3alpha/trace_service.proto | 2 +- envoy/type/hash_policy.proto | 2 +- envoy/type/http.proto | 2 +- envoy/type/http_status.proto | 2 +- envoy/type/matcher/metadata.proto | 2 +- envoy/type/matcher/number.proto | 2 +- envoy/type/matcher/regex.proto | 2 +- envoy/type/matcher/string.proto | 4 ++-- envoy/type/matcher/v3alpha/metadata.proto | 2 +- envoy/type/matcher/v3alpha/number.proto | 2 +- envoy/type/matcher/v3alpha/regex.proto | 2 +- envoy/type/matcher/v3alpha/string.proto | 2 +- envoy/type/matcher/v3alpha/value.proto | 2 +- envoy/type/matcher/value.proto | 2 +- envoy/type/metadata/v2/metadata.proto | 2 +- envoy/type/percent.proto | 2 +- envoy/type/range.proto | 2 +- envoy/type/tracing/v2/custom_tag.proto | 2 +- envoy/type/v3alpha/hash_policy.proto | 2 +- envoy/type/v3alpha/http.proto | 2 +- envoy/type/v3alpha/http_status.proto | 2 +- envoy/type/v3alpha/percent.proto | 2 +- envoy/type/v3alpha/range.proto | 2 +- 236 files changed, 278 insertions(+), 314 deletions(-) diff --git a/envoy/admin/v2alpha/certs.proto b/envoy/admin/v2alpha/certs.proto index e7fcc126..1994d422 100644 --- a/envoy/admin/v2alpha/certs.proto +++ b/envoy/admin/v2alpha/certs.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "CertsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; import "google/protobuf/timestamp.proto"; diff --git a/envoy/admin/v2alpha/clusters.proto b/envoy/admin/v2alpha/clusters.proto index 05218f81..c3580f16 100644 --- a/envoy/admin/v2alpha/clusters.proto +++ b/envoy/admin/v2alpha/clusters.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "ClustersProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; import "envoy/admin/v2alpha/metrics.proto"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/admin/v2alpha/config_dump.proto b/envoy/admin/v2alpha/config_dump.proto index 6ee87dd9..a133318b 100644 --- a/envoy/admin/v2alpha/config_dump.proto +++ b/envoy/admin/v2alpha/config_dump.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "ConfigDumpProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; import "envoy/api/v2/auth/cert.proto"; import "envoy/api/v2/cds.proto"; diff --git a/envoy/admin/v2alpha/listeners.proto b/envoy/admin/v2alpha/listeners.proto index e84f6454..087103dd 100644 --- a/envoy/admin/v2alpha/listeners.proto +++ b/envoy/admin/v2alpha/listeners.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "ListenersProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/admin/v2alpha/memory.proto b/envoy/admin/v2alpha/memory.proto index 65f2061d..8aea1481 100644 --- a/envoy/admin/v2alpha/memory.proto +++ b/envoy/admin/v2alpha/memory.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "MemoryProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; // [#protodoc-title: Memory] diff --git a/envoy/admin/v2alpha/metrics.proto b/envoy/admin/v2alpha/metrics.proto index 9a91c747..79c15f72 100644 --- a/envoy/admin/v2alpha/metrics.proto +++ b/envoy/admin/v2alpha/metrics.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "MetricsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; // [#protodoc-title: Metrics] diff --git a/envoy/admin/v2alpha/mutex_stats.proto b/envoy/admin/v2alpha/mutex_stats.proto index 682ff5b4..1b725a11 100644 --- a/envoy/admin/v2alpha/mutex_stats.proto +++ b/envoy/admin/v2alpha/mutex_stats.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "MutexStatsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; // [#protodoc-title: MutexStats] diff --git a/envoy/admin/v2alpha/server_info.proto b/envoy/admin/v2alpha/server_info.proto index 048fb490..555d2343 100644 --- a/envoy/admin/v2alpha/server_info.proto +++ b/envoy/admin/v2alpha/server_info.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "ServerInfoProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; import "google/protobuf/duration.proto"; diff --git a/envoy/admin/v2alpha/tap.proto b/envoy/admin/v2alpha/tap.proto index d7caf609..3f35c124 100644 --- a/envoy/admin/v2alpha/tap.proto +++ b/envoy/admin/v2alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v2alpha"; import "envoy/service/tap/v2alpha/common.proto"; diff --git a/envoy/admin/v3alpha/certs.proto b/envoy/admin/v3alpha/certs.proto index e6dda838..679456f4 100644 --- a/envoy/admin/v3alpha/certs.proto +++ b/envoy/admin/v3alpha/certs.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "CertsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "google/protobuf/timestamp.proto"; diff --git a/envoy/admin/v3alpha/clusters.proto b/envoy/admin/v3alpha/clusters.proto index be944f74..47d809fe 100644 --- a/envoy/admin/v3alpha/clusters.proto +++ b/envoy/admin/v3alpha/clusters.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "ClustersProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "envoy/admin/v3alpha/metrics.proto"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/envoy/admin/v3alpha/config_dump.proto b/envoy/admin/v3alpha/config_dump.proto index 36a035ed..c7c7ac85 100644 --- a/envoy/admin/v3alpha/config_dump.proto +++ b/envoy/admin/v3alpha/config_dump.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "ConfigDumpProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "envoy/api/v3alpha/auth/cert.proto"; import "envoy/api/v3alpha/cds.proto"; diff --git a/envoy/admin/v3alpha/listeners.proto b/envoy/admin/v3alpha/listeners.proto index f4e9cc66..054cdc18 100644 --- a/envoy/admin/v3alpha/listeners.proto +++ b/envoy/admin/v3alpha/listeners.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "ListenersProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/envoy/admin/v3alpha/memory.proto b/envoy/admin/v3alpha/memory.proto index 969a7031..e8b23497 100644 --- a/envoy/admin/v3alpha/memory.proto +++ b/envoy/admin/v3alpha/memory.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "MemoryProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/admin/v3alpha/metrics.proto b/envoy/admin/v3alpha/metrics.proto index 2ad415d1..b36932de 100644 --- a/envoy/admin/v3alpha/metrics.proto +++ b/envoy/admin/v3alpha/metrics.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "MetricsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/admin/v3alpha/mutex_stats.proto b/envoy/admin/v3alpha/mutex_stats.proto index ca7d8464..d2729b02 100644 --- a/envoy/admin/v3alpha/mutex_stats.proto +++ b/envoy/admin/v3alpha/mutex_stats.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "MutexStatsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/admin/v3alpha/server_info.proto b/envoy/admin/v3alpha/server_info.proto index 66ac6879..cefb9d74 100644 --- a/envoy/admin/v3alpha/server_info.proto +++ b/envoy/admin/v3alpha/server_info.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "ServerInfoProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "google/protobuf/duration.proto"; diff --git a/envoy/admin/v3alpha/tap.proto b/envoy/admin/v3alpha/tap.proto index b568a895..c0942866 100644 --- a/envoy/admin/v3alpha/tap.proto +++ b/envoy/admin/v3alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.admin.v3alpha; +option java_package = "io.envoyproxy.envoy.admin.v3alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.admin.v3alpha"; import "envoy/service/tap/v3alpha/common.proto"; diff --git a/envoy/api/v2/auth/cert.proto b/envoy/api/v2/auth/cert.proto index 4ff76394..b01999d7 100644 --- a/envoy/api/v2/auth/cert.proto +++ b/envoy/api/v2/auth/cert.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.auth; +option java_package = "io.envoyproxy.envoy.api.v2.auth"; option java_outer_classname = "CertProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.auth"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/config_source.proto"; diff --git a/envoy/api/v2/cds.proto b/envoy/api/v2/cds.proto index 677d6283..b9c9c859 100644 --- a/envoy/api/v2/cds.proto +++ b/envoy/api/v2/cds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; option java_outer_classname = "CdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2"; option java_generic_services = true; import "envoy/api/v2/auth/cert.proto"; @@ -39,10 +39,8 @@ service ClusterDiscoveryService { } rpc FetchClusters(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:clusters" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:clusters"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v2/cluster/circuit_breaker.proto b/envoy/api/v2/cluster/circuit_breaker.proto index 2a194417..922f3178 100644 --- a/envoy/api/v2/cluster/circuit_breaker.proto +++ b/envoy/api/v2/cluster/circuit_breaker.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.cluster; +option java_package = "io.envoyproxy.envoy.api.v2.cluster"; option java_outer_classname = "CircuitBreakerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; option ruby_package = "Envoy.Api.V2.ClusterNS"; diff --git a/envoy/api/v2/cluster/filter.proto b/envoy/api/v2/cluster/filter.proto index b89b2a6b..c8e7d0d6 100644 --- a/envoy/api/v2/cluster/filter.proto +++ b/envoy/api/v2/cluster/filter.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.cluster; +option java_package = "io.envoyproxy.envoy.api.v2.cluster"; option java_outer_classname = "FilterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; option ruby_package = "Envoy.Api.V2.ClusterNS"; diff --git a/envoy/api/v2/cluster/outlier_detection.proto b/envoy/api/v2/cluster/outlier_detection.proto index b4194fd0..a9708d7c 100644 --- a/envoy/api/v2/cluster/outlier_detection.proto +++ b/envoy/api/v2/cluster/outlier_detection.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.cluster; +option java_package = "io.envoyproxy.envoy.api.v2.cluster"; option java_outer_classname = "OutlierDetectionProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; option ruby_package = "Envoy.Api.V2.ClusterNS"; diff --git a/envoy/api/v2/core/address.proto b/envoy/api/v2/core/address.proto index 91ca1db6..f9445d3d 100644 --- a/envoy/api/v2/core/address.proto +++ b/envoy/api/v2/core/address.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "AddressProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/core/base.proto b/envoy/api/v2/core/base.proto index ccf2ea61..5bff9947 100644 --- a/envoy/api/v2/core/base.proto +++ b/envoy/api/v2/core/base.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "BaseProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "envoy/api/v2/core/http_uri.proto"; import "envoy/type/percent.proto"; diff --git a/envoy/api/v2/core/config_source.proto b/envoy/api/v2/core/config_source.proto index b1e0fa58..6e532cd5 100644 --- a/envoy/api/v2/core/config_source.proto +++ b/envoy/api/v2/core/config_source.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "ConfigSourceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/api/v2/core/grpc_service.proto b/envoy/api/v2/core/grpc_service.proto index acbce114..f9e469a0 100644 --- a/envoy/api/v2/core/grpc_service.proto +++ b/envoy/api/v2/core/grpc_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "GrpcServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/core/health_check.proto b/envoy/api/v2/core/health_check.proto index cd6fd79a..674303aa 100644 --- a/envoy/api/v2/core/health_check.proto +++ b/envoy/api/v2/core/health_check.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "HealthCheckProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "envoy/api/v2/core/base.proto"; import "envoy/type/http.proto"; diff --git a/envoy/api/v2/core/http_uri.proto b/envoy/api/v2/core/http_uri.proto index 7e4b4dba..11d6d80c 100644 --- a/envoy/api/v2/core/http_uri.proto +++ b/envoy/api/v2/core/http_uri.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "HttpUriProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "google/protobuf/duration.proto"; diff --git a/envoy/api/v2/core/protocol.proto b/envoy/api/v2/core/protocol.proto index af5e20cd..f3b9a412 100644 --- a/envoy/api/v2/core/protocol.proto +++ b/envoy/api/v2/core/protocol.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; option java_outer_classname = "ProtocolProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.core"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/api/v2/discovery.proto b/envoy/api/v2/discovery.proto index 5832ddb9..386c37d8 100644 --- a/envoy/api/v2/discovery.proto +++ b/envoy/api/v2/discovery.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; option java_outer_classname = "DiscoveryProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/eds.proto b/envoy/api/v2/eds.proto index 9d2e288d..974d9815 100644 --- a/envoy/api/v2/eds.proto +++ b/envoy/api/v2/eds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; option java_outer_classname = "EdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; @@ -30,10 +30,8 @@ service EndpointDiscoveryService { } rpc FetchEndpoints(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:endpoints" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:endpoints"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v2/endpoint/endpoint.proto b/envoy/api/v2/endpoint/endpoint.proto index 58d6ce7c..d8789600 100644 --- a/envoy/api/v2/endpoint/endpoint.proto +++ b/envoy/api/v2/endpoint/endpoint.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.endpoint; +option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; option java_outer_classname = "EndpointProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/endpoint/load_report.proto b/envoy/api/v2/endpoint/load_report.proto index 974f7a01..ff7465d4 100644 --- a/envoy/api/v2/endpoint/load_report.proto +++ b/envoy/api/v2/endpoint/load_report.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.endpoint; +option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; option java_outer_classname = "LoadReportProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/lds.proto b/envoy/api/v2/lds.proto index 0f35dd3c..2d56bff4 100644 --- a/envoy/api/v2/lds.proto +++ b/envoy/api/v2/lds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; option java_outer_classname = "LdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2"; option java_generic_services = true; import "envoy/api/v2/core/address.proto"; @@ -35,10 +35,8 @@ service ListenerDiscoveryService { } rpc FetchListeners(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:listeners" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:listeners"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v2/listener/listener.proto b/envoy/api/v2/listener/listener.proto index dbe3d351..851da80e 100644 --- a/envoy/api/v2/listener/listener.proto +++ b/envoy/api/v2/listener/listener.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.listener; +option java_package = "io.envoyproxy.envoy.api.v2.listener"; option java_outer_classname = "ListenerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy.Api.V2.ListenerNS"; diff --git a/envoy/api/v2/listener/quic_config.proto b/envoy/api/v2/listener/quic_config.proto index 4b5b2610..8679f3b3 100644 --- a/envoy/api/v2/listener/quic_config.proto +++ b/envoy/api/v2/listener/quic_config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.listener; +option java_package = "io.envoyproxy.envoy.api.v2.listener"; option java_outer_classname = "QuicConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy.Api.V2.ListenerNS"; diff --git a/envoy/api/v2/listener/udp_listener_config.proto b/envoy/api/v2/listener/udp_listener_config.proto index b4f5ba11..33318826 100644 --- a/envoy/api/v2/listener/udp_listener_config.proto +++ b/envoy/api/v2/listener/udp_listener_config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.listener; +option java_package = "io.envoyproxy.envoy.api.v2.listener"; option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; option ruby_package = "Envoy.Api.V2.ListenerNS"; diff --git a/envoy/api/v2/ratelimit/ratelimit.proto b/envoy/api/v2/ratelimit/ratelimit.proto index af910e39..48169716 100644 --- a/envoy/api/v2/ratelimit/ratelimit.proto +++ b/envoy/api/v2/ratelimit/ratelimit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.ratelimit; +option java_package = "io.envoyproxy.envoy.api.v2.ratelimit"; option java_outer_classname = "RatelimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.ratelimit"; import "validate/validate.proto"; diff --git a/envoy/api/v2/rds.proto b/envoy/api/v2/rds.proto index f9e5c12e..ff7cb323 100644 --- a/envoy/api/v2/rds.proto +++ b/envoy/api/v2/rds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; option java_outer_classname = "RdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; @@ -34,10 +34,8 @@ service RouteDiscoveryService { } rpc FetchRoutes(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:routes" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:routes"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v2/route/route.proto b/envoy/api/v2/route/route.proto index cd8e78cf..0e601d65 100644 --- a/envoy/api/v2/route/route.proto +++ b/envoy/api/v2/route/route.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2.route; +option java_package = "io.envoyproxy.envoy.api.v2.route"; option java_outer_classname = "RouteProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2.route"; import "envoy/api/v2/core/base.proto"; import "envoy/type/matcher/regex.proto"; @@ -381,7 +381,7 @@ message RouteMatch { // .. attention:: // This field has been deprecated in favor of `safe_regex` as it is not safe for use with // untrusted input in all cases. - string regex = 3 [(validate.rules).string = {max_bytes: 1024}, deprecated = true]; + string regex = 3 [deprecated = true, (validate.rules).string = {max_bytes: 1024}]; // If specified, the route is a regular expression rule meaning that the // regex must match the *:path* header once the query string is removed. The entire path @@ -464,7 +464,7 @@ message CorsPolicy { // This field has been deprecated in favor of `allow_origin_string_match` as it is not safe for // use with untrusted input in all cases. repeated string allow_origin_regex = 8 - [(validate.rules).repeated = {items {string {max_bytes: 1024}}}, deprecated = true]; + [deprecated = true, (validate.rules).repeated = {items {string {max_bytes: 1024}}}]; // Specifies string patterns that match allowed origins. An origin is allowed if any of the // string matchers match. @@ -1153,7 +1153,7 @@ message VirtualCluster { // .. attention:: // This field has been deprecated in favor of `headers` as it is not safe for use with // untrusted input in all cases. - string pattern = 1 [(validate.rules).string = {max_bytes: 1024}, deprecated = true]; + string pattern = 1 [deprecated = true, (validate.rules).string = {max_bytes: 1024}]; // Specifies a list of header matchers to use for matching requests. Each specified header must // match. The pseudo-headers `:path` and `:method` can be used to match the request path and @@ -1358,7 +1358,7 @@ message HeaderMatcher { // .. attention:: // This field has been deprecated in favor of `safe_regex_match` as it is not safe for use // with untrusted input in all cases. - string regex_match = 5 [(validate.rules).string = {max_bytes: 1024}, deprecated = true]; + string regex_match = 5 [deprecated = true, (validate.rules).string = {max_bytes: 1024}]; // If specified, this regex string is a regular expression rule which implies the entire request // header value must match the regex. The rule will not match if only a subsequence of the diff --git a/envoy/api/v2/srds.proto b/envoy/api/v2/srds.proto index b9b1e89b..89fc25c3 100644 --- a/envoy/api/v2/srds.proto +++ b/envoy/api/v2/srds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; option java_outer_classname = "SrdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v2"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; @@ -31,10 +31,8 @@ service ScopedRoutesDiscoveryService { } rpc FetchScopedRoutes(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:scoped-routes" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:scoped-routes"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v3alpha/auth/cert.proto b/envoy/api/v3alpha/auth/cert.proto index e67d81f8..82bbc3ed 100644 --- a/envoy/api/v3alpha/auth/cert.proto +++ b/envoy/api/v3alpha/auth/cert.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.auth; +option java_package = "io.envoyproxy.envoy.api.v3alpha.auth"; option java_outer_classname = "CertProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.auth"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/config_source.proto"; diff --git a/envoy/api/v3alpha/cds.proto b/envoy/api/v3alpha/cds.proto index c720407c..fe20046d 100644 --- a/envoy/api/v3alpha/cds.proto +++ b/envoy/api/v3alpha/cds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha; +option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_outer_classname = "CdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/cluster/circuit_breaker.proto"; @@ -40,10 +40,8 @@ service ClusterDiscoveryService { } rpc FetchClusters(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:clusters" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:clusters"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v3alpha/cluster/circuit_breaker.proto b/envoy/api/v3alpha/cluster/circuit_breaker.proto index 09a61ec2..89a8e3c4 100644 --- a/envoy/api/v3alpha/cluster/circuit_breaker.proto +++ b/envoy/api/v3alpha/cluster/circuit_breaker.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.cluster; +option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; option java_outer_classname = "CircuitBreakerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/cluster/filter.proto b/envoy/api/v3alpha/cluster/filter.proto index 802e7b07..aa2a24bf 100644 --- a/envoy/api/v3alpha/cluster/filter.proto +++ b/envoy/api/v3alpha/cluster/filter.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.cluster; +option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; option java_outer_classname = "FilterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; import "google/protobuf/any.proto"; diff --git a/envoy/api/v3alpha/cluster/outlier_detection.proto b/envoy/api/v3alpha/cluster/outlier_detection.proto index 4305bf14..f49ceba0 100644 --- a/envoy/api/v3alpha/cluster/outlier_detection.proto +++ b/envoy/api/v3alpha/cluster/outlier_detection.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.cluster; +option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; option java_outer_classname = "OutlierDetectionProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/api/v3alpha/core/address.proto b/envoy/api/v3alpha/core/address.proto index 73cbde93..e8ee1263 100644 --- a/envoy/api/v3alpha/core/address.proto +++ b/envoy/api/v3alpha/core/address.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "AddressProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/core/base.proto b/envoy/api/v3alpha/core/base.proto index 1ee0413f..49301934 100644 --- a/envoy/api/v3alpha/core/base.proto +++ b/envoy/api/v3alpha/core/base.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "BaseProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "envoy/api/v3alpha/core/http_uri.proto"; import "envoy/type/v3alpha/percent.proto"; diff --git a/envoy/api/v3alpha/core/config_source.proto b/envoy/api/v3alpha/core/config_source.proto index f56a3ba8..ef88f7d4 100644 --- a/envoy/api/v3alpha/core/config_source.proto +++ b/envoy/api/v3alpha/core/config_source.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "ConfigSourceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/api/v3alpha/core/grpc_service.proto b/envoy/api/v3alpha/core/grpc_service.proto index 09eb3124..02f3b646 100644 --- a/envoy/api/v3alpha/core/grpc_service.proto +++ b/envoy/api/v3alpha/core/grpc_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "GrpcServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/core/health_check.proto b/envoy/api/v3alpha/core/health_check.proto index f77b8fce..a8974740 100644 --- a/envoy/api/v3alpha/core/health_check.proto +++ b/envoy/api/v3alpha/core/health_check.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "HealthCheckProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/type/v3alpha/http.proto"; diff --git a/envoy/api/v3alpha/core/http_uri.proto b/envoy/api/v3alpha/core/http_uri.proto index 769f3a58..30b8d864 100644 --- a/envoy/api/v3alpha/core/http_uri.proto +++ b/envoy/api/v3alpha/core/http_uri.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "HttpUriProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "google/protobuf/duration.proto"; diff --git a/envoy/api/v3alpha/core/protocol.proto b/envoy/api/v3alpha/core/protocol.proto index 09968f1d..77ad860b 100644 --- a/envoy/api/v3alpha/core/protocol.proto +++ b/envoy/api/v3alpha/core/protocol.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.core; +option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; option java_outer_classname = "ProtocolProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.core"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/api/v3alpha/discovery.proto b/envoy/api/v3alpha/discovery.proto index 7b497a7e..38a357c4 100644 --- a/envoy/api/v3alpha/discovery.proto +++ b/envoy/api/v3alpha/discovery.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha; +option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_outer_classname = "DiscoveryProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/eds.proto b/envoy/api/v3alpha/eds.proto index df81bea3..dc2f90f4 100644 --- a/envoy/api/v3alpha/eds.proto +++ b/envoy/api/v3alpha/eds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha; +option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_outer_classname = "EdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; @@ -32,10 +32,8 @@ service EndpointDiscoveryService { } rpc FetchEndpoints(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:endpoints" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:endpoints"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v3alpha/endpoint/endpoint.proto b/envoy/api/v3alpha/endpoint/endpoint.proto index 15e4440d..cdd0ec03 100644 --- a/envoy/api/v3alpha/endpoint/endpoint.proto +++ b/envoy/api/v3alpha/endpoint/endpoint.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.endpoint; +option java_package = "io.envoyproxy.envoy.api.v3alpha.endpoint"; option java_outer_classname = "EndpointProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.endpoint"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/endpoint/load_report.proto b/envoy/api/v3alpha/endpoint/load_report.proto index 48f50ed0..844f776c 100644 --- a/envoy/api/v3alpha/endpoint/load_report.proto +++ b/envoy/api/v3alpha/endpoint/load_report.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.endpoint; +option java_package = "io.envoyproxy.envoy.api.v3alpha.endpoint"; option java_outer_classname = "LoadReportProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.endpoint"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/lds.proto b/envoy/api/v3alpha/lds.proto index 38894033..2424071c 100644 --- a/envoy/api/v3alpha/lds.proto +++ b/envoy/api/v3alpha/lds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha; +option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_outer_classname = "LdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/address.proto"; @@ -37,10 +37,8 @@ service ListenerDiscoveryService { } rpc FetchListeners(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:listeners" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:listeners"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v3alpha/listener/listener.proto b/envoy/api/v3alpha/listener/listener.proto index 130154b7..2cfcb73f 100644 --- a/envoy/api/v3alpha/listener/listener.proto +++ b/envoy/api/v3alpha/listener/listener.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.listener; +option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; option java_outer_classname = "ListenerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/listener/quic_config.proto b/envoy/api/v3alpha/listener/quic_config.proto index 1a8a7898..4f021de0 100644 --- a/envoy/api/v3alpha/listener/quic_config.proto +++ b/envoy/api/v3alpha/listener/quic_config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.listener; +option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; option java_outer_classname = "QuicConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/api/v3alpha/listener/udp_listener_config.proto b/envoy/api/v3alpha/listener/udp_listener_config.proto index 8de8febd..f53f7a8a 100644 --- a/envoy/api/v3alpha/listener/udp_listener_config.proto +++ b/envoy/api/v3alpha/listener/udp_listener_config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.listener; +option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; import "google/protobuf/any.proto"; import "google/protobuf/struct.proto"; diff --git a/envoy/api/v3alpha/ratelimit/ratelimit.proto b/envoy/api/v3alpha/ratelimit/ratelimit.proto index 91d0672c..28a6d7b9 100644 --- a/envoy/api/v3alpha/ratelimit/ratelimit.proto +++ b/envoy/api/v3alpha/ratelimit/ratelimit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.ratelimit; +option java_package = "io.envoyproxy.envoy.api.v3alpha.ratelimit"; option java_outer_classname = "RatelimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.ratelimit"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/api/v3alpha/rds.proto b/envoy/api/v3alpha/rds.proto index 0f5b7057..378f0316 100644 --- a/envoy/api/v3alpha/rds.proto +++ b/envoy/api/v3alpha/rds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha; +option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_outer_classname = "RdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; @@ -36,10 +36,8 @@ service RouteDiscoveryService { } rpc FetchRoutes(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:routes" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:routes"; + option (google.api.http).body = "*"; } } diff --git a/envoy/api/v3alpha/route/route.proto b/envoy/api/v3alpha/route/route.proto index e36f6ebd..6b00b7b4 100644 --- a/envoy/api/v3alpha/route/route.proto +++ b/envoy/api/v3alpha/route/route.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha.route; +option java_package = "io.envoyproxy.envoy.api.v3alpha.route"; option java_outer_classname = "RouteProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha.route"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/type/matcher/v3alpha/regex.proto"; diff --git a/envoy/api/v3alpha/srds.proto b/envoy/api/v3alpha/srds.proto index 6e98391b..e642fa80 100644 --- a/envoy/api/v3alpha/srds.proto +++ b/envoy/api/v3alpha/srds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.api.v3alpha; +option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_outer_classname = "SrdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.api.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; @@ -33,10 +33,8 @@ service ScopedRoutesDiscoveryService { } rpc FetchScopedRoutes(DiscoveryRequest) returns (DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:scoped-routes" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:scoped-routes"; + option (google.api.http).body = "*"; } } diff --git a/envoy/config/accesslog/v2/als.proto b/envoy/config/accesslog/v2/als.proto index a45d0ca5..84af198a 100644 --- a/envoy/config/accesslog/v2/als.proto +++ b/envoy/config/accesslog/v2/als.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.accesslog.v2; +option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; option java_outer_classname = "AlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/accesslog/v2/file.proto b/envoy/config/accesslog/v2/file.proto index ec8a33e7..5e58671a 100644 --- a/envoy/config/accesslog/v2/file.proto +++ b/envoy/config/accesslog/v2/file.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.accesslog.v2; +option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; option java_outer_classname = "FileProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; import "google/protobuf/struct.proto"; diff --git a/envoy/config/accesslog/v3alpha/als.proto b/envoy/config/accesslog/v3alpha/als.proto index ff001eb3..a723ff81 100644 --- a/envoy/config/accesslog/v3alpha/als.proto +++ b/envoy/config/accesslog/v3alpha/als.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.accesslog.v3alpha; +option java_package = "io.envoyproxy.envoy.config.accesslog.v3alpha"; option java_outer_classname = "AlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.accesslog.v3alpha"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/config/accesslog/v3alpha/file.proto b/envoy/config/accesslog/v3alpha/file.proto index 38451509..f366dc57 100644 --- a/envoy/config/accesslog/v3alpha/file.proto +++ b/envoy/config/accesslog/v3alpha/file.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.accesslog.v3alpha; +option java_package = "io.envoyproxy.envoy.config.accesslog.v3alpha"; option java_outer_classname = "FileProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.accesslog.v3alpha"; import "google/protobuf/struct.proto"; diff --git a/envoy/config/bootstrap/v2/bootstrap.proto b/envoy/config/bootstrap/v2/bootstrap.proto index 9615168d..6fd39230 100644 --- a/envoy/config/bootstrap/v2/bootstrap.proto +++ b/envoy/config/bootstrap/v2/bootstrap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.bootstrap.v2; +option java_package = "io.envoyproxy.envoy.config.bootstrap.v2"; option java_outer_classname = "BootstrapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.bootstrap.v2"; import "envoy/api/v2/auth/cert.proto"; import "envoy/api/v2/cds.proto"; diff --git a/envoy/config/bootstrap/v3alpha/bootstrap.proto b/envoy/config/bootstrap/v3alpha/bootstrap.proto index 19a8d00a..9b935529 100644 --- a/envoy/config/bootstrap/v3alpha/bootstrap.proto +++ b/envoy/config/bootstrap/v3alpha/bootstrap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.bootstrap.v3alpha; +option java_package = "io.envoyproxy.envoy.config.bootstrap.v3alpha"; option java_outer_classname = "BootstrapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.bootstrap.v3alpha"; import "envoy/api/v3alpha/auth/cert.proto"; import "envoy/api/v3alpha/cds.proto"; diff --git a/envoy/config/cluster/aggregate/v2alpha/cluster.proto b/envoy/config/cluster/aggregate/v2alpha/cluster.proto index b7a3ec74..73e79150 100644 --- a/envoy/config/cluster/aggregate/v2alpha/cluster.proto +++ b/envoy/config/cluster/aggregate/v2alpha/cluster.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.cluster.aggregate.v2alpha; +option java_package = "io.envoyproxy.envoy.config.cluster.aggregate.v2alpha"; option java_outer_classname = "ClusterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.cluster.aggregate.v2alpha"; import "validate/validate.proto"; diff --git a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto index ef87aeab..71a95434 100644 --- a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto +++ b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.cluster.dynamic_forward_proxy.v2alpha; +option java_package = "io.envoyproxy.envoy.config.cluster.dynamic_forward_proxy.v2alpha"; option java_outer_classname = "ClusterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.cluster.dynamic_forward_proxy.v2alpha"; import "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto"; diff --git a/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto b/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto index a40aae8e..167e1c2a 100644 --- a/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto +++ b/envoy/config/cluster/dynamic_forward_proxy/v3alpha/cluster.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.cluster.dynamic_forward_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.cluster.dynamic_forward_proxy.v3alpha"; option java_outer_classname = "ClusterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.cluster.dynamic_forward_proxy.v3alpha"; import "envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto"; diff --git a/envoy/config/cluster/redis/redis_cluster.proto b/envoy/config/cluster/redis/redis_cluster.proto index beef2197..e9927c63 100644 --- a/envoy/config/cluster/redis/redis_cluster.proto +++ b/envoy/config/cluster/redis/redis_cluster.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.cluster.redis; +option java_package = "io.envoyproxy.envoy.config.cluster.redis"; option java_outer_classname = "RedisClusterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.cluster.redis"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto b/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto index 56d11293..e9720cda 100644 --- a/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto +++ b/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.common.dynamic_forward_proxy.v2alpha; +option java_package = "io.envoyproxy.envoy.config.common.dynamic_forward_proxy.v2alpha"; option java_outer_classname = "DnsCacheProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.common.dynamic_forward_proxy.v2alpha"; import "envoy/api/v2/cds.proto"; diff --git a/envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto b/envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto index 6462b295..d59ad622 100644 --- a/envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto +++ b/envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.common.dynamic_forward_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.common.dynamic_forward_proxy.v3alpha"; option java_outer_classname = "DnsCacheProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.common.dynamic_forward_proxy.v3alpha"; import "envoy/api/v3alpha/cds.proto"; diff --git a/envoy/config/common/tap/v2alpha/common.proto b/envoy/config/common/tap/v2alpha/common.proto index 391bed13..30de0067 100644 --- a/envoy/config/common/tap/v2alpha/common.proto +++ b/envoy/config/common/tap/v2alpha/common.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.common.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.config.common.tap.v2alpha"; option java_outer_classname = "CommonProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.common.tap.v2alpha"; import "envoy/api/v2/core/config_source.proto"; import "envoy/service/tap/v2alpha/common.proto"; diff --git a/envoy/config/common/tap/v3alpha/common.proto b/envoy/config/common/tap/v3alpha/common.proto index abb91473..127bb3e4 100644 --- a/envoy/config/common/tap/v3alpha/common.proto +++ b/envoy/config/common/tap/v3alpha/common.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.common.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.config.common.tap.v3alpha"; option java_outer_classname = "CommonProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.common.tap.v3alpha"; import "envoy/api/v3alpha/core/config_source.proto"; import "envoy/service/tap/v3alpha/common.proto"; diff --git a/envoy/config/filter/accesslog/v2/accesslog.proto b/envoy/config/filter/accesslog/v2/accesslog.proto index b336fb0b..489bc82d 100644 --- a/envoy/config/filter/accesslog/v2/accesslog.proto +++ b/envoy/config/filter/accesslog/v2/accesslog.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.accesslog.v2; +option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2"; option java_outer_classname = "AccesslogProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/route/route.proto"; diff --git a/envoy/config/filter/accesslog/v3alpha/accesslog.proto b/envoy/config/filter/accesslog/v3alpha/accesslog.proto index 8c2e93e3..5a32bc1a 100644 --- a/envoy/config/filter/accesslog/v3alpha/accesslog.proto +++ b/envoy/config/filter/accesslog/v3alpha/accesslog.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.accesslog.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v3alpha"; option java_outer_classname = "AccesslogProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/route/route.proto"; diff --git a/envoy/config/filter/dubbo/router/v2alpha1/router.proto b/envoy/config/filter/dubbo/router/v2alpha1/router.proto index 4e65f14e..28bbdec4 100644 --- a/envoy/config/filter/dubbo/router/v2alpha1/router.proto +++ b/envoy/config/filter/dubbo/router/v2alpha1/router.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.dubbo.router.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.dubbo.router.v2alpha1"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.dubbo.router.v2alpha1"; // [#protodoc-title: Router] // Dubbo router :ref:`configuration overview `. diff --git a/envoy/config/filter/fault/v2/fault.proto b/envoy/config/filter/fault/v2/fault.proto index 8414f18b..696253f8 100644 --- a/envoy/config/filter/fault/v2/fault.proto +++ b/envoy/config/filter/fault/v2/fault.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.fault.v2; +option java_package = "io.envoyproxy.envoy.config.filter.fault.v2"; option java_outer_classname = "FaultProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.fault.v2"; import "envoy/type/percent.proto"; diff --git a/envoy/config/filter/fault/v3alpha/fault.proto b/envoy/config/filter/fault/v3alpha/fault.proto index ce4fe59e..8a225c47 100644 --- a/envoy/config/filter/fault/v3alpha/fault.proto +++ b/envoy/config/filter/fault/v3alpha/fault.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.fault.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.fault.v3alpha"; option java_outer_classname = "FaultProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.fault.v3alpha"; import "envoy/type/v3alpha/percent.proto"; diff --git a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto b/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto index a4ddb881..52a09519 100644 --- a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto +++ b/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.adaptive_concurrency.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.adaptive_concurrency.v2alpha"; option java_outer_classname = "AdaptiveConcurrencyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.adaptive_concurrency.v2alpha"; import "envoy/api/v2/core/base.proto"; import "envoy/type/percent.proto"; diff --git a/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto b/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto index 718bcd1c..a0745ce7 100644 --- a/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto +++ b/envoy/config/filter/http/adaptive_concurrency/v3alpha/adaptive_concurrency.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.adaptive_concurrency.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.adaptive_concurrency.v3alpha"; option java_outer_classname = "AdaptiveConcurrencyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.adaptive_concurrency.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/type/v3alpha/percent.proto"; diff --git a/envoy/config/filter/http/buffer/v2/buffer.proto b/envoy/config/filter/http/buffer/v2/buffer.proto index f342c72d..909e9a2b 100644 --- a/envoy/config/filter/http/buffer/v2/buffer.proto +++ b/envoy/config/filter/http/buffer/v2/buffer.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.buffer.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2"; option java_outer_classname = "BufferProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/config/filter/http/csrf/v2/csrf.proto b/envoy/config/filter/http/csrf/v2/csrf.proto index acc7718b..2ef87b1f 100644 --- a/envoy/config/filter/http/csrf/v2/csrf.proto +++ b/envoy/config/filter/http/csrf/v2/csrf.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.csrf.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.csrf.v2"; option java_outer_classname = "CsrfProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.csrf.v2"; import "envoy/api/v2/core/base.proto"; import "envoy/type/matcher/string.proto"; diff --git a/envoy/config/filter/http/csrf/v3alpha/csrf.proto b/envoy/config/filter/http/csrf/v3alpha/csrf.proto index e079f7fa..23ec7be0 100644 --- a/envoy/config/filter/http/csrf/v3alpha/csrf.proto +++ b/envoy/config/filter/http/csrf/v3alpha/csrf.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.csrf.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.csrf.v3alpha"; option java_outer_classname = "CsrfProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.csrf.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/type/matcher/v3alpha/string.proto"; diff --git a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto index d66fa81f..4c4e1a57 100644 --- a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto +++ b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.dynamic_forward_proxy.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.dynamic_forward_proxy.v2alpha"; option java_outer_classname = "DynamicForwardProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.dynamic_forward_proxy.v2alpha"; import "envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.proto"; diff --git a/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto b/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto index 35f8f702..e28aabfb 100644 --- a/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto +++ b/envoy/config/filter/http/dynamic_forward_proxy/v3alpha/dynamic_forward_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.dynamic_forward_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.dynamic_forward_proxy.v3alpha"; option java_outer_classname = "DynamicForwardProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.dynamic_forward_proxy.v3alpha"; import "envoy/config/common/dynamic_forward_proxy/v3alpha/dns_cache.proto"; diff --git a/envoy/config/filter/http/ext_authz/v2/ext_authz.proto b/envoy/config/filter/http/ext_authz/v2/ext_authz.proto index 8e3eb7b4..5b152979 100644 --- a/envoy/config/filter/http/ext_authz/v2/ext_authz.proto +++ b/envoy/config/filter/http/ext_authz/v2/ext_authz.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.ext_authz.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2"; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto b/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto index 3a75a152..01825760 100644 --- a/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto +++ b/envoy/config/filter/http/ext_authz/v3alpha/ext_authz.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.ext_authz.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v3alpha"; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/config/filter/http/fault/v2/fault.proto b/envoy/config/filter/http/fault/v2/fault.proto index 15103bfc..972dc704 100644 --- a/envoy/config/filter/http/fault/v2/fault.proto +++ b/envoy/config/filter/http/fault/v2/fault.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.fault.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2"; option java_outer_classname = "FaultProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2"; import "envoy/api/v2/route/route.proto"; import "envoy/config/filter/fault/v2/fault.proto"; diff --git a/envoy/config/filter/http/fault/v3alpha/fault.proto b/envoy/config/filter/http/fault/v3alpha/fault.proto index 852395d1..d5045f74 100644 --- a/envoy/config/filter/http/fault/v3alpha/fault.proto +++ b/envoy/config/filter/http/fault/v3alpha/fault.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.fault.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v3alpha"; option java_outer_classname = "FaultProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v3alpha"; import "envoy/api/v3alpha/route/route.proto"; import "envoy/config/filter/fault/v3alpha/fault.proto"; diff --git a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto index 2e533e9f..9aa6d4df 100644 --- a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto +++ b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.grpc_http1_reverse_bridge.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_http1_reverse_bridge.v2alpha1"; option java_outer_classname = "ConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_http1_reverse_bridge.v2alpha1"; import "validate/validate.proto"; diff --git a/envoy/config/filter/http/grpc_stats/v2alpha/config.proto b/envoy/config/filter/http/grpc_stats/v2alpha/config.proto index 609a8032..680bfa3d 100644 --- a/envoy/config/filter/http/grpc_stats/v2alpha/config.proto +++ b/envoy/config/filter/http/grpc_stats/v2alpha/config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.grpc_stats.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_stats.v2alpha"; option java_outer_classname = "ConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.grpc_stats.v2alpha"; import "validate/validate.proto"; diff --git a/envoy/config/filter/http/gzip/v2/gzip.proto b/envoy/config/filter/http/gzip/v2/gzip.proto index dd78214f..16ba4aa6 100644 --- a/envoy/config/filter/http/gzip/v2/gzip.proto +++ b/envoy/config/filter/http/gzip/v2/gzip.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.gzip.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2"; option java_outer_classname = "GzipProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto b/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto index d59ee83e..4571b880 100644 --- a/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto +++ b/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.header_to_metadata.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2"; option java_outer_classname = "HeaderToMetadataProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2"; import "validate/validate.proto"; diff --git a/envoy/config/filter/http/health_check/v2/health_check.proto b/envoy/config/filter/http/health_check/v2/health_check.proto index 055920ff..18f1e79b 100644 --- a/envoy/config/filter/http/health_check/v2/health_check.proto +++ b/envoy/config/filter/http/health_check/v2/health_check.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.health_check.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2"; option java_outer_classname = "HealthCheckProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2"; import "envoy/api/v2/route/route.proto"; import "envoy/type/percent.proto"; diff --git a/envoy/config/filter/http/health_check/v3alpha/health_check.proto b/envoy/config/filter/http/health_check/v3alpha/health_check.proto index 848cbefa..78b11e73 100644 --- a/envoy/config/filter/http/health_check/v3alpha/health_check.proto +++ b/envoy/config/filter/http/health_check/v3alpha/health_check.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.health_check.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v3alpha"; option java_outer_classname = "HealthCheckProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v3alpha"; import "envoy/api/v3alpha/route/route.proto"; import "envoy/type/v3alpha/percent.proto"; diff --git a/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto b/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto index 8e22c906..40dc1926 100644 --- a/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto +++ b/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.ip_tagging.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2"; option java_outer_classname = "IpTaggingProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto b/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto index 849c51f4..fc6922d0 100644 --- a/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto +++ b/envoy/config/filter/http/ip_tagging/v3alpha/ip_tagging.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.ip_tagging.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v3alpha"; option java_outer_classname = "IpTaggingProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/envoy/config/filter/http/jwt_authn/v2alpha/config.proto b/envoy/config/filter/http/jwt_authn/v2alpha/config.proto index 50105dad..42a9f32d 100644 --- a/envoy/config/filter/http/jwt_authn/v2alpha/config.proto +++ b/envoy/config/filter/http/jwt_authn/v2alpha/config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.jwt_authn.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha"; option java_outer_classname = "ConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/http_uri.proto"; diff --git a/envoy/config/filter/http/jwt_authn/v3alpha/config.proto b/envoy/config/filter/http/jwt_authn/v3alpha/config.proto index e3c8d15c..e4e1f59f 100644 --- a/envoy/config/filter/http/jwt_authn/v3alpha/config.proto +++ b/envoy/config/filter/http/jwt_authn/v3alpha/config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.jwt_authn.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v3alpha"; option java_outer_classname = "ConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/http_uri.proto"; diff --git a/envoy/config/filter/http/lua/v2/lua.proto b/envoy/config/filter/http/lua/v2/lua.proto index 1bf16f3c..b1f427cd 100644 --- a/envoy/config/filter/http/lua/v2/lua.proto +++ b/envoy/config/filter/http/lua/v2/lua.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.lua.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2"; option java_outer_classname = "LuaProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2"; import "validate/validate.proto"; diff --git a/envoy/config/filter/http/original_src/v2alpha1/original_src.proto b/envoy/config/filter/http/original_src/v2alpha1/original_src.proto index ad008269..2244cfc8 100644 --- a/envoy/config/filter/http/original_src/v2alpha1/original_src.proto +++ b/envoy/config/filter/http/original_src/v2alpha1/original_src.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.original_src.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.http.original_src.v2alpha1"; option java_outer_classname = "OriginalSrcProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.original_src.v2alpha1"; import "validate/validate.proto"; diff --git a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto b/envoy/config/filter/http/rate_limit/v2/rate_limit.proto index 0b0e1edf..0ccce68c 100644 --- a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto +++ b/envoy/config/filter/http/rate_limit/v2/rate_limit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.rate_limit.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2"; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto b/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto index a8c8aa19..3a41cb27 100644 --- a/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto +++ b/envoy/config/filter/http/rate_limit/v3alpha/rate_limit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.rate_limit.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v3alpha"; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v3alpha"; import "envoy/config/ratelimit/v3alpha/rls.proto"; diff --git a/envoy/config/filter/http/rbac/v2/rbac.proto b/envoy/config/filter/http/rbac/v2/rbac.proto index c497aa2f..baebccaf 100644 --- a/envoy/config/filter/http/rbac/v2/rbac.proto +++ b/envoy/config/filter/http/rbac/v2/rbac.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.rbac.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2"; option java_outer_classname = "RbacProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2"; import "envoy/config/rbac/v2/rbac.proto"; diff --git a/envoy/config/filter/http/rbac/v3alpha/rbac.proto b/envoy/config/filter/http/rbac/v3alpha/rbac.proto index 960aadef..b5c23c7d 100644 --- a/envoy/config/filter/http/rbac/v3alpha/rbac.proto +++ b/envoy/config/filter/http/rbac/v3alpha/rbac.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.rbac.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v3alpha"; option java_outer_classname = "RbacProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v3alpha"; import "envoy/config/rbac/v3alpha/rbac.proto"; diff --git a/envoy/config/filter/http/router/v2/router.proto b/envoy/config/filter/http/router/v2/router.proto index d8a329be..db02de41 100644 --- a/envoy/config/filter/http/router/v2/router.proto +++ b/envoy/config/filter/http/router/v2/router.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.router.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2"; import "envoy/config/filter/accesslog/v2/accesslog.proto"; diff --git a/envoy/config/filter/http/router/v3alpha/router.proto b/envoy/config/filter/http/router/v3alpha/router.proto index d89b5bc5..6ea99f42 100644 --- a/envoy/config/filter/http/router/v3alpha/router.proto +++ b/envoy/config/filter/http/router/v3alpha/router.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.router.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.router.v3alpha"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.router.v3alpha"; import "envoy/config/filter/accesslog/v3alpha/accesslog.proto"; diff --git a/envoy/config/filter/http/squash/v2/squash.proto b/envoy/config/filter/http/squash/v2/squash.proto index 8d4f352e..a864f453 100644 --- a/envoy/config/filter/http/squash/v2/squash.proto +++ b/envoy/config/filter/http/squash/v2/squash.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.squash.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2"; option java_outer_classname = "SquashProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2"; import "google/protobuf/duration.proto"; import "google/protobuf/struct.proto"; diff --git a/envoy/config/filter/http/tap/v2alpha/tap.proto b/envoy/config/filter/http/tap/v2alpha/tap.proto index 4dc3b33b..247e898a 100644 --- a/envoy/config/filter/http/tap/v2alpha/tap.proto +++ b/envoy/config/filter/http/tap/v2alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.tap.v2alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.tap.v2alpha"; import "envoy/config/common/tap/v2alpha/common.proto"; diff --git a/envoy/config/filter/http/tap/v3alpha/tap.proto b/envoy/config/filter/http/tap/v3alpha/tap.proto index 657c6f77..f2a1f256 100644 --- a/envoy/config/filter/http/tap/v3alpha/tap.proto +++ b/envoy/config/filter/http/tap/v3alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.tap.v3alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.tap.v3alpha"; import "envoy/config/common/tap/v3alpha/common.proto"; diff --git a/envoy/config/filter/http/transcoder/v2/transcoder.proto b/envoy/config/filter/http/transcoder/v2/transcoder.proto index af5ea5a1..c88b1854 100644 --- a/envoy/config/filter/http/transcoder/v2/transcoder.proto +++ b/envoy/config/filter/http/transcoder/v2/transcoder.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.http.transcoder.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2"; option java_outer_classname = "TranscoderProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2"; import "validate/validate.proto"; diff --git a/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto b/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto index f6aa6b5a..6259f376 100644 --- a/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto +++ b/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.listener.original_src.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.listener.original_src.v2alpha1"; option java_outer_classname = "OriginalSrcProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.listener.original_src.v2alpha1"; import "validate/validate.proto"; diff --git a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto b/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto index d9819c9e..cec44c94 100644 --- a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto +++ b/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.client_ssl_auth.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v2"; option java_outer_classname = "ClientSslAuthProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v2"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto b/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto index 704a96d3..2a6b6f10 100644 --- a/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto +++ b/envoy/config/filter/network/client_ssl_auth/v3alpha/client_ssl_auth.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.client_ssl_auth.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v3alpha"; option java_outer_classname = "ClientSslAuthProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto index 8a5ede0b..16308e28 100644 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto +++ b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.dubbo_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1"; option java_outer_classname = "DubboProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1"; import "envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto"; diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto b/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto index 9f76a007..b38089d9 100644 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto +++ b/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.dubbo_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1"; option java_outer_classname = "RouteProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1"; import "envoy/api/v2/route/route.proto"; import "envoy/type/matcher/string.proto"; diff --git a/envoy/config/filter/network/dubbo_proxy/v3alpha/dubbo_proxy.proto b/envoy/config/filter/network/dubbo_proxy/v3alpha/dubbo_proxy.proto index bcccc23e..ad1a3d5a 100644 --- a/envoy/config/filter/network/dubbo_proxy/v3alpha/dubbo_proxy.proto +++ b/envoy/config/filter/network/dubbo_proxy/v3alpha/dubbo_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.dubbo_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v3alpha"; option java_outer_classname = "DubboProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v3alpha"; import "envoy/config/filter/network/dubbo_proxy/v3alpha/route.proto"; diff --git a/envoy/config/filter/network/dubbo_proxy/v3alpha/route.proto b/envoy/config/filter/network/dubbo_proxy/v3alpha/route.proto index 3266808f..eef19b6a 100644 --- a/envoy/config/filter/network/dubbo_proxy/v3alpha/route.proto +++ b/envoy/config/filter/network/dubbo_proxy/v3alpha/route.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.dubbo_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v3alpha"; option java_outer_classname = "RouteProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v3alpha"; import "envoy/api/v3alpha/route/route.proto"; import "envoy/type/matcher/v3alpha/string.proto"; diff --git a/envoy/config/filter/network/ext_authz/v2/ext_authz.proto b/envoy/config/filter/network/ext_authz/v2/ext_authz.proto index 795607fc..3690bdc8 100644 --- a/envoy/config/filter/network/ext_authz/v2/ext_authz.proto +++ b/envoy/config/filter/network/ext_authz/v2/ext_authz.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.ext_authz.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2"; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto b/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto index 054b6341..215b9a59 100644 --- a/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto +++ b/envoy/config/filter/network/ext_authz/v3alpha/ext_authz.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.ext_authz.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v3alpha"; option java_outer_classname = "ExtAuthzProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v3alpha"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto index 2f44713b..f8185069 100644 --- a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto +++ b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.http_connection_manager.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2"; option java_outer_classname = "HttpConnectionManagerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2"; import "envoy/api/v2/core/config_source.proto"; import "envoy/api/v2/core/protocol.proto"; @@ -102,7 +102,7 @@ message HttpConnectionManager { // .. attention:: // This field has been deprecated in favor of `traffic_direction`. OperationName operation_name = 1 - [(validate.rules).enum = {defined_only: true}, deprecated = true]; + [deprecated = true, (validate.rules).enum = {defined_only: true}]; // A list of header names used to create tags for the active span. The header name is used to // populate the tag name, and the header value is used to populate the tag value. The tag is diff --git a/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto b/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto index 1cfbf623..f8880d1d 100644 --- a/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto +++ b/envoy/config/filter/network/http_connection_manager/v3alpha/http_connection_manager.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.http_connection_manager.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v3alpha"; option java_outer_classname = "HttpConnectionManagerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v3alpha"; import "envoy/api/v3alpha/core/config_source.proto"; import "envoy/api/v3alpha/core/protocol.proto"; diff --git a/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto b/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto index aee2936e..2a1fa76e 100644 --- a/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto +++ b/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.mongo_proxy.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2"; option java_outer_classname = "MongoProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2"; import "envoy/config/filter/fault/v2/fault.proto"; diff --git a/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto b/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto index 657d7e27..35be47ad 100644 --- a/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto +++ b/envoy/config/filter/network/mongo_proxy/v3alpha/mongo_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.mongo_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v3alpha"; option java_outer_classname = "MongoProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v3alpha"; import "envoy/config/filter/fault/v3alpha/fault.proto"; diff --git a/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto b/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto index 4665bbfa..cf4e2842 100644 --- a/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto +++ b/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.mysql_proxy.v1alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.mysql_proxy.v1alpha1"; option java_outer_classname = "MysqlProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.mysql_proxy.v1alpha1"; import "validate/validate.proto"; diff --git a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto b/envoy/config/filter/network/rate_limit/v2/rate_limit.proto index d65797ea..d9f4d11c 100644 --- a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto +++ b/envoy/config/filter/network/rate_limit/v2/rate_limit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.rate_limit.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2"; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2"; import "envoy/api/v2/ratelimit/ratelimit.proto"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto b/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto index f45b8ddf..50c36c1f 100644 --- a/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto +++ b/envoy/config/filter/network/rate_limit/v3alpha/rate_limit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.rate_limit.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v3alpha"; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v3alpha"; import "envoy/api/v3alpha/ratelimit/ratelimit.proto"; import "envoy/config/ratelimit/v3alpha/rls.proto"; diff --git a/envoy/config/filter/network/rbac/v2/rbac.proto b/envoy/config/filter/network/rbac/v2/rbac.proto index 4d6cb00c..de96f28c 100644 --- a/envoy/config/filter/network/rbac/v2/rbac.proto +++ b/envoy/config/filter/network/rbac/v2/rbac.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.rbac.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2"; option java_outer_classname = "RbacProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2"; import "envoy/config/rbac/v2/rbac.proto"; diff --git a/envoy/config/filter/network/rbac/v3alpha/rbac.proto b/envoy/config/filter/network/rbac/v3alpha/rbac.proto index 7a4ebe28..4dbdec4d 100644 --- a/envoy/config/filter/network/rbac/v3alpha/rbac.proto +++ b/envoy/config/filter/network/rbac/v3alpha/rbac.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.rbac.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v3alpha"; option java_outer_classname = "RbacProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v3alpha"; import "envoy/config/rbac/v3alpha/rbac.proto"; diff --git a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto index da1acdb7..9dbf9af6 100644 --- a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto +++ b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.redis_proxy.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2"; option java_outer_classname = "RedisProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto b/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto index d92247f9..26ea0f6c 100644 --- a/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto +++ b/envoy/config/filter/network/redis_proxy/v3alpha/redis_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.redis_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v3alpha"; option java_outer_classname = "RedisProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto index c958ca68..eacd7a7b 100644 --- a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto +++ b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.tcp_proxy.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2"; option java_outer_classname = "TcpProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto b/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto index a1f62ab5..d78bc780 100644 --- a/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto +++ b/envoy/config/filter/network/tcp_proxy/v3alpha/tcp_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.tcp_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v3alpha"; option java_outer_classname = "TcpProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto index 8f85fab5..d2983a13 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; option java_outer_classname = "RouteProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/route/route.proto"; diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto index a8575923..c99d2eea 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; option java_outer_classname = "ThriftProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; import "envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto"; diff --git a/envoy/config/filter/network/thrift_proxy/v3alpha/route.proto b/envoy/config/filter/network/thrift_proxy/v3alpha/route.proto index 75cb5acf..afe789a8 100644 --- a/envoy/config/filter/network/thrift_proxy/v3alpha/route.proto +++ b/envoy/config/filter/network/thrift_proxy/v3alpha/route.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v3alpha"; option java_outer_classname = "RouteProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/route/route.proto"; diff --git a/envoy/config/filter/network/thrift_proxy/v3alpha/thrift_proxy.proto b/envoy/config/filter/network/thrift_proxy/v3alpha/thrift_proxy.proto index 9268d6e4..73c52885 100644 --- a/envoy/config/filter/network/thrift_proxy/v3alpha/thrift_proxy.proto +++ b/envoy/config/filter/network/thrift_proxy/v3alpha/thrift_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v3alpha"; option java_outer_classname = "ThriftProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v3alpha"; import "envoy/config/filter/network/thrift_proxy/v3alpha/route.proto"; diff --git a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto index cfe2a107..11cb6a2f 100644 --- a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto +++ b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.network.zookeeper_proxy.v1alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.zookeeper_proxy.v1alpha1"; option java_outer_classname = "ZookeeperProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.network.zookeeper_proxy.v1alpha1"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto index bf3cb83d..7a057fa4 100644 --- a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto +++ b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.thrift.rate_limit.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1"; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/envoy/config/filter/thrift/rate_limit/v3alpha/rate_limit.proto b/envoy/config/filter/thrift/rate_limit/v3alpha/rate_limit.proto index 0889df18..c111454e 100644 --- a/envoy/config/filter/thrift/rate_limit/v3alpha/rate_limit.proto +++ b/envoy/config/filter/thrift/rate_limit/v3alpha/rate_limit.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.thrift.rate_limit.v3alpha; +option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v3alpha"; option java_outer_classname = "RateLimitProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v3alpha"; import "envoy/config/ratelimit/v3alpha/rls.proto"; diff --git a/envoy/config/filter/thrift/router/v2alpha1/router.proto b/envoy/config/filter/thrift/router/v2alpha1/router.proto index e5dd0855..8661675c 100644 --- a/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.thrift.router.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; option java_outer_classname = "RouterProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; // [#protodoc-title: Router] // Thrift router :ref:`configuration overview `. diff --git a/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.proto b/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.proto index c91420b2..4a8b079f 100644 --- a/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.proto +++ b/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.filter.udp.udp_proxy.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.udp.udp_proxy.v2alpha"; option java_outer_classname = "UdpProxyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.filter.udp.udp_proxy.v2alpha"; import "google/protobuf/duration.proto"; diff --git a/envoy/config/grpc_credential/v2alpha/aws_iam.proto b/envoy/config/grpc_credential/v2alpha/aws_iam.proto index 353843f2..7a256628 100644 --- a/envoy/config/grpc_credential/v2alpha/aws_iam.proto +++ b/envoy/config/grpc_credential/v2alpha/aws_iam.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.grpc_credential.v2alpha; +option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; option java_outer_classname = "AwsIamProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; import "validate/validate.proto"; diff --git a/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto b/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto index 3b814ee8..b7fccf2f 100644 --- a/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto +++ b/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.grpc_credential.v2alpha; +option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; option java_outer_classname = "FileBasedMetadataProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/config/grpc_credential/v3alpha/aws_iam.proto b/envoy/config/grpc_credential/v3alpha/aws_iam.proto index b3279f00..7841e3d7 100644 --- a/envoy/config/grpc_credential/v3alpha/aws_iam.proto +++ b/envoy/config/grpc_credential/v3alpha/aws_iam.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.grpc_credential.v3alpha; +option java_package = "io.envoyproxy.envoy.config.grpc_credential.v3alpha"; option java_outer_classname = "AwsIamProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.grpc_credential.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto b/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto index df37f947..a1166235 100644 --- a/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto +++ b/envoy/config/grpc_credential/v3alpha/file_based_metadata.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.grpc_credential.v3alpha; +option java_package = "io.envoyproxy.envoy.config.grpc_credential.v3alpha"; option java_outer_classname = "FileBasedMetadataProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.grpc_credential.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/config/health_checker/redis/v2/redis.proto b/envoy/config/health_checker/redis/v2/redis.proto index 5df58842..3f7e15d8 100644 --- a/envoy/config/health_checker/redis/v2/redis.proto +++ b/envoy/config/health_checker/redis/v2/redis.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.health_checker.redis.v2; +option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; option java_outer_classname = "RedisProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; // [#protodoc-title: Redis] // Redis health checker :ref:`configuration overview `. diff --git a/envoy/config/listener/v2/api_listener.proto b/envoy/config/listener/v2/api_listener.proto index 0c225359..5a497cd1 100644 --- a/envoy/config/listener/v2/api_listener.proto +++ b/envoy/config/listener/v2/api_listener.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.listener.v2; +option java_package = "io.envoyproxy.envoy.config.listener.v2"; option java_outer_classname = "ApiListenerProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.listener.v2"; import "google/protobuf/any.proto"; diff --git a/envoy/config/metrics/v2/metrics_service.proto b/envoy/config/metrics/v2/metrics_service.proto index 5fd045e4..d23de6c1 100644 --- a/envoy/config/metrics/v2/metrics_service.proto +++ b/envoy/config/metrics/v2/metrics_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.metrics.v2; +option java_package = "io.envoyproxy.envoy.config.metrics.v2"; option java_outer_classname = "MetricsServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.metrics.v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/metrics/v2/stats.proto b/envoy/config/metrics/v2/stats.proto index b46301b2..716c9c2e 100644 --- a/envoy/config/metrics/v2/stats.proto +++ b/envoy/config/metrics/v2/stats.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.metrics.v2; +option java_package = "io.envoyproxy.envoy.config.metrics.v2"; option java_outer_classname = "StatsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.metrics.v2"; import "envoy/api/v2/core/address.proto"; import "envoy/type/matcher/string.proto"; diff --git a/envoy/config/metrics/v3alpha/metrics_service.proto b/envoy/config/metrics/v3alpha/metrics_service.proto index c39c89cd..d389be5b 100644 --- a/envoy/config/metrics/v3alpha/metrics_service.proto +++ b/envoy/config/metrics/v3alpha/metrics_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.metrics.v3alpha; +option java_package = "io.envoyproxy.envoy.config.metrics.v3alpha"; option java_outer_classname = "MetricsServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.metrics.v3alpha"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/config/metrics/v3alpha/stats.proto b/envoy/config/metrics/v3alpha/stats.proto index f2beb559..5d69dd12 100644 --- a/envoy/config/metrics/v3alpha/stats.proto +++ b/envoy/config/metrics/v3alpha/stats.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.metrics.v3alpha; +option java_package = "io.envoyproxy.envoy.config.metrics.v3alpha"; option java_outer_classname = "StatsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.metrics.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/type/matcher/v3alpha/string.proto"; diff --git a/envoy/config/overload/v2alpha/overload.proto b/envoy/config/overload/v2alpha/overload.proto index 889b3683..42724535 100644 --- a/envoy/config/overload/v2alpha/overload.proto +++ b/envoy/config/overload/v2alpha/overload.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.overload.v2alpha; +option java_package = "io.envoyproxy.envoy.config.overload.v2alpha"; option java_outer_classname = "OverloadProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.overload.v2alpha"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/envoy/config/overload/v3alpha/overload.proto b/envoy/config/overload/v3alpha/overload.proto index 9008d341..7e52a31c 100644 --- a/envoy/config/overload/v3alpha/overload.proto +++ b/envoy/config/overload/v3alpha/overload.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.overload.v3alpha; +option java_package = "io.envoyproxy.envoy.config.overload.v3alpha"; option java_outer_classname = "OverloadProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.overload.v3alpha"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/envoy/config/ratelimit/v2/rls.proto b/envoy/config/ratelimit/v2/rls.proto index 184b3ec0..618ecf7c 100644 --- a/envoy/config/ratelimit/v2/rls.proto +++ b/envoy/config/ratelimit/v2/rls.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.ratelimit.v2; +option java_package = "io.envoyproxy.envoy.config.ratelimit.v2"; option java_outer_classname = "RlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.ratelimit.v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/ratelimit/v3alpha/rls.proto b/envoy/config/ratelimit/v3alpha/rls.proto index 093975ff..73da57d1 100644 --- a/envoy/config/ratelimit/v3alpha/rls.proto +++ b/envoy/config/ratelimit/v3alpha/rls.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.ratelimit.v3alpha; +option java_package = "io.envoyproxy.envoy.config.ratelimit.v3alpha"; option java_outer_classname = "RlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.ratelimit.v3alpha"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/config/rbac/v2/rbac.proto b/envoy/config/rbac/v2/rbac.proto index 90dfb07b..adf2b320 100644 --- a/envoy/config/rbac/v2/rbac.proto +++ b/envoy/config/rbac/v2/rbac.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.rbac.v2; +option java_package = "io.envoyproxy.envoy.config.rbac.v2"; option java_outer_classname = "RbacProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.rbac.v2"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/route/route.proto"; diff --git a/envoy/config/rbac/v3alpha/rbac.proto b/envoy/config/rbac/v3alpha/rbac.proto index b3cf1bcb..ed704d65 100644 --- a/envoy/config/rbac/v3alpha/rbac.proto +++ b/envoy/config/rbac/v3alpha/rbac.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.rbac.v3alpha; +option java_package = "io.envoyproxy.envoy.config.rbac.v3alpha"; option java_outer_classname = "RbacProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.rbac.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/route/route.proto"; diff --git a/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index 2f9b035f..42a946f4 100644 --- a/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.resource_monitor.fixed_heap.v2alpha; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; option java_outer_classname = "FixedHeapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; import "validate/validate.proto"; diff --git a/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index e31c6f5f..12fd97a5 100644 --- a/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.resource_monitor.injected_resource.v2alpha; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; option java_outer_classname = "InjectedResourceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; import "validate/validate.proto"; diff --git a/envoy/config/retry/previous_priorities/previous_priorities_config.proto b/envoy/config/retry/previous_priorities/previous_priorities_config.proto index ee92a2e4..c4df166e 100644 --- a/envoy/config/retry/previous_priorities/previous_priorities_config.proto +++ b/envoy/config/retry/previous_priorities/previous_priorities_config.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.retry.previous_priorities; +option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities"; option java_outer_classname = "PreviousPrioritiesConfigProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities"; // A retry host selector that attempts to spread retries between priorities, even if certain // priorities would not normally be attempted due to higher priorities being available. diff --git a/envoy/config/trace/v2/trace.proto b/envoy/config/trace/v2/trace.proto index c9eec1db..b419ae72 100644 --- a/envoy/config/trace/v2/trace.proto +++ b/envoy/config/trace/v2/trace.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.trace.v2; +option java_package = "io.envoyproxy.envoy.config.trace.v2"; option java_outer_classname = "TraceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.trace.v2"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/trace/v3alpha/trace.proto b/envoy/config/trace/v3alpha/trace.proto index f7604745..9827738a 100644 --- a/envoy/config/trace/v3alpha/trace.proto +++ b/envoy/config/trace/v3alpha/trace.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.trace.v3alpha; +option java_package = "io.envoyproxy.envoy.config.trace.v3alpha"; option java_outer_classname = "TraceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.trace.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/config/transport_socket/alts/v2alpha/alts.proto b/envoy/config/transport_socket/alts/v2alpha/alts.proto index 668facfc..6141595a 100644 --- a/envoy/config/transport_socket/alts/v2alpha/alts.proto +++ b/envoy/config/transport_socket/alts/v2alpha/alts.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.transport_socket.alts.v2alpha; +option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha"; option java_outer_classname = "AltsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha"; import "validate/validate.proto"; diff --git a/envoy/config/transport_socket/tap/v2alpha/tap.proto b/envoy/config/transport_socket/tap/v2alpha/tap.proto index 41811633..8f3a51ff 100644 --- a/envoy/config/transport_socket/tap/v2alpha/tap.proto +++ b/envoy/config/transport_socket/tap/v2alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.transport_socket.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v2alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v2alpha"; import "envoy/api/v2/core/base.proto"; import "envoy/config/common/tap/v2alpha/common.proto"; diff --git a/envoy/config/transport_socket/tap/v3alpha/tap.proto b/envoy/config/transport_socket/tap/v3alpha/tap.proto index d028a7b4..56648883 100644 --- a/envoy/config/transport_socket/tap/v3alpha/tap.proto +++ b/envoy/config/transport_socket/tap/v3alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.config.transport_socket.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v3alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/config/common/tap/v3alpha/common.proto"; diff --git a/envoy/data/accesslog/v2/accesslog.proto b/envoy/data/accesslog/v2/accesslog.proto index 00a2e9cc..5d2c75d7 100644 --- a/envoy/data/accesslog/v2/accesslog.proto +++ b/envoy/data/accesslog/v2/accesslog.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.accesslog.v2; +option java_package = "io.envoyproxy.envoy.data.accesslog.v2"; option java_outer_classname = "AccesslogProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.accesslog.v2"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/data/accesslog/v3alpha/accesslog.proto b/envoy/data/accesslog/v3alpha/accesslog.proto index 40a86f93..68980cb8 100644 --- a/envoy/data/accesslog/v3alpha/accesslog.proto +++ b/envoy/data/accesslog/v3alpha/accesslog.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.accesslog.v3alpha; +option java_package = "io.envoyproxy.envoy.data.accesslog.v3alpha"; option java_outer_classname = "AccesslogProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.accesslog.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/data/cluster/v2alpha/outlier_detection_event.proto b/envoy/data/cluster/v2alpha/outlier_detection_event.proto index db3fa1ee..80afadd9 100644 --- a/envoy/data/cluster/v2alpha/outlier_detection_event.proto +++ b/envoy/data/cluster/v2alpha/outlier_detection_event.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.cluster.v2alpha; +option java_package = "io.envoyproxy.envoy.data.cluster.v2alpha"; option java_outer_classname = "OutlierDetectionEventProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.cluster.v2alpha"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/data/core/v2alpha/health_check_event.proto b/envoy/data/core/v2alpha/health_check_event.proto index f384f9f4..f5a4533e 100644 --- a/envoy/data/core/v2alpha/health_check_event.proto +++ b/envoy/data/core/v2alpha/health_check_event.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.core.v2alpha; +option java_package = "io.envoyproxy.envoy.data.core.v2alpha"; option java_outer_classname = "HealthCheckEventProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.core.v2alpha"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/data/core/v3alpha/health_check_event.proto b/envoy/data/core/v3alpha/health_check_event.proto index 8024be51..3ae7b40d 100644 --- a/envoy/data/core/v3alpha/health_check_event.proto +++ b/envoy/data/core/v3alpha/health_check_event.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.core.v3alpha; +option java_package = "io.envoyproxy.envoy.data.core.v3alpha"; option java_outer_classname = "HealthCheckEventProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.core.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/envoy/data/tap/v2alpha/common.proto b/envoy/data/tap/v2alpha/common.proto index d9133118..93e33a2e 100644 --- a/envoy/data/tap/v2alpha/common.proto +++ b/envoy/data/tap/v2alpha/common.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; option java_outer_classname = "CommonProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; // [#protodoc-title: Tap common data] diff --git a/envoy/data/tap/v2alpha/http.proto b/envoy/data/tap/v2alpha/http.proto index d42e6ad5..849538b8 100644 --- a/envoy/data/tap/v2alpha/http.proto +++ b/envoy/data/tap/v2alpha/http.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; option java_outer_classname = "HttpProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; import "envoy/api/v2/core/base.proto"; import "envoy/data/tap/v2alpha/common.proto"; diff --git a/envoy/data/tap/v2alpha/transport.proto b/envoy/data/tap/v2alpha/transport.proto index a34518f3..7d2f2c4f 100644 --- a/envoy/data/tap/v2alpha/transport.proto +++ b/envoy/data/tap/v2alpha/transport.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; option java_outer_classname = "TransportProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; import "envoy/api/v2/core/address.proto"; import "envoy/data/tap/v2alpha/common.proto"; diff --git a/envoy/data/tap/v2alpha/wrapper.proto b/envoy/data/tap/v2alpha/wrapper.proto index 597b22f0..3445e67e 100644 --- a/envoy/data/tap/v2alpha/wrapper.proto +++ b/envoy/data/tap/v2alpha/wrapper.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; option java_outer_classname = "WrapperProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; import "envoy/data/tap/v2alpha/http.proto"; import "envoy/data/tap/v2alpha/transport.proto"; diff --git a/envoy/data/tap/v3alpha/common.proto b/envoy/data/tap/v3alpha/common.proto index 96d84653..148e48e2 100644 --- a/envoy/data/tap/v3alpha/common.proto +++ b/envoy/data/tap/v3alpha/common.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; option java_outer_classname = "CommonProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/data/tap/v3alpha/http.proto b/envoy/data/tap/v3alpha/http.proto index bc04bde7..f09b2c14 100644 --- a/envoy/data/tap/v3alpha/http.proto +++ b/envoy/data/tap/v3alpha/http.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; option java_outer_classname = "HttpProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/data/tap/v3alpha/common.proto"; diff --git a/envoy/data/tap/v3alpha/transport.proto b/envoy/data/tap/v3alpha/transport.proto index a17642e0..2fe147e5 100644 --- a/envoy/data/tap/v3alpha/transport.proto +++ b/envoy/data/tap/v3alpha/transport.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; option java_outer_classname = "TransportProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/data/tap/v3alpha/common.proto"; diff --git a/envoy/data/tap/v3alpha/wrapper.proto b/envoy/data/tap/v3alpha/wrapper.proto index 25f41c57..bcad27e6 100644 --- a/envoy/data/tap/v3alpha/wrapper.proto +++ b/envoy/data/tap/v3alpha/wrapper.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.data.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; option java_outer_classname = "WrapperProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.data.tap.v3alpha"; import "envoy/data/tap/v3alpha/http.proto"; import "envoy/data/tap/v3alpha/transport.proto"; diff --git a/envoy/service/accesslog/v2/als.proto b/envoy/service/accesslog/v2/als.proto index e3022af8..fffe668b 100644 --- a/envoy/service/accesslog/v2/als.proto +++ b/envoy/service/accesslog/v2/als.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.accesslog.v2; +option java_package = "io.envoyproxy.envoy.service.accesslog.v2"; option java_outer_classname = "AlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.accesslog.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/accesslog/v3alpha/als.proto b/envoy/service/accesslog/v3alpha/als.proto index c5bf457d..113e1adf 100644 --- a/envoy/service/accesslog/v3alpha/als.proto +++ b/envoy/service/accesslog/v3alpha/als.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.accesslog.v3alpha; +option java_package = "io.envoyproxy.envoy.service.accesslog.v3alpha"; option java_outer_classname = "AlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.accesslog.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/auth/v2/attribute_context.proto b/envoy/service/auth/v2/attribute_context.proto index a694b137..82b2065f 100644 --- a/envoy/service/auth/v2/attribute_context.proto +++ b/envoy/service/auth/v2/attribute_context.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.auth.v2; +option java_package = "io.envoyproxy.envoy.service.auth.v2"; option java_outer_classname = "AttributeContextProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.auth.v2"; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/auth/v2/external_auth.proto b/envoy/service/auth/v2/external_auth.proto index 7b2144cf..b9da8d6d 100644 --- a/envoy/service/auth/v2/external_auth.proto +++ b/envoy/service/auth/v2/external_auth.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.auth.v2; +option java_package = "io.envoyproxy.envoy.service.auth.v2"; option java_outer_classname = "ExternalAuthProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.auth.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/auth/v3alpha/attribute_context.proto b/envoy/service/auth/v3alpha/attribute_context.proto index 9a5d3b5a..e50f6d63 100644 --- a/envoy/service/auth/v3alpha/attribute_context.proto +++ b/envoy/service/auth/v3alpha/attribute_context.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.auth.v3alpha; +option java_package = "io.envoyproxy.envoy.service.auth.v3alpha"; option java_outer_classname = "AttributeContextProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.auth.v3alpha"; import "envoy/api/v3alpha/core/address.proto"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/auth/v3alpha/external_auth.proto b/envoy/service/auth/v3alpha/external_auth.proto index e3bc345f..8daf10f0 100644 --- a/envoy/service/auth/v3alpha/external_auth.proto +++ b/envoy/service/auth/v3alpha/external_auth.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.auth.v3alpha; +option java_package = "io.envoyproxy.envoy.service.auth.v3alpha"; option java_outer_classname = "ExternalAuthProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.auth.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/discovery/v2/ads.proto b/envoy/service/discovery/v2/ads.proto index 63b12906..40945e1b 100644 --- a/envoy/service/discovery/v2/ads.proto +++ b/envoy/service/discovery/v2/ads.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_outer_classname = "AdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; diff --git a/envoy/service/discovery/v2/hds.proto b/envoy/service/discovery/v2/hds.proto index fe96f06a..1045d865 100644 --- a/envoy/service/discovery/v2/hds.proto +++ b/envoy/service/discovery/v2/hds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_outer_classname = "HdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; @@ -62,10 +62,8 @@ service HealthDiscoveryService { // request/response. Should we add an identifier to the HealthCheckSpecifier // to bind with the response? rpc FetchHealthCheck(HealthCheckRequestOrEndpointHealthResponse) returns (HealthCheckSpecifier) { - option (google.api.http) = { - post: "/v2/discovery:health_check" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:health_check"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/discovery/v2/rtds.proto b/envoy/service/discovery/v2/rtds.proto index 4dfe6f2a..eebf9e20 100644 --- a/envoy/service/discovery/v2/rtds.proto +++ b/envoy/service/discovery/v2/rtds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_outer_classname = "RtdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; @@ -27,10 +27,8 @@ service RuntimeDiscoveryService { } rpc FetchRuntime(api.v2.DiscoveryRequest) returns (api.v2.DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:runtime" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:runtime"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/discovery/v2/sds.proto b/envoy/service/discovery/v2/sds.proto index 3a61947e..df517f06 100644 --- a/envoy/service/discovery/v2/sds.proto +++ b/envoy/service/discovery/v2/sds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_outer_classname = "SdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v2"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; @@ -20,10 +20,8 @@ service SecretDiscoveryService { } rpc FetchSecrets(api.v2.DiscoveryRequest) returns (api.v2.DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:secrets" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:secrets"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/discovery/v3alpha/ads.proto b/envoy/service/discovery/v3alpha/ads.proto index 43dbff71..a89bf61b 100644 --- a/envoy/service/discovery/v3alpha/ads.proto +++ b/envoy/service/discovery/v3alpha/ads.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v3alpha; +option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_outer_classname = "AdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; diff --git a/envoy/service/discovery/v3alpha/hds.proto b/envoy/service/discovery/v3alpha/hds.proto index b26e52a1..ca472f02 100644 --- a/envoy/service/discovery/v3alpha/hds.proto +++ b/envoy/service/discovery/v3alpha/hds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v3alpha; +option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_outer_classname = "HdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; @@ -64,10 +64,8 @@ service HealthDiscoveryService { // request/response. Should we add an identifier to the HealthCheckSpecifier // to bind with the response? rpc FetchHealthCheck(HealthCheckRequestOrEndpointHealthResponse) returns (HealthCheckSpecifier) { - option (google.api.http) = { - post: "/v3alpha/discovery:health_check" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:health_check"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/discovery/v3alpha/rtds.proto b/envoy/service/discovery/v3alpha/rtds.proto index 96180f16..ff1bc04d 100644 --- a/envoy/service/discovery/v3alpha/rtds.proto +++ b/envoy/service/discovery/v3alpha/rtds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v3alpha; +option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_outer_classname = "RtdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; @@ -30,10 +30,8 @@ service RuntimeDiscoveryService { } rpc FetchRuntime(api.v3alpha.DiscoveryRequest) returns (api.v3alpha.DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:runtime" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:runtime"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/discovery/v3alpha/sds.proto b/envoy/service/discovery/v3alpha/sds.proto index db0beb8e..6cdbd26a 100644 --- a/envoy/service/discovery/v3alpha/sds.proto +++ b/envoy/service/discovery/v3alpha/sds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.discovery.v3alpha; +option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_outer_classname = "SdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.discovery.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; @@ -23,10 +23,8 @@ service SecretDiscoveryService { } rpc FetchSecrets(api.v3alpha.DiscoveryRequest) returns (api.v3alpha.DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:secrets" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:secrets"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/load_stats/v2/lrs.proto b/envoy/service/load_stats/v2/lrs.proto index c2f7b5a0..fe3e7e97 100644 --- a/envoy/service/load_stats/v2/lrs.proto +++ b/envoy/service/load_stats/v2/lrs.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.load_stats.v2; +option java_package = "io.envoyproxy.envoy.service.load_stats.v2"; option java_outer_classname = "LrsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.load_stats.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/load_stats/v3alpha/lrs.proto b/envoy/service/load_stats/v3alpha/lrs.proto index c64e75b5..7718b168 100644 --- a/envoy/service/load_stats/v3alpha/lrs.proto +++ b/envoy/service/load_stats/v3alpha/lrs.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.load_stats.v3alpha; +option java_package = "io.envoyproxy.envoy.service.load_stats.v3alpha"; option java_outer_classname = "LrsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.load_stats.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/metrics/v2/metrics_service.proto b/envoy/service/metrics/v2/metrics_service.proto index dc7a5378..28484b22 100644 --- a/envoy/service/metrics/v2/metrics_service.proto +++ b/envoy/service/metrics/v2/metrics_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.metrics.v2; +option java_package = "io.envoyproxy.envoy.service.metrics.v2"; option java_outer_classname = "MetricsServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.metrics.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/metrics/v3alpha/metrics_service.proto b/envoy/service/metrics/v3alpha/metrics_service.proto index be0053dc..98d7a5a9 100644 --- a/envoy/service/metrics/v3alpha/metrics_service.proto +++ b/envoy/service/metrics/v3alpha/metrics_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.metrics.v3alpha; +option java_package = "io.envoyproxy.envoy.service.metrics.v3alpha"; option java_outer_classname = "MetricsServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.metrics.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/ratelimit/v2/rls.proto b/envoy/service/ratelimit/v2/rls.proto index 8dd4460f..d184657a 100644 --- a/envoy/service/ratelimit/v2/rls.proto +++ b/envoy/service/ratelimit/v2/rls.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.ratelimit.v2; +option java_package = "io.envoyproxy.envoy.service.ratelimit.v2"; option java_outer_classname = "RlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.ratelimit.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/ratelimit/v3alpha/rls.proto b/envoy/service/ratelimit/v3alpha/rls.proto index dc587b18..5c143035 100644 --- a/envoy/service/ratelimit/v3alpha/rls.proto +++ b/envoy/service/ratelimit/v3alpha/rls.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.ratelimit.v3alpha; +option java_package = "io.envoyproxy.envoy.service.ratelimit.v3alpha"; option java_outer_classname = "RlsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.ratelimit.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/tap/v2alpha/common.proto b/envoy/service/tap/v2alpha/common.proto index 66ac87cc..098ee6c6 100644 --- a/envoy/service/tap/v2alpha/common.proto +++ b/envoy/service/tap/v2alpha/common.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; option java_outer_classname = "CommonProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/service/tap/v2alpha/tap.proto b/envoy/service/tap/v2alpha/tap.proto index 8294f254..bdf46150 100644 --- a/envoy/service/tap/v2alpha/tap.proto +++ b/envoy/service/tap/v2alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/tap/v2alpha/tapds.proto b/envoy/service/tap/v2alpha/tapds.proto index 246d9d17..280d848f 100644 --- a/envoy/service/tap/v2alpha/tapds.proto +++ b/envoy/service/tap/v2alpha/tapds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; option java_outer_classname = "TapdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; option java_generic_services = true; import "envoy/api/v2/discovery.proto"; @@ -26,10 +26,8 @@ service TapDiscoveryService { } rpc FetchTapConfigs(api.v2.DiscoveryRequest) returns (api.v2.DiscoveryResponse) { - option (google.api.http) = { - post: "/v2/discovery:tap_configs" - body: "*" - }; + option (google.api.http).post = "/v2/discovery:tap_configs"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/tap/v3alpha/common.proto b/envoy/service/tap/v3alpha/common.proto index 54d0561e..dcb1f5ce 100644 --- a/envoy/service/tap/v3alpha/common.proto +++ b/envoy/service/tap/v3alpha/common.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; option java_outer_classname = "CommonProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; import "envoy/api/v3alpha/core/base.proto"; import "envoy/api/v3alpha/core/grpc_service.proto"; diff --git a/envoy/service/tap/v3alpha/tap.proto b/envoy/service/tap/v3alpha/tap.proto index 12392a08..4bb11675 100644 --- a/envoy/service/tap/v3alpha/tap.proto +++ b/envoy/service/tap/v3alpha/tap.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; option java_outer_classname = "TapProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/service/tap/v3alpha/tapds.proto b/envoy/service/tap/v3alpha/tapds.proto index c7749311..c4c5962e 100644 --- a/envoy/service/tap/v3alpha/tapds.proto +++ b/envoy/service/tap/v3alpha/tapds.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.tap.v3alpha; +option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; option java_outer_classname = "TapdsProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.tap.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/discovery.proto"; @@ -29,10 +29,8 @@ service TapDiscoveryService { } rpc FetchTapConfigs(api.v3alpha.DiscoveryRequest) returns (api.v3alpha.DiscoveryResponse) { - option (google.api.http) = { - post: "/v3alpha/discovery:tap_configs" - body: "*" - }; + option (google.api.http).post = "/v3alpha/discovery:tap_configs"; + option (google.api.http).body = "*"; } } diff --git a/envoy/service/trace/v2/trace_service.proto b/envoy/service/trace/v2/trace_service.proto index 00b1a5b7..7396d975 100644 --- a/envoy/service/trace/v2/trace_service.proto +++ b/envoy/service/trace/v2/trace_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.trace.v2; +option java_package = "io.envoyproxy.envoy.service.trace.v2"; option java_outer_classname = "TraceServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.trace.v2"; option java_generic_services = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/trace/v3alpha/trace_service.proto b/envoy/service/trace/v3alpha/trace_service.proto index a782300e..fbbe174d 100644 --- a/envoy/service/trace/v3alpha/trace_service.proto +++ b/envoy/service/trace/v3alpha/trace_service.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.service.trace.v3alpha; +option java_package = "io.envoyproxy.envoy.service.trace.v3alpha"; option java_outer_classname = "TraceServiceProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.service.trace.v3alpha"; option java_generic_services = true; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/type/hash_policy.proto b/envoy/type/hash_policy.proto index 077e2c25..29950a65 100644 --- a/envoy/type/hash_policy.proto +++ b/envoy/type/hash_policy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; option java_outer_classname = "HashPolicyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type"; import "validate/validate.proto"; diff --git a/envoy/type/http.proto b/envoy/type/http.proto index 2d0f5161..89944fd2 100644 --- a/envoy/type/http.proto +++ b/envoy/type/http.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; option java_outer_classname = "HttpProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type"; enum CodecClientType { HTTP1 = 0; diff --git a/envoy/type/http_status.proto b/envoy/type/http_status.proto index acde59c4..3b99cf0c 100644 --- a/envoy/type/http_status.proto +++ b/envoy/type/http_status.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; option java_outer_classname = "HttpStatusProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type"; import "validate/validate.proto"; diff --git a/envoy/type/matcher/metadata.proto b/envoy/type/matcher/metadata.proto index d2936a5c..65e478c6 100644 --- a/envoy/type/matcher/metadata.proto +++ b/envoy/type/matcher/metadata.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; option java_outer_classname = "MetadataProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher"; import "envoy/type/matcher/value.proto"; diff --git a/envoy/type/matcher/number.proto b/envoy/type/matcher/number.proto index 09eb8116..de00fbed 100644 --- a/envoy/type/matcher/number.proto +++ b/envoy/type/matcher/number.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; option java_outer_classname = "NumberProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher"; import "envoy/type/range.proto"; diff --git a/envoy/type/matcher/regex.proto b/envoy/type/matcher/regex.proto index 98819364..e3a9d8e2 100644 --- a/envoy/type/matcher/regex.proto +++ b/envoy/type/matcher/regex.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; option java_outer_classname = "RegexProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/type/matcher/string.proto b/envoy/type/matcher/string.proto index 8837fab8..ab252d6f 100644 --- a/envoy/type/matcher/string.proto +++ b/envoy/type/matcher/string.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; option java_outer_classname = "StringProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher"; import "envoy/type/matcher/regex.proto"; @@ -54,7 +54,7 @@ message StringMatcher { // .. attention:: // This field has been deprecated in favor of `safe_regex` as it is not safe for use with // untrusted input in all cases. - string regex = 4 [(validate.rules).string = {max_bytes: 1024}, deprecated = true]; + string regex = 4 [deprecated = true, (validate.rules).string = {max_bytes: 1024}]; // The input string must match the regular expression specified here. RegexMatcher safe_regex = 5 [(validate.rules).message = {required: true}]; diff --git a/envoy/type/matcher/v3alpha/metadata.proto b/envoy/type/matcher/v3alpha/metadata.proto index 964a0e4c..5c00876d 100644 --- a/envoy/type/matcher/v3alpha/metadata.proto +++ b/envoy/type/matcher/v3alpha/metadata.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher.v3alpha; +option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; option java_outer_classname = "MetadataProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; import "envoy/type/matcher/v3alpha/value.proto"; diff --git a/envoy/type/matcher/v3alpha/number.proto b/envoy/type/matcher/v3alpha/number.proto index 27e292bf..da265103 100644 --- a/envoy/type/matcher/v3alpha/number.proto +++ b/envoy/type/matcher/v3alpha/number.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher.v3alpha; +option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; option java_outer_classname = "NumberProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; import "envoy/type/v3alpha/range.proto"; diff --git a/envoy/type/matcher/v3alpha/regex.proto b/envoy/type/matcher/v3alpha/regex.proto index ca339fc0..51f296f1 100644 --- a/envoy/type/matcher/v3alpha/regex.proto +++ b/envoy/type/matcher/v3alpha/regex.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher.v3alpha; +option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; option java_outer_classname = "RegexProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/type/matcher/v3alpha/string.proto b/envoy/type/matcher/v3alpha/string.proto index 3472ca40..bba1b6b6 100644 --- a/envoy/type/matcher/v3alpha/string.proto +++ b/envoy/type/matcher/v3alpha/string.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher.v3alpha; +option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; option java_outer_classname = "StringProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; import "envoy/type/matcher/v3alpha/regex.proto"; diff --git a/envoy/type/matcher/v3alpha/value.proto b/envoy/type/matcher/v3alpha/value.proto index 7cc6a546..7268df47 100644 --- a/envoy/type/matcher/v3alpha/value.proto +++ b/envoy/type/matcher/v3alpha/value.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher.v3alpha; +option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; option java_outer_classname = "ValueProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher.v3alpha"; import "envoy/type/matcher/v3alpha/number.proto"; import "envoy/type/matcher/v3alpha/string.proto"; diff --git a/envoy/type/matcher/value.proto b/envoy/type/matcher/value.proto index 71e02310..f68d49af 100644 --- a/envoy/type/matcher/value.proto +++ b/envoy/type/matcher/value.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; option java_outer_classname = "ValueProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.matcher"; import "envoy/type/matcher/number.proto"; import "envoy/type/matcher/string.proto"; diff --git a/envoy/type/metadata/v2/metadata.proto b/envoy/type/metadata/v2/metadata.proto index ac51fe41..b1a92bef 100644 --- a/envoy/type/metadata/v2/metadata.proto +++ b/envoy/type/metadata/v2/metadata.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.metadata.v2; +option java_package = "io.envoyproxy.envoy.type.metadata.v2"; option java_outer_classname = "MetadataProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.metadata.v2"; import "validate/validate.proto"; diff --git a/envoy/type/percent.proto b/envoy/type/percent.proto index 6d0868fd..9c0aa65a 100644 --- a/envoy/type/percent.proto +++ b/envoy/type/percent.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; option java_outer_classname = "PercentProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type"; import "validate/validate.proto"; diff --git a/envoy/type/range.proto b/envoy/type/range.proto index f31cf32f..e000f93d 100644 --- a/envoy/type/range.proto +++ b/envoy/type/range.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; option java_outer_classname = "RangeProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type"; // [#protodoc-title: Range] diff --git a/envoy/type/tracing/v2/custom_tag.proto b/envoy/type/tracing/v2/custom_tag.proto index 555a198d..de3b550d 100644 --- a/envoy/type/tracing/v2/custom_tag.proto +++ b/envoy/type/tracing/v2/custom_tag.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.tracing.v2; +option java_package = "io.envoyproxy.envoy.type.tracing.v2"; option java_outer_classname = "CustomTagProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.tracing.v2"; import "envoy/type/metadata/v2/metadata.proto"; diff --git a/envoy/type/v3alpha/hash_policy.proto b/envoy/type/v3alpha/hash_policy.proto index 5bb6f936..06d98be4 100644 --- a/envoy/type/v3alpha/hash_policy.proto +++ b/envoy/type/v3alpha/hash_policy.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.v3alpha; +option java_package = "io.envoyproxy.envoy.type.v3alpha"; option java_outer_classname = "HashPolicyProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/type/v3alpha/http.proto b/envoy/type/v3alpha/http.proto index 2d0b19e5..799cbe13 100644 --- a/envoy/type/v3alpha/http.proto +++ b/envoy/type/v3alpha/http.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.v3alpha; +option java_package = "io.envoyproxy.envoy.type.v3alpha"; option java_outer_classname = "HttpProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.v3alpha"; enum CodecClientType { HTTP1 = 0; diff --git a/envoy/type/v3alpha/http_status.proto b/envoy/type/v3alpha/http_status.proto index c7d50c11..1a29e03d 100644 --- a/envoy/type/v3alpha/http_status.proto +++ b/envoy/type/v3alpha/http_status.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.v3alpha; +option java_package = "io.envoyproxy.envoy.type.v3alpha"; option java_outer_classname = "HttpStatusProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/type/v3alpha/percent.proto b/envoy/type/v3alpha/percent.proto index dfe58831..56941bff 100644 --- a/envoy/type/v3alpha/percent.proto +++ b/envoy/type/v3alpha/percent.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.v3alpha; +option java_package = "io.envoyproxy.envoy.type.v3alpha"; option java_outer_classname = "PercentProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.v3alpha"; import "udpa/annotations/versioning.proto"; diff --git a/envoy/type/v3alpha/range.proto b/envoy/type/v3alpha/range.proto index 3221e7cc..f8fda4cc 100644 --- a/envoy/type/v3alpha/range.proto +++ b/envoy/type/v3alpha/range.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package envoy.type.v3alpha; +option java_package = "io.envoyproxy.envoy.type.v3alpha"; option java_outer_classname = "RangeProto"; option java_multiple_files = true; -option java_package = "io.envoyproxy.envoy.type.v3alpha"; import "udpa/annotations/versioning.proto";