From ee8b9fc53f36d4806662d45fe99edd83923b7d23 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Tue, 8 Feb 2022 04:26:35 +0000 Subject: [PATCH] fix invalid ruby_package gen from protoxform (#19815) Risk Level: Should be none, this only changes ruby_package which was broken before. Testing: Generated the protobufs with the changed package names, and validated that generation succeeds. Docs Changes: N/A Release Notes: Pending backport discussions. Fixes #19814 Signed-off-by: Cynthia Mirrored from https://github.com/envoyproxy/envoy @ 4e486e1d336fd0e67ea4f1ee27475daaf6291321 --- envoy/api/v2/cluster/circuit_breaker.proto | 2 +- envoy/api/v2/cluster/filter.proto | 2 +- envoy/api/v2/cluster/outlier_detection.proto | 2 +- envoy/api/v2/listener/listener.proto | 2 +- envoy/api/v2/listener/listener_components.proto | 2 +- envoy/api/v2/listener/quic_config.proto | 2 +- envoy/api/v2/listener/udp_listener_config.proto | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/envoy/api/v2/cluster/circuit_breaker.proto b/envoy/api/v2/cluster/circuit_breaker.proto index 9b11be6a..c45409bc 100644 --- a/envoy/api/v2/cluster/circuit_breaker.proto +++ b/envoy/api/v2/cluster/circuit_breaker.proto @@ -16,7 +16,7 @@ option java_outer_classname = "CircuitBreakerProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; -option ruby_package = "Envoy.Api.V2.ClusterNS"; +option ruby_package = "Envoy::Api::V2::ClusterNS"; option (udpa.annotations.file_migrate).move_to_package = "envoy.config.cluster.v3"; option (udpa.annotations.file_status).package_version_status = FROZEN; diff --git a/envoy/api/v2/cluster/filter.proto b/envoy/api/v2/cluster/filter.proto index 828fe5a9..1609be4c 100644 --- a/envoy/api/v2/cluster/filter.proto +++ b/envoy/api/v2/cluster/filter.proto @@ -13,7 +13,7 @@ option java_outer_classname = "FilterProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; -option ruby_package = "Envoy.Api.V2.ClusterNS"; +option ruby_package = "Envoy::Api::V2::ClusterNS"; option (udpa.annotations.file_migrate).move_to_package = "envoy.config.cluster.v3"; option (udpa.annotations.file_status).package_version_status = FROZEN; diff --git a/envoy/api/v2/cluster/outlier_detection.proto b/envoy/api/v2/cluster/outlier_detection.proto index a7f75e05..ec8c6ee7 100644 --- a/envoy/api/v2/cluster/outlier_detection.proto +++ b/envoy/api/v2/cluster/outlier_detection.proto @@ -14,7 +14,7 @@ option java_outer_classname = "OutlierDetectionProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"; option csharp_namespace = "Envoy.Api.V2.ClusterNS"; -option ruby_package = "Envoy.Api.V2.ClusterNS"; +option ruby_package = "Envoy::Api::V2::ClusterNS"; option (udpa.annotations.file_migrate).move_to_package = "envoy.config.cluster.v3"; option (udpa.annotations.file_status).package_version_status = FROZEN; diff --git a/envoy/api/v2/listener/listener.proto b/envoy/api/v2/listener/listener.proto index 5f6b8509..d007ba51 100644 --- a/envoy/api/v2/listener/listener.proto +++ b/envoy/api/v2/listener/listener.proto @@ -9,4 +9,4 @@ option java_outer_classname = "ListenerProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; +option ruby_package = "Envoy::Api::V2::ListenerNS"; diff --git a/envoy/api/v2/listener/listener_components.proto b/envoy/api/v2/listener/listener_components.proto index e02642d2..4ebae87f 100644 --- a/envoy/api/v2/listener/listener_components.proto +++ b/envoy/api/v2/listener/listener_components.proto @@ -20,7 +20,7 @@ option java_outer_classname = "ListenerComponentsProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; +option ruby_package = "Envoy::Api::V2::ListenerNS"; option (udpa.annotations.file_migrate).move_to_package = "envoy.config.listener.v3"; option (udpa.annotations.file_status).package_version_status = FROZEN; diff --git a/envoy/api/v2/listener/quic_config.proto b/envoy/api/v2/listener/quic_config.proto index d56797a3..c6d5028f 100644 --- a/envoy/api/v2/listener/quic_config.proto +++ b/envoy/api/v2/listener/quic_config.proto @@ -13,7 +13,7 @@ option java_outer_classname = "QuicConfigProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; +option ruby_package = "Envoy::Api::V2::ListenerNS"; option (udpa.annotations.file_migrate).move_to_package = "envoy.config.listener.v3"; option (udpa.annotations.file_status).package_version_status = FROZEN; diff --git a/envoy/api/v2/listener/udp_listener_config.proto b/envoy/api/v2/listener/udp_listener_config.proto index 49e14698..d1642ab4 100644 --- a/envoy/api/v2/listener/udp_listener_config.proto +++ b/envoy/api/v2/listener/udp_listener_config.proto @@ -13,7 +13,7 @@ option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; option go_package = "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"; option csharp_namespace = "Envoy.Api.V2.ListenerNS"; -option ruby_package = "Envoy.Api.V2.ListenerNS"; +option ruby_package = "Envoy::Api::V2::ListenerNS"; option (udpa.annotations.file_migrate).move_to_package = "envoy.config.listener.v3"; option (udpa.annotations.file_status).package_version_status = FROZEN;