Merge pull request #1482 from yunkon-kim/240401-2

Replace all with Zerolog
cloud-barista · Apr 2, 2024 · 8f7b7e4 · 8f7b7e4
2 parents 8c9ebd7 + 10051f2
commit 8f7b7e4
Show file tree

Hide file tree

Showing 33 changed files with 965 additions and 933 deletions.
diff --git a/src/api/rest/server/common/config.go b/src/api/rest/server/common/config.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/labstack/echo/v4"
+	"github.com/rs/zerolog/log"
 
 	"github.com/cloud-barista/cb-tumblebug/src/core/common"
 )
@@ -46,7 +47,7 @@ func RestInitConfig(c echo.Context) error {
 		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
 	}
 	if err := Validate(c, []string{"configId"}); err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return common.EndRequestWithLog(c, reqID, err, nil)
 	}
 
@@ -55,7 +56,7 @@ func RestInitConfig(c echo.Context) error {
 		err := fmt.Errorf("Failed to init the config " + c.Param("configId"))
 		return common.EndRequestWithLog(c, reqID, err, nil)
 	} else {
-		return SendMessage(c, http.StatusOK, "The config "+c.Param("configId")+" has been initialized.")
+		// return SendMessage(c, http.StatusOK, "The config "+c.Param("configId")+" has been initialized.")
 		content := map[string]string{"message": "The config " + c.Param("configId") + " has been initialized."}
 		return common.EndRequestWithLog(c, reqID, err, content)
 	}
@@ -78,7 +79,7 @@ func RestGetConfig(c echo.Context) error {
 		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
 	}
 	if err := Validate(c, []string{"configId"}); err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return SendMessage(c, http.StatusBadRequest, err.Error())
 	}
 

diff --git a/src/api/rest/server/common/utility.go b/src/api/rest/server/common/utility.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/go-playground/validator/v10"
 	"github.com/labstack/echo/v4"
-	"github.com/rs/zerolog/log"
 
 	"github.com/cloud-barista/cb-tumblebug/src/core/common"
 	"github.com/cloud-barista/cb-tumblebug/src/core/mcis"
@@ -85,8 +84,6 @@ func RestGetHealth(c echo.Context) error {
 	okMessage := common.SimpleMsg{}
 	okMessage.Message = "API server of CB-Tumblebug is alive"
 
-	log.Debug().Msg("Inside of RestGetHealth() handler")
-
 	return c.JSON(http.StatusOK, &okMessage)
 }
 

diff --git a/src/api/rest/server/mcir/common.go b/src/api/rest/server/mcir/common.go
@@ -381,7 +381,7 @@ func RestRegisterExistingResources(c echo.Context) error {
 
 	result, err := mcir.RegisterExistingResources(nsId, u.ConnectionName)
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusConflict, &mapA)
 	}

diff --git a/src/api/rest/server/mcis/cluster.go b/src/api/rest/server/mcis/cluster.go
@@ -21,6 +21,7 @@ import (
 	"github.com/cloud-barista/cb-tumblebug/src/core/common"
 	"github.com/cloud-barista/cb-tumblebug/src/core/mcis"
 	"github.com/labstack/echo/v4"
+	"github.com/rs/zerolog/log"
 )
 
 // RestPostCluster godoc
@@ -52,7 +53,7 @@ func RestPostCluster(c echo.Context) error {
 	content, err := mcis.CreateCluster(nsId, u, optionFlag)
 
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}
@@ -111,7 +112,7 @@ func RestPostNodeGroup(c echo.Context) error {
 	content, err := mcis.AddNodeGroup(nsId, clusterId, u)
 
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}
@@ -141,7 +142,7 @@ func RestDeleteNodeGroup(c echo.Context) error {
 
 	res, err := mcis.RemoveNodeGroup(nsId, clusterId, nodeGroupName, forceFlag)
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}
@@ -185,7 +186,7 @@ func RestPutSetAutoscaling(c echo.Context) error {
 	content, err := mcis.SetAutoscaling(nsId, clusterId, nodeGroupName, u)
 
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}
@@ -222,7 +223,7 @@ func RestPutChangeAutoscaleSize(c echo.Context) error {
 	content, err := mcis.ChangeAutoscaleSize(nsId, clusterId, nodeGroupName, u)
 
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}
@@ -330,7 +331,7 @@ func RestDeleteCluster(c echo.Context) error {
 
 	res, err := mcis.DeleteCluster(nsId, clusterId, forceFlag)
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}
@@ -365,7 +366,7 @@ func RestDeleteAllCluster(c echo.Context) error {
 
 	output, err := mcis.DeleteAllCluster(nsId, subString, forceFlag)
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusConflict, &mapA)
 	}
