Support spec selection and custom request ID

cloud-barista · Mar 4, 2024 · 8f77ca9 · 8f77ca9
2 parents bca3a7c + 96915d9
commit 8f77ca9
Show file tree

Hide file tree

Showing 31 changed files with 527 additions and 126 deletions.
diff --git a/scripts/runSpider.sh b/scripts/runSpider.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CONTAINER_NAME_READ="CB-Spider"
-CONTAINER_VERSION="0.8.4"
+CONTAINER_VERSION="0.8.7"
 CONTAINER_PORT="-p 1024:1024 -p 2048:2048"
 CONTAINER_DATA_PATH="/root/go/src/github.com/cloud-barista/cb-spider/meta_db"
 

diff --git a/src/api/rest/docs/docs.go b/src/api/rest/docs/docs.go
@@ -1826,6 +1826,12 @@ const docTemplate = `{
                         "description": "vmId to apply the command only for a VM in MCIS",
                         "name": "vmId",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "Custom request ID",
+                        "name": "x-request-id",
+                        "in": "header"
                     }
                 ],
                 "responses": {

diff --git a/src/api/rest/docs/swagger.json b/src/api/rest/docs/swagger.json
@@ -1819,6 +1819,12 @@
                         "description": "vmId to apply the command only for a VM in MCIS",
                         "name": "vmId",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "Custom request ID",
+                        "name": "x-request-id",
+                        "in": "header"
                     }
                 ],
                 "responses": {

diff --git a/src/api/rest/docs/swagger.yaml b/src/api/rest/docs/swagger.yaml
@@ -4029,6 +4029,10 @@ paths:
         in: query
         name: vmId
         type: string
+      - description: Custom request ID
+        in: header
+        name: x-request-id
+        type: string
       produces:
       - application/json
       responses:

diff --git a/src/api/rest/server/common/config.go b/src/api/rest/server/common/config.go
@@ -41,7 +41,10 @@ import (
 // @Failure 500 {object} common.SimpleMsg
 // @Router /config/{configId} [delete]
 func RestInitConfig(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	if err := Validate(c, []string{"configId"}); err != nil {
 		common.CBLog.Error(err)
 		return common.EndRequestWithLog(c, reqID, err, nil)
@@ -70,7 +73,10 @@ func RestInitConfig(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /config/{configId} [get]
 func RestGetConfig(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	if err := Validate(c, []string{"configId"}); err != nil {
 		common.CBLog.Error(err)
 		return SendMessage(c, http.StatusBadRequest, err.Error())
@@ -102,7 +108,10 @@ type RestGetAllConfigResponse struct {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /config [get]
 func RestGetAllConfig(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	var content RestGetAllConfigResponse
 
 	configList, err := common.ListConfig()
@@ -122,7 +131,10 @@ func RestGetAllConfig(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /config [post]
 func RestPostConfig(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	u := &common.ConfigReq{}
 	if err := c.Bind(u); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
@@ -144,7 +156,10 @@ func RestPostConfig(c echo.Context) error {
 // @Failure 404 {object} common.SimpleMsg
 // @Router /config [delete]
 func RestInitAllConfig(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	err := common.InitAllConfig()
 	content := map[string]string{
 		"message": "All configs has been initialized"}

diff --git a/src/api/rest/server/common/namespace.go b/src/api/rest/server/common/namespace.go
@@ -15,13 +15,18 @@ limitations under the License.
 package common
 
 import (
+	"net/http"
+
 	"github.com/labstack/echo/v4"
 
 	"github.com/cloud-barista/cb-tumblebug/src/core/common"
 )
 
 func RestCheckNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	if err := Validate(c, []string{"nsId"}); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
 	}
@@ -45,7 +50,10 @@ func RestCheckNs(c echo.Context) error {
 // @Failure 404 {object} common.SimpleMsg
 // @Router /ns [delete]
 func RestDelAllNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	err := common.DelAllNs()
 	content := map[string]string{"message": "All namespaces has been deleted"}
 	return common.EndRequestWithLog(c, reqID, err, content)
@@ -62,7 +70,10 @@ func RestDelAllNs(c echo.Context) error {
 // @Failure 404 {object} common.SimpleMsg
 // @Router /ns/{nsId} [delete]
 func RestDelNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	if err := Validate(c, []string{"nsId"}); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
 	}
@@ -97,7 +108,10 @@ type RestGetAllNsResponse struct {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /ns [get]
 func RestGetAllNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	optionFlag := c.QueryParam("option")
 
 	var content RestGetAllNsResponse
@@ -125,7 +139,11 @@ func RestGetAllNs(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /ns/{nsId} [get]
 func RestGetNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
+
 	if err := Validate(c, []string{"nsId"}); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
 	}
@@ -146,7 +164,10 @@ func RestGetNs(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /ns [post]
 func RestPostNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	u := &common.NsReq{}
 	if err := c.Bind(u); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
@@ -170,7 +191,10 @@ func RestPostNs(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /ns/{nsId} [put]
 func RestPutNs(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	u := &common.NsReq{}
 	if err := c.Bind(u); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)

diff --git a/src/api/rest/server/common/utility.go b/src/api/rest/server/common/utility.go
@@ -152,7 +152,10 @@ func RestGetSwagger(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /connConfig/{connConfigName} [get]
 func RestGetConnConfig(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	connConfigName := c.Param("connConfigName")
 
 	content, err := common.GetConnConfig(connConfigName)
@@ -172,7 +175,10 @@ func RestGetConnConfig(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /connConfig [get]
 func RestGetConnConfigList(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	content, err := common.GetConnConfigList()
 	return common.EndRequestWithLog(c, reqID, err, content)
 }
@@ -190,7 +196,10 @@ func RestGetConnConfigList(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /region/{regionName} [get]
 func RestGetRegion(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	regionName := c.Param("regionName")
 
 	content, err := common.GetRegion(regionName)
@@ -210,7 +219,10 @@ func RestGetRegion(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /region [get]
 func RestGetRegionList(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	content, err := common.GetRegionList()
 	return common.EndRequestWithLog(c, reqID, err, content)
 
@@ -345,7 +357,10 @@ type RestInspectResourcesRequest struct {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /inspectResources [post]
 func RestInspectResources(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	u := &RestInspectResourcesRequest{}
 	if err := c.Bind(u); err != nil {
 		return err
@@ -375,7 +390,10 @@ func RestInspectResources(c echo.Context) error {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /inspectResourcesOverview [get]
 func RestInspectResourcesOverview(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	content, err := mcis.InspectResourcesOverview()
 	return common.EndRequestWithLog(c, reqID, err, content)
 }
@@ -401,7 +419,10 @@ type RestRegisterCspNativeResourcesRequest struct {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /registerCspResources [post]
 func RestRegisterCspNativeResources(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	u := &RestRegisterCspNativeResourcesRequest{}
 	if err := c.Bind(u); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
@@ -434,7 +455,10 @@ type RestRegisterCspNativeResourcesRequestAll struct {
 // @Failure 500 {object} common.SimpleMsg
 // @Router /registerCspResourcesAll [post]
 func RestRegisterCspNativeResourcesAll(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	u := &RestRegisterCspNativeResourcesRequest{}
 	if err := c.Bind(u); err != nil {
 		return common.EndRequestWithLog(c, reqID, err, nil)
@@ -457,7 +481,10 @@ func RestRegisterCspNativeResourcesAll(c echo.Context) error {
 // @Success 200 {object} map[string]interface{}
 // @Router /forward/{path} [post]
 func RestForwardAnyReqToAny(c echo.Context) error {
-	reqID := common.StartRequestWithLog(c)
+	reqID, idErr := common.StartRequestWithLog(c)
+	if idErr != nil {
+		return c.JSON(http.StatusBadRequest, map[string]string{"message": idErr.Error()})
+	}
 	reqPath := c.Param("*")
 	reqPath, err := url.PathUnescape(reqPath)
 	if err != nil {