From cfbf7a1f63b5bacd01b4fe35140387cac88df093 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Sat, 21 Aug 2021 15:02:34 +0000 Subject: [PATCH] rocketmq: move to contrib (#17796) Part of https://github.com/envoyproxy/envoy/issues/14078 Signed-off-by: Matt Klein Mirrored from https://github.com/envoyproxy/envoy @ 5b63ef4d5b8670977749a2f5a620d4b6d9f93a72 --- BUILD | 2 +- .../envoy}/extensions/filters/network/rocketmq_proxy/v3/BUILD | 0 .../filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto | 2 +- .../extensions/filters/network/rocketmq_proxy/v3/route.proto | 0 .../extensions/filters/network/rocketmq_proxy/v4alpha/BUILD | 0 .../filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto | 0 .../filters/network/rocketmq_proxy/v4alpha/route.proto | 0 envoy/extensions/filters/network/rocketmq_proxy/v3/README.md | 1 - versioning/BUILD | 2 +- 9 files changed, 3 insertions(+), 4 deletions(-) rename {envoy => contrib/envoy}/extensions/filters/network/rocketmq_proxy/v3/BUILD (100%) rename {envoy => contrib/envoy}/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto (94%) rename {envoy => contrib/envoy}/extensions/filters/network/rocketmq_proxy/v3/route.proto (100%) rename {envoy => contrib/envoy}/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD (100%) rename {envoy => contrib/envoy}/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto (100%) rename {envoy => contrib/envoy}/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto (100%) delete mode 100644 envoy/extensions/filters/network/rocketmq_proxy/v3/README.md diff --git a/BUILD b/BUILD index d61c9e48..538218e8 100644 --- a/BUILD +++ b/BUILD @@ -59,6 +59,7 @@ proto_library( deps = [ "//contrib/envoy/extensions/filters/http/squash/v3:pkg", "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg", + "//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg", "//envoy/admin/v3:pkg", "//envoy/config/accesslog/v3:pkg", "//envoy/config/bootstrap/v3:pkg", @@ -167,7 +168,6 @@ proto_library( "//envoy/extensions/filters/network/ratelimit/v3:pkg", "//envoy/extensions/filters/network/rbac/v3:pkg", "//envoy/extensions/filters/network/redis_proxy/v3:pkg", - "//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg", "//envoy/extensions/filters/network/sni_cluster/v3:pkg", "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", "//envoy/extensions/filters/network/tcp_proxy/v3:pkg", diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD similarity index 100% rename from envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD rename to contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto similarity index 94% rename from envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto rename to contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto index c354b629..12438751 100644 --- a/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto +++ b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package envoy.extensions.filters.network.rocketmq_proxy.v3; -import "envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto"; +import "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto"; import "google/protobuf/duration.proto"; diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto similarity index 100% rename from envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto rename to contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD similarity index 100% rename from envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD rename to contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto similarity index 100% rename from envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto rename to contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto similarity index 100% rename from envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto rename to contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto diff --git a/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md b/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md deleted file mode 100644 index c6fb05d1..00000000 --- a/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md +++ /dev/null @@ -1 +0,0 @@ -Protocol buffer definitions for the Rocketmq proxy. diff --git a/versioning/BUILD b/versioning/BUILD index de813567..2204c292 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -11,6 +11,7 @@ proto_library( deps = [ "//contrib/envoy/extensions/filters/http/squash/v3:pkg", "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg", + "//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg", "//envoy/admin/v3:pkg", "//envoy/config/accesslog/v3:pkg", "//envoy/config/bootstrap/v3:pkg", @@ -119,7 +120,6 @@ proto_library( "//envoy/extensions/filters/network/ratelimit/v3:pkg", "//envoy/extensions/filters/network/rbac/v3:pkg", "//envoy/extensions/filters/network/redis_proxy/v3:pkg", - "//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg", "//envoy/extensions/filters/network/sni_cluster/v3:pkg", "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", "//envoy/extensions/filters/network/tcp_proxy/v3:pkg",