Merge pull request #176 from openinfradev/release

Release
openinfradev · Oct 26, 2023 · b6c9460 · b6c9460
2 parents 0063468 + cfbf211
commit b6c9460
Show file tree

Hide file tree

Showing 12 changed files with 367 additions and 13 deletions.
diff --git a/api/swagger/docs.go b/api/swagger/docs.go
@@ -634,6 +634,45 @@ const docTemplate = `{
                 }
             }
         },
+        "/clusters/import": {
+            "post": {
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
+                "description": "Import cluster",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Clusters"
+                ],
+                "summary": "Import cluster",
+                "parameters": [
+                    {
+                        "description": "import cluster request",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/domain.ImportClusterRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/domain.ImportClusterResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/clusters/{clusterId}": {
             "get": {
                 "security": [
@@ -4398,6 +4437,12 @@ const docTemplate = `{
                 "isStack": {
                     "type": "boolean"
                 },
+                "kubeconfig": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
                 "name": {
                     "type": "string"
                 },
@@ -5661,6 +5706,45 @@ const docTemplate = `{
                 }
             }
         },
+        "domain.ImportClusterRequest": {
+            "type": "object",
+            "required": [
+                "name",
+                "organizationId",
+                "stackTemplateId"
+            ],
+            "properties": {
+                "clusterType": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "kubeconfig": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "name": {
+                    "type": "string"
+                },
+                "organizationId": {
+                    "type": "string"
+                },
+                "stackTemplateId": {
+                    "type": "string"
+                }
+            }
+        },
+        "domain.ImportClusterResponse": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            }
+        },
         "domain.ListOrganizationBody": {
             "type": "object",
             "properties": {
@@ -6758,7 +6842,7 @@ const docTemplate = `{
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
 	Version:          "1.0",
-	Host:             "tks-api-dev.taco-cat.xyz",
+	Host:             "tks-api-ft.taco-cat.xyz",
 	BasePath:         "/api/1.0/",
 	Schemes:          []string{},
 	Title:            "tks-api service",

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -13,7 +13,7 @@
         },
         "version": "1.0"
     },
-    "host": "tks-api-dev.taco-cat.xyz",
+    "host": "tks-api-ft.taco-cat.xyz",
     "basePath": "/api/1.0/",
     "paths": {
         "/app-groups": {
@@ -627,6 +627,45 @@
                 }
             }
         },
