kafka broker filter: move to contrib (#17750)

Part of #14078

Signed-off-by: Matt Klein <mklein@lyft.com>

.github/dependabot.yml

@@ -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"
 

CODEOWNERS

@@ -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

api/BUILD

@@ -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",
@@ -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",

api/versioning/BUILD

@@ -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",
@@ -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",

bazel/repositories_extra.bzl

@@ -69,7 +69,7 @@ def _python_deps():
     )
     pip_install(
         name = "kafka_pip3",
-        requirements = "@envoy//source/extensions/filters/network/kafka:requirements.txt",
+        requirements = "@envoy//contrib/kafka/filters/network/source:requirements.txt",
         extra_pip_args = ["--require-hashes"],
 
         # project_name = "Jinja",

contrib/contrib_build_config.bzl

@@ -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",
 }

contrib/extensions_metadata.yaml

@@ -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

source/extensions/filters/network/kafka/BUILD → contrib/kafka/filters/network/source/BUILD

@@ -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",
     ],
 )
 

source/extensions/filters/network/kafka/broker/config.cc → contrib/kafka/filters/network/source/broker/config.cc

@@ -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 {

source/extensions/filters/network/kafka/broker/config.h → contrib/kafka/filters/network/source/broker/config.h

@@ -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 {

source/extensions/filters/network/kafka/broker/filter.cc → contrib/kafka/filters/network/source/broker/filter.cc

@@ -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 {

source/extensions/filters/network/kafka/broker/filter.h → contrib/kafka/filters/network/source/broker/filter.h

@@ -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 {

source/extensions/filters/network/kafka/kafka_request.h → contrib/kafka/filters/network/source/kafka_request.h

@@ -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 {

source/extensions/filters/network/kafka/kafka_request_parser.cc → contrib/kafka/filters/network/source/kafka_request_parser.cc

@@ -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 {

source/extensions/filters/network/kafka/kafka_request_parser.h → contrib/kafka/filters/network/source/kafka_request_parser.h

@@ -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 {

source/extensions/filters/network/kafka/kafka_response.h → contrib/kafka/filters/network/source/kafka_response.h

@@ -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 {

source/extensions/filters/network/kafka/kafka_response_parser.cc → contrib/kafka/filters/network/source/kafka_response_parser.cc

@@ -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"
 

source/extensions/filters/network/kafka/kafka_response_parser.h → contrib/kafka/filters/network/source/kafka_response_parser.h

@@ -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 {

source/extensions/filters/network/kafka/mesh/BUILD → contrib/kafka/filters/network/source/mesh/BUILD

@@ -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",
@@ -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",
     ],
 )
 
@@ -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",
     ],
 )
 
@@ -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",
     ],
 )
 

source/extensions/filters/network/kafka/mesh/abstract_command.cc → contrib/kafka/filters/network/source/mesh/abstract_command.cc

@@ -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 {

source/extensions/filters/network/kafka/mesh/abstract_command.h → contrib/kafka/filters/network/source/mesh/abstract_command.h

@@ -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 {

contrib/kafka/filters/network/source/mesh/command_handlers/BUILD

@@ -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",
+    ],
+)

source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.cc → contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.cc

@@ -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 {

source/extensions/filters/network/kafka/mesh/command_handlers/api_versions.h → contrib/kafka/filters/network/source/mesh/command_handlers/api_versions.h

@@ -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 {

source/extensions/filters/network/kafka/mesh/command_handlers/metadata.cc → contrib/kafka/filters/network/source/mesh/command_handlers/metadata.cc

@@ -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 {