Merge pull request #195 from openinfradev/release

20231103 release to develop
openinfradev · Nov 3, 2023 · 5b0bac6 · 5b0bac6
2 parents c71a1aa + 78f1af0
commit 5b0bac6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/api/swagger/docs.go b/api/swagger/docs.go
@@ -4650,6 +4650,9 @@ const docTemplate = `{
                 "clusterRegion": {
                     "type": "string"
                 },
+                "clusterType": {
+                    "type": "string"
+                },
                 "sshKeyName": {
                     "type": "string"
                 },

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -4643,6 +4643,9 @@
                 "clusterRegion": {
                     "type": "string"
                 },
+                "clusterType": {
+                    "type": "string"
+                },
                 "sshKeyName": {
                     "type": "string"
                 },

diff --git a/api/swagger/swagger.yaml b/api/swagger/swagger.yaml
@@ -531,6 +531,8 @@ definitions:
         type: integer
       clusterRegion:
         type: string
+      clusterType:
+        type: string
       sshKeyName:
         type: string
       tksCpNode:

diff --git a/internal/delivery/http/cluster.go b/internal/delivery/http/cluster.go
@@ -220,7 +220,6 @@ func (h *ClusterHandler) ImportCluster(w http.ResponseWriter, r *http.Request) {
 	dto.Conf.SetDefault()
 	log.InfoWithContext(r.Context(), dto.Conf)
 
-	dto.CloudService = "AWS"
 	dto.CloudAccountId = uuid.Nil
 	clusterId, err := h.usecase.Import(r.Context(), dto)
 	if err != nil {

diff --git a/pkg/domain/cluster.go b/pkg/domain/cluster.go
@@ -247,6 +247,7 @@ type SimpleClusterResponse struct {
 }
 
 type ClusterSiteValuesResponse struct {
+	ClusterType            string `json:"clusterType"`
 	SshKeyName             string `json:"sshKeyName"`
 	ClusterRegion          string `json:"clusterRegion"`
 	TksCpNode              int    `json:"tksCpNode"`