Skip to content
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

kafka broker filter: move to contrib #17750

Merged
merged 3 commits into from
Aug 18, 2021
Merged

kafka broker filter: move to contrib #17750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b25b11
kafka broker filter: move to contrib
mattklein123 Aug 17, 2021
e421d3f
fix
mattklein123 Aug 17, 2021
3cefc3a
fix
mattklein123 Aug 17, 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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ updates:
interval: "daily"

- package-ecosystem: "pip"
directory: "/source/extensions/filters/network/kafka"
directory: "/contrib/kafka/filters/network/source"
schedule:
interval: "daily"

Expand Down
3 changes: 1 addition & 2 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,8 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
/*/extensions/formatter/req_without_query @dio @tsaarni
# IP address input matcher
/*/extensions/matching/input_matchers/ip @aguinet @snowp
# Kafka
/*/extensions/filters/network/kafka @mattklein123 @adamkotwasinski

# Contrib
/contrib/exe/ @mattklein123 @lizan
/contrib/squash/ @yuval-k @alyssawilk
/contrib/kafka/ @mattklein123 @adamkotwasinski
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 @@ -58,6 +58,7 @@ proto_library(
visibility = ["//visibility:public"],
deps = [
"//contrib/envoy/extensions/filters/http/squash/v3:pkg",
"//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
"//envoy/admin/v3:pkg",
"//envoy/config/accesslog/v3:pkg",
"//envoy/config/bootstrap/v3:pkg",
Expand Down Expand Up @@ -159,7 +160,6 @@ proto_library(
"//envoy/extensions/filters/network/echo/v3:pkg",
"//envoy/extensions/filters/network/ext_authz/v3:pkg",
"//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
"//envoy/extensions/filters/network/kafka_broker/v3:pkg",
"//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
"//envoy/extensions/filters/network/mongo_proxy/v3:pkg",
"//envoy/extensions/filters/network/mysql_proxy/v3:pkg",
Expand Down
0 ...ons/filters/network/kafka_broker/v3/BUILD → ...ons/filters/network/kafka_broker/v3/BUILD
View file
Open in desktop
File renamed without changes.
0 ...etwork/kafka_broker/v3/kafka_broker.proto → ...etwork/kafka_broker/v3/kafka_broker.proto
View file
Open in desktop
File renamed without changes.
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 @@ -10,6 +10,7 @@ proto_library(
visibility = ["//visibility:public"],
deps = [
"//contrib/envoy/extensions/filters/http/squash/v3:pkg",
"//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
"//envoy/admin/v3:pkg",
"//envoy/config/accesslog/v3:pkg",
"//envoy/config/bootstrap/v3:pkg",
Expand Down Expand Up @@ -111,7 +112,6 @@ proto_library(
"//envoy/extensions/filters/network/echo/v3:pkg",
"//envoy/extensions/filters/network/ext_authz/v3:pkg",
"//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
"//envoy/extensions/filters/network/kafka_broker/v3:pkg",
"//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
"//envoy/extensions/filters/network/mongo_proxy/v3:pkg",
"//envoy/extensions/filters/network/mysql_proxy/v3:pkg",
Expand Down
2 changes: 1 addition & 1 deletion bazel/repositories_extra.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def _python_deps():
)
pip_install(
name = "kafka_pip3",
requirements = "@envoy//source/extensions/filters/network/kafka:requirements.txt",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not immediately viable for this PR, but repositories_extra.bzl but AFAICT this file is going to be included in https://github.com/envoyproxy/envoy/blob/main/WORKSPACE#L15 in every build

in future we might want to separate extra repositories and extra things from bazel/foreign_cc, as we wouldn't want them in the main binary build

that would allow contributors to add their own static dependencies etc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I agree we can further improve. AFAIK though if kafka is never built bazel should not do anything, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah right! it's never going to be referenced

requirements = "@envoy//contrib/kafka/filters/network/source:requirements.txt",
extra_pip_args = ["--require-hashes"],

# project_name = "Jinja",
Expand Down
6 changes: 6 additions & 0 deletions contrib/contrib_build_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ CONTRIB_EXTENSIONS = {
#

"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",
}
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 @@ -3,3 +3,8 @@ envoy.filters.http.squash:
- envoy.filters.http
security_posture: requires_trusted_downstream_and_upstream
status: stable
envoy.filters.network.kafka_broker:
categories:
- envoy.filters.network
security_posture: requires_trusted_downstream_and_upstream
status: wip
12 changes: 6 additions & 6 deletions ...ce/extensions/filters/network/kafka/BUILD → contrib/kafka/filters/network/source/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
load(
"//bazel:envoy_build_system.bzl",
"envoy_cc_extension",
"envoy_cc_contrib_extension",
"envoy_cc_library",
"envoy_extension_package",
"envoy_contrib_package",
)
load("@rules_python//python:defs.bzl", "py_binary", "py_library")
load("@kafka_pip3//:requirements.bzl", "requirement")

licenses(["notice"]) # Apache 2

envoy_contrib_package()

# Kafka network filter.
# Broker filter public docs: docs/root/configuration/network_filters/kafka_broker_filter.rst

envoy_extension_package()

envoy_cc_extension(
envoy_cc_contrib_extension(
name = "kafka_broker_config_lib",
srcs = ["broker/config.cc"],
hdrs = ["broker/config.h"],
deps = [
":kafka_broker_filter_lib",
"//source/extensions/filters/network:well_known_names",
"//source/extensions/filters/network/common:factory_base_lib",
"@envoy_api//envoy/extensions/filters/network/kafka_broker/v3:pkg_cc_proto",
"@envoy_api//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg_cc_proto",
],
)

Expand Down
4 changes: 2 additions & 2 deletions ...ns/filters/network/kafka/broker/config.cc → ...a/filters/network/source/broker/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "source/extensions/filters/network/kafka/broker/config.h"
#include "contrib/kafka/filters/network/source/broker/config.h"

#include "envoy/registry/registry.h"
#include "envoy/server/filter_config.h"
#include "envoy/stats/scope.h"

#include "source/extensions/filters/network/kafka/broker/filter.h"
#include "contrib/kafka/filters/network/source/broker/filter.h"

namespace Envoy {
namespace Extensions {
Expand Down
6 changes: 3 additions & 3 deletions ...ons/filters/network/kafka/broker/config.h → ...ka/filters/network/source/broker/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.h"
#include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.h"

#include "source/extensions/filters/network/common/factory_base.h"
#include "source/extensions/filters/network/well_known_names.h"

#include "contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.h"
#include "contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.h"

namespace Envoy {
namespace Extensions {
namespace NetworkFilters {
Expand Down
2 changes: 1 addition & 1 deletion ...ns/filters/network/kafka/broker/filter.cc → ...a/filters/network/source/broker/filter.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/kafka/broker/filter.h"
#include "contrib/kafka/filters/network/source/broker/filter.h"

namespace Envoy {
namespace Extensions {
Expand Down
10 changes: 5 additions & 5 deletions ...ons/filters/network/kafka/broker/filter.h → ...ka/filters/network/source/broker/filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#include "envoy/stats/scope.h"

#include "source/common/common/logger.h"
#include "source/extensions/filters/network/kafka/external/request_metrics.h"
#include "source/extensions/filters/network/kafka/external/response_metrics.h"
#include "source/extensions/filters/network/kafka/parser.h"
#include "source/extensions/filters/network/kafka/request_codec.h"
#include "source/extensions/filters/network/kafka/response_codec.h"

#include "absl/container/flat_hash_map.h"
#include "contrib/kafka/filters/network/source/external/request_metrics.h"
#include "contrib/kafka/filters/network/source/external/response_metrics.h"
#include "contrib/kafka/filters/network/source/parser.h"
#include "contrib/kafka/filters/network/source/request_codec.h"
#include "contrib/kafka/filters/network/source/response_codec.h"

namespace Envoy {
namespace Extensions {
Expand Down
0 .../extensions/filters/network/kafka/codec.h → contrib/kafka/filters/network/source/codec.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ons/filters/network/kafka/kafka_request.h → ...ka/filters/network/source/kafka_request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "envoy/common/exception.h"

#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
#include "source/extensions/filters/network/kafka/serialization.h"
#include "source/extensions/filters/network/kafka/tagged_fields.h"
#include "contrib/kafka/filters/network/source/external/serialization_composite.h"
#include "contrib/kafka/filters/network/source/serialization.h"
#include "contrib/kafka/filters/network/source/tagged_fields.h"

namespace Envoy {
namespace Extensions {
Expand Down
2 changes: 1 addition & 1 deletion ...ers/network/kafka/kafka_request_parser.cc → ...rs/network/source/kafka_request_parser.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/kafka/kafka_request_parser.h"
#include "contrib/kafka/filters/network/source/kafka_request_parser.h"

namespace Envoy {
namespace Extensions {
Expand Down
7 changes: 4 additions & 3 deletions ...ters/network/kafka/kafka_request_parser.h → ...ers/network/source/kafka_request_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
#include "envoy/common/exception.h"

#include "source/common/common/assert.h"
#include "source/extensions/filters/network/kafka/kafka_request.h"
#include "source/extensions/filters/network/kafka/parser.h"
#include "source/extensions/filters/network/kafka/tagged_fields.h"

#include "contrib/kafka/filters/network/source/kafka_request.h"
#include "contrib/kafka/filters/network/source/parser.h"
#include "contrib/kafka/filters/network/source/tagged_fields.h"

namespace Envoy {
namespace Extensions {
Expand Down
6 changes: 3 additions & 3 deletions ...ns/filters/network/kafka/kafka_response.h → ...a/filters/network/source/kafka_response.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "source/extensions/filters/network/kafka/external/serialization_composite.h"
#include "source/extensions/filters/network/kafka/serialization.h"
#include "source/extensions/filters/network/kafka/tagged_fields.h"
#include "contrib/kafka/filters/network/source/external/serialization_composite.h"
#include "contrib/kafka/filters/network/source/serialization.h"
#include "contrib/kafka/filters/network/source/tagged_fields.h"

namespace Envoy {
namespace Extensions {
Expand Down
2 changes: 1 addition & 1 deletion ...rs/network/kafka/kafka_response_parser.cc → ...s/network/source/kafka_response_parser.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/kafka/kafka_response_parser.h"
#include "contrib/kafka/filters/network/source/kafka_response_parser.h"

#include "absl/strings/str_cat.h"

Expand Down
6 changes: 3 additions & 3 deletions ...ers/network/kafka/kafka_response_parser.h → ...rs/network/source/kafka_response_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include <map>
#include <memory>

#include "source/extensions/filters/network/kafka/kafka_response.h"
#include "source/extensions/filters/network/kafka/parser.h"
#include "source/extensions/filters/network/kafka/tagged_fields.h"
#include "contrib/kafka/filters/network/source/kafka_response.h"
#include "contrib/kafka/filters/network/source/parser.h"
#include "contrib/kafka/filters/network/source/tagged_fields.h"

namespace Envoy {
namespace Extensions {
Expand Down
0 ...sions/filters/network/kafka/kafka_types.h → ...afka/filters/network/source/kafka_types.h
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions ...tensions/filters/network/kafka/mesh/BUILD → ...b/kafka/filters/network/source/mesh/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
load(
"//bazel:envoy_build_system.bzl",
"envoy_cc_library",
"envoy_extension_package",
"envoy_contrib_package",
)

licenses(["notice"]) # Apache 2

# Kafka-mesh network filter.
envoy_contrib_package()

envoy_extension_package()
# Kafka-mesh network filter.

envoy_cc_library(
name = "filter_lib",
Expand All @@ -21,13 +21,13 @@ envoy_cc_library(
":abstract_command_lib",
":request_processor_lib",
":upstream_config_lib",
"//contrib/kafka/filters/network/source:kafka_request_codec_lib",
"//contrib/kafka/filters/network/source:kafka_response_codec_lib",
"//envoy/buffer:buffer_interface",
"//envoy/network:connection_interface",
"//envoy/network:filter_interface",
"//source/common/common:assert_lib",
"//source/common/common:minimal_logger_lib",
"//source/extensions/filters/network/kafka:kafka_request_codec_lib",
"//source/extensions/filters/network/kafka:kafka_response_codec_lib",
],
)

Expand All @@ -43,11 +43,11 @@ envoy_cc_library(
deps = [
":abstract_command_lib",
":upstream_config_lib",
"//contrib/kafka/filters/network/source:kafka_request_codec_lib",
"//contrib/kafka/filters/network/source:kafka_request_parser_lib",
"//contrib/kafka/filters/network/source/mesh/command_handlers:api_versions_lib",
"//contrib/kafka/filters/network/source/mesh/command_handlers:metadata_lib",
"//source/common/common:minimal_logger_lib",
"//source/extensions/filters/network/kafka:kafka_request_codec_lib",
"//source/extensions/filters/network/kafka:kafka_request_parser_lib",
"//source/extensions/filters/network/kafka/mesh/command_handlers:api_versions_lib",
"//source/extensions/filters/network/kafka/mesh/command_handlers:metadata_lib",
],
)

Expand All @@ -61,9 +61,9 @@ envoy_cc_library(
],
tags = ["skip_on_windows"],
deps = [
"//contrib/kafka/filters/network/source:kafka_response_lib",
"//contrib/kafka/filters/network/source:tagged_fields_lib",
"//source/common/common:minimal_logger_lib",
"//source/extensions/filters/network/kafka:kafka_response_lib",
"//source/extensions/filters/network/kafka:tagged_fields_lib",
],
)

Expand Down
2 changes: 1 addition & 1 deletion ...rs/network/kafka/mesh/abstract_command.cc → ...s/network/source/mesh/abstract_command.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/kafka/mesh/abstract_command.h"
#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"

namespace Envoy {
namespace Extensions {
Expand Down
3 changes: 2 additions & 1 deletion ...ers/network/kafka/mesh/abstract_command.h → ...rs/network/source/mesh/abstract_command.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#pragma once

#include "source/common/common/logger.h"
#include "source/extensions/filters/network/kafka/kafka_response.h"

#include "contrib/kafka/filters/network/source/kafka_response.h"

namespace Envoy {
namespace Extensions {
Expand Down
47 changes: 47 additions & 0 deletions contrib/kafka/filters/network/source/mesh/command_handlers/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
load(
"//bazel:envoy_build_system.bzl",
"envoy_cc_library",
"envoy_contrib_package",
)

licenses(["notice"]) # Apache 2

envoy_contrib_package()

# Handlers for particular Kafka requests that are used by Kafka-mesh filter.

envoy_cc_library(
name = "metadata_lib",
srcs = [
"metadata.cc",
],
hdrs = [
"metadata.h",
],
tags = ["skip_on_windows"],
deps = [
"//contrib/kafka/filters/network/source:kafka_request_parser_lib",
"//contrib/kafka/filters/network/source:kafka_response_parser_lib",
"//contrib/kafka/filters/network/source/mesh:abstract_command_lib",
"//contrib/kafka/filters/network/source/mesh:upstream_config_lib",
"//source/common/common:minimal_logger_lib",
],
)

envoy_cc_library(
name = "api_versions_lib",
srcs = [
"api_versions.cc",
],
hdrs = [
"api_versions.h",
],
tags = ["skip_on_windows"],
deps = [
"//contrib/kafka/filters/network/source:kafka_request_parser_lib",
"//contrib/kafka/filters/network/source:kafka_response_parser_lib",
"//contrib/kafka/filters/network/source:tagged_fields_lib",
"//contrib/kafka/filters/network/source/mesh:abstract_command_lib",
"//source/common/common:minimal_logger_lib",
],
)
6 changes: 3 additions & 3 deletions ...fka/mesh/command_handlers/api_versions.cc → ...rce/mesh/command_handlers/api_versions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h"
#include "contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h"

#include "source/extensions/filters/network/kafka/external/requests.h"
#include "source/extensions/filters/network/kafka/external/responses.h"
#include "contrib/kafka/filters/network/source/external/requests.h"
#include "contrib/kafka/filters/network/source/external/responses.h"

namespace Envoy {
namespace Extensions {
Expand Down
4 changes: 2 additions & 2 deletions ...afka/mesh/command_handlers/api_versions.h → ...urce/mesh/command_handlers/api_versions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "source/extensions/filters/network/kafka/external/requests.h"
#include "source/extensions/filters/network/kafka/mesh/abstract_command.h"
#include "contrib/kafka/filters/network/source/external/requests.h"
#include "contrib/kafka/filters/network/source/mesh/abstract_command.h"

namespace Envoy {
namespace Extensions {
Expand Down
4 changes: 2 additions & 2 deletions ...k/kafka/mesh/command_handlers/metadata.cc → .../source/mesh/command_handlers/metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "source/extensions/filters/network/kafka/mesh/command_handlers/metadata.h"
#include "contrib/kafka/filters/network/source/mesh/command_handlers/metadata.h"

#include "source/extensions/filters/network/kafka/external/responses.h"
#include "contrib/kafka/filters/network/source/external/responses.h"

namespace Envoy {
namespace Extensions {
Expand Down
Loading