Add the Tumblebug endpoint to config

cloud-barista · May 24, 2024 · 6cab49e · 6cab49e
1 parent c53c96d
commit 6cab49e
Show file tree

Hide file tree

Showing 6 changed files with 279 additions and 273 deletions.
diff --git a/cmd/cm-beetle/main.go b/cmd/cm-beetle/main.go
@@ -53,8 +53,9 @@ func main() {
 	}
 	log.Debug().Msgf("port number: %s", *port)
 
-	common.SpiderRestUrl = common.NVL(os.Getenv("SPIDER_REST_URL"), "http://localhost:1024/spider")
-	common.DragonflyRestUrl = common.NVL(os.Getenv("DRAGONFLY_REST_URL"), "http://localhost:9090/dragonfly")
+	// common.SpiderRestUrl = common.NVL(os.Getenv("SPIDER_REST_URL"), "http://localhost:1024/spider")
+	// common.DragonflyRestUrl = common.NVL(os.Getenv("DRAGONFLY_REST_URL"), "http://localhost:9090/dragonfly")
+	common.TumblebugRestUrl = common.NVL(os.Getenv("TUMBLEBUG_REST_URL"), "http://localhost:1323/tumblebug")
 	common.DBUrl = common.NVL(os.Getenv("DB_URL"), "localhost:3306")
 	common.DBDatabase = common.NVL(os.Getenv("DB_DATABASE"), "cb_beetle")
 	common.DBUser = common.NVL(os.Getenv("DB_USER"), "cb_beetle")

diff --git a/conf/setup.env b/conf/setup.env
@@ -6,8 +6,8 @@ export CBSTORE_ROOT=$CMBEETLE_ROOT
 export CBLOG_ROOT=$CMBEETLE_ROOT
 #export CBSPIDER_CALLMETHOD=REST
 #export CBSPIDER_REST_URL=http://localhost:1024/spider
-#export CBTUMBLEBUG_CALLMETHOD=REST
-#export CBTUMBLEBUG_REST_URL=http://localhost:1323/tumblebug
+export CBTUMBLEBUG_CALLMETHOD=REST
+export CBTUMBLEBUG_REST_URL=http://localhost:1323/tumblebug
 
 ## Logger configuration
 # Set log file path (default logfile path: ./cm-beetle.log) 

diff --git a/pkg/core/common/client.go b/pkg/core/common/client.go
@@ -326,40 +326,40 @@ func EndRequestWithLog(c echo.Context, reqID string, err error, responseData int
 	return c.JSON(http.StatusNotFound, map[string]string{"message": "Invalid Request ID"})
 }
 
-// ForwardRequestToAny forwards the given request to the specified path
-func ForwardRequestToAny(reqPath string, method string, requestBody interface{}) (interface{}, error) {
-	client := resty.New()
-	var callResult interface{}
-
-	url := SpiderRestUrl + "/" + reqPath
-
-	var requestBodyBytes []byte
-	var ok bool
-	if requestBodyBytes, ok = requestBody.([]byte); !ok {
-		return nil, fmt.Errorf("requestBody is not []byte type")
-	}
-
-	var requestBodyMap map[string]interface{}
-	err := json.Unmarshal(requestBodyBytes, &requestBodyMap)
-	if err != nil {
-		return nil, fmt.Errorf("JSON unmarshal error: %v", err)
-	}
-
-	err = ExecuteHttpRequest(
-		client,
-		method,
-		url,
-		nil,
-		SetUseBody(requestBodyMap),
-		&requestBodyMap,
-		&callResult,
-		MediumDuration,
-	)
-
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		return nil, err
-	}
-
-	return callResult, nil
-}
+// // ForwardRequestToAny forwards the given request to the specified path
+// func ForwardRequestToAny(reqPath string, method string, requestBody interface{}) (interface{}, error) {
+// 	client := resty.New()
+// 	var callResult interface{}
+
+// 	url := SpiderRestUrl + "/" + reqPath
+
+// 	var requestBodyBytes []byte
+// 	var ok bool
+// 	if requestBodyBytes, ok = requestBody.([]byte); !ok {
+// 		return nil, fmt.Errorf("requestBody is not []byte type")
+// 	}
+
+// 	var requestBodyMap map[string]interface{}
+// 	err := json.Unmarshal(requestBodyBytes, &requestBodyMap)
+// 	if err != nil {
+// 		return nil, fmt.Errorf("JSON unmarshal error: %v", err)
+// 	}
+
+// 	err = ExecuteHttpRequest(
+// 		client,
+// 		method,
+// 		url,
+// 		nil,
+// 		SetUseBody(requestBodyMap),
+// 		&requestBodyMap,
+// 		&callResult,
+// 		MediumDuration,
+// 	)
+
+// 	if err != nil {
+// 		log.Error().Err(err).Msg("")
+// 		return nil, err
+// 	}
+
+// 	return callResult, nil
+// }
diff --git a/pkg/core/common/common.go b/pkg/core/common/common.go
@@ -38,8 +38,9 @@ var SystemReady bool
 var CBLog *logrus.Logger
 var CBStore icbs.Store
 
