sync from master.

.github/actions/pr_notifier/requirements.in

@@ -0,0 +1,2 @@
+pygithub
+slack_sdk

.github/dependabot.yml

@@ -7,12 +7,12 @@ updates:
     interval: "daily"
 
 - package-ecosystem: "pip"
-  directory: "/test/extensions/filters/network/thrift_proxy"
+  directory: "/configs"
   schedule:
     interval: "daily"
 
 - package-ecosystem: "pip"
-  directory: "/contrib/kafka/filters/network/source"
+  directory: "/test/extensions/filters/network/thrift_proxy"
   schedule:
     interval: "daily"
 
@@ -27,17 +27,7 @@ updates:
     interval: "daily"
 
 - package-ecosystem: "pip"
-  directory: "/tools/docs"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/git"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/config_validation"
+  directory: "/tools/code_format"
   schedule:
     interval: "daily"
 
@@ -46,28 +36,13 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/tools/deprecate_version"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/distribution"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/protodoc"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "pip"
   directory: "/tools/deprecate_features"
   schedule:
     interval: "daily"
 
 - package-ecosystem: "pip"
-  directory: "/tools/code_format"
+  directory: "/tools/deprecate_version"
   schedule:
     interval: "daily"
 
@@ -76,16 +51,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/configs"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/testing"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "docker"
   directory: "/ci"
   schedule:

WORKSPACE

@@ -16,6 +16,10 @@ load("//bazel:repositories_extra.bzl", "envoy_dependencies_extra")
 
 envoy_dependencies_extra()
 
+load("@base_pip3//:requirements.bzl", "install_deps")
+
+install_deps()
+
 load("//bazel:dependency_imports.bzl", "envoy_dependency_imports")
 
 envoy_dependency_imports()

api/BUILD

@@ -60,6 +60,7 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha: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",

api/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/BUILD

@@ -0,0 +1,9 @@
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
+
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
+licenses(["notice"])  # Apache 2
+
+api_proto_package(
+    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+)

api/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.proto

@@ -0,0 +1,58 @@
+syntax = "proto3";
+
+package envoy.extensions.filters.network.kafka_mesh.v3alpha;
+
+import "udpa/annotations/status.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.extensions.filters.network.kafka_mesh.v3alpha";
+option java_outer_classname = "KafkaMeshProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).work_in_progress = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
+
+// [#protodoc-title: Kafka Mesh]
+// Kafka Mesh :ref:`configuration overview <config_network_filters_kafka_mesh>`.
+// [#extension: envoy.filters.network.kafka_mesh]
+
+message KafkaMesh {
+  // Envoy's host that's advertised to clients.
+  // Has the same meaning as corresponding Kafka broker properties.
+  // Usually equal to filter chain's listener config, but needs to be reachable by clients
+  // (so 0.0.0.0 will not work).
+  string advertised_host = 1 [(validate.rules).string = {min_len: 1}];
+
+  // Envoy's port that's advertised to clients.
+  int32 advertised_port = 2 [(validate.rules).int32 = {gt: 0}];
+
+  // Upstream clusters this filter will connect to.
+  repeated KafkaClusterDefinition upstream_clusters = 3;
+
+  // Rules that will decide which cluster gets which request.
+  repeated ForwardingRule forwarding_rules = 4;
+}
+
+message KafkaClusterDefinition {
+  // Cluster name.
+  string cluster_name = 1 [(validate.rules).string = {min_len: 1}];
+
+  // Kafka cluster address.
+  string bootstrap_servers = 2 [(validate.rules).string = {min_len: 1}];
+
+  // Default number of partitions present in this cluster.
+  // This is especially important for clients that do not specify partition in their payloads and depend on this value for hashing.
+  int32 partition_count = 3 [(validate.rules).int32 = {gt: 0}];
+
+  // Custom configuration passed to Kafka producer.
+  map<string, string> producer_config = 4;
+}
+
+message ForwardingRule {
+  // Cluster name.
+  string target_cluster = 1;
+
+  oneof trigger {
+    // Intended place for future types of forwarding rules.
+    string topic_prefix = 2;
+  }
+}

