Merge pull request #1222 from seokho-son/main

Provide show or hide option for sshKey in access info
cloud-barista · Oct 20, 2022 · bd7cb32 · bd7cb32
2 parents 9d46645 + aef070d
commit bd7cb32
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git a/src/api/rest/docs/docs.go b/src/api/rest/docs/docs.go
@@ -1792,17 +1792,21 @@ const docTemplate = `{
                     },
                     {
                         "type": "string",
-                        "default": "connectionName",
-                        "description": "(for option==id) Field key for filtering (ex: connectionName)",
+                        "description": "(For option==id) Field key for filtering (ex: connectionName)",
                         "name": "filterKey",
                         "in": "query"
                     },
                     {
                         "type": "string",
-                        "default": "aws-ap-northeast-2",
-                        "description": "(for option==id) Field value for filtering (ex: aws-ap-northeast-2)",
+                        "description": "(For option==id) Field value for filtering (ex: aws-ap-northeast-2)",
                         "name": "filterVal",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "(For option==accessinfo) accessInfoOption (showSshKey)",
+                        "name": "accessInfoOption",
+                        "in": "query"
                     }
                 ],
                 "responses": {

diff --git a/src/api/rest/docs/swagger.json b/src/api/rest/docs/swagger.json
@@ -1784,17 +1784,21 @@
                     },
                     {
                         "type": "string",
-                        "default": "connectionName",
-                        "description": "(for option==id) Field key for filtering (ex: connectionName)",
+                        "description": "(For option==id) Field key for filtering (ex: connectionName)",
                         "name": "filterKey",
                         "in": "query"
                     },
                     {
                         "type": "string",
-                        "default": "aws-ap-northeast-2",
-                        "description": "(for option==id) Field value for filtering (ex: aws-ap-northeast-2)",
+                        "description": "(For option==id) Field value for filtering (ex: aws-ap-northeast-2)",
                         "name": "filterVal",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "(For option==accessinfo) accessInfoOption (showSshKey)",
+                        "name": "accessInfoOption",
+                        "in": "query"
                     }
                 ],
                 "responses": {

diff --git a/src/api/rest/docs/swagger.yaml b/src/api/rest/docs/swagger.yaml
@@ -3589,16 +3589,18 @@ paths:
         in: query
         name: option
         type: string
-      - default: connectionName
-        description: '(for option==id) Field key for filtering (ex: connectionName)'
+      - description: '(For option==id) Field key for filtering (ex: connectionName)'
         in: query
         name: filterKey
         type: string
-      - default: aws-ap-northeast-2
-        description: '(for option==id) Field value for filtering (ex: aws-ap-northeast-2)'
+      - description: '(For option==id) Field value for filtering (ex: aws-ap-northeast-2)'
         in: query
         name: filterVal
         type: string
+      - description: (For option==accessinfo) accessInfoOption (showSshKey)
+        in: query
+        name: accessInfoOption
+        type: string
       produces:
       - application/json
       responses:

diff --git a/src/api/rest/server/mcis/manageInfo.go b/src/api/rest/server/mcis/manageInfo.go
@@ -42,8 +42,9 @@ type JSONResult struct {
 // @Param nsId path string true "Namespace ID" default(ns01)
 // @Param mcisId path string true "MCIS ID" default(mcis01)
 // @Param option query string false "Option" Enums(default, id, status, accessinfo)
-// @Param filterKey query string false "(for option==id) Field key for filtering (ex: connectionName)" default(connectionName)
-// @Param filterVal query string false "(for option==id) Field value for filtering (ex: aws-ap-northeast-2)" default(aws-ap-northeast-2)
+// @Param filterKey query string false "(For option=id) Field key for filtering (ex: connectionName)"
+// @Param filterVal query string false "(For option=id) Field value for filtering (ex: aws-ap-northeast-2)"
+// @Param accessInfoOption query string false "(For option=accessinfo) accessInfoOption (showSshKey)"
 // @success 200 {object} JSONResult{[DEFAULT]=mcis.TbMcisInfo,[ID]=common.IdList,[STATUS]=mcis.McisStatusInfo,[AccessInfo]=mcis.McisAccessInfo} "Different return structures by the given action param"
 // @Failure 404 {object} common.SimpleMsg
 // @Failure 500 {object} common.SimpleMsg
@@ -56,6 +57,7 @@ func RestGetMcis(c echo.Context) error {
 	option := c.QueryParam("option")
 	filterKey := c.QueryParam("filterKey")
 	filterVal := c.QueryParam("filterVal")
+	accessInfoOption := c.QueryParam("accessInfoOption")
 
 	if option == "id" {
 		content := common.IdList{}
@@ -85,7 +87,7 @@ func RestGetMcis(c echo.Context) error {
 
 	} else if option == "accessinfo" {
 
-		result, err := mcis.GetMcisAccessInfo(nsId, mcisId)
+		result, err := mcis.GetMcisAccessInfo(nsId, mcisId, accessInfoOption)
 		if err != nil {
 			mapA := map[string]string{"message": err.Error()}
 			return c.JSON(http.StatusInternalServerError, &mapA)

diff --git a/src/core/mcis/manageInfo.go b/src/core/mcis/manageInfo.go
@@ -325,7 +325,7 @@ func GetMcisInfo(nsId string, mcisId string) (*TbMcisInfo, error) {
 }
 
 // GetMcisAccessInfo is func to retrieve MCIS Access information
-func GetMcisAccessInfo(nsId string, mcisId string) (*McisAccessInfo, error) {
+func GetMcisAccessInfo(nsId string, mcisId string, option string) (*McisAccessInfo, error) {
 
 	output := &McisAccessInfo{}
 	temp := &McisAccessInfo{}
@@ -378,7 +378,11 @@ func GetMcisAccessInfo(nsId string, mcisId string) (*McisAccessInfo, error) {
 			vmAccessInfo.SSHPort = vmInfo.SSHPort
 
 			_, verifiedUserName, privateKey := GetVmSshKey(nsId, mcisId, vmId)
-			vmAccessInfo.PrivateKey = privateKey
+
+			if strings.EqualFold(option, "showSshKey") {
+				vmAccessInfo.PrivateKey = privateKey
+			}
+
 			vmAccessInfo.VmUserAccount = verifiedUserName
 			//vmAccessInfo.VmUserPassword