From ca73750929761fef81969df63f0e7faf8450b4a1 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <59896149+AndrewZuo01@users.noreply.github.com>
Date: Mon, 25 Dec 2023 15:00:27 +0800
Subject: [PATCH] fix component check (#343)

* update init config

* update init

* update component check

* update component check

* update component check
---
 tools/component/component.go | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/tools/component/component.go b/tools/component/component.go
index 0d14800b8..4e68dbde5 100644
--- a/tools/component/component.go
+++ b/tools/component/component.go
@@ -66,20 +66,23 @@ func successPrint(s string, hide bool) {
 func newZkClient() (*zk.Conn, error) {
 	var c *zk.Conn
 	c, _, err := zk.Connect(config.Config.Zookeeper.ZkAddr, time.Second, zk.WithLogger(log.NewZkLogger()))
-	result, _, _ := c.Exists("zookeeper")
 	fmt.Println("zk addr=", config.Config.Zookeeper.ZkAddr)
-	if err != nil || !result {
+	if err != nil {
 		fmt.Println("zookeeper connect error:", err)
 		return nil, errs.Wrap(err, "Zookeeper Addr: "+strings.Join(config.Config.Zookeeper.ZkAddr, " "))
-	} else {
-		if config.Config.Zookeeper.Username != "" && config.Config.Zookeeper.Password != "" {
-			if err := c.AddAuth("digest", []byte(config.Config.Zookeeper.Username+":"+config.Config.Zookeeper.Password)); err != nil {
-				return nil, errs.Wrap(err, "Zookeeper Username: "+config.Config.Zookeeper.Username+
-					", Zookeeper Password: "+config.Config.Zookeeper.Password+
-					", Zookeeper Addr: "+strings.Join(config.Config.Zookeeper.ZkAddr, " "))
-			}
+	}
+	if config.Config.Zookeeper.Username != "" && config.Config.Zookeeper.Password != "" {
+		if err := c.AddAuth("digest", []byte(config.Config.Zookeeper.Username+":"+config.Config.Zookeeper.Password)); err != nil {
+			return nil, errs.Wrap(err, "Zookeeper Username: "+config.Config.Zookeeper.Username+
+				", Zookeeper Password: "+config.Config.Zookeeper.Password+
+				", Zookeeper Addr: "+strings.Join(config.Config.Zookeeper.ZkAddr, " "))
 		}
 	}
+	result, _, _ := c.Exists("/zookeeper")
+	if !result {
+		err = errors.New("zookeeper not exist")
+		return nil, errs.Wrap(err, "Zookeeper Addr: "+strings.Join(config.Config.Zookeeper.ZkAddr, " "))
+	}
 	return c, nil
 }