Skip to content

Commit

Permalink
rocketmq: move to contrib (#17796)
Browse files Browse the repository at this point in the history
Part of #14078

Signed-off-by: Matt Klein <mklein@lyft.com>
  • Loading branch information
mattklein123 authored Aug 21, 2021
1 parent a63b899 commit 5b63ef4
Show file tree
Hide file tree
Showing 59 changed files with 142 additions and 154 deletions.
3 changes: 1 addition & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion api/versioning/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions contrib/contrib_build_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
5 changes: 5 additions & 0 deletions contrib/extensions_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
],
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#include "source/extensions/filters/network/rocketmq_proxy/codec.h"
#include "contrib/rocketmq_proxy/filters/network/source/codec.h"

#include <string>

#include "source/common/common/assert.h"
#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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#include "source/extensions/filters/network/rocketmq_proxy/config.h"
#include "contrib/rocketmq_proxy/filters/network/source/config.h"

#include <cstdlib>

#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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
#include <memory>
#include <string>

#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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#include <list>

#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"
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
],
)

Expand All @@ -37,14 +37,14 @@ 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",
"//source/common/common:matchers_lib",
"//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",
],
)
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
#include <string>

#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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Loading

0 comments on commit 5b63ef4

Please sign in to comment.