Drastically simplify approach

itadventurer · Jun 24, 2019 · b69ff5d · b69ff5d
1 parent cb67d6f
commit b69ff5d
Show file tree

Hide file tree

Showing 23 changed files with 96 additions and 148 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,2 +1,5 @@
 FROM strimzi/kafka:0.11.3-kafka-2.1.0
-COPY bin /opt/kafka/bin
+ENV KAFKA_VERSION=2.1.0
+ENV KAFKA_CLI_DIR=/opt/kafka/bin
+ENV PATH=/opt/kafka-toolbox:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+COPY bin /opt/kafka-toolbox
diff --git a/bin/kafka-acls b/bin/kafka-acls
diff --git a/bin/kafka-acls b/bin/kafka-acls
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-broker-api-versions b/bin/kafka-broker-api-versions
diff --git a/bin/kafka-broker-api-versions b/bin/kafka-broker-api-versions
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-configs b/bin/kafka-configs
diff --git a/bin/kafka-configs b/bin/kafka-configs
@@ -0,0 +1 @@
+run-cli-tool-with-zookeeper
diff --git a/bin/kafka-console-consumer b/bin/kafka-console-consumer
diff --git a/bin/kafka-console-consumer b/bin/kafka-console-consumer
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-console-producer b/bin/kafka-console-producer
diff --git a/bin/kafka-console-producer b/bin/kafka-console-producer
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-broker-list
diff --git a/bin/kafka-consumer-groups b/bin/kafka-consumer-groups
diff --git a/bin/kafka-consumer-groups b/bin/kafka-consumer-groups
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-consumer-perf-test b/bin/kafka-consumer-perf-test
diff --git a/bin/kafka-consumer-perf-test b/bin/kafka-consumer-perf-test
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-broker-list
diff --git a/bin/kafka-delegation-tokens b/bin/kafka-delegation-tokens
diff --git a/bin/kafka-delegation-tokens b/bin/kafka-delegation-tokens
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-delete-records b/bin/kafka-delete-records
diff --git a/bin/kafka-delete-records b/bin/kafka-delete-records
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-log-dirs b/bin/kafka-log-dirs
diff --git a/bin/kafka-log-dirs b/bin/kafka-log-dirs
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-preferred-replica-election b/bin/kafka-preferred-replica-election
diff --git a/bin/kafka-preferred-replica-election b/bin/kafka-preferred-replica-election
@@ -0,0 +1 @@
+run-cli-tool-with-zookeeper
diff --git a/bin/kafka-producer-perf-test b/bin/kafka-producer-perf-test
@@ -2,8 +2,6 @@
 PARAMS="$@"
 DIR=$( dirname "${BASH_SOURCE[0]}" )
 source "$DIR/utils.sh"
-
 PARAMS=$(add_config_from_env "$KAFKA_BOOTSTRAP_SERVERS" "--producer-props" "bootstrap.servers" "$PARAMS")
-PARAMS=$(add_tls "$PARAMS" "--producer.config")
-
-exec $KAFKA_CLI_DIR/$(basename $0).sh $PARAMS
+TLS_CONFIG_PARAM="--producer.config"
+source $(dirname $0)/run-kafka-cli-tool.sh
diff --git a/bin/kafka-reassign-partitions b/bin/kafka-reassign-partitions
diff --git a/bin/kafka-reassign-partitions b/bin/kafka-reassign-partitions
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-bootstrap-server
diff --git a/bin/kafka-streams-application-reset b/bin/kafka-streams-application-reset
@@ -1,9 +1,4 @@
 #!/bin/bash
-PARAMS="$@"
-DIR=$( dirname "${BASH_SOURCE[0]}" )
-source "$DIR/utils.sh"
-
-PARAMS=$(add_bootstrap_servers "$PARAMS" "--broker-list")
-PARAMS=$(add_tls "$PARAMS" "--config-file")
-
-exec $KAFKA_CLI_DIR/$(basename $0).sh $PARAMS
+BOOTSTRAP_SERVERS_PARAM="--bootstrap-servers"
+TLS_CONFIG_PARAM="--command-config"
+source $(dirname $0)/run-kafka-cli-tool.sh
diff --git a/bin/kafka-topics b/bin/kafka-topics
diff --git a/bin/kafka-topics b/bin/kafka-topics
@@ -0,0 +1 @@
+run-cli-tool-with-zookeeper
diff --git a/bin/kafka-verifiable-consumer b/bin/kafka-verifiable-consumer
diff --git a/bin/kafka-verifiable-consumer b/bin/kafka-verifiable-consumer
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-broker-list
diff --git a/bin/kafka-verifiable-producer b/bin/kafka-verifiable-producer
diff --git a/bin/kafka-verifiable-producer b/bin/kafka-verifiable-producer
@@ -0,0 +1 @@
+run-cli-tool-with-kafka-broker-list
diff --git a/bin/run-cli-tool-with-kafka-bootstrap-server b/bin/run-cli-tool-with-kafka-bootstrap-server
@@ -0,0 +1,4 @@
+#!/bin/bash
+BOOTSTRAP_SERVERS_PARAM="--bootstrap-server"
+TLS_CONFIG_PARAM="--command-config"
+source $(dirname $0)/run-kafka-cli-tool.sh
diff --git a/bin/run_kafka_cli_tool → bin/run-cli-tool-with-kafka-broker-list b/bin/run_kafka_cli_tool → bin/run-cli-tool-with-kafka-broker-list
@@ -3,8 +3,7 @@ PARAMS="$@"
 DIR=$( dirname "${BASH_SOURCE[0]}" )
 source "$DIR/utils.sh"
 
