api: fix ruby package naming conflicts

This fixes for ruby what envoyproxy#3854 fixed for C#. Description: The existing protos yield a ruby module and class with the same name for both cluster and listener. This fixes for ruby what envoyproxy#3854 fixed for C#. Risk Level: Low Testing: I successfully generated valid envoy configurations using the ruby code generated by these updated protos. Docs Changes: N/A Release Notes: Ruby module name overrides for data plane api proto definitions. Signed-off-by: Justin Stallard <jstallard@gmail.com>
jstallard · Jun 22, 2019 · dc2fed3 · dc2fed3
1 parent ccf66c6
commit dc2fed3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/api/envoy/api/v2/cluster/circuit_breaker.proto b/api/envoy/api/v2/cluster/circuit_breaker.proto
@@ -7,6 +7,7 @@ option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option go_package = "cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
+option ruby_package = "Envoy.Api.V2.ClusterNS";
 
 import "envoy/api/v2/core/base.proto";
 

diff --git a/api/envoy/api/v2/cluster/outlier_detection.proto b/api/envoy/api/v2/cluster/outlier_detection.proto
@@ -6,6 +6,7 @@ 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";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";

diff --git a/api/envoy/api/v2/listener/listener.proto b/api/envoy/api/v2/listener/listener.proto
@@ -7,6 +7,7 @@ option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.listener";
 option go_package = "listener";
 option csharp_namespace = "Envoy.Api.V2.ListenerNS";
+option ruby_package = "Envoy::Api::V2::ListenerNS";
 
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/auth/cert.proto";