+        "/clusters/import": {
+            "post": {
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
+                "description": "Import cluster",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Clusters"
+                ],
+                "summary": "Import cluster",
+                "parameters": [
+                    {
+                        "description": "import cluster request",
+                        "name": "body",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/domain.ImportClusterRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/domain.ImportClusterResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/clusters/{clusterId}": {
             "get": {
                 "security": [
@@ -4391,6 +4430,12 @@
                 "isStack": {
                     "type": "boolean"
                 },
+                "kubeconfig": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
                 "name": {
                     "type": "string"
                 },
@@ -5654,6 +5699,45 @@
                 }
             }
         },
+        "domain.ImportClusterRequest": {
+            "type": "object",
+            "required": [
+                "name",
+                "organizationId",
+                "stackTemplateId"
+            ],
+            "properties": {
+                "clusterType": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "kubeconfig": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "name": {
+                    "type": "string"
+                },
+                "organizationId": {
+                    "type": "string"
+                },
+                "stackTemplateId": {
+                    "type": "string"
+                }
+            }
+        },
+        "domain.ImportClusterResponse": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            }
+        },
         "domain.ListOrganizationBody": {
             "type": "object",
             "properties": {

diff --git a/api/swagger/swagger.yaml b/api/swagger/swagger.yaml
@@ -391,6 +391,10 @@ definitions:
         type: string
       isStack:
         type: boolean
+      kubeconfig:
+        items:
+          type: integer
+        type: array
       name:
         type: string
       organizationId:
@@ -1232,6 +1236,32 @@ definitions:
             type: string
         type: object
     type: object
+  domain.ImportClusterRequest:
+    properties:
+      clusterType:
+        type: string
+      description:
+        type: string
+      kubeconfig:
+        items:
+          type: integer
+        type: array
+      name:
+        type: string
+      organizationId:
+        type: string
+      stackTemplateId:
+        type: string
+    required:
+    - name
+    - organizationId
+    - stackTemplateId
+    type: object
+  domain.ImportClusterResponse:
+    properties:
+      id:
+        type: string
+    type: object
   domain.ListOrganizationBody:
     properties:
       createdAt:
@@ -1949,7 +1979,7 @@ definitions:
       text:
         type: string
     type: object
-host: tks-api-dev.taco-cat.xyz
+host: tks-api-ft.taco-cat.xyz
 info:
   contact:
     email: taekyu.kang@sk.com
@@ -2502,6 +2532,30 @@ paths:
       summary: Get cluster site values for creating
       tags:
       - Clusters
+  /clusters/import:
+    post:
+      consumes:
+      - application/json
+      description: Import cluster
+      parameters:
+      - description: import cluster request
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/domain.ImportClusterRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/domain.ImportClusterResponse'
+      security:
+      - JWT: []
+      summary: Import cluster
+      tags:
+      - Clusters
   /organizations:
     get:
       consumes:

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -29,7 +29,7 @@ func init() {
 	flag.String("dbport", "5432", "port of postgreSQL")
 	flag.String("dbuser", "postgres", "postgreSQL user")
 	flag.String("dbpassword", "password", "password for postgreSQL user")
-	flag.String("kubeconfig-path", "/Users/1110640/.kube/config_dev", "path of kubeconfig. used development only!")
+	flag.String("kubeconfig-path", "", "path of kubeconfig. used development only!")
 	flag.String("jwt-secret", "tks-api-secret", "secret value of jwt")
 	flag.String("git-base-url", "https://github.com", "git base url")
 	flag.String("git-account", "decapod10", "git account of admin cluster")
@@ -91,7 +91,7 @@ func init() {
 // @in                          header
 // @name                        Authorization
 
-// @host tks-api-dev.taco-cat.xyz
+// @host tks-api-ft.taco-cat.xyz
 // @BasePath /api/1.0/
 func main() {
 	log.Info("*** Arguments *** ")

diff --git a/internal/delivery/http/cluster.go b/internal/delivery/http/cluster.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/openinfradev/tks-api/internal/pagination"
 	"github.com/openinfradev/tks-api/internal/serializer"
@@ -190,6 +191,49 @@ func (h *ClusterHandler) CreateCluster(w http.ResponseWriter, r *http.Request) {
 	ResponseJSON(w, r, http.StatusOK, out)
 }
 
+// ImportCluster godoc
+// @Tags Clusters
+// @Summary Import cluster
+// @Description Import cluster
+// @Accept json
+// @Produce json
+// @Param body body domain.ImportClusterRequest true "import cluster request"
+// @Success 200 {object} domain.ImportClusterResponse
+// @Router /clusters/import [post]
+// @Security     JWT
+func (h *ClusterHandler) ImportCluster(w http.ResponseWriter, r *http.Request) {
+	input := domain.ImportClusterRequest{}
+	err := UnmarshalRequestInput(r, &input)
+	if err != nil {
+		ErrorJSON(w, r, err)
+		return
+	}
+
+	var dto domain.Cluster
+	if err = serializer.Map(input, &dto); err != nil {
+		log.InfoWithContext(r.Context(), err)
+	}
+
+	if err = serializer.Map(input, &dto.Conf); err != nil {
+		log.InfoWithContext(r.Context(), err)
+	}
+	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 {
+		ErrorJSON(w, r, err)
+		return
+	}
+
+	var out domain.ImportClusterResponse
+	out.ID = clusterId.String()
+
+	ResponseJSON(w, r, http.StatusOK, out)
+}
+
 // InstallCluster godoc
 // @Tags Clusters
 // @Summary Install cluster on tks cluster

diff --git a/internal/repository/cluster.go b/internal/repository/cluster.go
@@ -215,7 +215,7 @@ func (r *ClusterRepository) GetByName(organizationId string, name string) (out d
 func (r *ClusterRepository) Create(dto domain.Cluster) (clusterId domain.ClusterId, err error) {
 	var cloudAccountId *uuid.UUID
 	cloudAccountId = &dto.CloudAccountId
-	if dto.CloudService == domain.CloudService_BYOH {
+	if dto.CloudService == domain.CloudService_BYOH || dto.CloudAccountId == uuid.Nil {
 		cloudAccountId = nil
 	}
 	cluster := Cluster{