fix: 避免同步不到其他域的云账号

yunionio · Jun 29, 2020 · ef0242d · ef0242d
1 parent 0d18266
commit ef0242d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/pkg/cloudevent/models/cloudproviders.go b/pkg/cloudevent/models/cloudproviders.go
@@ -74,14 +74,27 @@ type SCloudprovider struct {
 
 func (manager *SCloudproviderManager) GetRegionCloudproviders(ctx context.Context, userCred mcclient.TokenCredential) ([]SCloudprovider, error) {
 	s := session.GetSession(ctx, userCred)
+
+	data := []jsonutils.JSONObject{}
+	offset := int64(0)
 	params := jsonutils.NewDict()
-	result, err := modules.Cloudproviders.List(s, params)
-	if err != nil {
-		return nil, errors.Wrap(err, "modules.Cloudproviders.List")
+	params.Set("scope", jsonutils.NewString("system"))
+	params.Set("limit", jsonutils.NewInt(1024))
+	for {
+		params.Set("offset", jsonutils.NewInt(offset))
+		result, err := modules.Cloudproviders.List(s, params)
+		if err != nil {
+			return nil, errors.Wrap(err, "modules.Cloudproviders.List")
+		}
+		data = append(data, result.Data...)
+		if len(data) >= result.Total {
+			break
+		}
+		offset += 1024
 	}
 
 	providers := []SCloudprovider{}
-	err = jsonutils.Update(&providers, result.Data)
+	err := jsonutils.Update(&providers, data)
 	if err != nil {
 		return nil, errors.Wrap(err, "jsonutils.Update")
 	}

diff --git a/pkg/cloudid/models/cloudaccount.go b/pkg/cloudid/models/cloudaccount.go
@@ -73,13 +73,27 @@ type SCloudaccount struct {
 
 func (manager *SCloudaccountManager) GetICloudaccounts() ([]SCloudaccount, error) {
 	s := auth.GetAdminSession(context.Background(), options.Options.Region, "")
+
+	data := []jsonutils.JSONObject{}
+	offset := int64(0)
 	params := jsonutils.NewDict()
-	result, err := modules.Cloudaccounts.List(s, params)
-	if err != nil {
-		return nil, errors.Wrap(err, "modules.Cloudaccounts.List")
+	params.Set("scope", jsonutils.NewString("system"))
+	params.Set("limit", jsonutils.NewInt(1024))
+	for {
+		params.Set("offset", jsonutils.NewInt(offset))
+		result, err := modules.Cloudaccounts.List(s, params)
+		if err != nil {
+			return nil, errors.Wrap(err, "modules.Cloudaccounts.List")
+		}
+		data = append(data, result.Data...)
+		if len(data) >= result.Total {
+			break
+		}
+		offset += 1024
 	}
+
 	accounts := []SCloudaccount{}
-	err = jsonutils.Update(&accounts, result.Data)
+	err := jsonutils.Update(&accounts, data)
 	if err != nil {
 		return nil, errors.Wrap(err, "jsonutils.Update")
 	}