Implement PR change requests: fewer versions for travis testing, remo…

…ve unused older versions for inference code, remove one minor version from known server list

Do not use newly created ACL request / responses in allowed version lists, due to flexible versions enabling in kafka actually requiring a serialization protocol header update
Revert admin client file change

.travis.yml

@@ -14,10 +14,6 @@ env:
     - KAFKA_VERSION=0.10.2.2
     - KAFKA_VERSION=0.11.0.3
     - KAFKA_VERSION=1.1.1
-    - KAFKA_VERSION=2.0.1
-    - KAFKA_VERSION=2.1.1
-    - KAFKA_VERSION=2.2.0
-    - KAFKA_VERSION=2.3.0
     - KAFKA_VERSION=2.4.0
     - KAFKA_VERSION=2.5.0
 

build_integration.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.0 2.2.1 2.3.0 2.4.0 2.5.0"}
+: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0"}
 : ${SCALA_VERSION:=2.11}
 : ${DIST_BASE_URL:=https://archive.apache.org/dist/kafka/}
 : ${KAFKA_SRC_GIT:=https://github.com/apache/kafka.git}

kafka/admin/client.py

@@ -763,7 +763,7 @@ def delete_acls(self, acl_filters):
             request = DeleteAclsRequest[version](
                 filters=[self._convert_delete_acls_resource_request_v0(acl) for acl in acl_filters]
             )
-        elif version <= 1:
+        elif version <= 2:
             request = DeleteAclsRequest[version](
                 filters=[self._convert_delete_acls_resource_request_v1(acl) for acl in acl_filters]
             )

kafka/conn.py

@@ -24,7 +24,7 @@
 from kafka.future import Future
 from kafka.metrics.stats import Avg, Count, Max, Rate
 from kafka.oauth.abstract import AbstractTokenProvider
-from kafka.protocol.admin import SaslHandShakeRequest, DescribeAclsRequest
+from kafka.protocol.admin import SaslHandShakeRequest, DescribeAclsRequest_v2
 from kafka.protocol.commit import OffsetFetchRequest
 from kafka.protocol.offset import OffsetRequest
 from kafka.protocol.produce import ProduceRequest
@@ -1169,7 +1169,7 @@ def _infer_broker_version_from_api_versions(self, api_versions):
         # in reverse order. As soon as we find one that works, return it
         test_cases = [
             # format (<broker version>, <needed struct>)
-            ((2, 5, 0), DescribeAclsRequest[2]),
+            ((2, 5, 0), DescribeAclsRequest_v2),
             ((2, 4, 0), ProduceRequest[8]),
             ((2, 3, 0), FetchRequest[11]),
             ((2, 2, 0), OffsetRequest[5]),
@@ -1180,10 +1180,6 @@ def _infer_broker_version_from_api_versions(self, api_versions):
             ((0, 11, 0), MetadataRequest[4]),
             ((0, 10, 2), OffsetFetchRequest[2]),
             ((0, 10, 1), MetadataRequest[2]),
-            # taken from https://github.com/edenhill/librdkafka/blob/master/src/rdkafka_feature.c#L234
-            ((0, 9, 0), ProduceRequest[1]),
-            ((0, 8, 2), OffsetFetchRequest[1]),
-            ((0, 8, 1), OffsetFetchRequest[0]),
         ]
 
         # Get the best match of test cases

kafka/protocol/admin.py

@@ -523,8 +523,8 @@ class DescribeAclsRequest_v2(Request):
     SCHEMA = DescribeAclsRequest_v1.SCHEMA
 
 
-DescribeAclsRequest = [DescribeAclsRequest_v0, DescribeAclsRequest_v1, DescribeAclsRequest_v2]
-DescribeAclsResponse = [DescribeAclsResponse_v0, DescribeAclsResponse_v1, DescribeAclsResponse_v2]
+DescribeAclsRequest = [DescribeAclsRequest_v0, DescribeAclsRequest_v1]
+DescribeAclsResponse = [DescribeAclsResponse_v0, DescribeAclsResponse_v1]
 
 class CreateAclsResponse_v0(Response):
     API_KEY = 30