contrib: move sql filters (envoyproxy#17800)

Fixes envoyproxy#14078

Signed-off-by: Matt Klein <[email protected]>

CODEOWNERS

@@ -60,10 +60,6 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/tracers/xray @abaptiste @lavignes @mattklein123
 # tracers.skywalking extension
 /*/extensions/tracers/skywalking @wbpcode @dio @lizan @Shikugawa
-# mysql_proxy extension
-/*/extensions/filters/network/mysql_proxy @rshriram @venilnoronha @mattklein123
-# postgres_proxy extension
-/*/extensions/filters/network/postgres_proxy @fabriziomello @cpakulski @dio
 # quic extension
 /*/extensions/quic/ @alyssawilk @danzh2010 @mattklein123 @mpwarres @wu-bin @ggreenway
 # zookeeper_proxy extension
@@ -108,7 +104,6 @@ extensions/filters/common/original_src @snowp @klarose
 # common crypto extension
 /*/extensions/common/crypto @lizan @bdecoste @asraa
 /*/extensions/common/proxy_protocol @alyssawilk @wez470
-/*/extensions/common/sqlutils @cpakulski @dio
 /*/extensions/filters/http/grpc_http1_bridge @snowp @jose
 /*/extensions/filters/http/gzip @gsagula @dio
 /*/extensions/filters/http/fault @rshriram @alyssawilk
@@ -201,6 +196,9 @@ extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
 
 # Contrib
 /contrib/exe/ @mattklein123 @lizan
+/contrib/common/sqlutils/ @cpakulski @dio
 /contrib/squash/ @yuval-k @alyssawilk
 /contrib/kafka/ @mattklein123 @adamkotwasinski
 /contrib/rocketmq_proxy/ @aaron-ai @lizhanhui @lizan
+/contrib/mysql_proxy/ @rshriram @venilnoronha
+/contrib/postgres_proxy/ @fabriziomello @cpakulski @dio

api/BUILD

@@ -59,6 +59,8 @@ 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/mysql_proxy/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg",
         "//envoy/admin/v3:pkg",
         "//envoy/config/accesslog/v3:pkg",
@@ -164,8 +166,6 @@ proto_library(
         "//envoy/extensions/filters/network/http_connection_manager/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",
-        "//envoy/extensions/filters/network/postgres_proxy/v3alpha:pkg",
         "//envoy/extensions/filters/network/ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/rbac/v3:pkg",
         "//envoy/extensions/filters/network/redis_proxy/v3:pkg",

api/versioning/BUILD

@@ -11,6 +11,8 @@ 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/mysql_proxy/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/rocketmq_proxy/v3:pkg",
         "//envoy/admin/v3:pkg",
         "//envoy/config/accesslog/v3:pkg",
@@ -116,8 +118,6 @@ proto_library(
         "//envoy/extensions/filters/network/http_connection_manager/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",
-        "//envoy/extensions/filters/network/postgres_proxy/v3alpha:pkg",
         "//envoy/extensions/filters/network/ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/rbac/v3:pkg",
         "//envoy/extensions/filters/network/redis_proxy/v3:pkg",

bazel/envoy_test.bzl

@@ -156,7 +156,8 @@ def envoy_cc_test(
         coverage = True,
         local = False,
         size = "medium",
-        flaky = False):
+        flaky = False,
+        env = {}):
     coverage_tags = tags + ([] if coverage else ["nocoverage"])
 
     cc_test(
@@ -180,6 +181,7 @@ def envoy_cc_test(
         shard_count = shard_count,
         size = size,
         flaky = flaky,
+        env = env,
     )
 
 # Envoy C++ test related libraries (that want gtest, gmock) should be specified

configs/configgen.sh

@@ -10,7 +10,10 @@ shift
 mkdir -p "$OUT_DIR/certs"
 mkdir -p "$OUT_DIR/lib"
 mkdir -p "$OUT_DIR/protos"
-"$CONFIGGEN" "$OUT_DIR"
+
+if [[ "$CONFIGGEN" != "NO_CONFIGGEN" ]]; then
+  "$CONFIGGEN" "$OUT_DIR"
+fi
 
 for FILE in "$@"; do
   case "$FILE" in
@@ -33,4 +36,9 @@ for FILE in "$@"; do
 done
 
 # tar is having issues with -C for some reason so just cd into OUT_DIR.
-(cd "$OUT_DIR"; tar -hcvf example_configs.tar -- *.yaml certs/*.pem certs/*.der protos/*.pb lib/*.wasm lib/*.lua)
+# Ignore files that don't exist so this script works for both core and contrib.
+# shellcheck disable=SC2046
+# shellcheck disable=SC2035
+# TODO(mattklein123): I can't make this work when using the shellcheck suggestions. Try
+# to fix this.
+(cd "$OUT_DIR"; tar -hcvf example_configs.tar -- $(ls *.yaml certs/*.pem certs/*.der protos/*.pb lib/*.wasm lib/*.lua 2>/dev/null))

source/extensions/common/sqlutils/BUILD → contrib/common/sqlutils/source/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 = "sqlutils_lib",

source/extensions/common/sqlutils/sqlutils.cc → contrib/common/sqlutils/source/sqlutils.cc

@@ -1,4 +1,4 @@
-#include "source/extensions/common/sqlutils/sqlutils.h"
+#include "contrib/common/sqlutils/source/sqlutils.h"
 
 namespace Envoy {
 namespace Extensions {

test/extensions/common/sqlutils/BUILD → contrib/common/sqlutils/test/BUILD

@@ -1,12 +1,12 @@
 load(
     "//bazel:envoy_build_system.bzl",
     "envoy_cc_test",
-    "envoy_package",
+    "envoy_contrib_package",
 )
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_contrib_package()
 
 envoy_cc_test(
     name = "sqlutils_tests",
@@ -15,6 +15,6 @@ envoy_cc_test(
     ],
     external_deps = ["sqlparser"],
     deps = [
-        "//source/extensions/common/sqlutils:sqlutils_lib",
+        "//contrib/common/sqlutils/source:sqlutils_lib",
     ],
 )

test/extensions/common/sqlutils/sqlutils_test.cc → contrib/common/sqlutils/test/sqlutils_test.cc

@@ -1,5 +1,4 @@
-#include "source/extensions/common/sqlutils/sqlutils.h"
-
+#include "contrib/common/sqlutils/source/sqlutils.h"
 #include "gtest/gtest.h"
 
 namespace Envoy {

contrib/contrib_build_config.bzl

@@ -11,5 +11,7 @@ CONTRIB_EXTENSIONS = {
     #
 
     "envoy.filters.network.kafka_broker":                       "//contrib/kafka/filters/network/source:kafka_broker_config_lib",
+    "envoy.filters.network.mysql_proxy":                        "//contrib/mysql_proxy/filters/network/source:config",
+    "envoy.filters.network.postgres_proxy":                     "//contrib/postgres_proxy/filters/network/source:config",
     "envoy.filters.network.rocketmq_proxy":                     "//contrib/rocketmq_proxy/filters/network/source:config",
 }

contrib/exe/BUILD

@@ -1,6 +1,7 @@
 load(
     "//bazel:envoy_build_system.bzl",
     "envoy_cc_binary",
+    "envoy_cc_test",
     "envoy_contrib_package",
 )
 load(
@@ -22,3 +23,19 @@ envoy_cc_binary(
     stamped = True,
     deps = ["//source/exe:envoy_main_entry_lib"] + envoy_all_contrib_extensions(),
 )
+
+envoy_cc_test(
+    name = "example_configs_test",
+    size = "large",
+    data = [
+        "//examples:contrib_configs",
+        "//test/config_test:example_configs_test_setup.sh",
+    ],
+    env = {
+        "EXAMPLE_CONFIGS_TAR_PATH": "envoy/examples/example_configs.tar",
+        "DISABLE_TEST_MERGE": "true",
+    },
+    deps = [
+        "//test/config_test:example_configs_test_lib",
+    ] + envoy_all_contrib_extensions(),
+)

contrib/extensions_metadata.yaml

@@ -13,3 +13,13 @@ envoy.filters.network.rocketmq_proxy:
   - envoy.filters.network
   security_posture: requires_trusted_downstream_and_upstream
   status: alpha
+envoy.filters.network.mysql_proxy:
+  categories:
+  - envoy.filters.network
+  security_posture: requires_trusted_downstream_and_upstream
+  status: alpha
+envoy.filters.network.postgres_proxy:
+  categories:
+  - envoy.filters.network
+  security_posture: requires_trusted_downstream_and_upstream
+  status: stable

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

@@ -1,17 +1,17 @@
 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_contrib_package()
+
 # MySQL proxy L7 network filter.
 # Public docs: docs/root/configuration/network_filters/mysql_proxy_filter.rst
 
-envoy_extension_package()
-
 envoy_cc_library(
     name = "filter_lib",
     srcs = [
@@ -53,8 +53,8 @@ envoy_cc_library(
     deps = [
         ":codec_interface",
         ":util_lib",
+        "//contrib/common/sqlutils/source:sqlutils_lib",
         "//source/common/buffer:buffer_lib",
-        "//source/extensions/common/sqlutils:sqlutils_lib",
     ],
 )
 
@@ -90,7 +90,7 @@ envoy_cc_library(
     deps = [
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
-        "@envoy_api//envoy/extensions/filters/network/mysql_proxy/v3:pkg_cc_proto",
+        "@envoy_api//contrib/envoy/extensions/filters/network/mysql_proxy/v3:pkg_cc_proto",
     ],
 )
 
@@ -103,14 +103,14 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_extension(
+envoy_cc_contrib_extension(
     name = "config",
     srcs = ["mysql_config.cc"],
     hdrs = ["mysql_config.h"],
     deps = [
         ":filter_lib",
         "//source/extensions/filters/network:well_known_names",
         "//source/extensions/filters/network/common:factory_base_lib",
-        "@envoy_api//envoy/extensions/filters/network/mysql_proxy/v3:pkg_cc_proto",
+        "@envoy_api//contrib/envoy/extensions/filters/network/mysql_proxy/v3:pkg_cc_proto",
     ],
 )

source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc → contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.cc

@@ -1,9 +1,10 @@
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h"
 
 #include "source/common/buffer/buffer_impl.h"
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h → contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h

@@ -2,7 +2,8 @@
 #include "envoy/buffer/buffer.h"
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc → contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.cc

@@ -1,11 +1,12 @@
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h"
 
 #include "envoy/buffer/buffer.h"
 
 #include "source/common/common/assert.h"
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h → contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h

@@ -5,8 +5,9 @@
 #include "envoy/buffer/buffer.h"
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc → contrib/mysql_proxy/filters/network/source/mysql_codec_command.cc

@@ -1,11 +1,12 @@
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec_command.h"
 
 #include "envoy/buffer/buffer.h"
 
 #include "source/common/common/logger.h"
 #include "source/common/common/macros.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_command.h → contrib/mysql_proxy/filters/network/source/mysql_codec_command.h

@@ -2,7 +2,8 @@
 #include "envoy/buffer/buffer.h"
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc → contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.cc

@@ -1,9 +1,9 @@
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h"
 
 #include "envoy/buffer/buffer.h"
 
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h → contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc → contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.cc

@@ -1,10 +1,11 @@
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h"
 
 #include "envoy/buffer/buffer.h"
 
 #include "source/common/common/logger.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
+#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h"
 
 namespace Envoy {
 namespace Extensions {

source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h → contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h

@@ -1,7 +1,8 @@
 #pragma once
 
 #include "source/common/buffer/buffer_impl.h"
-#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h"
+
+#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h"
 
 namespace Envoy {
 namespace Extensions {