Staging v0.8.10

cloud-barista · May 15, 2024 · 203a835 · 203a835
2 parents 47b7016 + 454f004
commit 203a835
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/scripts/runMapUI.sh b/scripts/runMapUI.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CONTAINER_NAME_READ="CB-MapUI"
-CONTAINER_VERSION="0.8.14"
+CONTAINER_VERSION="0.8.16"
 CONTAINER_PORT="-p 1324:1324"
 CONTAINER_DATA_PATH=""
 

diff --git a/src/api/rest/docs/docs.go b/src/api/rest/docs/docs.go
@@ -7593,6 +7593,13 @@ const docTemplate = `{
                 ],
                 "summary": "Get registered region info",
                 "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Name of the CSP to retrieve",
+                        "name": "providerName",
+                        "in": "path",
+                        "required": true
+                    },
                     {
                         "type": "string",
                         "description": "Name of region to retrieve",

diff --git a/src/api/rest/docs/swagger.json b/src/api/rest/docs/swagger.json
@@ -7586,6 +7586,13 @@
                 ],
                 "summary": "Get registered region info",
                 "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Name of the CSP to retrieve",
+                        "name": "providerName",
+                        "in": "path",
+                        "required": true
+                    },
                     {
                         "type": "string",
                         "description": "Name of region to retrieve",

diff --git a/src/api/rest/docs/swagger.yaml b/src/api/rest/docs/swagger.yaml
@@ -7965,6 +7965,11 @@ paths:
       - application/json
       description: Get registered region info
       parameters:
+      - description: Name of the CSP to retrieve
+        in: path
+        name: providerName
+        required: true
+        type: string
       - description: Name of region to retrieve
         in: path
         name: regionName

diff --git a/src/api/rest/server/common/utility.go b/src/api/rest/server/common/utility.go
@@ -258,6 +258,7 @@ func RestGetProviderList(c echo.Context) error {
 // @Tags [Admin] Multi-Cloud environment configuration
 // @Accept  json
 // @Produce  json
+// @Param providerName path string true "Name of the CSP to retrieve"
 // @Param regionName path string true "Name of region to retrieve"
 // @Success 200 {object} common.RegionDetail
 // @Failure 404 {object} common.SimpleMsg

diff --git a/src/api/rest/server/server.go b/src/api/rest/server/server.go
@@ -170,7 +170,7 @@ func RunServer(port string) {
 	e.GET("/tumblebug/connConfig", rest_common.RestGetConnConfigList)
 	e.GET("/tumblebug/connConfig/:connConfigName", rest_common.RestGetConnConfig)
 	e.GET("/tumblebug/provider", rest_common.RestGetProviderList)
-	e.GET("/tumblebug/provider/:providerName/region", rest_common.RestGetRegionList)
+	e.GET("/tumblebug/region", rest_common.RestGetRegionList)
 	e.GET("/tumblebug/provider/:providerName/region/:regionName", rest_common.RestGetRegion)
 	e.POST("/tumblebug/credential", rest_common.RestRegisterCredential)