From 47fef3411b255c00b475ab8703aa95d87b362db7 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Wed, 2 Jan 2019 23:51:45 +0000 Subject: [PATCH] api: add proto options for java (#5369) * api: add proto options for java * add ci for checking proto options Signed-off-by: Penn (Dapeng) Zhang Mirrored from https://github.com/envoyproxy/envoy @ 02659d411332e9f20d229f482931c15304ea17fd --- envoy/admin/v2alpha/certs.proto | 2 ++ envoy/admin/v2alpha/clusters.proto | 2 ++ envoy/admin/v2alpha/config_dump.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/api/v2/auth/cert.proto | 2 ++ envoy/api/v2/cds.proto | 2 ++ envoy/api/v2/cluster/circuit_breaker.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 | 2 ++ envoy/api/v2/endpoint/endpoint.proto | 2 ++ envoy/api/v2/endpoint/load_report.proto | 2 ++ envoy/api/v2/lds.proto | 2 ++ envoy/api/v2/listener/listener.proto | 2 ++ envoy/api/v2/ratelimit/ratelimit.proto | 2 ++ envoy/api/v2/rds.proto | 2 ++ envoy/api/v2/route/route.proto | 2 ++ envoy/config/accesslog/v2/als.proto | 2 ++ envoy/config/accesslog/v2/file.proto | 2 ++ envoy/config/bootstrap/v2/bootstrap.proto | 2 ++ envoy/config/filter/accesslog/v2/accesslog.proto | 2 ++ envoy/config/filter/fault/v2/fault.proto | 2 ++ envoy/config/filter/http/buffer/v2/buffer.proto | 2 ++ envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto | 2 ++ envoy/config/filter/http/fault/v2/fault.proto | 2 ++ envoy/config/filter/http/gzip/v2/gzip.proto | 2 ++ .../filter/http/header_to_metadata/v2/header_to_metadata.proto | 2 ++ envoy/config/filter/http/health_check/v2/health_check.proto | 2 ++ envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto | 2 ++ envoy/config/filter/http/jwt_authn/v2alpha/config.proto | 2 ++ envoy/config/filter/http/lua/v2/lua.proto | 2 ++ envoy/config/filter/http/rate_limit/v2/rate_limit.proto | 2 ++ envoy/config/filter/http/rbac/v2/rbac.proto | 2 ++ envoy/config/filter/http/router/v2/router.proto | 2 ++ envoy/config/filter/http/squash/v2/squash.proto | 2 ++ envoy/config/filter/http/transcoder/v2/transcoder.proto | 2 ++ .../filter/network/client_ssl_auth/v2/client_ssl_auth.proto | 2 ++ .../filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto | 2 ++ envoy/config/filter/network/ext_authz/v2/ext_authz.proto | 2 ++ .../http_connection_manager/v2/http_connection_manager.proto | 2 ++ envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto | 2 ++ envoy/config/filter/network/rate_limit/v2/rate_limit.proto | 2 ++ envoy/config/filter/network/rbac/v2/rbac.proto | 2 ++ envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto | 2 ++ envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto | 2 ++ envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto | 2 ++ .../filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto | 2 ++ envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto | 2 ++ envoy/config/filter/thrift/router/v2alpha1/router.proto | 2 ++ envoy/config/grpc_credential/v2alpha/file_based_metadata.proto | 2 ++ envoy/config/health_checker/redis/v2/redis.proto | 2 ++ envoy/config/metrics/v2/metrics_service.proto | 2 ++ envoy/config/metrics/v2/stats.proto | 2 ++ envoy/config/overload/v2alpha/overload.proto | 2 ++ envoy/config/ratelimit/v2/rls.proto | 2 ++ envoy/config/rbac/v2alpha/rbac.proto | 2 ++ .../config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto | 2 ++ .../injected_resource/v2alpha/injected_resource.proto | 2 ++ .../retry/previous_priorities/previous_priorities_config.proto | 2 ++ envoy/config/trace/v2/trace.proto | 2 ++ envoy/config/transport_socket/alts/v2alpha/alts.proto | 2 ++ envoy/config/transport_socket/capture/v2alpha/capture.proto | 2 ++ envoy/data/accesslog/v2/accesslog.proto | 2 ++ envoy/data/core/v2alpha/health_check_event.proto | 2 ++ envoy/data/tap/v2alpha/capture.proto | 2 ++ envoy/service/accesslog/v2/als.proto | 2 ++ envoy/service/auth/v2alpha/attribute_context.proto | 2 ++ envoy/service/auth/v2alpha/external_auth.proto | 2 ++ envoy/service/discovery/v2/ads.proto | 2 ++ envoy/service/discovery/v2/hds.proto | 2 ++ envoy/service/discovery/v2/sds.proto | 2 ++ envoy/service/load_stats/v2/lrs.proto | 2 ++ envoy/service/metrics/v2/metrics_service.proto | 2 ++ envoy/service/ratelimit/v2/rls.proto | 2 ++ envoy/service/trace/v2/trace_service.proto | 2 ++ envoy/type/http_status.proto | 2 ++ envoy/type/matcher/metadata.proto | 2 ++ envoy/type/matcher/number.proto | 2 ++ envoy/type/matcher/string.proto | 2 ++ envoy/type/matcher/value.proto | 2 ++ envoy/type/percent.proto | 2 ++ envoy/type/range.proto | 2 ++ 92 files changed, 184 insertions(+) diff --git a/envoy/admin/v2alpha/certs.proto b/envoy/admin/v2alpha/certs.proto index 649e122c..ffcd0695 100644 --- a/envoy/admin/v2alpha/certs.proto +++ b/envoy/admin/v2alpha/certs.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; import "google/protobuf/timestamp.proto"; diff --git a/envoy/admin/v2alpha/clusters.proto b/envoy/admin/v2alpha/clusters.proto index dd8c77eb..b41d9733 100644 --- a/envoy/admin/v2alpha/clusters.proto +++ b/envoy/admin/v2alpha/clusters.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; 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 8f78148f..f02acaff 100644 --- a/envoy/admin/v2alpha/config_dump.proto +++ b/envoy/admin/v2alpha/config_dump.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; import "envoy/api/v2/cds.proto"; import "envoy/api/v2/lds.proto"; diff --git a/envoy/admin/v2alpha/memory.proto b/envoy/admin/v2alpha/memory.proto index f148b2c6..556af734 100644 --- a/envoy/admin/v2alpha/memory.proto +++ b/envoy/admin/v2alpha/memory.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; // [#protodoc-title: Memory] diff --git a/envoy/admin/v2alpha/metrics.proto b/envoy/admin/v2alpha/metrics.proto index a22f3eed..936ef218 100644 --- a/envoy/admin/v2alpha/metrics.proto +++ b/envoy/admin/v2alpha/metrics.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; // [#protodoc-title: Metrics] diff --git a/envoy/admin/v2alpha/mutex_stats.proto b/envoy/admin/v2alpha/mutex_stats.proto index 81194e5d..6b6b5845 100644 --- a/envoy/admin/v2alpha/mutex_stats.proto +++ b/envoy/admin/v2alpha/mutex_stats.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; // [#protodoc-title: MutexStats] diff --git a/envoy/admin/v2alpha/server_info.proto b/envoy/admin/v2alpha/server_info.proto index 171c6c69..51595efe 100644 --- a/envoy/admin/v2alpha/server_info.proto +++ b/envoy/admin/v2alpha/server_info.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.admin.v2alpha; +option java_package = "io.envoyproxy.envoy.admin.v2alpha"; +option java_multiple_files = true; import "google/protobuf/duration.proto"; diff --git a/envoy/api/v2/auth/cert.proto b/envoy/api/v2/auth/cert.proto index 0bc9c866..1393924e 100644 --- a/envoy/api/v2/auth/cert.proto +++ b/envoy/api/v2/auth/cert.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.auth; +option java_package = "io.envoyproxy.envoy.api.v2.auth"; +option java_multiple_files = true; option go_package = "auth"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/cds.proto b/envoy/api/v2/cds.proto index a1021ec2..e8f86e9b 100644 --- a/envoy/api/v2/cds.proto +++ b/envoy/api/v2/cds.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; +option java_multiple_files = true; option java_generic_services = true; diff --git a/envoy/api/v2/cluster/circuit_breaker.proto b/envoy/api/v2/cluster/circuit_breaker.proto index 1d574311..0571f90e 100644 --- a/envoy/api/v2/cluster/circuit_breaker.proto +++ b/envoy/api/v2/cluster/circuit_breaker.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.cluster; +option java_package = "io.envoyproxy.envoy.api.v2.cluster"; +option java_multiple_files = true; option go_package = "cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; diff --git a/envoy/api/v2/cluster/outlier_detection.proto b/envoy/api/v2/cluster/outlier_detection.proto index 3ef96192..c4fb9e81 100644 --- a/envoy/api/v2/cluster/outlier_detection.proto +++ b/envoy/api/v2/cluster/outlier_detection.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.cluster; +option java_package = "io.envoyproxy.envoy.api.v2.cluster"; +option java_multiple_files = true; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; import "google/protobuf/duration.proto"; diff --git a/envoy/api/v2/core/address.proto b/envoy/api/v2/core/address.proto index 081e313c..009def94 100644 --- a/envoy/api/v2/core/address.proto +++ b/envoy/api/v2/core/address.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/core/base.proto b/envoy/api/v2/core/base.proto index b597fa1a..82482099 100644 --- a/envoy/api/v2/core/base.proto +++ b/envoy/api/v2/core/base.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; option go_package = "core"; import "google/protobuf/any.proto"; diff --git a/envoy/api/v2/core/config_source.proto b/envoy/api/v2/core/config_source.proto index 5d85e285..56eb2379 100644 --- a/envoy/api/v2/core/config_source.proto +++ b/envoy/api/v2/core/config_source.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; 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 f4e919c4..7a009d81 100644 --- a/envoy/api/v2/core/grpc_service.proto +++ b/envoy/api/v2/core/grpc_service.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; 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 4a2e8673..ea2e245a 100644 --- a/envoy/api/v2/core/health_check.proto +++ b/envoy/api/v2/core/health_check.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/core/http_uri.proto b/envoy/api/v2/core/http_uri.proto index 0c0ab766..5b48bdd5 100644 --- a/envoy/api/v2/core/http_uri.proto +++ b/envoy/api/v2/core/http_uri.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; import "google/protobuf/duration.proto"; import "gogoproto/gogo.proto"; diff --git a/envoy/api/v2/core/protocol.proto b/envoy/api/v2/core/protocol.proto index 7399beda..e8ddf0e7 100644 --- a/envoy/api/v2/core/protocol.proto +++ b/envoy/api/v2/core/protocol.proto @@ -3,6 +3,8 @@ syntax = "proto3"; package envoy.api.v2.core; +option java_package = "io.envoyproxy.envoy.api.v2.core"; +option java_multiple_files = true; 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 f3ab1913..85fa34b9 100644 --- a/envoy/api/v2/discovery.proto +++ b/envoy/api/v2/discovery.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/api/v2/eds.proto b/envoy/api/v2/eds.proto index b807ab98..d4cdd672 100644 --- a/envoy/api/v2/eds.proto +++ b/envoy/api/v2/eds.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; +option java_multiple_files = true; option java_generic_services = true; diff --git a/envoy/api/v2/endpoint/endpoint.proto b/envoy/api/v2/endpoint/endpoint.proto index cba452ab..bdb677b8 100644 --- a/envoy/api/v2/endpoint/endpoint.proto +++ b/envoy/api/v2/endpoint/endpoint.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.endpoint; +option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; +option java_multiple_files = true; option go_package = "endpoint"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/api/v2/endpoint/load_report.proto b/envoy/api/v2/endpoint/load_report.proto index 608bce8c..832e8504 100644 --- a/envoy/api/v2/endpoint/load_report.proto +++ b/envoy/api/v2/endpoint/load_report.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.endpoint; +option java_package = "io.envoyproxy.envoy.api.v2.endpoint"; +option java_multiple_files = true; 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 b9bb7872..d05e37e5 100644 --- a/envoy/api/v2/lds.proto +++ b/envoy/api/v2/lds.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; +option java_multiple_files = true; option java_generic_services = true; diff --git a/envoy/api/v2/listener/listener.proto b/envoy/api/v2/listener/listener.proto index 204790b9..0d617cea 100644 --- a/envoy/api/v2/listener/listener.proto +++ b/envoy/api/v2/listener/listener.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.listener; +option java_package = "io.envoyproxy.envoy.api.v2.listener"; +option java_multiple_files = true; option go_package = "listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; diff --git a/envoy/api/v2/ratelimit/ratelimit.proto b/envoy/api/v2/ratelimit/ratelimit.proto index 47818cdc..e60172d2 100644 --- a/envoy/api/v2/ratelimit/ratelimit.proto +++ b/envoy/api/v2/ratelimit/ratelimit.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.ratelimit; +option java_package = "io.envoyproxy.envoy.api.v2.ratelimit"; +option java_multiple_files = true; option go_package = "ratelimit"; import "validate/validate.proto"; diff --git a/envoy/api/v2/rds.proto b/envoy/api/v2/rds.proto index 4927f8dc..3671f359 100644 --- a/envoy/api/v2/rds.proto +++ b/envoy/api/v2/rds.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2; +option java_package = "io.envoyproxy.envoy.api.v2"; +option java_multiple_files = true; option java_generic_services = true; diff --git a/envoy/api/v2/route/route.proto b/envoy/api/v2/route/route.proto index 30e78d2b..7fbe350b 100644 --- a/envoy/api/v2/route/route.proto +++ b/envoy/api/v2/route/route.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.api.v2.route; +option java_package = "io.envoyproxy.envoy.api.v2.route"; +option java_multiple_files = true; option go_package = "route"; option java_generic_services = true; diff --git a/envoy/config/accesslog/v2/als.proto b/envoy/config/accesslog/v2/als.proto index 5dd965a6..0c51d123 100644 --- a/envoy/config/accesslog/v2/als.proto +++ b/envoy/config/accesslog/v2/als.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.accesslog.v2; +option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; +option java_multiple_files = true; option go_package = "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 a53c5aab..bd22ef2e 100644 --- a/envoy/config/accesslog/v2/file.proto +++ b/envoy/config/accesslog/v2/file.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.accesslog.v2; +option java_package = "io.envoyproxy.envoy.config.accesslog.v2"; +option java_multiple_files = true; option go_package = "v2"; import "validate/validate.proto"; diff --git a/envoy/config/bootstrap/v2/bootstrap.proto b/envoy/config/bootstrap/v2/bootstrap.proto index 4ba4cd2b..13a88b95 100644 --- a/envoy/config/bootstrap/v2/bootstrap.proto +++ b/envoy/config/bootstrap/v2/bootstrap.proto @@ -6,6 +6,8 @@ syntax = "proto3"; package envoy.config.bootstrap.v2; +option java_package = "io.envoyproxy.envoy.config.bootstrap.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/config/filter/accesslog/v2/accesslog.proto b/envoy/config/filter/accesslog/v2/accesslog.proto index b09bd2ef..76f5994a 100644 --- a/envoy/config/filter/accesslog/v2/accesslog.proto +++ b/envoy/config/filter/accesslog/v2/accesslog.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.accesslog.v2; +option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/config/filter/fault/v2/fault.proto b/envoy/config/filter/fault/v2/fault.proto index 56560f13..15eefbed 100644 --- a/envoy/config/filter/fault/v2/fault.proto +++ b/envoy/config/filter/fault/v2/fault.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.fault.v2; +option java_package = "io.envoyproxy.envoy.config.filter.fault.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/type/percent.proto"; diff --git a/envoy/config/filter/http/buffer/v2/buffer.proto b/envoy/config/filter/http/buffer/v2/buffer.proto index 0dfbfbdc..b476800b 100644 --- a/envoy/config/filter/http/buffer/v2/buffer.proto +++ b/envoy/config/filter/http/buffer/v2/buffer.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.buffer.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2"; +option java_multiple_files = true; option go_package = "v2"; import "google/protobuf/duration.proto"; diff --git a/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto b/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto index 5947f0b5..6d8566ad 100644 --- a/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto +++ b/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.ext_authz.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2alpha"; +option java_multiple_files = true; option go_package = "v2alpha"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/config/filter/http/fault/v2/fault.proto b/envoy/config/filter/http/fault/v2/fault.proto index d42a9fe9..e1e24e6f 100644 --- a/envoy/config/filter/http/fault/v2/fault.proto +++ b/envoy/config/filter/http/fault/v2/fault.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.fault.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/route/route.proto"; diff --git a/envoy/config/filter/http/gzip/v2/gzip.proto b/envoy/config/filter/http/gzip/v2/gzip.proto index d98972e9..63216c54 100644 --- a/envoy/config/filter/http/gzip/v2/gzip.proto +++ b/envoy/config/filter/http/gzip/v2/gzip.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.gzip.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2"; +option java_multiple_files = true; option go_package = "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 813dacfd..2adaa8dc 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 @@ -1,6 +1,8 @@ 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_multiple_files = true; option go_package = "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 0f584b45..c3c8290d 100644 --- a/envoy/config/filter/http/health_check/v2/health_check.proto +++ b/envoy/config/filter/http/health_check/v2/health_check.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.health_check.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2"; +option java_multiple_files = true; option go_package = "v2"; import "google/protobuf/duration.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 902e90a2..a8d86d71 100644 --- a/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto +++ b/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.ip_tagging.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/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 71feff22..1a52ae1c 100644 --- a/envoy/config/filter/http/jwt_authn/v2alpha/config.proto +++ b/envoy/config/filter/http/jwt_authn/v2alpha/config.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package envoy.config.filter.http.jwt_authn.v2alpha; +option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha"; +option java_multiple_files = true; import "envoy/api/v2/core/base.proto"; import "envoy/api/v2/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 f42f1b6e..3c0887b3 100644 --- a/envoy/config/filter/http/lua/v2/lua.proto +++ b/envoy/config/filter/http/lua/v2/lua.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.lua.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2"; +option java_multiple_files = true; option go_package = "v2"; 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 773d1153..a1cfabbf 100644 --- a/envoy/config/filter/http/rate_limit/v2/rate_limit.proto +++ b/envoy/config/filter/http/rate_limit/v2/rate_limit.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.rate_limit.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/envoy/config/filter/http/rbac/v2/rbac.proto b/envoy/config/filter/http/rbac/v2/rbac.proto index 2947c8b6..847372ed 100644 --- a/envoy/config/filter/http/rbac/v2/rbac.proto +++ b/envoy/config/filter/http/rbac/v2/rbac.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.rbac.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/rbac/v2alpha/rbac.proto"; diff --git a/envoy/config/filter/http/router/v2/router.proto b/envoy/config/filter/http/router/v2/router.proto index 5ecf88c5..b8a394c4 100644 --- a/envoy/config/filter/http/router/v2/router.proto +++ b/envoy/config/filter/http/router/v2/router.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.router.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/accesslog/v2/accesslog.proto"; diff --git a/envoy/config/filter/http/squash/v2/squash.proto b/envoy/config/filter/http/squash/v2/squash.proto index a1455417..472cc933 100644 --- a/envoy/config/filter/http/squash/v2/squash.proto +++ b/envoy/config/filter/http/squash/v2/squash.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.squash.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2"; +option java_multiple_files = true; option go_package = "v2"; import "google/protobuf/duration.proto"; diff --git a/envoy/config/filter/http/transcoder/v2/transcoder.proto b/envoy/config/filter/http/transcoder/v2/transcoder.proto index cb937b3b..342a8b5c 100644 --- a/envoy/config/filter/http/transcoder/v2/transcoder.proto +++ b/envoy/config/filter/http/transcoder/v2/transcoder.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.http.transcoder.v2; +option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2"; +option java_multiple_files = true; option go_package = "v2"; 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 7d0321cf..7a3a5487 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 @@ -1,6 +1,8 @@ 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_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/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 879108a1..ea98392a 100644 --- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto +++ b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.extensions.filters.network.dubbo_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.extensions.filters.network.dubbo_proxy.v2alpha1"; +option java_multiple_files = true; option go_package = "v2"; import "validate/validate.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 020fb8e5..8bfd00df 100644 --- a/envoy/config/filter/network/ext_authz/v2/ext_authz.proto +++ b/envoy/config/filter/network/ext_authz/v2/ext_authz.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.ext_authz.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/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 c6cb8bfc..440188ef 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 @@ -1,6 +1,8 @@ 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_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/config_source.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 476f401a..c7756e47 100644 --- a/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto +++ b/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.mongo_proxy.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/fault/v2/fault.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 c0a2d8f5..cb390c16 100644 --- a/envoy/config/filter/network/rate_limit/v2/rate_limit.proto +++ b/envoy/config/filter/network/rate_limit/v2/rate_limit.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.rate_limit.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/ratelimit/ratelimit.proto"; diff --git a/envoy/config/filter/network/rbac/v2/rbac.proto b/envoy/config/filter/network/rbac/v2/rbac.proto index 6f442781..171c17bc 100644 --- a/envoy/config/filter/network/rbac/v2/rbac.proto +++ b/envoy/config/filter/network/rbac/v2/rbac.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.rbac.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/rbac/v2alpha/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 4d522013..367999b3 100644 --- a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto +++ b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.redis_proxy.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2"; +option java_multiple_files = true; option go_package = "v2"; import "google/protobuf/duration.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 c0cced1f..0cb8c179 100644 --- a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto +++ b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.tcp_proxy.v2; +option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/accesslog/v2/accesslog.proto"; diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto index 5381bb26..2936f199 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/base.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 1ce0d3b4..7d17a6aa 100644 --- a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto +++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/network/thrift_proxy/v2alpha1/route.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 9c23d487..dedad645 100644 --- a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto +++ b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.thrift.rate_limit.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1"; +option java_multiple_files = true; option go_package = "v2alpha1"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/envoy/config/filter/thrift/router/v2alpha1/router.proto b/envoy/config/filter/thrift/router/v2alpha1/router.proto index 6731e273..5c0b6023 100644 --- a/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.filter.thrift.router.v2alpha1; +option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; +option java_multiple_files = true; option go_package = "v2alpha1"; // [#protodoc-title: Router] diff --git a/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto b/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto index f2e00b8e..9f1848a2 100644 --- a/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto +++ b/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto @@ -4,6 +4,8 @@ syntax = "proto3"; // Configuration for File Based Metadata Grpc Credentials Plugin package envoy.config.grpc_credential.v2alpha; +option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; +option java_multiple_files = true; option go_package = "v2alpha"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/config/health_checker/redis/v2/redis.proto b/envoy/config/health_checker/redis/v2/redis.proto index 3204d05e..9438ff66 100644 --- a/envoy/config/health_checker/redis/v2/redis.proto +++ b/envoy/config/health_checker/redis/v2/redis.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.health_checker.redis.v2; +option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; +option java_multiple_files = true; option go_package = "v2"; // [#protodoc-title: Redis] diff --git a/envoy/config/metrics/v2/metrics_service.proto b/envoy/config/metrics/v2/metrics_service.proto index 39e0f972..fb3e88d3 100644 --- a/envoy/config/metrics/v2/metrics_service.proto +++ b/envoy/config/metrics/v2/metrics_service.proto @@ -3,6 +3,8 @@ syntax = "proto3"; // [#protodoc-title: Metrics service] package envoy.config.metrics.v2; +option java_package = "io.envoyproxy.envoy.config.metrics.v2"; +option java_multiple_files = true; 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 542920d8..1cd4b146 100644 --- a/envoy/config/metrics/v2/stats.proto +++ b/envoy/config/metrics/v2/stats.proto @@ -4,6 +4,8 @@ syntax = "proto3"; package envoy.config.metrics.v2; +option java_package = "io.envoyproxy.envoy.config.metrics.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/config/overload/v2alpha/overload.proto b/envoy/config/overload/v2alpha/overload.proto index 6b37fe43..cbb34e17 100644 --- a/envoy/config/overload/v2alpha/overload.proto +++ b/envoy/config/overload/v2alpha/overload.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.overload.v2alpha; +option java_package = "io.envoyproxy.envoy.config.overload.v2alpha"; +option java_multiple_files = true; option go_package = "v2alpha"; import "google/protobuf/any.proto"; diff --git a/envoy/config/ratelimit/v2/rls.proto b/envoy/config/ratelimit/v2/rls.proto index 0c76ad83..7deeac90 100644 --- a/envoy/config/ratelimit/v2/rls.proto +++ b/envoy/config/ratelimit/v2/rls.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.ratelimit.v2; +option java_package = "io.envoyproxy.envoy.config.ratelimit.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/envoy/config/rbac/v2alpha/rbac.proto b/envoy/config/rbac/v2alpha/rbac.proto index 0751b671..35aea0f0 100644 --- a/envoy/config/rbac/v2alpha/rbac.proto +++ b/envoy/config/rbac/v2alpha/rbac.proto @@ -7,6 +7,8 @@ import "envoy/type/matcher/metadata.proto"; import "envoy/type/matcher/string.proto"; package envoy.config.rbac.v2alpha; +option java_package = "io.envoyproxy.envoy.config.rbac.v2alpha"; +option java_multiple_files = true; option go_package = "v2alpha"; // [#protodoc-title: Role Based Access Control (RBAC)] 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 6e0127a5..34832244 100644 --- a/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.resource_monitor.fixed_heap.v2alpha; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; +option java_multiple_files = true; option go_package = "v2alpha"; // [#protodoc-title: Fixed heap] 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 58bd782a..beb8f467 100644 --- a/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.resource_monitor.injected_resource.v2alpha; +option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; +option java_multiple_files = true; option go_package = "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 fb55cdbb..ae3c3ea0 100644 --- a/envoy/config/retry/previous_priorities/previous_priorities_config.proto +++ b/envoy/config/retry/previous_priorities/previous_priorities_config.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.retry.previous_priorities; +option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities"; +option java_multiple_files = true; // 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 7aac3277..058bc99b 100644 --- a/envoy/config/trace/v2/trace.proto +++ b/envoy/config/trace/v2/trace.proto @@ -4,6 +4,8 @@ syntax = "proto3"; package envoy.config.trace.v2; +option java_package = "io.envoyproxy.envoy.config.trace.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/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 a4d414c0..5286d94a 100644 --- a/envoy/config/transport_socket/alts/v2alpha/alts.proto +++ b/envoy/config/transport_socket/alts/v2alpha/alts.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.transport_socket.alts.v2alpha; +option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha"; +option java_multiple_files = true; option go_package = "v2"; // [#protodoc-title: ALTS] diff --git a/envoy/config/transport_socket/capture/v2alpha/capture.proto b/envoy/config/transport_socket/capture/v2alpha/capture.proto index 6d2f9a0e..dda6602a 100644 --- a/envoy/config/transport_socket/capture/v2alpha/capture.proto +++ b/envoy/config/transport_socket/capture/v2alpha/capture.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.config.transport_socket.capture.v2alpha; +option java_package = "io.envoyproxy.envoy.config.transport_socket.capture.v2alpha"; +option java_multiple_files = true; option go_package = "v2"; // [#protodoc-title: Capture] diff --git a/envoy/data/accesslog/v2/accesslog.proto b/envoy/data/accesslog/v2/accesslog.proto index 5395c2e8..621cf49e 100644 --- a/envoy/data/accesslog/v2/accesslog.proto +++ b/envoy/data/accesslog/v2/accesslog.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.data.accesslog.v2; +option java_package = "io.envoyproxy.envoy.data.accesslog.v2"; +option java_multiple_files = true; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/data/core/v2alpha/health_check_event.proto b/envoy/data/core/v2alpha/health_check_event.proto index dfb016e8..51efb119 100644 --- a/envoy/data/core/v2alpha/health_check_event.proto +++ b/envoy/data/core/v2alpha/health_check_event.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.data.core.v2alpha; +option java_package = "io.envoyproxy.envoy.data.core.v2alpha"; +option java_multiple_files = true; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/data/tap/v2alpha/capture.proto b/envoy/data/tap/v2alpha/capture.proto index 57c68277..aea51a19 100644 --- a/envoy/data/tap/v2alpha/capture.proto +++ b/envoy/data/tap/v2alpha/capture.proto @@ -5,6 +5,8 @@ syntax = "proto3"; // sequences on a socket. package envoy.data.tap.v2alpha; +option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/service/accesslog/v2/als.proto b/envoy/service/accesslog/v2/als.proto index 168293e0..aca6c938 100644 --- a/envoy/service/accesslog/v2/als.proto +++ b/envoy/service/accesslog/v2/als.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.accesslog.v2; +option java_package = "io.envoyproxy.envoy.service.accesslog.v2"; +option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/envoy/service/auth/v2alpha/attribute_context.proto b/envoy/service/auth/v2alpha/attribute_context.proto index 3ef8fe39..8f2e2243 100644 --- a/envoy/service/auth/v2alpha/attribute_context.proto +++ b/envoy/service/auth/v2alpha/attribute_context.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.auth.v2alpha; +option java_package = "io.envoyproxy.envoy.service.auth.v2alpha"; +option java_multiple_files = true; import "envoy/api/v2/core/address.proto"; diff --git a/envoy/service/auth/v2alpha/external_auth.proto b/envoy/service/auth/v2alpha/external_auth.proto index caa5e308..deca67ef 100644 --- a/envoy/service/auth/v2alpha/external_auth.proto +++ b/envoy/service/auth/v2alpha/external_auth.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.auth.v2alpha; +option java_package = "io.envoyproxy.envoy.service.auth.v2alpha"; +option java_multiple_files = true; option go_package = "v2alpha"; option java_generic_services = true; diff --git a/envoy/service/discovery/v2/ads.proto b/envoy/service/discovery/v2/ads.proto index 16953ee7..108fb1da 100644 --- a/envoy/service/discovery/v2/ads.proto +++ b/envoy/service/discovery/v2/ads.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; +option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/envoy/service/discovery/v2/hds.proto b/envoy/service/discovery/v2/hds.proto index a02cfa5c..d19e3cb6 100644 --- a/envoy/service/discovery/v2/hds.proto +++ b/envoy/service/discovery/v2/hds.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; +option java_multiple_files = true; option java_generic_services = true; diff --git a/envoy/service/discovery/v2/sds.proto b/envoy/service/discovery/v2/sds.proto index 4bea525f..51b699d6 100644 --- a/envoy/service/discovery/v2/sds.proto +++ b/envoy/service/discovery/v2/sds.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.discovery.v2; +option java_package = "io.envoyproxy.envoy.service.discovery.v2"; +option java_multiple_files = true; import "envoy/api/v2/discovery.proto"; diff --git a/envoy/service/load_stats/v2/lrs.proto b/envoy/service/load_stats/v2/lrs.proto index 6dee77db..849f69a7 100644 --- a/envoy/service/load_stats/v2/lrs.proto +++ b/envoy/service/load_stats/v2/lrs.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.load_stats.v2; +option java_package = "io.envoyproxy.envoy.service.load_stats.v2"; +option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/envoy/service/metrics/v2/metrics_service.proto b/envoy/service/metrics/v2/metrics_service.proto index 15419b4d..8f9e08c6 100644 --- a/envoy/service/metrics/v2/metrics_service.proto +++ b/envoy/service/metrics/v2/metrics_service.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.metrics.v2; +option java_package = "io.envoyproxy.envoy.service.metrics.v2"; +option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/envoy/service/ratelimit/v2/rls.proto b/envoy/service/ratelimit/v2/rls.proto index 6ebea2b4..4d4f768a 100644 --- a/envoy/service/ratelimit/v2/rls.proto +++ b/envoy/service/ratelimit/v2/rls.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.service.ratelimit.v2; +option java_package = "io.envoyproxy.envoy.service.ratelimit.v2"; +option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/envoy/service/trace/v2/trace_service.proto b/envoy/service/trace/v2/trace_service.proto index bcc314eb..89ff50e1 100644 --- a/envoy/service/trace/v2/trace_service.proto +++ b/envoy/service/trace/v2/trace_service.proto @@ -3,6 +3,8 @@ syntax = "proto3"; // [#proto-status: draft] package envoy.service.trace.v2; +option java_package = "io.envoyproxy.envoy.service.trace.v2"; +option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/envoy/type/http_status.proto b/envoy/type/http_status.proto index 35655613..b682ea05 100644 --- a/envoy/type/http_status.proto +++ b/envoy/type/http_status.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; +option java_multiple_files = true; import "validate/validate.proto"; diff --git a/envoy/type/matcher/metadata.proto b/envoy/type/matcher/metadata.proto index 9faa53b1..d59f08ce 100644 --- a/envoy/type/matcher/metadata.proto +++ b/envoy/type/matcher/metadata.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; +option java_multiple_files = true; option go_package = "matcher"; import "envoy/type/matcher/value.proto"; diff --git a/envoy/type/matcher/number.proto b/envoy/type/matcher/number.proto index 9cf4ff1f..78d4beb3 100644 --- a/envoy/type/matcher/number.proto +++ b/envoy/type/matcher/number.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; +option java_multiple_files = true; option go_package = "matcher"; import "envoy/type/range.proto"; diff --git a/envoy/type/matcher/string.proto b/envoy/type/matcher/string.proto index db6930f9..e22e6c7d 100644 --- a/envoy/type/matcher/string.proto +++ b/envoy/type/matcher/string.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; +option java_multiple_files = true; option go_package = "matcher"; import "validate/validate.proto"; diff --git a/envoy/type/matcher/value.proto b/envoy/type/matcher/value.proto index d5a664a8..dcd8db01 100644 --- a/envoy/type/matcher/value.proto +++ b/envoy/type/matcher/value.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type.matcher; +option java_package = "io.envoyproxy.envoy.type.matcher"; +option java_multiple_files = true; option go_package = "matcher"; import "envoy/type/matcher/number.proto"; diff --git a/envoy/type/percent.proto b/envoy/type/percent.proto index 3641d823..fc12de75 100644 --- a/envoy/type/percent.proto +++ b/envoy/type/percent.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; +option java_multiple_files = true; import "validate/validate.proto"; import "gogoproto/gogo.proto"; diff --git a/envoy/type/range.proto b/envoy/type/range.proto index 115091dd..bb0fd19d 100644 --- a/envoy/type/range.proto +++ b/envoy/type/range.proto @@ -1,6 +1,8 @@ syntax = "proto3"; package envoy.type; +option java_package = "io.envoyproxy.envoy.type"; +option java_multiple_files = true; option go_package = "envoy_type"; import "gogoproto/gogo.proto";