feat: remove zookeeper dependency from kafka-topics

Author: devshawn

kafkashell/executor.py

@@ -164,7 +164,7 @@ def handle_cluster_describe(self, split_text):
             print("Unknown cluster!")
 
     def handle_kafka_topics_command(self, command):
-        command += self.handle_zookeeper_flag(command)
+        command += self.handle_bootstrap_or_zookeeper_flag(command)
         return command
 
     def handle_kafka_configs_command(self, command):
@@ -254,6 +254,12 @@ def handle_zookeeper_shell_command(self, command):
 
     # Helpers
 
+    def handle_bootstrap_or_zookeeper_flag(self, command):
+        if self.settings.get_cluster_details()["zookeeper_connect"] is not None:
+            return self.handle_zookeeper_flag(command)
+        
+        return self.handle_bootstrap_server_flag(command)
+
     def handle_zookeeper_flag(self, command):
         if constants.FLAG_ZOOKEEPER not in command:
             zookeeper_flag = self.wrap_with_spaces(constants.FLAG_ZOOKEEPER)

tests/data/test-no-zookeeper-config.yaml

@@ -0,0 +1,12 @@
+version: 1
+enable:
+  history: true
+  save_on_exit: true
+  auto_complete: true
+  auto_suggest: true
+  inline_help: true
+  fuzzy_search: true
+cluster: local
+clusters:
+  local:
+    bootstrap_servers: localhost:9092

tests/test_executor.py

@@ -609,6 +609,11 @@
     )
 ]
 
+no_zookeeper_test_data = [
+    ("kafka-topics --list", "kafka-topics --list --bootstrap-server localhost:9092"),
+    ("kafka-topics --list --bootstrap-server docker:9092", "kafka-topics --list --bootstrap-server docker:9092"),
+]
+
 command_prefix_test_data = [
     ({}, False),
     ({"command_prefix": ""}, False),
@@ -662,6 +667,18 @@ def test_executor(mock_config_path, mock_os_system, test_input, expected):
     mock_os_system.assert_called_once_with(expected)
 
 
+@mock.patch('os.system')
+@mock.patch('kafkashell.config.get_user_config_path')
+@pytest.mark.parametrize("test_input,expected", no_zookeeper_test_data)
+def test_executor_command_prefix(mock_config_path, mock_os_system, test_input, expected):
+    mock_config_path.return_value = setup_config_path_for_test("test-no-zookeeper")
+
+    executor = kafkashell.executor.Executor(kafkashell.settings.Settings())
+    executor.execute(test_input)
+
+    mock_os_system.assert_called_once_with(expected)
+
+
 @mock.patch('os.system')
 @mock.patch('kafkashell.config.get_user_config_path')
 @pytest.mark.parametrize("test_input,expected,config_file", consumer_test_data)