|
1 | 1 | import pytest
|
2 |
| -import os |
3 | 2 |
|
4 |
| -from test.fixtures import ZookeeperFixture, KafkaFixture |
5 |
| -from test.testutil import KafkaIntegrationTestCase, env_kafka_version, current_offset |
| 3 | +from test.testutil import env_kafka_version |
6 | 4 |
|
7 | 5 | from kafka.errors import NoError
|
8 |
| -from kafka.admin import KafkaAdminClient, ACLFilter, ACLOperation, ACLPermissionType, ResourcePattern, ResourceType, ACL |
| 6 | +from kafka.admin import ACLFilter, ACLOperation, ACLPermissionType, ResourcePattern, ResourceType, ACL |
9 | 7 |
|
10 |
| -# This test suite passes for me locally, but fails on travis |
11 |
| -# Needs investigation |
12 |
| -DISABLED = True |
13 | 8 |
|
14 |
| -# TODO: Convert to pytest / fixtures |
15 |
| -# Note that ACL features require broker 0.11, but other admin apis may work on |
16 |
| -# earlier broker versions |
17 |
| -class TestAdminClientIntegration(KafkaIntegrationTestCase): |
18 |
| - @classmethod |
19 |
| - def setUpClass(cls): # noqa |
20 |
| - if env_kafka_version() < (0, 11) or DISABLED: |
21 |
| - return |
| 9 | +@pytest.mark.skipif(env_kafka_version() < (0, 11), reason="ACL features require broker >=0.11") |
| 10 | +def test_create_describe_delete_acls(kafka_admin_client): |
| 11 | + """Tests that we can add, list and remove ACLs |
| 12 | + """ |
22 | 13 |
|
23 |
| - cls.zk = ZookeeperFixture.instance() |
24 |
| - cls.server = KafkaFixture.instance(0, cls.zk) |
25 |
| - |
26 |
| - @classmethod |
27 |
| - def tearDownClass(cls): # noqa |
28 |
| - if env_kafka_version() < (0, 11) or DISABLED: |
29 |
| - return |
30 |
| - |
31 |
| - cls.server.close() |
32 |
| - cls.zk.close() |
33 |
| - |
34 |
| - def setUp(self): |
35 |
| - if env_kafka_version() < (0, 11) or DISABLED: |
36 |
| - self.skipTest('Admin ACL Integration test requires KAFKA_VERSION >= 0.11') |
37 |
| - super(TestAdminClientIntegration, self).setUp() |
38 |
| - |
39 |
| - def tearDown(self): |
40 |
| - if env_kafka_version() < (0, 11) or DISABLED: |
41 |
| - return |
42 |
| - super(TestAdminClientIntegration, self).tearDown() |
43 |
| - |
44 |
| - def test_create_describe_delete_acls(self): |
45 |
| - """Tests that we can add, list and remove ACLs |
46 |
| - """ |
47 |
| - |
48 |
| - # Setup |
49 |
| - brokers = '%s:%d' % (self.server.host, self.server.port) |
50 |
| - admin_client = KafkaAdminClient( |
51 |
| - bootstrap_servers=brokers |
| 14 | + # Check that we don't have any ACLs in the cluster |
| 15 | + acls, error = kafka_admin_client.describe_acls( |
| 16 | + ACLFilter( |
| 17 | + principal=None, |
| 18 | + host="*", |
| 19 | + operation=ACLOperation.ANY, |
| 20 | + permission_type=ACLPermissionType.ANY, |
| 21 | + resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic") |
52 | 22 | )
|
53 |
| - |
54 |
| - # Check that we don't have any ACLs in the cluster |
55 |
| - acls, error = admin_client.describe_acls( |
| 23 | + ) |
| 24 | + |
| 25 | + assert error is NoError |
| 26 | + assert len(acls) == 0 |
| 27 | + |
| 28 | + # Try to add an ACL |
| 29 | + acl = ACL( |
| 30 | + principal="User:test", |
| 31 | + host="*", |
| 32 | + operation=ACLOperation.READ, |
| 33 | + permission_type=ACLPermissionType.ALLOW, |
| 34 | + resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic") |
| 35 | + ) |
| 36 | + result = kafka_admin_client.create_acls([acl]) |
| 37 | + |
| 38 | + assert len(result["failed"]) == 0 |
| 39 | + assert len(result["succeeded"]) == 1 |
| 40 | + |
| 41 | + # Check that we can list the ACL we created |
| 42 | + acl_filter = ACLFilter( |
| 43 | + principal=None, |
| 44 | + host="*", |
| 45 | + operation=ACLOperation.ANY, |
| 46 | + permission_type=ACLPermissionType.ANY, |
| 47 | + resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic") |
| 48 | + ) |
| 49 | + acls, error = kafka_admin_client.describe_acls(acl_filter) |
| 50 | + |
| 51 | + assert error is NoError |
| 52 | + assert len(acls) == 1 |
| 53 | + |
| 54 | + # Remove the ACL |
| 55 | + delete_results = kafka_admin_client.delete_acls( |
| 56 | + [ |
56 | 57 | ACLFilter(
|
57 |
| - principal=None, |
| 58 | + principal="User:test", |
58 | 59 | host="*",
|
59 |
| - operation=ACLOperation.ANY, |
60 |
| - permission_type=ACLPermissionType.ANY, |
| 60 | + operation=ACLOperation.READ, |
| 61 | + permission_type=ACLPermissionType.ALLOW, |
61 | 62 | resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic")
|
62 | 63 | )
|
63 |
| - ) |
| 64 | + ] |
| 65 | + ) |
64 | 66 |
|
65 |
| - self.assertIs(error, NoError) |
66 |
| - self.assertEqual(0, len(acls)) |
| 67 | + assert len(delete_results) == 1 |
| 68 | + assert len(delete_results[0][1]) == 1 # Check number of affected ACLs |
67 | 69 |
|
68 |
| - # Try to add an ACL |
69 |
| - acl = ACL( |
70 |
| - principal="User:test", |
71 |
| - host="*", |
72 |
| - operation=ACLOperation.READ, |
73 |
| - permission_type=ACLPermissionType.ALLOW, |
74 |
| - resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic") |
75 |
| - ) |
76 |
| - result = admin_client.create_acls([acl]) |
77 |
| - |
78 |
| - self.assertFalse(len(result["failed"])) |
79 |
| - self.assertEqual(len(result["succeeded"]), 1) |
80 |
| - |
81 |
| - # Check that we can list the ACL we created |
82 |
| - acl_filter = ACLFilter( |
83 |
| - principal=None, |
| 70 | + # Make sure the ACL does not exist in the cluster anymore |
| 71 | + acls, error = kafka_admin_client.describe_acls( |
| 72 | + ACLFilter( |
| 73 | + principal="*", |
84 | 74 | host="*",
|
85 | 75 | operation=ACLOperation.ANY,
|
86 | 76 | permission_type=ACLPermissionType.ANY,
|
87 | 77 | resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic")
|
88 | 78 | )
|
89 |
| - acls, error = admin_client.describe_acls(acl_filter) |
90 |
| - |
91 |
| - self.assertIs(error, NoError) |
92 |
| - self.assertEqual(1, len(acls)) |
93 |
| - |
94 |
| - # Remove the ACL |
95 |
| - delete_results = admin_client.delete_acls( |
96 |
| - [ |
97 |
| - ACLFilter( |
98 |
| - principal="User:test", |
99 |
| - host="*", |
100 |
| - operation=ACLOperation.READ, |
101 |
| - permission_type=ACLPermissionType.ALLOW, |
102 |
| - resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic") |
103 |
| - ) |
104 |
| - ] |
105 |
| - ) |
| 79 | + ) |
106 | 80 |
|
107 |
| - self.assertEqual(1, len(delete_results)) |
108 |
| - self.assertEqual(1, len(delete_results[0][1])) # Check number of affected ACLs |
109 |
| - |
110 |
| - |
111 |
| - # Make sure the ACL does not exist in the cluster anymore |
112 |
| - acls, error = admin_client.describe_acls( |
113 |
| - ACLFilter( |
114 |
| - principal="*", |
115 |
| - host="*", |
116 |
| - operation=ACLOperation.ANY, |
117 |
| - permission_type=ACLPermissionType.ANY, |
118 |
| - resource_pattern=ResourcePattern(ResourceType.TOPIC, "topic") |
119 |
| - ) |
120 |
| - ) |
121 |
| - self.assertIs(error, NoError) |
122 |
| - self.assertEqual(0, len(acls)) |
| 81 | + assert error is NoError |
| 82 | + assert len(acls) == 0 |
0 commit comments