Revert "kafka: upgrade dependencies to 3.5.1 (envoyproxy#28932)"

This reverts commit ffb25ce.

Signed-off-by: Ryan Northey <ryan@synca.io>

bazel/repository_locations.bzl

@@ -1250,13 +1250,13 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Kafka (source)",
         project_desc = "Open-source distributed event streaming platform",
         project_url = "https://kafka.apache.org",
-        version = "3.5.1",
-        sha256 = "9715589a02148fb21bc80d79f29763dbd371457bedcbbeab3db4f5c7fdd2d29c",
+        version = "3.4.0",
+        sha256 = "9eeaf83ffddb85d253a2441a29ba6be0a563cd3d6eb9ddf0eeb8d6e2f49c0ef7",
         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", "envoy.filters.network.kafka_mesh"],
-        release_date = "2023-07-14",
+        release_date = "2023-01-31",
         cpe = "cpe:2.3:a:apache:kafka:*",
         license = "Apache-2.0",
         license_url = "https://github.com/apache/kafka/blob/{version}/LICENSE",
@@ -1280,11 +1280,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Kafka (server binary)",
         project_desc = "Open-source distributed event streaming platform",
         project_url = "https://kafka.apache.org",
-        version = "3.5.1",
-        sha256 = "f7b74d544023f2c0ec52a179de59975cb64e34ea03650d829328b407b560e4da",
+        version = "3.4.0",
+        sha256 = "67025feb03eb963a8852d4adc5b2810744f493a672c5992728955e38bed43da8",
         strip_prefix = "kafka_2.13-{version}",
         urls = ["https://archive.apache.org/dist/kafka/{version}/kafka_2.13-{version}.tgz"],
-        release_date = "2023-07-21",
+        release_date = "2023-01-31",
         use_category = ["test_only"],
     ),
     kafka_python_client = dict(

contrib/kafka/filters/network/source/protocol/generator.py

@@ -128,10 +128,8 @@ def parse_messages(self, input_files):
                     amended = re.sub(r'-2147483648', 'INT32_MIN', without_empty_newlines)
                     message_spec = json.loads(amended)
                     api_key = message_spec['apiKey']
-                    # (adam.kotwasinski) ConsumerGroupHeartbeat needs some more changes to parse.
-                    if api_key not in [68]:
-                        message = self.parse_top_level_element(message_spec)
-                        messages.append(message)
+                    message = self.parse_top_level_element(message_spec)
+                    messages.append(message)
             except Exception as e:
                 print('could not process %s' % input_file)
                 raise
@@ -167,7 +165,7 @@ def parse_top_level_element(self, spec):
             # So let's parse them and store them in state.
             common_structs = spec.get('commonStructs')
             if common_structs is not None:
-                for common_struct in reversed(common_structs):
+                for common_struct in common_structs:
                     common_struct_name = common_struct['name']
                     common_struct_versions = Statics.parse_version_string(
                         common_struct['versions'], versions[-1])

docs/root/configuration/listeners/network_filters/kafka_broker_filter.rst

@@ -5,8 +5,8 @@ Kafka Broker filter
 
 The Apache Kafka broker filter decodes the client protocol for
 `Apache Kafka <https://kafka.apache.org/>`_, both the requests and responses in the payload.
-The message versions in `Kafka 3.5.1 <http://kafka.apache.org/35/protocol.html#protocol_api_keys>`_
-are supported (apart from ConsumerGroupHeartbeat).
+The message versions in `Kafka 3.4.0 <http://kafka.apache.org/34/protocol.html#protocol_api_keys>`_
+are supported.
 The filter attempts not to influence the communication between client and brokers, so the messages
 that could not be decoded (due to Kafka client or broker running a newer version than supported by
 this filter) are forwarded as-is.

docs/root/configuration/listeners/network_filters/kafka_mesh_filter.rst

@@ -12,7 +12,7 @@ clients.
 The requests received by this filter instance can be forwarded to one of multiple clusters,
 depending on the configured forwarding rules.
 
-Corresponding message versions from Kafka 3.5.1 are supported.
+Corresponding message versions from Kafka 3.4.0 are supported.
 
 * This filter should be configured with the type URL ``type.googleapis.com/envoy.extensions.filters.network.kafka_mesh.v3alpha.KafkaMesh``.
 * :ref:`v3 API reference <envoy_v3_api_msg_extensions.filters.network.kafka_mesh.v3alpha.KafkaMesh>`