diff --git a/CODEOWNERS b/CODEOWNERS index ba95181c6c0f..545df28b3829 100644 --- a/CODEOWNERS +++ b/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 diff --git a/api/BUILD b/api/BUILD index b1b6a97973d4..43e75f74fa5d 100644 --- a/api/BUILD +++ b/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", diff --git a/api/envoy/extensions/filters/network/mysql_proxy/v3/BUILD b/api/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD similarity index 100% rename from api/envoy/extensions/filters/network/mysql_proxy/v3/BUILD rename to api/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD diff --git a/api/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto b/api/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto similarity index 100% rename from api/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto rename to api/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto diff --git a/api/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD b/api/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD similarity index 100% rename from api/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD rename to api/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD diff --git a/api/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto b/api/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto similarity index 100% rename from api/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto rename to api/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto diff --git a/api/versioning/BUILD b/api/versioning/BUILD index 593b9fa44e88..b42275b37992 100644 --- a/api/versioning/BUILD +++ b/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", diff --git a/bazel/envoy_test.bzl b/bazel/envoy_test.bzl index 7f45c554c54d..799e60154afc 100644 --- a/bazel/envoy_test.bzl +++ b/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 diff --git a/configs/configgen.sh b/configs/configgen.sh index 6f4ab35c26f7..c38398071583 100755 --- a/configs/configgen.sh +++ b/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)) diff --git a/source/extensions/common/sqlutils/BUILD b/contrib/common/sqlutils/source/BUILD similarity index 84% rename from source/extensions/common/sqlutils/BUILD rename to contrib/common/sqlutils/source/BUILD index f477e6a42208..c100c39ae95c 100644 --- a/source/extensions/common/sqlutils/BUILD +++ b/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", diff --git a/source/extensions/common/sqlutils/sqlutils.cc b/contrib/common/sqlutils/source/sqlutils.cc similarity index 95% rename from source/extensions/common/sqlutils/sqlutils.cc rename to contrib/common/sqlutils/source/sqlutils.cc index 1c9a30d6e502..dffa393bd039 100644 --- a/source/extensions/common/sqlutils/sqlutils.cc +++ b/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 { diff --git a/source/extensions/common/sqlutils/sqlutils.h b/contrib/common/sqlutils/source/sqlutils.h similarity index 100% rename from source/extensions/common/sqlutils/sqlutils.h rename to contrib/common/sqlutils/source/sqlutils.h diff --git a/test/extensions/common/sqlutils/BUILD b/contrib/common/sqlutils/test/BUILD similarity index 69% rename from test/extensions/common/sqlutils/BUILD rename to contrib/common/sqlutils/test/BUILD index 0277e47706b2..e89cb0138b71 100644 --- a/test/extensions/common/sqlutils/BUILD +++ b/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", ], ) diff --git a/test/extensions/common/sqlutils/sqlutils_test.cc b/contrib/common/sqlutils/test/sqlutils_test.cc similarity index 99% rename from test/extensions/common/sqlutils/sqlutils_test.cc rename to contrib/common/sqlutils/test/sqlutils_test.cc index f7464b668901..e58f03eab5f7 100644 --- a/test/extensions/common/sqlutils/sqlutils_test.cc +++ b/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 { diff --git a/contrib/contrib_build_config.bzl b/contrib/contrib_build_config.bzl index 941985fe0853..0f076ec9767c 100644 --- a/contrib/contrib_build_config.bzl +++ b/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", } diff --git a/contrib/exe/BUILD b/contrib/exe/BUILD index 778ceb7dc7b4..b70a786989d7 100644 --- a/contrib/exe/BUILD +++ b/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(), +) diff --git a/contrib/extensions_metadata.yaml b/contrib/extensions_metadata.yaml index 15b043770e2d..ed6333bfb79c 100644 --- a/contrib/extensions_metadata.yaml +++ b/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 diff --git a/source/extensions/filters/network/mysql_proxy/BUILD b/contrib/mysql_proxy/filters/network/source/BUILD similarity index 87% rename from source/extensions/filters/network/mysql_proxy/BUILD rename to contrib/mysql_proxy/filters/network/source/BUILD index 8c2f9316138a..5b219fae1d39 100644 --- a/source/extensions/filters/network/mysql_proxy/BUILD +++ b/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,7 +103,7 @@ envoy_cc_library( ], ) -envoy_cc_extension( +envoy_cc_contrib_extension( name = "config", srcs = ["mysql_config.cc"], hdrs = ["mysql_config.h"], @@ -111,6 +111,6 @@ envoy_cc_extension( ":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", ], ) diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec.h b/contrib/mysql_proxy/filters/network/source/mysql_codec.h similarity index 100% rename from source/extensions/filters/network/mysql_proxy/mysql_codec.h rename to contrib/mysql_proxy/filters/network/source/mysql_codec.h diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc b/contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.cc similarity index 98% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc rename to contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.cc index a851b4ad581d..a2b6e3664cb0 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h b/contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h similarity index 97% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h rename to contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h index 44e8ba16ee74..a264d240ab67 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc b/contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.cc similarity index 96% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc rename to contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.cc index 8847de47baf0..0df27bab2f6a 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h b/contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h similarity index 96% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h rename to contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h index a843e0c85b62..ca48b19401e1 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc b/contrib/mysql_proxy/filters/network/source/mysql_codec_command.cc similarity index 90% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc rename to contrib/mysql_proxy/filters/network/source/mysql_codec_command.cc index 4e515381760a..6d6aa88adcdb 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h b/contrib/mysql_proxy/filters/network/source/mysql_codec_command.h similarity index 96% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_command.h rename to contrib/mysql_proxy/filters/network/source/mysql_codec_command.h index 4764770e0704..80e42a3fd5e0 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc b/contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.cc similarity index 97% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc rename to contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.cc index 88b2ba5f1ec1..ab5550a05b51 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h b/contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h similarity index 97% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h rename to contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h index a507a5ec8939..11b5fec77bac 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc b/contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.cc similarity index 77% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc rename to contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.cc index 120669c5f288..d55d820ec990 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h b/contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h similarity index 91% rename from source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h rename to contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h index f6128191e372..e649092f36ca 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h +++ b/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 { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.cc b/contrib/mysql_proxy/filters/network/source/mysql_config.cc similarity index 80% rename from source/extensions/filters/network/mysql_proxy/mysql_config.cc rename to contrib/mysql_proxy/filters/network/source/mysql_config.cc index 39a68f5f8d26..c5e3b32d66ec 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_config.cc +++ b/contrib/mysql_proxy/filters/network/source/mysql_config.cc @@ -1,14 +1,15 @@ -#include "source/extensions/filters/network/mysql_proxy/mysql_config.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_config.h" #include -#include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.h" -#include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" #include "source/common/common/logger.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" + +#include "contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.h b/contrib/mysql_proxy/filters/network/source/mysql_config.h similarity index 77% rename from source/extensions/filters/network/mysql_proxy/mysql_config.h rename to contrib/mysql_proxy/filters/network/source/mysql_config.h index 66e459f90144..bd69b7758546 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_config.h +++ b/contrib/mysql_proxy/filters/network/source/mysql_config.h @@ -1,12 +1,12 @@ #pragma once -#include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.h" -#include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.h" - #include "source/extensions/filters/network/common/factory_base.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_filter.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder.h b/contrib/mysql_proxy/filters/network/source/mysql_decoder.h similarity index 73% rename from source/extensions/filters/network/mysql_proxy/mysql_decoder.h rename to contrib/mysql_proxy/filters/network/source/mysql_decoder.h index 6b4f83a2c8cc..491cb93a49d2 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_decoder.h +++ b/contrib/mysql_proxy/filters/network/source/mysql_decoder.h @@ -1,12 +1,12 @@ #pragma once -#include "source/extensions/common/sqlutils/sqlutils.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_session.h" +#include "contrib/common/sqlutils/source/sqlutils.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_command.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_session.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc b/contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.cc similarity index 95% rename from source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc rename to contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.cc index b3006abb670d..36d28b768809 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc +++ b/contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.cc @@ -1,9 +1,10 @@ -#include "source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_decoder_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_codec_clogin_resp.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_codec_clogin_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h b/contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.h similarity index 92% rename from source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h rename to contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.h index ae787ba777c0..6c126edaeba1 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h +++ b/contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.h @@ -1,5 +1,5 @@ #pragma once -#include "source/extensions/filters/network/mysql_proxy/mysql_decoder.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_decoder.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc b/contrib/mysql_proxy/filters/network/source/mysql_filter.cc similarity index 93% rename from source/extensions/filters/network/mysql_proxy/mysql_filter.cc rename to contrib/mysql_proxy/filters/network/source/mysql_filter.cc index 10af4580d390..cc92cca92aa8 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc +++ b/contrib/mysql_proxy/filters/network/source/mysql_filter.cc @@ -1,15 +1,16 @@ -#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_filter.h" #include "envoy/config/core/v3/base.pb.h" #include "source/common/buffer/buffer_impl.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_codec_clogin_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_decoder_impl.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.h b/contrib/mysql_proxy/filters/network/source/mysql_filter.h similarity index 85% rename from source/extensions/filters/network/mysql_proxy/mysql_filter.h rename to contrib/mysql_proxy/filters/network/source/mysql_filter.h index 6b83b13770f0..fc7d0b2c9147 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_filter.h +++ b/contrib/mysql_proxy/filters/network/source/mysql_filter.h @@ -8,14 +8,15 @@ #include "envoy/stats/stats_macros.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_codec_clogin.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_decoder.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_session.h" + +#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_command.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_decoder.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_session.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_session.h b/contrib/mysql_proxy/filters/network/source/mysql_session.h similarity index 100% rename from source/extensions/filters/network/mysql_proxy/mysql_session.h rename to contrib/mysql_proxy/filters/network/source/mysql_session.h diff --git a/source/extensions/filters/network/mysql_proxy/mysql_utils.cc b/contrib/mysql_proxy/filters/network/source/mysql_utils.cc similarity index 98% rename from source/extensions/filters/network/mysql_proxy/mysql_utils.cc rename to contrib/mysql_proxy/filters/network/source/mysql_utils.cc index d2574cc94fbf..c51fffd2076c 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_utils.cc +++ b/contrib/mysql_proxy/filters/network/source/mysql_utils.cc @@ -1,4 +1,4 @@ -#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h" #include "envoy/common/exception.h" diff --git a/source/extensions/filters/network/mysql_proxy/mysql_utils.h b/contrib/mysql_proxy/filters/network/source/mysql_utils.h similarity index 97% rename from source/extensions/filters/network/mysql_proxy/mysql_utils.h rename to contrib/mysql_proxy/filters/network/source/mysql_utils.h index d8548eed24f0..254ce0f8edc8 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_utils.h +++ b/contrib/mysql_proxy/filters/network/source/mysql_utils.h @@ -6,7 +6,8 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/byte_order.h" #include "source/common/common/logger.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 { diff --git a/test/extensions/filters/network/mysql_proxy/BUILD b/contrib/mysql_proxy/filters/network/test/BUILD similarity index 52% rename from test/extensions/filters/network/mysql_proxy/BUILD rename to contrib/mysql_proxy/filters/network/test/BUILD index 97710a2289ac..1a7e65a43469 100644 --- a/test/extensions/filters/network/mysql_proxy/BUILD +++ b/contrib/mysql_proxy/filters/network/test/BUILD @@ -1,101 +1,91 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_package", -) -load( - "//test/extensions:extensions_build_system.bzl", - "envoy_extension_cc_test", - "envoy_extension_cc_test_library", + "envoy_cc_test", + "envoy_cc_test_library", + "envoy_contrib_package", ) licenses(["notice"]) # Apache 2 -envoy_package() +envoy_contrib_package() -envoy_extension_cc_test_library( +envoy_cc_test_library( name = "mysql_test_utils_lib", srcs = ["mysql_test_utils.cc"], hdrs = ["mysql_test_utils.h"], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ - "//source/extensions/filters/network/mysql_proxy:codec_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_codec_tests", srcs = [ "mysql_codec_test.cc", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", - "//source/extensions/filters/network/mysql_proxy:codec_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_greet_tests", srcs = [ "mysql_greet_test.cc", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", - "//source/extensions/filters/network/mysql_proxy:codec_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_auth_switch_resp_tests", srcs = [ "mysql_auth_switch_resp_test.cc", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", - "//source/extensions/filters/network/mysql_proxy:codec_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_clogin_tests", srcs = [ "mysql_clogin_test.cc", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", - "//source/extensions/filters/network/mysql_proxy:codec_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_clogin_resp_tests", srcs = [ "mysql_clogin_resp_test.cc", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", - "//source/extensions/filters/network/mysql_proxy:codec_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_filter_tests", srcs = [ "mysql_filter_test.cc", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", - "//source/extensions/filters/network/mysql_proxy:config", + "//contrib/mysql_proxy/filters/network/source:config", "//test/mocks/network:network_mocks", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_integration_test", srcs = [ "mysql_integration_test.cc", @@ -103,30 +93,28 @@ envoy_extension_cc_test( data = [ "mysql_test_config.yaml", ], - extension_names = ["envoy.filters.network.mysql_proxy"], deps = [ ":mysql_test_utils_lib", + "//contrib/mysql_proxy/filters/network/source:config", + "//contrib/mysql_proxy/filters/network/source:filter_lib", "//source/common/tcp_proxy", - "//source/extensions/filters/network/mysql_proxy:config", - "//source/extensions/filters/network/mysql_proxy:filter_lib", "//source/extensions/filters/network/tcp_proxy:config", "//test/integration:integration_lib", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "mysql_command_tests", srcs = [ "mysql_command_test.cc", ], data = ["mysql_test_config.yaml"], - extension_names = ["envoy.filters.network.mysql_proxy"], external_deps = ["sqlparser"], deps = [ ":mysql_test_utils_lib", + "//contrib/mysql_proxy/filters/network/source:codec_lib", + "//contrib/mysql_proxy/filters/network/source:config", "//source/common/tcp_proxy", - "//source/extensions/filters/network/mysql_proxy:codec_lib", - "//source/extensions/filters/network/mysql_proxy:config", "//source/extensions/filters/network/tcp_proxy:config", "//test/integration:integration_lib", ], diff --git a/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_auth_switch_resp_test.cc similarity index 93% rename from test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_auth_switch_resp_test.cc index 7529af8de0c5..97bee60e1314 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_auth_switch_resp_test.cc @@ -1,5 +1,4 @@ -#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 "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_clogin_resp_test.cc similarity index 99% rename from test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_clogin_resp_test.cc index 60a064b5d46c..1d518a6768a6 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_clogin_resp_test.cc @@ -1,7 +1,7 @@ #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_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_clogin_test.cc similarity index 99% rename from test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_clogin_test.cc index ee6611f4fac5..3772e220eb26 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_clogin_test.cc @@ -1,10 +1,10 @@ #include #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 "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_codec_clogin.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_codec_test.cc similarity index 95% rename from test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_codec_test.cc index 3d1add37faf0..cec25deb66ef 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_codec_test.cc @@ -1,7 +1,7 @@ #include "source/common/buffer/buffer_impl.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_command.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_command_test.cc similarity index 98% rename from test/extensions/filters/network/mysql_proxy/mysql_command_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_command_test.cc index 906d6f2b5530..02d4c9fa3ea8 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_command_test.cc @@ -1,11 +1,11 @@ #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 "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.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_codec_clogin.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_command.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "include/sqlparser/SQLParser.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_filter_test.cc similarity index 99% rename from test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_filter_test.cc index 85756cf59e72..89886c048ff4 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_filter_test.cc @@ -1,10 +1,10 @@ #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_filter.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" #include "test/mocks/network/mocks.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_filter.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_utils.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_greet_test.cc similarity index 99% rename from test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_greet_test.cc index 185198aa8587..2e3c4a8fcd51 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_greet_test.cc @@ -1,7 +1,7 @@ #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_greeting.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc b/contrib/mysql_proxy/filters/network/test/mysql_integration_test.cc similarity index 95% rename from test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc rename to contrib/mysql_proxy/filters/network/test/mysql_integration_test.cc index f2799c5fb230..c44b165d03eb 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc +++ b/contrib/mysql_proxy/filters/network/test/mysql_integration_test.cc @@ -1,15 +1,14 @@ -#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" - #include "test/integration/fake_upstream.h" #include "test/integration/integration.h" #include "test/integration/utility.h" #include "test/mocks/network/mocks.h" #include "test/test_common/network_utility.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_clogin_resp.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_greeting.h" +#include "contrib/mysql_proxy/filters/network/source/mysql_codec_switch_resp.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" @@ -26,7 +25,7 @@ class MySQLIntegrationTest : public testing::TestWithParam diff --git a/source/extensions/filters/network/postgres_proxy/postgres_decoder.h b/contrib/postgres_proxy/filters/network/source/postgres_decoder.h similarity index 97% rename from source/extensions/filters/network/postgres_proxy/postgres_decoder.h rename to contrib/postgres_proxy/filters/network/source/postgres_decoder.h index f62de0108f57..2d4dffcb41e4 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_decoder.h +++ b/contrib/postgres_proxy/filters/network/source/postgres_decoder.h @@ -5,11 +5,11 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/logger.h" -#include "source/extensions/common/sqlutils/sqlutils.h" -#include "source/extensions/filters/network/postgres_proxy/postgres_message.h" -#include "source/extensions/filters/network/postgres_proxy/postgres_session.h" #include "absl/container/flat_hash_map.h" +#include "contrib/common/sqlutils/source/sqlutils.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_message.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_session.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_filter.cc b/contrib/postgres_proxy/filters/network/source/postgres_filter.cc similarity index 98% rename from source/extensions/filters/network/postgres_proxy/postgres_filter.cc rename to contrib/postgres_proxy/filters/network/source/postgres_filter.cc index 0e8daac36fed..6255c2ba5917 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_filter.cc +++ b/contrib/postgres_proxy/filters/network/source/postgres_filter.cc @@ -1,11 +1,12 @@ -#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_filter.h" #include "envoy/buffer/buffer.h" #include "envoy/network/connection.h" -#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" #include "source/extensions/filters/network/well_known_names.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_decoder.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_filter.h b/contrib/postgres_proxy/filters/network/source/postgres_filter.h similarity index 98% rename from source/extensions/filters/network/postgres_proxy/postgres_filter.h rename to contrib/postgres_proxy/filters/network/source/postgres_filter.h index cb89499d47c4..dbc63686e870 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_filter.h +++ b/contrib/postgres_proxy/filters/network/source/postgres_filter.h @@ -7,7 +7,8 @@ #include "source/common/buffer/buffer_impl.h" #include "source/common/common/logger.h" -#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" + +#include "contrib/postgres_proxy/filters/network/source/postgres_decoder.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_message.cc b/contrib/postgres_proxy/filters/network/source/postgres_message.cc similarity index 98% rename from source/extensions/filters/network/postgres_proxy/postgres_message.cc rename to contrib/postgres_proxy/filters/network/source/postgres_message.cc index b8e4a3d5febe..91595b8f0056 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_message.cc +++ b/contrib/postgres_proxy/filters/network/source/postgres_message.cc @@ -1,4 +1,4 @@ -#include "source/extensions/filters/network/postgres_proxy/postgres_message.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_message.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_message.h b/contrib/postgres_proxy/filters/network/source/postgres_message.h similarity index 100% rename from source/extensions/filters/network/postgres_proxy/postgres_message.h rename to contrib/postgres_proxy/filters/network/source/postgres_message.h diff --git a/source/extensions/filters/network/postgres_proxy/postgres_session.h b/contrib/postgres_proxy/filters/network/source/postgres_session.h similarity index 100% rename from source/extensions/filters/network/postgres_proxy/postgres_session.h rename to contrib/postgres_proxy/filters/network/source/postgres_session.h diff --git a/test/extensions/filters/network/postgres_proxy/BUILD b/contrib/postgres_proxy/filters/network/test/BUILD similarity index 52% rename from test/extensions/filters/network/postgres_proxy/BUILD rename to contrib/postgres_proxy/filters/network/test/BUILD index 2d5c9c22ee72..496f8ec416e5 100644 --- a/test/extensions/filters/network/postgres_proxy/BUILD +++ b/contrib/postgres_proxy/filters/network/test/BUILD @@ -1,67 +1,60 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_package", -) -load( - "//test/extensions:extensions_build_system.bzl", - "envoy_extension_cc_test", - "envoy_extension_cc_test_library", + "envoy_cc_test", + "envoy_cc_test_library", + "envoy_contrib_package", ) licenses(["notice"]) # Apache 2 -envoy_package() +envoy_contrib_package() -envoy_extension_cc_test_library( +envoy_cc_test_library( name = "postgres_test_utils_lib", srcs = ["postgres_test_utils.cc"], hdrs = ["postgres_test_utils.h"], - extension_names = ["envoy.filters.network.postgres_proxy"], deps = [ + "//contrib/postgres_proxy/filters/network/source:filter", "//source/common/buffer:buffer_lib", - "//source/extensions/filters/network/postgres_proxy:filter", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "postgres_decoder_tests", srcs = [ "postgres_decoder_test.cc", ], - extension_names = ["envoy.filters.network.postgres_proxy"], deps = [ ":postgres_test_utils_lib", - "//source/extensions/filters/network/postgres_proxy:filter", + "//contrib/postgres_proxy/filters/network/source:filter", "//test/mocks/network:network_mocks", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "postgres_message_tests", srcs = [ "postgres_message_test.cc", ], - extension_names = ["envoy.filters.network.postgres_proxy"], deps = [ + "//contrib/postgres_proxy/filters/network/source:filter", "//source/common/buffer:buffer_lib", - "//source/extensions/filters/network/postgres_proxy:filter", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "postgres_filter_tests", srcs = [ "postgres_filter_test.cc", ], - extension_names = ["envoy.filters.network.postgres_proxy"], deps = [ ":postgres_test_utils_lib", - "//source/extensions/filters/network/postgres_proxy:filter", + "//contrib/postgres_proxy/filters/network/source:filter", "//test/mocks/network:network_mocks", ], ) -envoy_extension_cc_test( +envoy_cc_test( name = "postgres_integration_test", srcs = [ "postgres_integration_test.cc", @@ -70,14 +63,13 @@ envoy_extension_cc_test( "postgres_test_config.yaml", "//test/config/integration/certs", ], - extension_names = ["envoy.filters.network.postgres_proxy"], deps = [ + "//contrib/postgres_proxy/filters/network/source:config", + "//contrib/postgres_proxy/filters/network/source:filter", "//source/common/tcp_proxy", - "//source/extensions/filters/network/postgres_proxy:config", - "//source/extensions/filters/network/postgres_proxy:filter", "//source/extensions/filters/network/tcp_proxy:config", "//source/extensions/transport_sockets/starttls:config", "//test/integration:integration_lib", - "@envoy_api//envoy/extensions/filters/network/postgres_proxy/v3alpha:pkg_cc_proto", + "@envoy_api//contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc b/contrib/postgres_proxy/filters/network/test/postgres_decoder_test.cc similarity index 99% rename from test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc rename to contrib/postgres_proxy/filters/network/test/postgres_decoder_test.cc index 3c6e05bf9f1f..b143c1db2573 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc +++ b/contrib/postgres_proxy/filters/network/test/postgres_decoder_test.cc @@ -1,9 +1,8 @@ #include #include -#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" - -#include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_decoder.h" +#include "contrib/postgres_proxy/filters/network/test/postgres_test_utils.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc b/contrib/postgres_proxy/filters/network/test/postgres_filter_test.cc similarity index 99% rename from test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc rename to contrib/postgres_proxy/filters/network/test/postgres_filter_test.cc index 656488372760..3a081ce55b68 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc +++ b/contrib/postgres_proxy/filters/network/test/postgres_filter_test.cc @@ -3,12 +3,13 @@ #include -#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h" #include "source/extensions/filters/network/well_known_names.h" -#include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h" #include "test/mocks/network/mocks.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_filter.h" +#include "contrib/postgres_proxy/filters/network/test/postgres_test_utils.h" + namespace Envoy { namespace Extensions { namespace NetworkFilters { diff --git a/test/extensions/filters/network/postgres_proxy/postgres_integration_test.cc b/contrib/postgres_proxy/filters/network/test/postgres_integration_test.cc similarity index 96% rename from test/extensions/filters/network/postgres_proxy/postgres_integration_test.cc rename to contrib/postgres_proxy/filters/network/test/postgres_integration_test.cc index c9308517ea8d..258410172a32 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_integration_test.cc +++ b/contrib/postgres_proxy/filters/network/test/postgres_integration_test.cc @@ -1,12 +1,11 @@ -#include "envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.h" -#include "envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.validate.h" - #include "test/integration/fake_upstream.h" #include "test/integration/integration.h" #include "test/integration/utility.h" #include "test/mocks/network/mocks.h" #include "test/test_common/network_utility.h" +#include "contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.h" +#include "contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.validate.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -21,7 +20,7 @@ class PostgresBaseIntegrationTest : public testing::TestWithParam #include "source/common/buffer/buffer_impl.h" -#include "source/extensions/filters/network/postgres_proxy/postgres_message.h" +#include "contrib/postgres_proxy/filters/network/source/postgres_message.h" #include "fmt/printf.h" namespace Envoy { diff --git a/test/extensions/filters/network/postgres_proxy/postgres_test_config.yaml b/contrib/postgres_proxy/filters/network/test/postgres_test_config.yaml similarity index 100% rename from test/extensions/filters/network/postgres_proxy/postgres_test_config.yaml rename to contrib/postgres_proxy/filters/network/test/postgres_test_config.yaml diff --git a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.cc b/contrib/postgres_proxy/filters/network/test/postgres_test_utils.cc similarity index 87% rename from test/extensions/filters/network/postgres_proxy/postgres_test_utils.cc rename to contrib/postgres_proxy/filters/network/test/postgres_test_utils.cc index 56450f5c5fe9..8793acf3b815 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.cc +++ b/contrib/postgres_proxy/filters/network/test/postgres_test_utils.cc @@ -1,4 +1,4 @@ -#include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h" +#include "contrib/postgres_proxy/filters/network/test/postgres_test_utils.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h b/contrib/postgres_proxy/filters/network/test/postgres_test_utils.h similarity index 100% rename from test/extensions/filters/network/postgres_proxy/postgres_test_utils.h rename to contrib/postgres_proxy/filters/network/test/postgres_test_utils.h diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index 4cc773a334fd..578e49596007 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -13,6 +13,10 @@ Incompatible Behavior Changes :ref:`contrib images `. * contrib: the :ref:`RocketMQ proxy filter ` has been moved to :ref:`contrib images `. +* contrib: the :ref:`Postgres proxy filter ` has been moved to + :ref:`contrib images `. +* contrib: the :ref:`MySQL proxy filter ` has been moved to + :ref:`contrib images `. * ext_authz: fixed skipping authentication when returning either a direct response or a redirect. This behavior can be temporarily reverted by setting the ``envoy.reloadable_features.http_ext_authz_do_not_skip_direct_response_and_redirect`` runtime guard to false. Minor Behavior Changes diff --git a/examples/BUILD b/examples/BUILD index e8ea0aed15fd..80becfa0e61a 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -18,10 +18,33 @@ filegroup( "dynamic-config-fs/**/*", "jaeger-native-tracing/*", "**/*docker-compose*.yaml", + # Contrib extensions tested over in contrib. + "mysql/*", + "postgres/*", ], ), ) +genrule( + name = "contrib_configs", + srcs = glob( + [ + "mysql/*.yaml", + "postgres/*.yaml", + ], + exclude = [ + "**/*docker-compose*.yaml", + ], + ), + outs = ["example_configs.tar"], + cmd = ( + "$(location //configs:configgen.sh) NO_CONFIGGEN $(@D) $(SRCS)" + ), + tools = [ + "//configs:configgen.sh", + ], +) + filegroup( name = "certs", srcs = glob(["_extra_certs/*.pem"]), diff --git a/examples/double-proxy/envoy-backend.yaml b/examples/double-proxy/envoy-backend.yaml index 1d764fe77d64..07cc1a7905f1 100644 --- a/examples/double-proxy/envoy-backend.yaml +++ b/examples/double-proxy/envoy-backend.yaml @@ -9,10 +9,6 @@ static_resources: - name: "envoy.filters.listener.tls_inspector" filter_chains: - filters: - - name: envoy.filters.network.postgres_proxy - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy - stat_prefix: egress_postgres - name: envoy.filters.network.tcp_proxy typed_config: "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy diff --git a/examples/double-proxy/envoy-frontend.yaml b/examples/double-proxy/envoy-frontend.yaml index af836ba8fc30..37acbf334124 100644 --- a/examples/double-proxy/envoy-frontend.yaml +++ b/examples/double-proxy/envoy-frontend.yaml @@ -7,10 +7,6 @@ static_resources: port_value: 5432 filter_chains: - filters: - - name: envoy.filters.network.postgres_proxy - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.postgres_proxy.v3alpha.PostgresProxy - stat_prefix: egress_postgres - name: envoy.filters.network.tcp_proxy typed_config: "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy diff --git a/examples/mysql/Dockerfile-proxy b/examples/mysql/Dockerfile-proxy index f70f44311461..274973e070e6 100644 --- a/examples/mysql/Dockerfile-proxy +++ b/examples/mysql/Dockerfile-proxy @@ -1,4 +1,4 @@ -FROM envoyproxy/envoy-dev:latest +FROM envoyproxy/envoy-contrib-dev:latest COPY ./envoy.yaml /etc/envoy.yaml RUN chmod go+r /etc/envoy.yaml diff --git a/examples/postgres/Dockerfile-proxy b/examples/postgres/Dockerfile-proxy index f70f44311461..274973e070e6 100644 --- a/examples/postgres/Dockerfile-proxy +++ b/examples/postgres/Dockerfile-proxy @@ -1,4 +1,4 @@ -FROM envoyproxy/envoy-dev:latest +FROM envoyproxy/envoy-contrib-dev:latest COPY ./envoy.yaml /etc/envoy.yaml RUN chmod go+r /etc/envoy.yaml diff --git a/generated_api_shadow/BUILD b/generated_api_shadow/BUILD index b1b6a97973d4..43e75f74fa5d 100644 --- a/generated_api_shadow/BUILD +++ b/generated_api_shadow/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", diff --git a/generated_api_shadow/envoy/extensions/filters/network/mysql_proxy/v3/BUILD b/generated_api_shadow/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/mysql_proxy/v3/BUILD rename to generated_api_shadow/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD diff --git a/generated_api_shadow/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto rename to generated_api_shadow/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto diff --git a/generated_api_shadow/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD b/generated_api_shadow/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD rename to generated_api_shadow/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD diff --git a/generated_api_shadow/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto b/generated_api_shadow/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto similarity index 100% rename from generated_api_shadow/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto rename to generated_api_shadow/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto diff --git a/source/docs/network_filter_fuzzing.md b/source/docs/network_filter_fuzzing.md index e8fb490a0129..f23354423bcd 100644 --- a/source/docs/network_filter_fuzzing.md +++ b/source/docs/network_filter_fuzzing.md @@ -34,7 +34,7 @@ envoy_cc_fuzz_test( ":uber_writefilter_lib", "//source/common/config:utility_lib", "//source/extensions/filters/network/mongo_proxy:config", - "//source/extensions/filters/network/mysql_proxy:config", + "//contrib/mysql_proxy/filters/network/source:config", "//source/extensions/filters/network/zookeeper_proxy:config", "//source/extensions/filters/network/the_new_filter_created_by_you:config", // <---Add the filter config module here "//test/config:utility_lib", diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl index be1b8367719c..907828f07f8c 100644 --- a/source/extensions/extensions_build_config.bzl +++ b/source/extensions/extensions_build_config.bzl @@ -133,8 +133,6 @@ EXTENSIONS = { "envoy.filters.network.http_connection_manager": "//source/extensions/filters/network/http_connection_manager:config", "envoy.filters.network.local_ratelimit": "//source/extensions/filters/network/local_ratelimit:config", "envoy.filters.network.mongo_proxy": "//source/extensions/filters/network/mongo_proxy:config", - "envoy.filters.network.mysql_proxy": "//source/extensions/filters/network/mysql_proxy:config", - "envoy.filters.network.postgres_proxy": "//source/extensions/filters/network/postgres_proxy:config", "envoy.filters.network.ratelimit": "//source/extensions/filters/network/ratelimit:config", "envoy.filters.network.rbac": "//source/extensions/filters/network/rbac:config", "envoy.filters.network.redis_proxy": "//source/extensions/filters/network/redis_proxy:config", diff --git a/source/extensions/extensions_metadata.yaml b/source/extensions/extensions_metadata.yaml index 70fbc4585707..c8ad920b51e1 100644 --- a/source/extensions/extensions_metadata.yaml +++ b/source/extensions/extensions_metadata.yaml @@ -348,16 +348,6 @@ envoy.filters.network.mongo_proxy: - envoy.filters.network security_posture: requires_trusted_downstream_and_upstream status: stable -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 envoy.filters.network.ratelimit: categories: - envoy.filters.network diff --git a/test/config_test/BUILD b/test/config_test/BUILD index c8837d38b666..7104a8d336b8 100644 --- a/test/config_test/BUILD +++ b/test/config_test/BUILD @@ -13,16 +13,11 @@ envoy_package() exports_files(["example_configs_test_setup.sh"]) -envoy_cc_test( - name = "example_configs_test", - size = "large", +envoy_cc_test_library( + name = "example_configs_test_lib", srcs = [ "example_configs_test.cc", ], - data = [ - "example_configs_test_setup.sh", - "//configs:example_configs", - ], deps = [ ":config_test_lib", "//source/common/filesystem:filesystem_lib", @@ -32,6 +27,19 @@ envoy_cc_test( ], ) +envoy_cc_test( + name = "example_configs_test", + size = "large", + data = [ + "example_configs_test_setup.sh", + "//configs:example_configs", + ], + env = {"EXAMPLE_CONFIGS_TAR_PATH": "envoy/configs/example_configs.tar"}, + deps = [ + ":example_configs_test_lib", + ], +) + envoy_cc_test_library( name = "config_test_lib", srcs = ["config_test.cc"], diff --git a/test/config_test/example_configs_test.cc b/test/config_test/example_configs_test.cc index fc5b0892008c..02d0504fbd9a 100644 --- a/test/config_test/example_configs_test.cc +++ b/test/config_test/example_configs_test.cc @@ -28,7 +28,9 @@ TEST(ExampleConfigsTest, All) { EXPECT_EQ(config_file_count, ConfigTest::run(directory)); - ConfigTest::testMerge(); + if (std::getenv("DISABLE_TEST_MERGE") == nullptr) { + ConfigTest::testMerge(); + } // Return to the original working directory, otherwise "bazel.coverage" breaks (...but why?). RELEASE_ASSERT(::chdir(cwd) == 0, ""); diff --git a/test/config_test/example_configs_test_setup.sh b/test/config_test/example_configs_test_setup.sh index 49c2066add89..4271f9008530 100755 --- a/test/config_test/example_configs_test_setup.sh +++ b/test/config_test/example_configs_test_setup.sh @@ -4,7 +4,7 @@ set -e DIR="$TEST_TMPDIR"/test/config_test mkdir -p "$DIR" -tar -xvf "$TEST_SRCDIR"/envoy/configs/example_configs.tar -C "$DIR" +tar -xvf "$TEST_SRCDIR"/"$EXAMPLE_CONFIGS_TAR_PATH" -C "$DIR" # find uses full path to prevent using Windows find on Windows. /usr/bin/find "$DIR" -type f | grep -c .yaml > "$TEST_TMPDIR"/config-file-count.txt diff --git a/test/extensions/filters/network/common/fuzz/BUILD b/test/extensions/filters/network/common/fuzz/BUILD index cab37d134b73..1ca89bf59f76 100644 --- a/test/extensions/filters/network/common/fuzz/BUILD +++ b/test/extensions/filters/network/common/fuzz/BUILD @@ -103,7 +103,6 @@ envoy_cc_fuzz_test( ":uber_writefilter_lib", "//source/common/config:utility_lib", "//source/extensions/filters/network/mongo_proxy:config", - "//source/extensions/filters/network/mysql_proxy:config", "//source/extensions/filters/network/zookeeper_proxy:config", "//test/config:utility_lib", ], diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index 03cddb20150e..626b0b9381f3 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -48,6 +48,7 @@ envoy_cc_test( "//configs:example_configs", "//test/config_test:example_configs_test_setup.sh", ], + env = {"EXAMPLE_CONFIGS_TAR_PATH": "envoy/configs/example_configs.tar"}, deps = [ "//source/extensions/filters/http/router:config", "//source/extensions/filters/listener/original_dst:config", diff --git a/tools/code_format/check_format.py b/tools/code_format/check_format.py index 858d50c7591e..a91a6d7bfe22 100755 --- a/tools/code_format/check_format.py +++ b/tools/code_format/check_format.py @@ -175,7 +175,7 @@ HISTOGRAM_SI_SUFFIX_REGEX = re.compile(r"(?<=HISTOGRAM\()[a-zA-Z0-9_]+_(b|kb|mb|ns|us|ms|s)(?=,)") TEST_NAME_STARTING_LOWER_CASE_REGEX = re.compile(r"TEST(_.\(.*,\s|\()[a-z].*\)\s\{") EXTENSIONS_CODEOWNERS_REGEX = re.compile(r'.*(extensions[^@]*\s+)(@.*)') -CONTRIB_CODEOWNERS_REGEX = re.compile(r'(/contrib/\w+/\s+)(@.*)') +CONTRIB_CODEOWNERS_REGEX = re.compile(r'(/contrib/[^@]*\s+)(@.*)') COMMENT_REGEX = re.compile(r"//|\*") DURATION_VALUE_REGEX = re.compile(r'\b[Dd]uration\(([0-9.]+)') PROTO_VALIDATION_STRING = re.compile(r'\bmin_bytes\b') @@ -1223,7 +1223,22 @@ def owned_directories(error_messages): m = CONTRIB_CODEOWNERS_REGEX.search(line) if m is not None and not line.startswith('#'): - owned.append(m.group(1).strip()) + stripped_path = m.group(1).strip() + if not stripped_path.endswith('/'): + error_messages.append( + "Contrib CODEOWNERS entry '{}' must end in '/'".format( + stripped_path)) + continue + + if not (stripped_path.count('/') == 3 or + (stripped_path.count('/') == 4 + and stripped_path.startswith('/contrib/common/'))): + error_messages.append( + "Contrib CODEOWNERS entry '{}' must be 2 directories deep unless in /contrib/common/ and then it can be 3 directories deep" + .format(stripped_path)) + continue + + owned.append(stripped_path) owners = re.findall('@\S+', m.group(2).strip()) if len(owners) < 2: error_messages.append( diff --git a/tools/proto_format/proto_sync.py b/tools/proto_format/proto_sync.py index 0fce2af67ff3..b3ea6686b6be 100755 --- a/tools/proto_format/proto_sync.py +++ b/tools/proto_format/proto_sync.py @@ -46,6 +46,7 @@ # Extensions moved from core to contrib. 'envoy.extensions.filters.http.squash.v3', 'envoy.extensions.filters.network.kafka_broker.v3', + 'envoy.extensions.filters.network.mysql_proxy.v3', 'envoy.extensions.filters.network.rocketmq_proxy.v3', ]