Remove option java_generic_services from proto files (#25298)

Generic services are deprecated since protoc version 2.4.0 (2010). Protoc plugins that generates code may require that generic services are disabled, so that they can generate their own classes of the same name.

Risk Level: Low

Fixes #25172

Signed-off-by: Sébastien CROCQUESEL <88554524+scrocquesel@users.noreply.github.com>

Mirrored from https://github.com/envoyproxy/envoy @ baec129464bba6e3651147a0d846e8c1f4610199
pull/626/head
data-plane-api(Azure Pipelines) 2 years ago
parent 5e7c1ae5f3
commit 75f905d05d
  1. 1
      contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.proto
  2. 1
      envoy/api/v2/cds.proto
  3. 1
      envoy/api/v2/eds.proto
  4. 1
      envoy/api/v2/lds.proto
  5. 1
      envoy/api/v2/rds.proto
  6. 1
      envoy/api/v2/srds.proto
  7. 1
      envoy/service/accesslog/v2/als.proto
  8. 1
      envoy/service/accesslog/v3/als.proto
  9. 1
      envoy/service/auth/v2/external_auth.proto
  10. 1
      envoy/service/auth/v2alpha/external_auth.proto
  11. 1
      envoy/service/auth/v3/external_auth.proto
  12. 1
      envoy/service/cluster/v3/cds.proto
  13. 1
      envoy/service/discovery/v2/ads.proto
  14. 1
      envoy/service/discovery/v2/hds.proto
  15. 1
      envoy/service/discovery/v2/rtds.proto
  16. 1
      envoy/service/discovery/v2/sds.proto
  17. 1
      envoy/service/discovery/v3/ads.proto
  18. 1
      envoy/service/endpoint/v3/eds.proto
  19. 1
      envoy/service/endpoint/v3/leds.proto
  20. 1
      envoy/service/event_reporting/v2alpha/event_reporting_service.proto
  21. 1
      envoy/service/event_reporting/v3/event_reporting_service.proto
  22. 1
      envoy/service/ext_proc/v3/external_processor.proto
  23. 1
      envoy/service/extension/v3/config_discovery.proto
  24. 1
      envoy/service/health/v3/hds.proto
  25. 1
      envoy/service/listener/v3/lds.proto
  26. 1
      envoy/service/load_stats/v2/lrs.proto
  27. 1
      envoy/service/load_stats/v3/lrs.proto
  28. 1
      envoy/service/metrics/v2/metrics_service.proto
  29. 1
      envoy/service/metrics/v3/metrics_service.proto
  30. 1
      envoy/service/rate_limit_quota/v3/rlqs.proto
  31. 1
      envoy/service/ratelimit/v2/rls.proto
  32. 1
      envoy/service/ratelimit/v3/rls.proto
  33. 1
      envoy/service/route/v3/rds.proto
  34. 1
      envoy/service/route/v3/srds.proto
  35. 1
      envoy/service/runtime/v3/rtds.proto
  36. 1
      envoy/service/secret/v3/sds.proto
  37. 1
      envoy/service/status/v2/csds.proto
  38. 1
      envoy/service/status/v3/csds.proto
  39. 1
      envoy/service/tap/v2alpha/tap.proto
  40. 1
      envoy/service/tap/v3/tap.proto
  41. 1
      envoy/service/trace/v2/trace_service.proto
  42. 1
      envoy/service/trace/v3/trace_service.proto

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.extensions.filters.network.sip_proxy.
option java_outer_classname = "TraProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sip_proxy/tra/v3alpha";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: TRA]

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
option java_outer_classname = "CdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.cluster.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
option java_outer_classname = "EdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.endpoint.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
option java_outer_classname = "LdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.listener.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
option java_outer_classname = "RdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.route.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.api.v2";
option java_outer_classname = "SrdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2;apiv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.route.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -12,7 +12,6 @@ option java_package = "io.envoyproxy.envoy.service.accesslog.v2";
option java_outer_classname = "AlsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2;accesslogv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: gRPC Access Log Service (ALS)]

@ -13,7 +13,6 @@ option java_package = "io.envoyproxy.envoy.service.accesslog.v3";
option java_outer_classname = "AlsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v3;accesslogv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: gRPC access log service (ALS)]

@ -15,7 +15,6 @@ option java_package = "io.envoyproxy.envoy.service.auth.v2";
option java_outer_classname = "ExternalAuthProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2;authv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Authorization Service ]

@ -3,7 +3,6 @@ syntax = "proto3";
package envoy.service.auth.v2alpha;
option java_multiple_files = true;
option java_generic_services = true;
option java_outer_classname = "CertsProto";
option java_package = "io.envoyproxy.envoy.service.auth.v2alpha";
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha";

@ -17,7 +17,6 @@ option java_package = "io.envoyproxy.envoy.service.auth.v3";
option java_outer_classname = "ExternalAuthProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3;authv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Authorization service]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.cluster.v3";
option java_outer_classname = "CdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3;clusterv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: CDS]