@@ -400,7 +401,7 @@ func RestPutUpgradeCluster(c echo.Context) error {
 	content, err := mcis.UpgradeCluster(nsId, clusterId, u)
 
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)
 	}

diff --git a/src/api/rest/server/mcis/manageInfo.go b/src/api/rest/server/mcis/manageInfo.go
@@ -21,6 +21,7 @@ import (
 	"github.com/cloud-barista/cb-tumblebug/src/core/common"
 	"github.com/cloud-barista/cb-tumblebug/src/core/mcis"
 	"github.com/labstack/echo/v4"
+	"github.com/rs/zerolog/log"
 )
 
 // JSONResult is a dummy struct for Swagger annotations.
@@ -316,7 +317,7 @@ func RestDelMcisVm(c echo.Context) error {
 
 	err := mcis.DelMcisVm(nsId, mcisId, vmId, option)
 	if err != nil {
-		common.CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		err := fmt.Errorf("Failed to delete the VM info")
 		return common.EndRequestWithLog(c, reqID, err, nil)
 	}

diff --git a/src/core/common/client.go b/src/core/common/client.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/go-resty/resty/v2"
 	"github.com/labstack/echo/v4"
+	"github.com/rs/zerolog/log"
 )
 
 // CacheItem is a struct to store cached item
@@ -345,7 +346,7 @@ func ForwardRequestToAny(reqPath string, method string, requestBody interface{})
 	)
 
 	if err != nil {
-		CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return nil, err
 	}
 

diff --git a/src/core/common/config.go b/src/core/common/config.go
@@ -23,6 +23,8 @@ import (
 	"github.com/jedib0t/go-pretty/v6/table"
 
 	cbstore_utils "github.com/cloud-barista/cb-store/utils"
+
+	"github.com/rs/zerolog/log"
 )
 
 type CloudInfo struct {
@@ -188,7 +190,7 @@ func UpdateConfig(u *ConfigReq) (ConfigInfo, error) {
 	val, _ := json.Marshal(content)
 	err := CBStore.Put(key, string(val))
 	if err != nil {
-		CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return content, err
 	}
 	keyValue, _ := CBStore.Get(key)
@@ -205,7 +207,7 @@ func UpdateGlobalVariable(id string) error {
 
 	configInfo, err := GetConfig(id)
 	if err != nil {
-		//CBLog.Error(err)
+		//log.Error().Err(err).Msg("")
 		return err
 	}
 
@@ -274,7 +276,7 @@ func InitConfig(id string) error {
 
 		CBStore.Delete(key)
 		// if err != nil {
-		// 	CBLog.Error(err)
+		// 	log.Error().Err(err).Msg("")
 		// 	return err
 		// }
 	}
@@ -296,7 +298,7 @@ func GetConfig(id string) (ConfigInfo, error) {
 
 	if err != nil {
 		temp := ConfigInfo{}
-		CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return temp, err
 	}
 
@@ -305,15 +307,15 @@ func GetConfig(id string) (ConfigInfo, error) {
 
 	keyValue, err := CBStore.Get(key)
 	if err != nil {
-		//CBLog.Error(err)
+		//log.Error().Err(err).Msg("")
 		return res, err
 	}
 
 	fmt.Println("<" + keyValue.Key + "> " + keyValue.Value)
 
 	err = json.Unmarshal([]byte(keyValue.Value), &res)
 	if err != nil {
-		CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return res, err
 	}
 	return res, nil
@@ -328,7 +330,7 @@ func ListConfig() ([]ConfigInfo, error) {
 	keyValue = cbstore_utils.GetChildList(keyValue, key)
 
 	if err != nil {
-		CBLog.Error(err)
+		log.Error().Err(err).Msg("")
 		return nil, err
 	}
 	if keyValue != nil {
@@ -337,7 +339,7 @@ func ListConfig() ([]ConfigInfo, error) {
 			tempObj := ConfigInfo{}
 			err = json.Unmarshal([]byte(v.Value), &tempObj)
 			if err != nil {
-				CBLog.Error(err)
+				log.Error().Err(err).Msg("")
 				return nil, err
 			}
 			res = append(res, tempObj)