Skip to content

Commit 8976815

Browse files
author
Gabriel Tincu
committed
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
1 parent d30db3a commit 8976815

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

kafka/admin/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ def describe_acls(self, acl_filter):
570570
operation=acl_filter.operation,
571571
permission_type=acl_filter.permission_type
572572
)
573-
elif version <= 1:
573+
elif version <= 2:
574574
request = DescribeAclsRequest[version](
575575
resource_type=acl_filter.resource_pattern.resource_type,
576576
resource_name=acl_filter.resource_pattern.resource_name,
@@ -763,7 +763,7 @@ def delete_acls(self, acl_filters):
763763
request = DeleteAclsRequest[version](
764764
filters=[self._convert_delete_acls_resource_request_v0(acl) for acl in acl_filters]
765765
)
766-
elif version <= 1:
766+
elif version <= 2:
767767
request = DeleteAclsRequest[version](
768768
filters=[self._convert_delete_acls_resource_request_v1(acl) for acl in acl_filters]
769769
)

kafka/conn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from kafka.future import Future
2525
from kafka.metrics.stats import Avg, Count, Max, Rate
2626
from kafka.oauth.abstract import AbstractTokenProvider
27-
from kafka.protocol.admin import SaslHandShakeRequest, DescribeAclsRequest
27+
from kafka.protocol.admin import SaslHandShakeRequest, DescribeAclsRequest_v2
2828
from kafka.protocol.commit import OffsetFetchRequest
2929
from kafka.protocol.offset import OffsetRequest
3030
from kafka.protocol.produce import ProduceRequest
@@ -1169,7 +1169,7 @@ def _infer_broker_version_from_api_versions(self, api_versions):
11691169
# in reverse order. As soon as we find one that works, return it
11701170
test_cases = [
11711171
# format (<broker version>, <needed struct>)
1172-
((2, 5, 0), DescribeAclsRequest[2]),
1172+
((2, 5, 0), DescribeAclsRequest_v2),
11731173
((2, 4, 0), ProduceRequest[8]),
11741174
((2, 3, 0), FetchRequest[11]),
11751175
((2, 2, 0), OffsetRequest[5]),

kafka/protocol/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,8 @@ class DescribeAclsRequest_v2(Request):
523523
SCHEMA = DescribeAclsRequest_v1.SCHEMA
524524

525525

526-
DescribeAclsRequest = [DescribeAclsRequest_v0, DescribeAclsRequest_v1, DescribeAclsRequest_v2]
527-
DescribeAclsResponse = [DescribeAclsResponse_v0, DescribeAclsResponse_v1, DescribeAclsResponse_v2]
526+
DescribeAclsRequest = [DescribeAclsRequest_v0, DescribeAclsRequest_v1]
527+
DescribeAclsResponse = [DescribeAclsResponse_v0, DescribeAclsResponse_v1]
528528

529529
class CreateAclsResponse_v0(Response):
530530
API_KEY = 30

0 commit comments

Comments
 (0)