@ -10,7 +10,6 @@ option java_package = "io.envoyproxy.envoy.service.discovery.v2";
option java_outer_classname = "AdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2;discoveryv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Aggregated Discovery Service (ADS)]

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.service.discovery.v2";
option java_outer_classname = "HdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2;discoveryv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.health.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.service.discovery.v2";
option java_outer_classname = "RtdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2;discoveryv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.runtime.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.discovery.v2";
option java_outer_classname = "SdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2;discoveryv2";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.secret.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -11,7 +11,6 @@ option java_package = "io.envoyproxy.envoy.service.discovery.v3";
option java_outer_classname = "AdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3;discoveryv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Aggregated Discovery Service (ADS)]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.endpoint.v3";
option java_outer_classname = "EdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3;endpointv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: EDS]

@ -11,7 +11,6 @@ option java_package = "io.envoyproxy.envoy.service.endpoint.v3";
option java_outer_classname = "LedsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3;endpointv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#not-implemented-hide:]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.event_reporting.v2alpha";
option java_outer_classname = "EventReportingServiceProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v2alpha";
option java_generic_services = true;
option (udpa.annotations.file_migrate).move_to_package = "envoy.service.event_reporting.v3";
option (udpa.annotations.file_status).package_version_status = FROZEN;

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.event_reporting.v3";
option java_outer_classname = "EventReportingServiceProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v3;event_reportingv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: gRPC Event Reporting Service]

@ -17,7 +17,6 @@ option java_package = "io.envoyproxy.envoy.service.ext_proc.v3";
option java_outer_classname = "ExternalProcessorProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3;ext_procv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
option (xds.annotations.v3.file_status).work_in_progress = true;

@ -13,7 +13,6 @@ option java_package = "io.envoyproxy.envoy.service.extension.v3";
option java_outer_classname = "ConfigDiscoveryProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/extension/v3;extensionv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Extension config discovery service (ECDS)]

@ -19,7 +19,6 @@ option java_package = "io.envoyproxy.envoy.service.health.v3";
option java_outer_classname = "HdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/health/v3;healthv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Health discovery service (HDS)]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.listener.v3";
option java_outer_classname = "LdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3;listenerv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Listener]

@ -13,7 +13,6 @@ option java_package = "io.envoyproxy.envoy.service.load_stats.v2";
option java_outer_classname = "LrsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2;load_statsv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Load reporting service]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.load_stats.v3";
option java_outer_classname = "LrsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3;load_statsv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Load reporting service (LRS)]

@ -13,7 +13,6 @@ option java_package = "io.envoyproxy.envoy.service.metrics.v2";
option java_outer_classname = "MetricsServiceProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2;metricsv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Metrics service]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.metrics.v3";
option java_outer_classname = "MetricsServiceProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3;metricsv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Metrics service]

@ -15,7 +15,6 @@ option java_package = "io.envoyproxy.envoy.service.rate_limit_quota.v3";
option java_outer_classname = "RlqsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/rate_limit_quota/v3;rate_limit_quotav3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
option (xds.annotations.v3.file_status).work_in_progress = true;

@ -12,7 +12,6 @@ option java_package = "io.envoyproxy.envoy.service.ratelimit.v2";
option java_outer_classname = "RlsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2;ratelimitv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Rate Limit Service (RLS)]

@ -17,7 +17,6 @@ option java_package = "io.envoyproxy.envoy.service.ratelimit.v3";
option java_outer_classname = "RlsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3;ratelimitv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Rate limit service (RLS)]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.route.v3";
option java_outer_classname = "RdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/route/v3;routev3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: RDS]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.route.v3";
option java_outer_classname = "SrdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/route/v3;routev3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: SRDS]

@ -16,7 +16,6 @@ option java_package = "io.envoyproxy.envoy.service.runtime.v3";
option java_outer_classname = "RtdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3;runtimev3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Runtime discovery service (RTDS)]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.secret.v3";
option java_outer_classname = "SdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3;secretv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Secret Discovery Service (SDS)]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.status.v2";
option java_outer_classname = "CsdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/status/v2;statusv2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Client Status Discovery Service (CSDS)]

@ -18,7 +18,6 @@ option java_package = "io.envoyproxy.envoy.service.status.v3";
option java_outer_classname = "CsdsProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/status/v3;statusv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Client status discovery service (CSDS)]

@ -12,7 +12,6 @@ option java_package = "io.envoyproxy.envoy.service.tap.v2alpha";
option java_outer_classname = "TapProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Tap Sink Service]

@ -13,7 +13,6 @@ option java_package = "io.envoyproxy.envoy.service.tap.v3";
option java_outer_classname = "TapProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/tap/v3;tapv3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Tap sink service]

@ -13,7 +13,6 @@ option java_package = "io.envoyproxy.envoy.service.trace.v2";
option java_outer_classname = "TraceServiceProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/trace/v2;tracev2";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = FROZEN;
// [#protodoc-title: Trace service]

@ -14,7 +14,6 @@ option java_package = "io.envoyproxy.envoy.service.trace.v3";
option java_outer_classname = "TraceServiceProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/service/trace/v3;tracev3";
option java_generic_services = true;
option (udpa.annotations.file_status).package_version_status = ACTIVE;
// [#protodoc-title: Trace service]

Loading…
Cancel
Save