Merge pull request #1465 from ioito/hotfix/qx-aws-cluster-rds

fix(aws): cluster rds sync

Author: ioito

pkg/apis/compute/dbinstance_const.go

@@ -106,6 +106,8 @@ const (
 	AWS_DBINSTANCE_CATEGORY_EXPRESS_EDITION    = "Express Edition"
 	AWS_DBINSTANCE_CATEGORY_STANDARD_EDITION   = "Standard Edition"
 	AWS_DBINSTANCE_CATEGORY_WEB_EDITION        = "Web Edition"
+
+	AWS_DBINSTANCE_CATEGORY_CLUSTER = "Cluster"
 	// Oracle
 	AWS_DBINSTANCE_CATEGORY_STANDARD_EDITION_TWO = "Standard Edition Two"
 

pkg/multicloud/aws/dbinstance.go

@@ -119,11 +119,6 @@ type SDBInstance struct {
 	CopyTagsToSnapshot         bool               `xml:"CopyTagsToSnapshot"`
 }
 
-type SDBInstances struct {
-	DBInstances []SDBInstance `xml:"DBInstances>DBInstance"`
-	Marker      string        `xml:"Marker"`
-}
-
 func (rds *SDBInstance) GetName() string {
 	return rds.DBInstanceIdentifier
 }
@@ -297,24 +292,17 @@ func (rds *SDBInstance) Refresh() error {
 }
 
 func (region *SRegion) GetDBInstance(instanceId string) (*SDBInstance, error) {
-	instances, _, err := region.GetDBInstances(instanceId, "")
+	instances, err := region.GetDBInstances(instanceId)
 	if err != nil {
 		return nil, errors.Wrap(err, "GetDBInstances")
 	}
-
-	if len(instances) == 1 {
-		if instances[0].DbiResourceId == instanceId {
-			instances[0].region = region
-			return &instances[0], nil
+	for i := range instances {
+		if instances[i].DbiResourceId == instanceId {
+			instances[i].region = region
+			return &instances[i], nil
 		}
-		return nil, cloudprovider.ErrNotFound
 	}
-
-	if len(instances) == 0 {
-		return nil, cloudprovider.ErrNotFound
-	}
-
-	return nil, cloudprovider.ErrDuplicateId
+	return nil, errors.Wrapf(cloudprovider.ErrNotFound, instanceId)
 }
 
 func (rds *SDBInstance) GetZone1Id() string {
@@ -421,65 +409,67 @@ func (rds *SDBInstance) CreateIBackup(conf *cloudprovider.SDBInstanceBackupCreat
 	return ret.DBSnapshot.GetGlobalId(), nil
 }
 
-func (region *SRegion) GetDBInstances(instanceId, marker string) ([]SDBInstance, string, error) {
-	instances := SDBInstances{}
+func (region *SRegion) GetDBInstances(instanceId string) ([]SDBInstance, error) {
 	params := map[string]string{}
 	idx := 1
 	if len(instanceId) > 0 {
 		params[fmt.Sprintf("Filters.Filter.%d.Name", idx)] = "dbi-resource-id"
 		params[fmt.Sprintf("Filters.Filter.%d.Values.Value.1", idx)] = instanceId
 	}
-
-	if len(marker) > 0 {
-		params["Marker"] = marker
+	ret := []SDBInstance{}
+	for {
+		part := struct {
+			DBInstances []SDBInstance `xml:"DBInstances>DBInstance"`
+			Marker      string        `xml:"Marker"`
+		}{}
+		err := region.rdsRequest("DescribeDBInstances", params, &part)
+		if err != nil {
+			return nil, errors.Wrap(err, "DescribeDBInstances")
+		}
+		ret = append(ret, part.DBInstances...)
+		if len(part.DBInstances) == 0 || len(part.Marker) == 0 {
+			break
+		}
+		params["Marker"] = part.Marker
 	}
 
-	err := region.rdsRequest("DescribeDBInstances", params, &instances)
-	if err != nil {
-		return nil, "", errors.Wrap(err, "DescribeDBInstances")
-	}
-	return instances.DBInstances, instances.Marker, nil
+	return ret, nil
 }
 
 func (region *SRegion) GetIDBInstances() ([]cloudprovider.ICloudDBInstance, error) {
-	idbinstances := []cloudprovider.ICloudDBInstance{}
-	instances, marker, err := region.GetDBInstances("", "")
+	ret := []cloudprovider.ICloudDBInstance{}
+	instances, err := region.GetDBInstances("")
 	if err != nil {
 		return nil, errors.Wrap(err, "GetDBInstances")
 	}
-	for i := 0; i < len(instances); i++ {
+	for i := range instances {
 		instances[i].region = region
-		idbinstances = append(idbinstances, &instances[i])
+		ret = append(ret, &instances[i])
 	}
-	for len(marker) > 0 {
-		instances, marker, err = region.GetDBInstances("", marker)
-		if err != nil {
-			return nil, errors.Wrap(err, "GetDBInstances")
-		}
-		for i := 0; i < len(instances); i++ {
-			instances[i].region = region
-			idbinstances = append(idbinstances, &instances[i])
-		}
+	clusters, err := region.GetDBInstanceClusters("")
+	if err != nil {
+		return nil, errors.Wrap(err, "GetDBInstanceClusters")
 	}
-	return idbinstances, nil
+	for i := range clusters {
+		clusters[i].region = region
+		ret = append(ret, &clusters[i])
+	}
+	return ret, nil
 }
 
 func (self *SRegion) GetIDBInstanceById(id string) (cloudprovider.ICloudDBInstance, error) {
-	instances, _, err := self.GetDBInstances(id, "")
-	if err != nil {
-		return nil, errors.Wrap(err, "GetDBInstances")
-	}
-
-	if len(instances) > 1 {
-		return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, id)
+	if strings.HasPrefix(id, "db-") {
+		ret, err := self.GetDBInstance(id)
+		if err != nil {
+			return nil, errors.Wrap(err, "GetDBInstance")
+		}
+		return ret, nil
 	}
-
-	if len(instances) == 0 {
-		return nil, errors.Wrapf(cloudprovider.ErrNotFound, id)
+	cluster, err := self.GetDBInstanceCluster(id)
+	if err != nil {
+		return nil, errors.Wrap(err, "GetDBInstanceCluster")
 	}
-
-	instances[0].region = self
-	return &instances[0], nil
+	return cluster, nil
 }
 
 func (self *SRegion) CreateIDBInstance(desc *cloudprovider.SManagedDBInstanceCreateConfig) (cloudprovider.ICloudDBInstance, error) {