From 39af693945dde7a2990eb53784b6ba32ff9464d8 Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Fri, 20 Aug 2021 21:47:30 +0000 Subject: [PATCH 1/2] rocketmq: move to contrib Part of https://github.com/envoyproxy/envoy/issues/14078 Signed-off-by: Matt Klein --- api/BUILD | 2 +- .../filters/network/rocketmq_proxy/v3/BUILD | 0 .../rocketmq_proxy/v3/rocketmq_proxy.proto | 2 +- .../network/rocketmq_proxy/v3/route.proto | 0 .../network/rocketmq_proxy/v4alpha/BUILD | 0 .../v4alpha/rocketmq_proxy.proto | 0 .../rocketmq_proxy/v4alpha/route.proto | 0 .../network/rocketmq_proxy/v3/README.md | 1 - api/versioning/BUILD | 2 +- contrib/contrib_build_config.bzl | 5 +- contrib/extensions_metadata.yaml | 5 ++ .../filters/network/source}/BUILD | 18 +++--- .../filters/network/source}/active_message.cc | 8 +-- .../filters/network/source}/active_message.h | 8 +-- .../filters/network/source}/codec.cc | 5 +- .../filters/network/source}/codec.h | 3 +- .../filters/network/source}/config.cc | 9 +-- .../filters/network/source}/config.h | 12 ++-- .../filters/network/source}/conn_manager.cc | 2 +- .../filters/network/source}/conn_manager.h | 10 ++-- .../filters/network/source}/metadata.h | 0 .../filters/network/source}/protocol.cc | 5 +- .../filters/network/source}/protocol.h | 2 +- .../filters/network/source}/router/BUILD | 10 ++-- .../network/source}/router/route_matcher.cc | 5 +- .../network/source}/router/route_matcher.h | 5 +- .../filters/network/source}/router/router.h | 0 .../network/source}/router/router_impl.cc | 13 +++-- .../network/source}/router/router_impl.h | 3 +- .../filters/network/source}/stats.h | 0 .../filters/network/source}/topic_route.cc | 2 +- .../filters/network/source}/topic_route.h | 0 .../network/source}/well_known_names.h | 0 .../filters/network/test}/BUILD | 55 ++++++++----------- .../network/test}/active_message_test.cc | 12 ++-- .../filters/network/test}/codec_test.cc | 5 +- .../filters/network/test}/config_test.cc | 8 +-- .../network/test}/conn_manager_test.cc | 9 ++- .../filters/network/test}/mocks.cc | 5 +- .../filters/network/test}/mocks.h | 5 +- .../filters/network/test}/protocol_test.cc | 2 +- .../network/test}/route_matcher_test.cc | 14 ++--- .../filters/network/test}/router_test.cc | 13 ++--- .../filters/network/test}/topic_route_test.cc | 2 +- .../filters/network/test}/utility.cc | 2 +- .../filters/network/test}/utility.h | 5 +- docs/root/version_history/current.rst | 2 + generated_api_shadow/BUILD | 2 +- .../filters/network/rocketmq_proxy/v3/BUILD | 0 .../rocketmq_proxy/v3/rocketmq_proxy.proto | 2 +- .../network/rocketmq_proxy/v3/route.proto | 0 .../network/rocketmq_proxy/v4alpha/BUILD | 0 .../v4alpha/rocketmq_proxy.proto | 0 .../rocketmq_proxy/v4alpha/route.proto | 0 source/extensions/extensions_build_config.bzl | 1 - source/extensions/extensions_metadata.yaml | 5 -- tools/proto_format/proto_sync.py | 5 +- tools/protoxform/protoprint.py | 2 +- 58 files changed, 141 insertions(+), 152 deletions(-) rename api/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD (100%) rename api/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto (94%) rename api/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto (100%) rename api/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD (100%) rename api/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto (100%) rename api/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto (100%) delete mode 100644 api/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/BUILD (84%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/active_message.cc (97%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/active_message.h (92%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/codec.cc (99%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/codec.h (97%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/config.cc (89%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/config.h (84%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/conn_manager.cc (99%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/conn_manager.h (94%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/metadata.h (100%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/protocol.cc (99%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/protocol.h (99%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/router/BUILD (80%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/router/route_matcher.cc (94%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/router/route_matcher.h (93%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/router/router.h (100%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/router/router_impl.cc (94%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/router/router_impl.h (97%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/stats.h (100%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/topic_route.cc (96%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/topic_route.h (100%) rename {source/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/source}/well_known_names.h (100%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/BUILD (59%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/active_message_test.cc (93%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/codec_test.cc (99%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/config_test.cc (96%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/conn_manager_test.cc (98%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/mocks.cc (92%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/mocks.h (93%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/protocol_test.cc (99%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/route_matcher_test.cc (77%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/router_test.cc (97%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/topic_route_test.cc (96%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/utility.cc (99%) rename {test/extensions/filters/network/rocketmq_proxy => contrib/rocketmq_proxy/filters/network/test}/utility.h (84%) rename generated_api_shadow/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD (100%) rename generated_api_shadow/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto (94%) rename generated_api_shadow/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto (100%) rename generated_api_shadow/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD (100%) rename generated_api_shadow/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto (100%) rename generated_api_shadow/{ => contrib}/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto (100%) diff --git a/api/BUILD b/api/BUILD index d61c9e486b81e..538218e83a9f3 100644 --- a/api/BUILD +++ b/api/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/api/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD b/api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD similarity index 100% rename from api/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD rename to api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD diff --git a/api/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto b/api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto similarity index 94% rename from api/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto rename to api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto index c354b629bea28..12438751fada6 100644 --- a/api/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto +++ b/api/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/api/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto b/api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto similarity index 100% rename from api/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto rename to api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto diff --git a/api/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD b/api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD similarity index 100% rename from api/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD rename to api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD diff --git a/api/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto b/api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto similarity index 100% rename from api/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto rename to api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto diff --git a/api/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto b/api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto similarity index 100% rename from api/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto rename to api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto diff --git a/api/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md b/api/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md deleted file mode 100644 index c6fb05d180635..0000000000000 --- a/api/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md +++ /dev/null @@ -1 +0,0 @@ -Protocol buffer definitions for the Rocketmq proxy. diff --git a/api/versioning/BUILD b/api/versioning/BUILD index de8135674d212..2204c292949d9 100644 --- a/api/versioning/BUILD +++ b/api/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", diff --git a/contrib/contrib_build_config.bzl b/contrib/contrib_build_config.bzl index da72332be3612..941985fe08531 100644 --- a/contrib/contrib_build_config.bzl +++ b/contrib/contrib_build_config.bzl @@ -4,11 +4,12 @@ CONTRIB_EXTENSIONS = { # HTTP filters # - "envoy.filters.http.squash": "//contrib/squash/filters/http/source:config", + "envoy.filters.http.squash": "//contrib/squash/filters/http/source:config", # # Network filters # - "envoy.filters.network.kafka_broker": "//contrib/kafka/filters/network/source:kafka_broker_config_lib", + "envoy.filters.network.kafka_broker": "//contrib/kafka/filters/network/source:kafka_broker_config_lib", + "envoy.filters.network.rocketmq_proxy": "//contrib/rocketmq_proxy/filters/network/source:config", } diff --git a/contrib/extensions_metadata.yaml b/contrib/extensions_metadata.yaml index 76e01821520c5..15b043770e2d9 100644 --- a/contrib/extensions_metadata.yaml +++ b/contrib/extensions_metadata.yaml @@ -8,3 +8,8 @@ envoy.filters.network.kafka_broker: - envoy.filters.network security_posture: requires_trusted_downstream_and_upstream status: wip +envoy.filters.network.rocketmq_proxy: + categories: + - envoy.filters.network + security_posture: requires_trusted_downstream_and_upstream + status: alpha diff --git a/source/extensions/filters/network/rocketmq_proxy/BUILD b/contrib/rocketmq_proxy/filters/network/source/BUILD similarity index 84% rename from source/extensions/filters/network/rocketmq_proxy/BUILD rename to contrib/rocketmq_proxy/filters/network/source/BUILD index f9ea690d242d8..b15d7db7e41ba 100644 --- a/source/extensions/filters/network/rocketmq_proxy/BUILD +++ b/contrib/rocketmq_proxy/filters/network/source/BUILD @@ -1,13 +1,13 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_cc_extension", + "envoy_cc_contrib_extension", "envoy_cc_library", - "envoy_extension_package", + "envoy_contrib_package", ) licenses(["notice"]) # Apache 2 -envoy_extension_package() +envoy_contrib_package() envoy_cc_library( name = "well_known_names", @@ -95,6 +95,7 @@ envoy_cc_library( ":rocketmq_lib", ":stats_interface", ":well_known_names", + "//contrib/rocketmq_proxy/filters/network/source/router:router_interface", "//envoy/buffer:buffer_interface", "//envoy/event:dispatcher_interface", "//envoy/network:connection_interface", @@ -109,12 +110,11 @@ envoy_cc_library( "//source/common/stats:timespan_lib", "//source/common/upstream:load_balancer_lib", "//source/extensions/filters/network:well_known_names", - "//source/extensions/filters/network/rocketmq_proxy/router:router_interface", - "@envoy_api//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", + "@envoy_api//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", ], ) -envoy_cc_extension( +envoy_cc_contrib_extension( name = "config", srcs = [ "config.cc", @@ -124,15 +124,15 @@ envoy_cc_extension( ], deps = [ ":conn_manager_lib", + "//contrib/rocketmq_proxy/filters/network/source/router:route_matcher", + "//contrib/rocketmq_proxy/filters/network/source/router:router_lib", "//envoy/registry", "//envoy/server:filter_config_interface", "//source/common/common:logger_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:utility_lib", "//source/extensions/filters/network/common:factory_base_lib", - "//source/extensions/filters/network/rocketmq_proxy/router:route_matcher", - "//source/extensions/filters/network/rocketmq_proxy/router:router_lib", - "@envoy_api//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", + "@envoy_api//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/rocketmq_proxy/active_message.cc b/contrib/rocketmq_proxy/filters/network/source/active_message.cc similarity index 97% rename from source/extensions/filters/network/rocketmq_proxy/active_message.cc rename to contrib/rocketmq_proxy/filters/network/source/active_message.cc index d510ccadfebe7..15e0f505e3f4e 100644 --- a/source/extensions/filters/network/rocketmq_proxy/active_message.cc +++ b/contrib/rocketmq_proxy/filters/network/source/active_message.cc @@ -1,16 +1,16 @@ -#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" +#include "contrib/rocketmq_proxy/filters/network/source/active_message.h" #include "envoy/upstream/cluster_manager.h" #include "source/common/common/empty_string.h" #include "source/common/common/enum_to_int.h" #include "source/common/protobuf/utility.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" -#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" #include "source/extensions/filters/network/well_known_names.h" #include "absl/strings/match.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/topic_route.h" +#include "contrib/rocketmq_proxy/filters/network/source/well_known_names.h" using Envoy::Tcp::ConnectionPool::ConnectionDataPtr; diff --git a/source/extensions/filters/network/rocketmq_proxy/active_message.h b/contrib/rocketmq_proxy/filters/network/source/active_message.h similarity index 92% rename from source/extensions/filters/network/rocketmq_proxy/active_message.h rename to contrib/rocketmq_proxy/filters/network/source/active_message.h index cbec9f1071280..bdf5d594181a6 100644 --- a/source/extensions/filters/network/rocketmq_proxy/active_message.h +++ b/contrib/rocketmq_proxy/filters/network/source/active_message.h @@ -8,12 +8,12 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/linked_object.h" #include "source/common/common/logger.h" -#include "source/extensions/filters/network/rocketmq_proxy/codec.h" -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" -#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" #include "absl/types/optional.h" +#include "contrib/rocketmq_proxy/filters/network/source/codec.h" +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/router.h" +#include "contrib/rocketmq_proxy/filters/network/source/topic_route.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/codec.cc b/contrib/rocketmq_proxy/filters/network/source/codec.cc similarity index 99% rename from source/extensions/filters/network/rocketmq_proxy/codec.cc rename to contrib/rocketmq_proxy/filters/network/source/codec.cc index 8255de59d3e1c..e5d35d1ffe432 100644 --- a/source/extensions/filters/network/rocketmq_proxy/codec.cc +++ b/contrib/rocketmq_proxy/filters/network/source/codec.cc @@ -1,4 +1,4 @@ -#include "source/extensions/filters/network/rocketmq_proxy/codec.h" +#include "contrib/rocketmq_proxy/filters/network/source/codec.h" #include @@ -6,7 +6,8 @@ #include "source/common/common/empty_string.h" #include "source/common/common/enum_to_int.h" #include "source/common/common/logger.h" -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" + +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/codec.h b/contrib/rocketmq_proxy/filters/network/source/codec.h similarity index 97% rename from source/extensions/filters/network/rocketmq_proxy/codec.h rename to contrib/rocketmq_proxy/filters/network/source/codec.h index 5459c380370e6..6ee9c8a9a97bb 100644 --- a/source/extensions/filters/network/rocketmq_proxy/codec.h +++ b/contrib/rocketmq_proxy/filters/network/source/codec.h @@ -10,7 +10,8 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/logger.h" #include "source/common/protobuf/utility.h" -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" + +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/config.cc b/contrib/rocketmq_proxy/filters/network/source/config.cc similarity index 89% rename from source/extensions/filters/network/rocketmq_proxy/config.cc rename to contrib/rocketmq_proxy/filters/network/source/config.cc index 938c79edaa716..dbb63f91a292a 100644 --- a/source/extensions/filters/network/rocketmq_proxy/config.cc +++ b/contrib/rocketmq_proxy/filters/network/source/config.cc @@ -1,15 +1,16 @@ -#include "source/extensions/filters/network/rocketmq_proxy/config.h" +#include "contrib/rocketmq_proxy/filters/network/source/config.h" #include -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/stats.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/stats.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/rocketmq_proxy/config.h b/contrib/rocketmq_proxy/filters/network/source/config.h similarity index 84% rename from source/extensions/filters/network/rocketmq_proxy/config.h rename to contrib/rocketmq_proxy/filters/network/source/config.h index 5ff3d7e98966a..978eb9ed5bfd0 100644 --- a/source/extensions/filters/network/rocketmq_proxy/config.h +++ b/contrib/rocketmq_proxy/filters/network/source/config.h @@ -3,15 +3,15 @@ #include #include -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" - #include "source/extensions/filters/network/common/factory_base.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/route_matcher.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/router_impl.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc b/contrib/rocketmq_proxy/filters/network/source/conn_manager.cc similarity index 99% rename from source/extensions/filters/network/rocketmq_proxy/conn_manager.cc rename to contrib/rocketmq_proxy/filters/network/source/conn_manager.cc index 8f5ba509f6db4..7dfb039736436 100644 --- a/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc +++ b/contrib/rocketmq_proxy/filters/network/source/conn_manager.cc @@ -1,4 +1,4 @@ -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" #include "envoy/buffer/buffer.h" #include "envoy/network/connection.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/conn_manager.h b/contrib/rocketmq_proxy/filters/network/source/conn_manager.h similarity index 94% rename from source/extensions/filters/network/rocketmq_proxy/conn_manager.h rename to contrib/rocketmq_proxy/filters/network/source/conn_manager.h index e724b15b3393c..125332b1c3bcd 100644 --- a/source/extensions/filters/network/rocketmq_proxy/conn_manager.h +++ b/contrib/rocketmq_proxy/filters/network/source/conn_manager.h @@ -3,8 +3,6 @@ #include #include "envoy/common/time.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/stats/scope.h" @@ -15,12 +13,14 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/logger.h" -#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" -#include "source/extensions/filters/network/rocketmq_proxy/codec.h" -#include "source/extensions/filters/network/rocketmq_proxy/stats.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" +#include "contrib/rocketmq_proxy/filters/network/source/active_message.h" +#include "contrib/rocketmq_proxy/filters/network/source/codec.h" +#include "contrib/rocketmq_proxy/filters/network/source/stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/metadata.h b/contrib/rocketmq_proxy/filters/network/source/metadata.h similarity index 100% rename from source/extensions/filters/network/rocketmq_proxy/metadata.h rename to contrib/rocketmq_proxy/filters/network/source/metadata.h diff --git a/source/extensions/filters/network/rocketmq_proxy/protocol.cc b/contrib/rocketmq_proxy/filters/network/source/protocol.cc similarity index 99% rename from source/extensions/filters/network/rocketmq_proxy/protocol.cc rename to contrib/rocketmq_proxy/filters/network/source/protocol.cc index f35a5f68d64fa..7b9ff954798e8 100644 --- a/source/extensions/filters/network/rocketmq_proxy/protocol.cc +++ b/contrib/rocketmq_proxy/filters/network/source/protocol.cc @@ -1,8 +1,9 @@ -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" #include "source/common/common/assert.h" #include "source/common/common/enum_to_int.h" -#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" + +#include "contrib/rocketmq_proxy/filters/network/source/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/protocol.h b/contrib/rocketmq_proxy/filters/network/source/protocol.h similarity index 99% rename from source/extensions/filters/network/rocketmq_proxy/protocol.h rename to contrib/rocketmq_proxy/filters/network/source/protocol.h index c6a0855627993..03082f3398c3f 100644 --- a/source/extensions/filters/network/rocketmq_proxy/protocol.h +++ b/contrib/rocketmq_proxy/filters/network/source/protocol.h @@ -9,9 +9,9 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/logger.h" #include "source/common/protobuf/protobuf.h" -#include "source/extensions/filters/network/rocketmq_proxy/metadata.h" #include "absl/strings/string_view.h" +#include "contrib/rocketmq_proxy/filters/network/source/metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/BUILD b/contrib/rocketmq_proxy/filters/network/source/router/BUILD similarity index 80% rename from source/extensions/filters/network/rocketmq_proxy/router/BUILD rename to contrib/rocketmq_proxy/filters/network/source/router/BUILD index 396e5bc401323..03eb3b741abf9 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/BUILD +++ b/contrib/rocketmq_proxy/filters/network/source/router/BUILD @@ -1,12 +1,12 @@ load( "//bazel:envoy_build_system.bzl", "envoy_cc_library", - "envoy_extension_package", + "envoy_contrib_package", ) licenses(["notice"]) # Apache 2 -envoy_extension_package() +envoy_contrib_package() envoy_cc_library( name = "router_interface", @@ -24,10 +24,10 @@ envoy_cc_library( hdrs = ["router_impl.h"], deps = [ ":router_interface", + "//contrib/rocketmq_proxy/filters/network/source:conn_manager_lib", "//envoy/upstream:cluster_manager_interface", "//envoy/upstream:thread_local_cluster_interface", "//source/extensions/filters/network:well_known_names", - "//source/extensions/filters/network/rocketmq_proxy:conn_manager_lib", ], ) @@ -37,6 +37,7 @@ envoy_cc_library( hdrs = ["route_matcher.h"], deps = [ ":router_interface", + "//contrib/rocketmq_proxy/filters/network/source:metadata_lib", "//envoy/config:typed_config_interface", "//envoy/server:filter_config_interface", "//source/common/common:logger_lib", @@ -44,7 +45,6 @@ envoy_cc_library( "//source/common/http:header_utility_lib", "//source/common/router:metadatamatchcriteria_lib", "//source/extensions/filters/network:well_known_names", - "//source/extensions/filters/network/rocketmq_proxy:metadata_lib", - "@envoy_api//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", + "@envoy_api//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc b/contrib/rocketmq_proxy/filters/network/source/router/route_matcher.cc similarity index 94% rename from source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc rename to contrib/rocketmq_proxy/filters/network/source/router/route_matcher.cc index 4bb961f5fa391..d23ab2de9171e 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc +++ b/contrib/rocketmq_proxy/filters/network/source/router/route_matcher.cc @@ -1,9 +1,10 @@ -#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/route_matcher.h" #include "source/common/router/metadatamatchcriteria_impl.h" -#include "source/extensions/filters/network/rocketmq_proxy/metadata.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/rocketmq_proxy/filters/network/source/metadata.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h b/contrib/rocketmq_proxy/filters/network/source/router/route_matcher.h similarity index 93% rename from source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h rename to contrib/rocketmq_proxy/filters/network/source/router/route_matcher.h index bb2d40d9e59f8..3a4c58715de83 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h +++ b/contrib/rocketmq_proxy/filters/network/source/router/route_matcher.h @@ -3,13 +3,14 @@ #include #include "envoy/config/typed_config.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h" #include "envoy/server/filter_config.h" #include "source/common/common/logger.h" #include "source/common/common/matchers.h" #include "source/common/http/header_utility.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" + +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router.h b/contrib/rocketmq_proxy/filters/network/source/router/router.h similarity index 100% rename from source/extensions/filters/network/rocketmq_proxy/router/router.h rename to contrib/rocketmq_proxy/filters/network/source/router/router.h diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc b/contrib/rocketmq_proxy/filters/network/source/router/router_impl.cc similarity index 94% rename from source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc rename to contrib/rocketmq_proxy/filters/network/source/router/router_impl.cc index 7c24db78482f7..138ff56bd747b 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc +++ b/contrib/rocketmq_proxy/filters/network/source/router/router_impl.cc @@ -1,13 +1,14 @@ -#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/router_impl.h" #include "source/common/common/enum_to_int.h" -#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" -#include "source/extensions/filters/network/rocketmq_proxy/codec.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" -#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/rocketmq_proxy/filters/network/source/active_message.h" +#include "contrib/rocketmq_proxy/filters/network/source/codec.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" +#include "contrib/rocketmq_proxy/filters/network/source/well_known_names.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h b/contrib/rocketmq_proxy/filters/network/source/router/router_impl.h similarity index 97% rename from source/extensions/filters/network/rocketmq_proxy/router/router_impl.h rename to contrib/rocketmq_proxy/filters/network/source/router/router_impl.h index 38a61dcdfef2e..1cb222f5d7f9f 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h +++ b/contrib/rocketmq_proxy/filters/network/source/router/router_impl.h @@ -6,7 +6,8 @@ #include "source/common/common/logger.h" #include "source/common/upstream/load_balancer_impl.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" + +#include "contrib/rocketmq_proxy/filters/network/source/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/stats.h b/contrib/rocketmq_proxy/filters/network/source/stats.h similarity index 100% rename from source/extensions/filters/network/rocketmq_proxy/stats.h rename to contrib/rocketmq_proxy/filters/network/source/stats.h diff --git a/source/extensions/filters/network/rocketmq_proxy/topic_route.cc b/contrib/rocketmq_proxy/filters/network/source/topic_route.cc similarity index 96% rename from source/extensions/filters/network/rocketmq_proxy/topic_route.cc rename to contrib/rocketmq_proxy/filters/network/source/topic_route.cc index afe0a828d0adb..7336ec97d17cc 100644 --- a/source/extensions/filters/network/rocketmq_proxy/topic_route.cc +++ b/contrib/rocketmq_proxy/filters/network/source/topic_route.cc @@ -1,4 +1,4 @@ -#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" +#include "contrib/rocketmq_proxy/filters/network/source/topic_route.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/topic_route.h b/contrib/rocketmq_proxy/filters/network/source/topic_route.h similarity index 100% rename from source/extensions/filters/network/rocketmq_proxy/topic_route.h rename to contrib/rocketmq_proxy/filters/network/source/topic_route.h diff --git a/source/extensions/filters/network/rocketmq_proxy/well_known_names.h b/contrib/rocketmq_proxy/filters/network/source/well_known_names.h similarity index 100% rename from source/extensions/filters/network/rocketmq_proxy/well_known_names.h rename to contrib/rocketmq_proxy/filters/network/source/well_known_names.h diff --git a/test/extensions/filters/network/rocketmq_proxy/BUILD b/contrib/rocketmq_proxy/filters/network/test/BUILD similarity index 59% rename from test/extensions/filters/network/rocketmq_proxy/BUILD rename to contrib/rocketmq_proxy/filters/network/test/BUILD index 975eaecd30608..00ac24134fd46 100644 --- a/test/extensions/filters/network/rocketmq_proxy/BUILD +++ b/contrib/rocketmq_proxy/filters/network/test/BUILD @@ -1,25 +1,22 @@ load( "//bazel:envoy_build_system.bzl", "envoy_cc_mock", + "envoy_cc_test", "envoy_cc_test_library", - "envoy_package", -) -load( - "//test/extensions:extensions_build_system.bzl", - "envoy_extension_cc_test", + "envoy_contrib_package", ) licenses(["notice"]) # Apache 2 -envoy_package() +envoy_contrib_package() envoy_cc_mock( name = "mocks_lib", srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//source/extensions/filters/network/rocketmq_proxy:config", - "//source/extensions/filters/network/rocketmq_proxy/router:router_lib", + "//contrib/rocketmq_proxy/filters/network/source:config", + "//contrib/rocketmq_proxy/filters/network/source/router:router_lib", "//test/mocks/upstream:cluster_manager_mocks", ], ) @@ -29,48 +26,44 @@ envoy_cc_test_library( srcs = ["utility.cc"], hdrs = ["utility.h"], deps = [ - "//source/extensions/filters/network/rocketmq_proxy:config", + "//contrib/rocketmq_proxy/filters/network/source:config", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "protocol_test", srcs = ["protocol_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ - "//source/extensions/filters/network/rocketmq_proxy:config", + "//contrib/rocketmq_proxy/filters/network/source:config", "//test/test_common:utility_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "router_test", srcs = ["router_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ ":mocks_lib", ":utility_lib", - "//source/extensions/filters/network/rocketmq_proxy:config", + "//contrib/rocketmq_proxy/filters/network/source:config", "//test/mocks/server:factory_context_mocks", "//test/test_common:utility_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "topic_route_test", srcs = ["topic_route_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ + "//contrib/rocketmq_proxy/filters/network/source:config", "//source/common/protobuf:utility_lib", - "//source/extensions/filters/network/rocketmq_proxy:config", "//test/test_common:utility_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "conn_manager_test", srcs = ["conn_manager_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ ":utility_lib", "//test/common/stats:stat_test_utility_lib", @@ -83,14 +76,13 @@ envoy_extension_cc_test( ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "active_message_test", srcs = ["active_message_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ ":utility_lib", + "//contrib/rocketmq_proxy/filters/network/source:config", "//source/common/network:address_lib", - "//source/extensions/filters/network/rocketmq_proxy:config", "//test/mocks/network:network_mocks", "//test/mocks/server:factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", @@ -98,24 +90,22 @@ envoy_extension_cc_test( ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "config_test", srcs = ["config_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ - "//source/extensions/filters/network/rocketmq_proxy:config", + "//contrib/rocketmq_proxy/filters/network/source:config", "//test/mocks/local_info:local_info_mocks", "//test/mocks/server:factory_context_mocks", "//test/mocks/server:instance_mocks", "//test/test_common:registry_lib", - "@envoy_api//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", + "@envoy_api//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "codec_test", srcs = ["codec_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ ":utility_lib", "//source/common/network:address_lib", @@ -125,13 +115,12 @@ envoy_extension_cc_test( ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "route_matcher_test", srcs = ["route_matcher_test.cc"], - extension_names = ["envoy.filters.network.rocketmq_proxy"], deps = [ - "//source/extensions/filters/network/rocketmq_proxy/router:route_matcher", + "//contrib/rocketmq_proxy/filters/network/source/router:route_matcher", "//test/test_common:utility_lib", - "@envoy_api//envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", + "@envoy_api//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc b/contrib/rocketmq_proxy/filters/network/test/active_message_test.cc similarity index 93% rename from test/extensions/filters/network/rocketmq_proxy/active_message_test.cc rename to contrib/rocketmq_proxy/filters/network/test/active_message_test.cc index 3720074f1b576..8b98a7be887b6 100644 --- a/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/active_message_test.cc @@ -1,14 +1,14 @@ #include "source/common/network/address_impl.h" -#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" -#include "source/extensions/filters/network/rocketmq_proxy/config.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" -#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" -#include "test/extensions/filters/network/rocketmq_proxy/utility.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" +#include "contrib/rocketmq_proxy/filters/network/source/active_message.h" +#include "contrib/rocketmq_proxy/filters/network/source/config.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" +#include "contrib/rocketmq_proxy/filters/network/source/well_known_names.h" +#include "contrib/rocketmq_proxy/filters/network/test/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/codec_test.cc b/contrib/rocketmq_proxy/filters/network/test/codec_test.cc similarity index 99% rename from test/extensions/filters/network/rocketmq_proxy/codec_test.cc rename to contrib/rocketmq_proxy/filters/network/test/codec_test.cc index 9c8fe92beb238..9a8d471078a7c 100644 --- a/test/extensions/filters/network/rocketmq_proxy/codec_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/codec_test.cc @@ -2,10 +2,9 @@ #include "source/common/common/enum_to_int.h" #include "source/common/network/address_impl.h" #include "source/common/protobuf/utility.h" -#include "source/extensions/filters/network/rocketmq_proxy/codec.h" - -#include "test/extensions/filters/network/rocketmq_proxy/utility.h" +#include "contrib/rocketmq_proxy/filters/network/source/codec.h" +#include "contrib/rocketmq_proxy/filters/network/test/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/config_test.cc b/contrib/rocketmq_proxy/filters/network/test/config_test.cc similarity index 96% rename from test/extensions/filters/network/rocketmq_proxy/config_test.cc rename to contrib/rocketmq_proxy/filters/network/test/config_test.cc index 592ae5de01f83..eb63ad3ae9608 100644 --- a/test/extensions/filters/network/rocketmq_proxy/config_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/config_test.cc @@ -1,13 +1,11 @@ -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" - -#include "source/extensions/filters/network/rocketmq_proxy/config.h" - #include "test/mocks/local_info/mocks.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" #include "test/test_common/registry.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" +#include "contrib/rocketmq_proxy/filters/network/source/config.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc b/contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc similarity index 98% rename from test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc rename to contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc index 44e3c1a9d64e3..30b783c4a0d98 100644 --- a/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc @@ -1,17 +1,16 @@ #include "envoy/network/connection.h" -#include "source/extensions/filters/network/rocketmq_proxy/config.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" - #include "test/common/stats/stat_test_utility.h" #include "test/common/upstream/utility.h" -#include "test/extensions/filters/network/rocketmq_proxy/utility.h" #include "test/mocks/network/connection.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" +#include "contrib/rocketmq_proxy/filters/network/source/config.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/well_known_names.h" +#include "contrib/rocketmq_proxy/filters/network/test/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/mocks.cc b/contrib/rocketmq_proxy/filters/network/test/mocks.cc similarity index 92% rename from test/extensions/filters/network/rocketmq_proxy/mocks.cc rename to contrib/rocketmq_proxy/filters/network/test/mocks.cc index aea79d23d4e11..17f8ee9958eb4 100644 --- a/test/extensions/filters/network/rocketmq_proxy/mocks.cc +++ b/contrib/rocketmq_proxy/filters/network/test/mocks.cc @@ -1,7 +1,6 @@ -#include "test/extensions/filters/network/rocketmq_proxy/mocks.h" - -#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h" +#include "contrib/rocketmq_proxy/filters/network/test/mocks.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/router_impl.h" #include "gtest/gtest.h" using testing::_; diff --git a/test/extensions/filters/network/rocketmq_proxy/mocks.h b/contrib/rocketmq_proxy/filters/network/test/mocks.h similarity index 93% rename from test/extensions/filters/network/rocketmq_proxy/mocks.h rename to contrib/rocketmq_proxy/filters/network/test/mocks.h index 23302611dc287..8eff761dfba2c 100644 --- a/test/extensions/filters/network/rocketmq_proxy/mocks.h +++ b/contrib/rocketmq_proxy/filters/network/test/mocks.h @@ -1,10 +1,9 @@ #pragma once -#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" - #include "test/mocks/upstream/cluster_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/active_message.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" #include "gmock/gmock.h" namespace Envoy { diff --git a/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc b/contrib/rocketmq_proxy/filters/network/test/protocol_test.cc similarity index 99% rename from test/extensions/filters/network/rocketmq_proxy/protocol_test.cc rename to contrib/rocketmq_proxy/filters/network/test/protocol_test.cc index 057b6dcc10d76..495eb74671463 100644 --- a/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/protocol_test.cc @@ -1,6 +1,6 @@ #include "source/common/protobuf/utility.h" -#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" +#include "contrib/rocketmq_proxy/filters/network/source/protocol.h" #include "gtest/gtest.h" namespace Envoy { diff --git a/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc b/contrib/rocketmq_proxy/filters/network/test/route_matcher_test.cc similarity index 77% rename from test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc rename to contrib/rocketmq_proxy/filters/network/test/route_matcher_test.cc index 5153bc13729d9..daef5b3daff0b 100644 --- a/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/route_matcher_test.cc @@ -1,13 +1,11 @@ -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h" -#include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.validate.h" - -#include "source/extensions/filters/network/rocketmq_proxy/metadata.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h" - #include "test/test_common/utility.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h" +#include "contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.validate.h" +#include "contrib/rocketmq_proxy/filters/network/source/metadata.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/route_matcher.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/router_test.cc b/contrib/rocketmq_proxy/filters/network/test/router_test.cc similarity index 97% rename from test/extensions/filters/network/rocketmq_proxy/router_test.cc rename to contrib/rocketmq_proxy/filters/network/test/router_test.cc index 49521a9c4763f..3cee446599e4e 100644 --- a/test/extensions/filters/network/rocketmq_proxy/router_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/router_test.cc @@ -1,12 +1,11 @@ -#include "source/extensions/filters/network/rocketmq_proxy/config.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" -#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" - -#include "test/extensions/filters/network/rocketmq_proxy/mocks.h" -#include "test/extensions/filters/network/rocketmq_proxy/utility.h" #include "test/mocks/server/factory_context.h" +#include "contrib/rocketmq_proxy/filters/network/source/config.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" +#include "contrib/rocketmq_proxy/filters/network/source/router/router.h" +#include "contrib/rocketmq_proxy/filters/network/source/well_known_names.h" +#include "contrib/rocketmq_proxy/filters/network/test/mocks.h" +#include "contrib/rocketmq_proxy/filters/network/test/utility.h" #include "gtest/gtest.h" using testing::_; diff --git a/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc b/contrib/rocketmq_proxy/filters/network/test/topic_route_test.cc similarity index 96% rename from test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc rename to contrib/rocketmq_proxy/filters/network/test/topic_route_test.cc index e1c64375c7407..59b1d8bd9c3d7 100644 --- a/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/topic_route_test.cc @@ -1,7 +1,7 @@ #include "source/common/protobuf/utility.h" -#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" #include "absl/container/node_hash_map.h" +#include "contrib/rocketmq_proxy/filters/network/source/topic_route.h" #include "gtest/gtest.h" namespace Envoy { diff --git a/test/extensions/filters/network/rocketmq_proxy/utility.cc b/contrib/rocketmq_proxy/filters/network/test/utility.cc similarity index 99% rename from test/extensions/filters/network/rocketmq_proxy/utility.cc rename to contrib/rocketmq_proxy/filters/network/test/utility.cc index 16d89d148c0a4..c4459bd36ae6a 100644 --- a/test/extensions/filters/network/rocketmq_proxy/utility.cc +++ b/contrib/rocketmq_proxy/filters/network/test/utility.cc @@ -1,4 +1,4 @@ -#include "test/extensions/filters/network/rocketmq_proxy/utility.h" +#include "contrib/rocketmq_proxy/filters/network/test/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/utility.h b/contrib/rocketmq_proxy/filters/network/test/utility.h similarity index 84% rename from test/extensions/filters/network/rocketmq_proxy/utility.h rename to contrib/rocketmq_proxy/filters/network/test/utility.h index ffbc286bc18b1..9055e1809b75b 100644 --- a/test/extensions/filters/network/rocketmq_proxy/utility.h +++ b/contrib/rocketmq_proxy/filters/network/test/utility.h @@ -1,8 +1,7 @@ #pragma once -#include "source/extensions/filters/network/rocketmq_proxy/config.h" -#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" - +#include "contrib/rocketmq_proxy/filters/network/source/config.h" +#include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" #include "gtest/gtest.h" namespace Envoy { diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index 403e6b9cbb1ec..37b026b20b618 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -9,6 +9,8 @@ Incompatible Behavior Changes :ref:`contrib images `. * contrib: the :ref:`kafka broker filter ` has been moved to :ref:`contrib images `. +* contrib: the :ref:`RocketMQ proxy filter ` has been moved to + :ref:`contrib images `. * ext_authz: fixed skipping authentication when returning either a direct response or a redirect. This behavior can be temporarily reverted by setting the ``envoy.reloadable_features.http_ext_authz_do_not_skip_direct_response_and_redirect`` runtime guard to false. Minor Behavior Changes diff --git a/generated_api_shadow/BUILD b/generated_api_shadow/BUILD index d61c9e486b81e..538218e83a9f3 100644 --- a/generated_api_shadow/BUILD +++ b/generated_api_shadow/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/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD b/generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD rename to generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD diff --git a/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto similarity index 94% rename from generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto rename to generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto index c354b629bea28..12438751fada6 100644 --- a/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto +++ b/generated_api_shadow/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/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto rename to generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto diff --git a/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD b/generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD rename to generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/BUILD diff --git a/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto rename to generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/rocketmq_proxy.proto diff --git a/generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto rename to generated_api_shadow/contrib/envoy/extensions/filters/network/rocketmq_proxy/v4alpha/route.proto diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl index 52ebaac2823be..b0188235dde69 100644 --- a/source/extensions/extensions_build_config.bzl +++ b/source/extensions/extensions_build_config.bzl @@ -138,7 +138,6 @@ EXTENSIONS = { "envoy.filters.network.ratelimit": "//source/extensions/filters/network/ratelimit:config", "envoy.filters.network.rbac": "//source/extensions/filters/network/rbac:config", "envoy.filters.network.redis_proxy": "//source/extensions/filters/network/redis_proxy:config", - "envoy.filters.network.rocketmq_proxy": "//source/extensions/filters/network/rocketmq_proxy:config", "envoy.filters.network.tcp_proxy": "//source/extensions/filters/network/tcp_proxy:config", "envoy.filters.network.thrift_proxy": "//source/extensions/filters/network/thrift_proxy:config", "envoy.filters.network.sni_cluster": "//source/extensions/filters/network/sni_cluster:config", diff --git a/source/extensions/extensions_metadata.yaml b/source/extensions/extensions_metadata.yaml index 85c03a9323ef7..2cd7f158865ba 100644 --- a/source/extensions/extensions_metadata.yaml +++ b/source/extensions/extensions_metadata.yaml @@ -373,11 +373,6 @@ envoy.filters.network.redis_proxy: - envoy.filters.network security_posture: requires_trusted_downstream_and_upstream status: stable -envoy.filters.network.rocketmq_proxy: - categories: - - envoy.filters.network - security_posture: requires_trusted_downstream_and_upstream - status: alpha envoy.filters.network.sni_cluster: categories: - envoy.filters.network diff --git a/tools/proto_format/proto_sync.py b/tools/proto_format/proto_sync.py index 3fcdd7320a6d0..0fce2af67ff3a 100755 --- a/tools/proto_format/proto_sync.py +++ b/tools/proto_format/proto_sync.py @@ -46,6 +46,7 @@ # Extensions moved from core to contrib. 'envoy.extensions.filters.http.squash.v3', 'envoy.extensions.filters.network.kafka_broker.v3', + 'envoy.extensions.filters.network.rocketmq_proxy.v3', ] BUILD_FILE_TEMPLATE = string.Template( @@ -175,7 +176,7 @@ def get_destination_path(src): # contrib API files have the standard namespace but are in a contrib folder for clarity. # The following prepends contrib for contrib packages so we wind up with the real final path. if 'contrib' in src: - if 'v3alpha' not in package and package not in CONTRIB_V3_ALLOW_LIST: + if 'v3alpha' not in package and 'v4alpha' not in package and package not in CONTRIB_V3_ALLOW_LIST: raise ProtoSyncError( "contrib extension package '{}' does not use v3alpha namespace. " "Add to CONTRIB_V3_ALLOW_LIST with an explanation if this is on purpose.".format( @@ -306,7 +307,7 @@ def get_import_deps(proto_path): imports.append( external_proto_deps.EXTERNAL_PROTO_IMPORT_BAZEL_DEP_MAP[import_path]) continue - if import_path.startswith('envoy/'): + if import_path.startswith('envoy/') or import_path.startswith('contrib/'): # Ignore package internal imports. if os.path.dirname(proto_path).endswith(os.path.dirname(import_path)): continue diff --git a/tools/protoxform/protoprint.py b/tools/protoxform/protoprint.py index 38c3b3e11338e..b30058b37a68e 100755 --- a/tools/protoxform/protoprint.py +++ b/tools/protoxform/protoprint.py @@ -268,7 +268,7 @@ def camel_case(s): # import_deprecation_proto is True or the proto is frozen. continue infra_imports.append(d) - elif d.startswith('envoy/'): + elif d.startswith('envoy/') or d.startswith('contrib/'): # We ignore existing envoy/ imports, since these are computed explicitly # from type_dependencies. pass From 205fc61684f6380aae6d99867aad9f5334f4212f Mon Sep 17 00:00:00 2001 From: Matt Klein Date: Fri, 20 Aug 2021 22:54:22 +0000 Subject: [PATCH 2/2] fix Signed-off-by: Matt Klein --- CODEOWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index e0e1c5a593b62..9ae4293d99d23 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -23,8 +23,6 @@ extensions/filters/common/original_src @snowp @klarose # dubbo_proxy extension /*/extensions/filters/network/dubbo_proxy @zyfjeff @lizan -# rocketmq_proxy extension -/*/extensions/filters/network/rocketmq_proxy @aaron-ai @lizhanhui @lizan # thrift_proxy extension /*/extensions/filters/network/thrift_proxy @zuercher @rgs1 # cdn_loop extension @@ -203,3 +201,4 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp /contrib/exe/ @mattklein123 @lizan /contrib/squash/ @yuval-k @alyssawilk /contrib/kafka/ @mattklein123 @adamkotwasinski +/contrib/rocketmq_proxy/ @aaron-ai @lizhanhui @lizan