Add csp connection info to k8s cluster info

cloud-barista · Oct 2, 2024 · 07e7c75 · 07e7c75
2 parents cb578d2 + 7362a15
commit 07e7c75
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 0 deletions.
diff --git a/src/api/rest/docs/docs.go b/src/api/rest/docs/docs.go
@@ -12644,6 +12644,14 @@ const docTemplate = `{
         "model.TbK8sClusterInfo": {
             "type": "object",
             "properties": {
+                "connectionConfig": {
+                    "description": "ConnectionConfig shows connection info to cloud service provider",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.ConnConfig"
+                        }
+                    ]
+                },
                 "connectionName": {
                     "type": "string",
                     "example": "alibaba-ap-northeast-2"

diff --git a/src/api/rest/docs/swagger.json b/src/api/rest/docs/swagger.json
@@ -12638,6 +12638,14 @@
         "model.TbK8sClusterInfo": {
             "type": "object",
             "properties": {
+                "connectionConfig": {
+                    "description": "ConnectionConfig shows connection info to cloud service provider",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.ConnConfig"
+                        }
+                    ]
+                },
                 "connectionName": {
                     "type": "string",
                     "example": "alibaba-ap-northeast-2"

diff --git a/src/api/rest/docs/swagger.yaml b/src/api/rest/docs/swagger.yaml
@@ -9391,6 +9391,11 @@ components:
     model.TbK8sClusterInfo:
       type: object
       properties:
+        connectionConfig:
+          type: object
+          description: ConnectionConfig shows connection info to cloud service provider
+          allOf:
+          - $ref: '#/components/schemas/model.ConnConfig'
         connectionName:
           type: string
           example: alibaba-ap-northeast-2

diff --git a/src/core/model/k8scluster.go b/src/core/model/k8scluster.go
@@ -309,6 +309,9 @@ type TbK8sClusterInfo struct {
 	Name           string `json:"name" example:"aws-ap-southeast-1"`
 	ConnectionName string `json:"connectionName" example:"alibaba-ap-northeast-2"`
 
+	// ConnectionConfig shows connection info to cloud service provider
+	ConnectionConfig ConnConfig `json:"connectionConfig"`
+
 	/*
 		Version string `json:"version" example:"1.30.1-aliyun.1"` // Kubernetes Version, ex) 1.23.3
 

diff --git a/src/core/resource/k8scluster.go b/src/core/resource/k8scluster.go
@@ -82,6 +82,12 @@ func CreateK8sCluster(nsId string, req *model.TbK8sClusterReq, option string) (m
 		return emptyObj, err
 	}
 
+	connectionConfig, err := common.GetConnConfig(req.ConnectionName)
+	if err != nil {
+		err = fmt.Errorf("Cannot retrieve ConnectionConfig" + err.Error())
+		log.Error().Err(err).Msg("")
+	}
+
 	/*
 	 * Build RequestBody for model.SpiderClusterReq{}
 	 */
@@ -265,6 +271,7 @@ func CreateK8sCluster(nsId string, req *model.TbK8sClusterReq, option string) (m
 		CspResourceId:           spClusterRes.ClusterInfo.IId.SystemId,
 		Name:                    reqId,
 		ConnectionName:          req.ConnectionName,
+		ConnectionConfig:        connectionConfig,
 		Description:             req.Description,
 		CspViewK8sClusterDetail: spClusterRes.ClusterInfo,
 	}