-var SpiderRestUrl string
-var DragonflyRestUrl string
+// var SpiderRestUrl string
+// var DragonflyRestUrl string
+var TumblebugRestUrl string
 var DBUrl string
 var DBDatabase string
 var DBUser string
@@ -50,8 +51,9 @@ var err error
 var ORM *xorm.Engine
 
 const (
-	StrSpiderRestUrl              string = "SPIDER_REST_URL"
-	StrDragonflyRestUrl           string = "DRAGONFLY_REST_URL"
+	// StrSpiderRestUrl              string = "SPIDER_REST_URL"
+	// StrDragonflyRestUrl           string = "DRAGONFLY_REST_URL"
+	StrTumblebugRestUrl           string = "TUMBLEBUG_REST_URL"
 	StrDBUrl                      string = "DB_URL"
 	StrDBDatabase                 string = "DB_DATABASE"
 	StrDBUser                     string = "DB_USER"

diff --git a/pkg/core/common/config.go b/pkg/core/common/config.go
@@ -136,12 +136,15 @@ func UpdateGlobalVariable(id string) error {
 	}
 
 	switch id {
-	case StrSpiderRestUrl:
-		SpiderRestUrl = configInfo.Value
-		fmt.Println("<SPIDER_REST_URL> " + SpiderRestUrl)
-	case StrDragonflyRestUrl:
-		DragonflyRestUrl = configInfo.Value
-		fmt.Println("<DRAGONFLY_REST_URL> " + DragonflyRestUrl)
+	// case StrSpiderRestUrl:
+	// 	SpiderRestUrl = configInfo.Value
+	// 	fmt.Println("<SPIDER_REST_URL> " + SpiderRestUrl)
+	// case StrDragonflyRestUrl:
+	// 	DragonflyRestUrl = configInfo.Value
+	// 	fmt.Println("<DRAGONFLY_REST_URL> " + DragonflyRestUrl)
+	case StrTumblebugRestUrl:
+		TumblebugRestUrl = configInfo.Value
+		fmt.Println("<TUMBELBUG_REST_URL> " + TumblebugRestUrl)
 	case StrDBUrl:
 		DBUrl = configInfo.Value
 		fmt.Println("<DB_URL> " + DBUrl)
@@ -167,12 +170,15 @@ func UpdateGlobalVariable(id string) error {
 func InitConfig(id string) error {
 
 	switch id {
-	case StrSpiderRestUrl:
-		SpiderRestUrl = NVL(os.Getenv("SPIDER_REST_URL"), "http://localhost:1024/spider")
-		fmt.Println("<SPIDER_REST_URL> " + SpiderRestUrl)
-	case StrDragonflyRestUrl:
-		DragonflyRestUrl = NVL(os.Getenv("DRAGONFLY_REST_URL"), "http://localhost:9090/dragonfly")
-		fmt.Println("<DRAGONFLY_REST_URL> " + DragonflyRestUrl)
+	// case StrSpiderRestUrl:
+	// 	SpiderRestUrl = NVL(os.Getenv("SPIDER_REST_URL"), "http://localhost:1024/spider")
+	// 	fmt.Println("<SPIDER_REST_URL> " + SpiderRestUrl)
+	// case StrDragonflyRestUrl:
+	// 	DragonflyRestUrl = NVL(os.Getenv("DRAGONFLY_REST_URL"), "http://localhost:9090/dragonfly")
+	// 	fmt.Println("<DRAGONFLY_REST_URL> " + DragonflyRestUrl)
+	case StrTumblebugRestUrl:
+		TumblebugRestUrl = NVL(os.Getenv("TUMBLEBUG_REST_URL"), "http://localhost:1323/tumblebug")
+		fmt.Println("<TUMBLEBUG_REST_URL> " + TumblebugRestUrl)
 	case StrDBUrl:
 		DBUrl = NVL(os.Getenv("DB_URL"), "localhost:3306")
 		fmt.Println("<DB_URL> " + DBUrl)