From c1021b339211ec9debd7d79f8cca545db65f2bff Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Wed, 25 Sep 2019 17:57:28 +0000 Subject: [PATCH] api: generate v3alpha from v2 via protoxform. (#8356) This takes protoxform from being a v2 format tool to being able to generate something similar to what ./api/migration/v3alpha.sh generates. Risk level: Low (v3alpha not used yet) Testing: fix_format, manual verification that the delta from ./api/migration/v3alpha.sh makes sense (for now). Signed-off-by: Harvey Tuch Mirrored from https://github.com/envoyproxy/envoy @ 89539d31e9fe749418d499352897c7acb474fab2 --- 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/listener/listener.proto | 2 -- envoy/api/v3alpha/listener/quic_config.proto | 2 -- envoy/api/v3alpha/listener/udp_listener_config.proto | 2 -- envoy/config/trace/v3alpha/trace.proto | 2 +- 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/envoy/api/v3alpha/cluster/circuit_breaker.proto b/envoy/api/v3alpha/cluster/circuit_breaker.proto index 277459f9..8ff53dc3 100644 --- a/envoy/api/v3alpha/cluster/circuit_breaker.proto +++ b/envoy/api/v3alpha/cluster/circuit_breaker.proto @@ -5,8 +5,6 @@ package envoy.api.v3alpha.cluster; option java_outer_classname = "CircuitBreakerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; -option csharp_namespace = "Envoy.Api.V2.ClusterNS"; -option ruby_package = "Envoy.Api.V2.ClusterNS"; import "envoy/api/v3alpha/core/base.proto"; diff --git a/envoy/api/v3alpha/cluster/filter.proto b/envoy/api/v3alpha/cluster/filter.proto index f1c5cc5d..c9d37869 100644 --- a/envoy/api/v3alpha/cluster/filter.proto +++ b/envoy/api/v3alpha/cluster/filter.proto @@ -5,8 +5,6 @@ package envoy.api.v3alpha.cluster; option java_outer_classname = "FilterProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; -option csharp_namespace = "Envoy.Api.V2.ClusterNS"; -option ruby_package = "Envoy.Api.V2.ClusterNS"; import "google/protobuf/any.proto"; diff --git a/envoy/api/v3alpha/cluster/outlier_detection.proto b/envoy/api/v3alpha/cluster/outlier_detection.proto index 8e768803..34beaadd 100644 --- a/envoy/api/v3alpha/cluster/outlier_detection.proto +++ b/envoy/api/v3alpha/cluster/outlier_detection.proto @@ -5,8 +5,6 @@ package envoy.api.v3alpha.cluster; option java_outer_classname = "OutlierDetectionProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.cluster"; -option csharp_namespace = "Envoy.Api.V2.ClusterNS"; -option ruby_package = "Envoy.Api.V2.ClusterNS"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; diff --git a/envoy/api/v3alpha/listener/listener.proto b/envoy/api/v3alpha/listener/listener.proto index a00b535c..f13a6425 100644 --- a/envoy/api/v3alpha/listener/listener.proto +++ b/envoy/api/v3alpha/listener/listener.proto @@ -5,8 +5,6 @@ package envoy.api.v3alpha.listener; option java_outer_classname = "ListenerProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; -option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; import "envoy/api/v3alpha/auth/cert.proto"; import "envoy/api/v3alpha/core/address.proto"; diff --git a/envoy/api/v3alpha/listener/quic_config.proto b/envoy/api/v3alpha/listener/quic_config.proto index 9c5a1af6..3600a795 100644 --- a/envoy/api/v3alpha/listener/quic_config.proto +++ b/envoy/api/v3alpha/listener/quic_config.proto @@ -5,8 +5,6 @@ package envoy.api.v3alpha.listener; option java_outer_classname = "QuicConfigProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; -option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; 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 3693e4b6..671f7232 100644 --- a/envoy/api/v3alpha/listener/udp_listener_config.proto +++ b/envoy/api/v3alpha/listener/udp_listener_config.proto @@ -5,8 +5,6 @@ package envoy.api.v3alpha.listener; option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v3alpha.listener"; -option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; import "google/protobuf/any.proto"; import "google/protobuf/struct.proto"; diff --git a/envoy/config/trace/v3alpha/trace.proto b/envoy/config/trace/v3alpha/trace.proto index ec17869d..f8abdb0c 100644 --- a/envoy/config/trace/v3alpha/trace.proto +++ b/envoy/config/trace/v3alpha/trace.proto @@ -179,7 +179,7 @@ message OpenCensusConfig { // also be set. bool zipkin_exporter_enabled = 5; - // The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v3alpha/spans" + // The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans" string zipkin_url = 6; // Enables the OpenCensus Agent exporter if set to true. The address must also