Merge pull request #3 from denverdino/master

Rebase master
denverdino · Oct 31, 2019 · bc5bf74 · bc5bf74
2 parents 669e8b4 + dba750c
commit bc5bf74
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/cs/clusters.go b/cs/clusters.go
@@ -31,7 +31,7 @@ const (
 	ClusterTypeKubernetes        = "Kubernetes"
 	ClusterTypeManagedKubernetes = "ManagedKubernetes"
 
-	ClusterTypeServelessKubernetes = "Ask"
+	ClusterTypeServerlessKubernetes = "Ask"
 )
 
 var NodeStableClusterState = []ClusterState{Running, Updating, Failed, DeleteFailed, Deleted, InActive}

diff --git a/cs/serverless.go b/cs/serverless.go
@@ -51,8 +51,8 @@ func (this *ServerlessCreationArgs) Validate() error {
 	return nil
 }
 
-//create serveless cluster
-func (client *Client) CreateServelessKubernetesCluster(args *ServerlessCreationArgs) (*ClusterCreationResponse, error) {
+//create Serverless cluster
+func (client *Client) CreateServerlessKubernetesCluster(args *ServerlessCreationArgs) (*ClusterCreationResponse, error) {
 	if args == nil {
 		return nil, common.GetCustomError("InvalidArgs", "The args is nil ")
 	}
@@ -62,7 +62,7 @@ func (client *Client) CreateServelessKubernetesCluster(args *ServerlessCreationA
 	}
 
 	//reset clusterType,
-	args.ClusterType = ClusterTypeServelessKubernetes
+	args.ClusterType = ClusterTypeServerlessKubernetes
 	cluster := &ClusterCreationResponse{}
 	err := client.Invoke(common.Region(args.RegionId), http.MethodPost, "/clusters", nil, args, &cluster)
 	if err != nil {
@@ -71,8 +71,8 @@ func (client *Client) CreateServelessKubernetesCluster(args *ServerlessCreationA
 	return cluster, nil
 }
 
-//describe serveless cluster
-func (client *Client) DescribeServelessKubernetesCluster(clusterId string) (*ServerlessClusterResponse, error) {
+//describe Serverless cluster
+func (client *Client) DescribeServerlessKubernetesCluster(clusterId string) (*ServerlessClusterResponse, error) {
 	cluster := &ServerlessClusterResponse{}
 	err := client.Invoke("", http.MethodGet, "/clusters/"+clusterId, nil, nil, cluster)
 	if err != nil {
@@ -81,8 +81,8 @@ func (client *Client) DescribeServelessKubernetesCluster(clusterId string) (*Ser
 	return cluster, nil
 }
 
-//describe serveless clsuters
-func (client *Client) DescribeServelessKubernetesClusters() ([]*ServerlessClusterResponse, error) {
+//describe Serverless clsuters
+func (client *Client) DescribeServerlessKubernetesClusters() ([]*ServerlessClusterResponse, error) {
 	allClusters := make([]*ServerlessClusterResponse, 0)
 	askClusters := make([]*ServerlessClusterResponse, 0)
 
@@ -92,7 +92,7 @@ func (client *Client) DescribeServelessKubernetesClusters() ([]*ServerlessCluste
 	}
 
 	for _, cluster := range allClusters {
-		if cluster.ClusterType == ClusterTypeServelessKubernetes {
+		if cluster.ClusterType == ClusterTypeServerlessKubernetes {
 			askClusters = append(askClusters, cluster)
 		}
 	}

diff --git a/cs/serverless_test.go b/cs/serverless_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-func Test_CreateServelessKubernetesCluster(t *testing.T) {
+func Test_CreateServerlessKubernetesCluster(t *testing.T) {
 	client := NewTestClientForDebug()
 
 	tags := make([]Tag, 0)
@@ -26,8 +26,8 @@ func Test_CreateServelessKubernetesCluster(t *testing.T) {
 	})
 
 	args := &ServerlessCreationArgs{
-		ClusterType:          ClusterTypeServelessKubernetes,
-		Name:                 fmt.Sprintf("serveless-cluster-%d", time.Now().Unix()),
+		ClusterType:          ClusterTypeServerlessKubernetes,
+		Name:                 fmt.Sprintf("Serverless-cluster-%d", time.Now().Unix()),
 		RegionId:             string(TestRegionID),
 		VpcId:                TestVpcId,
 		VSwitchId:            TestVSwitchId,
@@ -38,7 +38,7 @@ func Test_CreateServelessKubernetesCluster(t *testing.T) {
 		Tags:                 tags,
 	}
 
-	response, err := client.CreateServelessKubernetesCluster(args)
+	response, err := client.CreateServerlessKubernetesCluster(args)
 	if err != nil {
 		t.Errorf("Error %++v", err)
 	} else {
@@ -49,7 +49,7 @@ func Test_CreateServelessKubernetesCluster(t *testing.T) {
 func Test_DescribeCluster(t *testing.T) {
 	client := NewTestClientForDebug()
 
-	cluster, err := client.DescribeServelessKubernetesCluster(TestClusterId)
+	cluster, err := client.DescribeServerlessKubernetesCluster(TestClusterId)
 	if err != nil {
 		t.Errorf("Error = %++v", err)
 	} else {
@@ -69,7 +69,7 @@ func Test_DescribeClusterUserConfig(t *testing.T) {
 	}
 }
 
-func Test_DeleteServelessCluster(t *testing.T) {
+func Test_DeleteServerlessCluster(t *testing.T) {
 	client := NewTestClientForDebug()
 
 	err := client.DeleteCluster(TestClusterId)
@@ -80,9 +80,9 @@ func Test_DeleteServelessCluster(t *testing.T) {
 	}
 }
 
-func Test_DescribeServelessKubernetesClusters(t *testing.T) {
+func Test_DescribeServerlessKubernetesClusters(t *testing.T) {
 	client := NewTestClientForDebug()
-	clusters, err := client.DescribeServelessKubernetesClusters()
+	clusters, err := client.DescribeServerlessKubernetesClusters()
 	if err != nil {
 		t.Errorf("Error = %++v", err)
 	} else {

diff --git a/slb/vserver_group.go b/slb/vserver_group.go
@@ -9,6 +9,7 @@ type VBackendServerType struct {
 	Weight   int
 	Port     int
 	Type     string
+	Description string
 }
 
 type VServerGroup struct {