3+ kafka-topics.sh uses --bootstrap-server not --zookeeper

Author: dpkp

test/fixtures.py

@@ -620,15 +620,18 @@ def _create_topic_via_cli(self, topic_name, num_partitions, replication_factor):
                 raise RuntimeError("Failed to create topic %s" % (topic_name,))
 
     def get_topic_names(self):
-        args = self.run_script('kafka-topics.sh',
-                                         '--zookeeper', '%s:%s/%s' % (self.zookeeper.host,
-                                                                      self.zookeeper.port,
-                                                                      self.zk_chroot),
-                                         '--list'
-                              )
+        args = ['--list']
+        if env_kafka_version() < (3, 0, 0):
+            args.append('--zookeeper')
+            args.append('%s:%s/%s' % (self.zookeeper.host, self.zookeeper.port, self.zk_chroot))
+        else:
+            args.append('--bootstrap-server')
+            args.append('%s:%s' % (self.host, self.port))
+
+        cmd = self.run_script('kafka-topics.sh', *args)
         env = self.kafka_run_class_env()
         env.pop('KAFKA_LOG4J_OPTS')
-        proc = subprocess.Popen(args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        proc = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = proc.communicate()
         if proc.returncode != 0:
             self.out("Failed to list topics!")