-if [ ! -z "$ZOOKEEPER_PARAM" ] ; then
-    PARAMS=$(add_zookeeper "$PARAMS" "--zookeeper")
-fi
+PARAMS=$(add_bootstrap_servers "$PARAMS" "--broker-list")
+PARAMS=$(add_tls "$PARAMS" "--config-file")
 
 exec $KAFKA_CLI_DIR/$(basename $0).sh $PARAMS
diff --git a/bin/run-cli-tool-with-zookeeper b/bin/run-cli-tool-with-zookeeper
@@ -0,0 +1,3 @@
+#!/bin/bash
+ZOOKEEPER_PARAM="--zookeeper"
+source $(dirname $0)/run-kafka-cli-tool.sh
diff --git a/bin/run-kafka-cli-tool.sh b/bin/run-kafka-cli-tool.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+if [ -z "$PARAMS" ] ; then
+    PARAMS="$@"
+fi
+DIR=$( dirname "${BASH_SOURCE[0]}" )
+source "$DIR/utils.sh"
+
+if [ ! -z "$ZOOKEEPER_PARAM" ] ; then
+    PARAMS=$(add_zookeeper "$PARAMS" "$ZOOKEEPER_PARAM")
+fi
+
+if [ ! -z "$BOOTSTRAP_SERVERS_PARAM" ] ; then
+    PARAMS=$(add_bootstrap_servers "$PARAMS" "$BOOTSTRAP_SERVERS_PARAM")
+fi
+
+if [ ! -z "$TLS_CONFIG_PARAM" ] ; then
+PARAMS=$(add_tls "$PARAMS" "$TLS_CONFIG_PARAM")
+fi
+
+if [ ! -z "$DEBUG" ] ; then
+    echo "$KAFKA_CLI_DIR/$(basename $0).sh $PARAMS"
+fi
+
+exec $KAFKA_CLI_DIR/$(basename $0).sh $PARAMS
diff --git a/bin/test-toolbox.sh b/bin/test-toolbox.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+red='\033[0;31m'
+green='\033[0;32m'
+normal='\e[0m'
+
+function test_script {
+    echo -e -n "Testing $@ …"
+    $@ > /tmp/log 2>/tmp/err
+
+    echo -e -n "\b"
+
+    if [ -z "$(cat /tmp/err)" ]  || [ "$(cat /tmp/err)" != "Processed a total of 2 messages\n" ] ; then
+        echo -e "${bold}${green}✓${normal}"
+    else
+        echo -e "${bold}${red}✗${normal}"
+        cat /tmp/err
+    fi
+}
+
+test_script kafka-acls --list
+test_script kafka-broker-api-versions
+test_script kafka-configs --entity-type topics --describe
+test_script kafka-topics --create --topic kafka-toolbox-test --partitions 1 --replication-factor 1
+echo -e "foo\nbar" | test_script kafka-console-producer --topic kafka-toolbox-test
+test_script kafka-console-consumer --topic kafka-toolbox-test --offset 0 --partition 0 --max-messages 2
+test_script kafka-consumer-groups --list
+test_script kafka-consumer-perf-test --topic kafka-toolbox-test --messages 2
+#test_script kafka-delegation-tokens
+#test_script kafka-delete-records
+test_script kafka-log-dirs --describe --broker-list 0
+test_script kafka-preferred-replica-election
+test_script kafka-producer-perf-test --topic kafka-toolbox-test --num-records 10 --record-size 10 --throughput 100
+#test_script kafka-reassign-partitions
+test_script kafka-streams-application-reset --application-id foo
+test_script kafka-verifiable-producer --topic kafka-toolbox-test --max-messages 10
+test_script kafka-verifiable-consumer --topic kafka-toolbox-test --max-messages 10 --group-id verifiable-consumer
+
+test_script kafka-topics --delete --topic kafka-toolbox-test
+#test_script zookeeper-shell