api/versioning/BUILD

@@ -12,6 +12,7 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha: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",

bazel/BUILD

@@ -586,3 +586,8 @@ alias(
     name = "remote_jdk11",
     actual = "@bazel_tools//tools/jdk:remote_jdk11",
 )
+
+alias(
+    name = "windows",
+    actual = "@bazel_tools//src/conditions:windows",
+)

bazel/repositories.bzl

@@ -637,14 +637,8 @@ def _com_google_absl():
     )
 
 def _com_google_protobuf():
-    # TODO(phlax): remove patch
-    #    patch is applied to update setuptools to version (0.5.4),
-    #    and can be removed once this has been updated in rules_python
-    #    see https://github.com/envoyproxy/envoy/pull/15236#issuecomment-788650946 for discussion
     external_http_archive(
         name = "rules_python",
-        patches = ["@envoy//bazel:rules_python.patch"],
-        patch_args = ["-p1"],
     )
 
     external_http_archive(

bazel/repositories_extra.bzl

@@ -1,138 +1,28 @@
-load("@rules_python//python:pip.bzl", "pip_install")
+load("@rules_python//python:pip.bzl", "pip_install", "pip_parse")
 load("@proxy_wasm_cpp_host//bazel/cargo:crates.bzl", "proxy_wasm_cpp_host_fetch_remote_crates")
 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
 
 # Python dependencies.
 def _python_deps():
-    pip_install(
+    pip_parse(
         name = "base_pip3",
-        requirements = "@envoy//tools/base:requirements.txt",
+        requirements_lock = "@envoy//tools/base:requirements.txt",
         extra_pip_args = ["--require-hashes"],
     )
-    pip_install(
-        name = "config_validation_pip3",
-        requirements = "@envoy//tools/config_validation:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "PyYAML",
-        # project_url = "https://github.com/yaml/pyyaml",
-        # version = "5.4.1",
-        # release_date = "2021-01-20"
-        # use_category = ["devtools"],
-        # cpe = "cpe:2.3:a:pyyaml:pyyaml:*",
-    )
     pip_install(
         name = "configs_pip3",
         requirements = "@envoy//configs:requirements.txt",
         extra_pip_args = ["--require-hashes"],
-
-        # project_name = "Jinja",
-        # project_url = "http://palletsprojects.com/p/jinja",
-        # version = "2.11.2",
-        # release_date = "2020-04-13"
-        # use_category = ["test"],
-        # cpe = "cpe:2.3:a:palletsprojects:jinja:*",
-
-        # project_name = "MarkupSafe",
-        # project_url = "https://markupsafe.palletsprojects.com/en/1.1.x/",
-        # version = "1.1.1",
-        # release_date = "2019-02-23"
-        # use_category = ["test"],
-    )
-    pip_install(
-        name = "docs_pip3",
-        requirements = "@envoy//tools/docs:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
-    pip_install(
-        name = "deps_pip3",
-        requirements = "@envoy//tools/dependency:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
-    pip_install(
-        name = "distribution_pip3",
-        requirements = "@envoy//tools/distribution:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
-    pip_install(
-        name = "git_pip3",
-        requirements = "@envoy//tools/git:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
-    pip_install(
-        name = "kafka_pip3",
-        requirements = "@envoy//contrib/kafka/filters/network/source:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "Jinja",
-        # project_url = "http://palletsprojects.com/p/jinja",
-        # version = "2.11.2",
-        # release_date = "2020-04-13"
-        # use_category = ["test"],
-        # cpe = "cpe:2.3:a:palletsprojects:jinja:*",
-
-        # project_name = "MarkupSafe",
-        # project_url = "https://markupsafe.palletsprojects.com/en/1.1.x/",
-        # version = "1.1.1",
-        # release_date = "2019-02-23"
-        # use_category = ["test"],
-    )
-    pip_install(
-        name = "protodoc_pip3",
-        requirements = "@envoy//tools/protodoc:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "PyYAML",
-        # project_url = "https://github.com/yaml/pyyaml",
-        # version = "5.4.1",
-        # release_date = "2021-01-20"
-        # use_category = ["docs"],
-        # cpe = "cpe:2.3:a:pyyaml:pyyaml:*",
-    )
-    pip_install(
-        name = "pylint_pip3",
-        requirements = "@envoy//tools/code_format:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
-    pip_install(
-        name = "testing_pip3",
-        requirements = "@envoy//tools/testing:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
     )
     pip_install(
         name = "thrift_pip3",
         requirements = "@envoy//test/extensions/filters/network/thrift_proxy:requirements.txt",
         extra_pip_args = ["--require-hashes"],
-
-        # project_name = "Apache Thrift",
-        # project_url = "http://thrift.apache.org/",
-        # version = "0.11.0",
-        # release_date = "2017-12-07"
-        # use_category = ["test"],
-        # cpe = "cpe:2.3:a:apache:thrift:*",
-
-        # project_name = "Six: Python 2 and 3 Compatibility Library",
-        # project_url = "https://six.readthedocs.io/",
-        # version = "1.15.0",
-        # release_date = "2020-05-21"
-        # use_category = ["test"],
     )
     pip_install(
         name = "fuzzing_pip3",
         requirements = "@rules_fuzzing//fuzzing:requirements.txt",
         extra_pip_args = ["--require-hashes"],
-
-        # project_name = "Abseil Python Common Libraries",
-        # project_url = "https://github.com/abseil/abseil-py",
-        # version = "0.11.0",
-        # release_date = "2020-10-27",
-        # use_category = ["test"],
-
-        # project_name = "Six: Python 2 and 3 Compatibility Library",
-        # project_url = "https://six.readthedocs.io/",
-        # version = "1.15.0",
-        # release_date = "2020-05-21"
-        # use_category = ["test"],
     )
 
 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().

bazel/repository_locations.bzl

@@ -675,10 +675,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Python rules for Bazel",
         project_desc = "Bazel rules for the Python language",
         project_url = "https://github.com/bazelbuild/rules_python",
-        version = "0.3.0",
-        sha256 = "934c9ceb552e84577b0faf1e5a2f0450314985b4d8712b2b70717dc679fdc01b",
-        release_date = "2021-06-23",
-        urls = ["https://github.com/bazelbuild/rules_python/releases/download/{version}/rules_python-{version}.tar.gz"],
+        version = "9f597623ccfbe430b0d81c82498e33b80b7aec88",
+        sha256 = "8d61fed6974f1e69e09243ca78c9ecf82f50fa3de64bb5df6b0b9061f9c9639b",
+        release_date = "2021-09-07",
+        strip_prefix = "rules_python-{version}",
+        urls = ["https://github.com/bazelbuild/rules_python/archive/{version}.tar.gz"],
         use_category = ["build"],
     ),
     rules_pkg = dict(
@@ -935,7 +936,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         strip_prefix = "kafka-{version}/clients/src/main/resources/common/message",
         urls = ["https://github.com/apache/kafka/archive/{version}.zip"],
         use_category = ["dataplane_ext"],
-        extensions = ["envoy.filters.network.kafka_broker"],
+        extensions = ["envoy.filters.network.kafka_broker", "envoy.filters.network.kafka_mesh"],
         release_date = "2020-03-03",
         cpe = "cpe:2.3:a:apache:kafka:*",
     ),
@@ -948,7 +949,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         strip_prefix = "librdkafka-{version}",
         urls = ["https://github.com/edenhill/librdkafka/archive/v{version}.tar.gz"],
         use_category = ["dataplane_ext"],
-        extensions = ["envoy.filters.network.kafka_broker"],
+        extensions = ["envoy.filters.network.kafka_mesh"],
         release_date = "2021-05-10",
         cpe = "N/A",
     ),