Skip to content

rocketmq: move to contrib #17796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 2 commits into from
Aug 21, 2021
Merged

rocketmq: move to contrib #17796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39af693
rocketmq: move to contrib
mattklein123 Aug 20, 2021
205fc61
fix
mattklein123 Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CODEOWNERS
View file
Open in desktop
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
View file
Open in desktop
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
0 ...s/filters/network/rocketmq_proxy/v3/BUILD → ...s/filters/network/rocketmq_proxy/v3/BUILD
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rk/rocketmq_proxy/v3/rocketmq_proxy.proto → ...rk/rocketmq_proxy/v3/rocketmq_proxy.proto
View file
Open in desktop
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
0 ...ers/network/rocketmq_proxy/v3/route.proto → ...ers/network/rocketmq_proxy/v3/route.proto
View file
Open in desktop
File renamed without changes.
0 ...ters/network/rocketmq_proxy/v4alpha/BUILD → ...ters/network/rocketmq_proxy/v4alpha/BUILD
View file
Open in desktop
File renamed without changes.
0 ...cketmq_proxy/v4alpha/rocketmq_proxy.proto → ...cketmq_proxy/v4alpha/rocketmq_proxy.proto
View file
Open in desktop
File renamed without changes.
0 ...etwork/rocketmq_proxy/v4alpha/route.proto → ...etwork/rocketmq_proxy/v4alpha/route.proto
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion api/envoy/extensions/filters/network/rocketmq_proxy/v3/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/versioning/BUILD
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
18 changes: 9 additions & 9 deletions ...ions/filters/network/rocketmq_proxy/BUILD → ...cketmq_proxy/filters/network/source/BUILD
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions .../network/rocketmq_proxy/active_message.cc → .../filters/network/source/active_message.cc
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions ...s/network/rocketmq_proxy/active_message.h → ...y/filters/network/source/active_message.h
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions ...s/filters/network/rocketmq_proxy/codec.cc → ...tmq_proxy/filters/network/source/codec.cc
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion ...ns/filters/network/rocketmq_proxy/codec.h → ...etmq_proxy/filters/network/source/codec.h
View file
Open in desktop
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
9 changes: 5 additions & 4 deletions .../filters/network/rocketmq_proxy/config.cc → ...mq_proxy/filters/network/source/config.cc
View file
Open in desktop
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
12 changes: 6 additions & 6 deletions ...s/filters/network/rocketmq_proxy/config.h → ...tmq_proxy/filters/network/source/config.h
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...rs/network/rocketmq_proxy/conn_manager.cc → ...xy/filters/network/source/conn_manager.cc
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions ...ers/network/rocketmq_proxy/conn_manager.h → ...oxy/filters/network/source/conn_manager.h
View file
Open in desktop
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
0 ...filters/network/rocketmq_proxy/metadata.h → ...q_proxy/filters/network/source/metadata.h
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions ...ilters/network/rocketmq_proxy/protocol.cc → ..._proxy/filters/network/source/protocol.cc
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...filters/network/rocketmq_proxy/protocol.h → ...q_proxy/filters/network/source/protocol.h
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions ...lters/network/rocketmq_proxy/router/BUILD → ...proxy/filters/network/source/router/BUILD
View file
Open in desktop
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",
],
)
5 changes: 3 additions & 2 deletions ...rk/rocketmq_proxy/router/route_matcher.cc → ...rs/network/source/router/route_matcher.cc
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions ...ork/rocketmq_proxy/router/route_matcher.h → ...ers/network/source/router/route_matcher.h
View file
Open in desktop
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
0 ...rs/network/rocketmq_proxy/router/router.h → ...xy/filters/network/source/router/router.h
View file
Open in desktop
File renamed without changes.
13 changes: 7 additions & 6 deletions ...work/rocketmq_proxy/router/router_impl.cc → ...ters/network/source/router/router_impl.cc
View file
Open in desktop
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