feat: add cdn cluster id for scheduler cluster (#580)

* feat: add cdn cluster id
* docs: swagger api

Signed-off-by: Gaius <gaius.qi@gmail.com>

Author: gaius-qi

api/manager/docs.go

@@ -1839,6 +1839,9 @@ var doc = `{
                 "bio": {
                     "type": "string"
                 },
+                "cdn_cluster_id": {
+                    "type": "integer"
+                },
                 "client_config": {
                     "type": "object",
                     "additionalProperties": true
@@ -2012,6 +2015,9 @@ var doc = `{
                 "bio": {
                     "type": "string"
                 },
+                "cdn_cluster_id": {
+                    "type": "integer"
+                },
                 "client_config": {
                     "type": "object",
                     "additionalProperties": true

api/manager/swagger.json

@@ -1824,6 +1824,9 @@
                 "bio": {
                     "type": "string"
                 },
+                "cdn_cluster_id": {
+                    "type": "integer"
+                },
                 "client_config": {
                     "type": "object",
                     "additionalProperties": true
@@ -1997,6 +2000,9 @@
                 "bio": {
                     "type": "string"
                 },
+                "cdn_cluster_id": {
+                    "type": "integer"
+                },
                 "client_config": {
                     "type": "object",
                     "additionalProperties": true

api/manager/swagger.yaml

@@ -212,6 +212,8 @@ definitions:
     properties:
       bio:
         type: string
+      cdn_cluster_id:
+        type: integer
       client_config:
         additionalProperties: true
         type: object
@@ -333,6 +335,8 @@ definitions:
     properties:
       bio:
         type: string
+      cdn_cluster_id:
+        type: integer
       client_config:
         additionalProperties: true
         type: object

manager/router/router.go

@@ -122,7 +122,7 @@ func Init(console bool, verbose bool, publicPath string, service service.REST, e
 	c.GET(":id", h.GetCDN)
 	c.GET("", h.GetCDNs)
 
-	// roles
+	// Role
 	re := apiv1.Group("/roles", jwt.MiddlewareFunc(), rbac)
 	re.POST("", h.CreateRole)
 	re.GET("", h.GetRoles)

manager/service/scheduler_cluster.go

@@ -35,6 +35,12 @@ func (s *rest) CreateSchedulerCluster(json types.CreateSchedulerClusterRequest)
 		return nil, err
 	}
 
+	if json.CDNClusterID > 0 {
+		if err := s.AddSchedulerClusterToCDNCluster(json.CDNClusterID, schedulerCluster.ID); err != nil {
+			return nil, err
+		}
+	}
+
 	return &schedulerCluster, nil
 }
 
@@ -59,6 +65,12 @@ func (s *rest) CreateSchedulerClusterWithSecurityGroupDomain(json types.CreateSc
 		return nil, err
 	}
 
+	if json.CDNClusterID > 0 {
+		if err := s.AddSchedulerClusterToCDNCluster(json.CDNClusterID, schedulerCluster.ID); err != nil {
+			return nil, err
+		}
+	}
+
 	return &schedulerCluster, nil
 }
 
@@ -83,6 +95,12 @@ func (s *rest) UpdateSchedulerCluster(id uint, json types.UpdateSchedulerCluster
 		return nil, err
 	}
 
+	if json.CDNClusterID > 0 {
+		if err := s.AddSchedulerClusterToCDNCluster(json.CDNClusterID, schedulerCluster.ID); err != nil {
+			return nil, err
+		}
+	}
+
 	return &schedulerCluster, nil
 }
 
@@ -107,6 +125,12 @@ func (s *rest) UpdateSchedulerClusterWithSecurityGroupDomain(id uint, json types
 		return nil, err
 	}
 
+	if json.CDNClusterID > 0 {
+		if err := s.AddSchedulerClusterToCDNCluster(json.CDNClusterID, schedulerCluster.ID); err != nil {
+			return nil, err
+		}
+	}
+
 	return &schedulerCluster, nil
 }
 

manager/types/scheduler_cluster.go

@@ -32,6 +32,7 @@ type CreateSchedulerClusterRequest struct {
 	ClientConfig        map[string]interface{} `json:"client_config" binding:"required"`
 	Scopes              map[string]interface{} `json:"scopes" binding:"omitempty"`
 	IsDefault           bool                   `json:"is_default" binding:"omitempty"`
+	CDNClusterID        uint                   `json:"cdn_cluster_id" binding:"omitempty"`
 	SecurityGroupDomain string                 `json:"security_group_domain" binding:"omitempty"`
 }
 
@@ -42,6 +43,7 @@ type UpdateSchedulerClusterRequest struct {
 	ClientConfig        map[string]interface{} `json:"client_config" binding:"omitempty"`
 	Scopes              map[string]interface{} `json:"scopes" binding:"omitempty"`
 	IsDefault           bool                   `json:"is_default" binding:"omitempty"`
+	CDNClusterID        uint                   `json:"cdn_cluster_id" binding:"omitempty"`
 	SecurityGroupDomain string                 `json:"security_group_domain" binding:"omitempty"`
 }