From 78fff01c8abd96ec6a02c22e2b8308b94c4ed377 Mon Sep 17 00:00:00 2001
From: "data-plane-api(CircleCI)" <data-plane-api@users.noreply.github.com>
Date: Sat, 22 Jun 2019 17:33:24 +0000
Subject: [PATCH] api: fix ruby package naming conflicts (#7369)

This fixes for ruby what
https://github.com/envoyproxy/envoy/pull/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 https://github.com/envoyproxy/envoy/pull/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>

Mirrored from https://github.com/envoyproxy/envoy @ 47925a53e67645fa20ca60a5c3257084bd870994
---
 envoy/api/v2/cluster/circuit_breaker.proto   | 1 +
 envoy/api/v2/cluster/outlier_detection.proto | 1 +
 envoy/api/v2/listener/listener.proto         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/envoy/api/v2/cluster/circuit_breaker.proto b/envoy/api/v2/cluster/circuit_breaker.proto
index f219fa07..bc2bcf25 100644
--- a/envoy/api/v2/cluster/circuit_breaker.proto
+++ b/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/envoy/api/v2/cluster/outlier_detection.proto b/envoy/api/v2/cluster/outlier_detection.proto
index cd33cde1..95f13224 100644
--- a/envoy/api/v2/cluster/outlier_detection.proto
+++ b/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/envoy/api/v2/listener/listener.proto b/envoy/api/v2/listener/listener.proto
index b9397ab7..157def72 100644
--- a/envoy/api/v2/listener/listener.proto
+++ b/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";