diff --git a/pkg/apis/compute/cloudaccount.go b/pkg/apis/compute/cloudaccount.go index a6efdce933..fe906b44ec 100644 --- a/pkg/apis/compute/cloudaccount.go +++ b/pkg/apis/compute/cloudaccount.go @@ -517,8 +517,8 @@ type SyncRangeInput struct { Host []string `json:"host"` // 按资源类型同步,可输入多个 - // enmu: compute, network, loadbalancer, objectstore, rds, cache, nat, nas, waf, mongodb, es, kafka, app, container - Resources []string `json:"resources" choices:"compute|network|loadbalancer|objectstore|rds|cache|nat|nas|waf|mongodb|es|kafka|app|container|eip|tablestore"` + // enmu: project, compute, network, eip, loadbalancer, objectstore, rds, cache, event, cloudid, dnszone, public_ip, intervpcnetwork, saml_auth, quota, nat, nas, waf, mongodb, es, kafka, app, cdn, container, ipv6_gateway, tablestore, modelarts, vpcpeer, misc + Resources []string `json:"resources" choices:"project|compute|network|eip|loadbalancer|objectstore|rds|cache|event|cloudid|dnszone|public_ip|intervpcnetwork|saml_auth|quota|nat|nas|waf|mongodb|es|kafka|app|cdn|container|ipv6_gateway|tablestore|modelarts|vpcpeer|misc"` } type SAccountPermission struct { diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 7b43dacc1b..a591edf58a 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -509,6 +509,10 @@ func (sr *SSyncRange) GetRegionIds() ([]string, error) { } func (sr *SSyncRange) NeedSyncResource(res string) bool { + if sr.FullSync { + return true + } + if len(sr.Resources) == 0 { return true } diff --git a/pkg/compute/tasks/cloud_account_sync_task.go b/pkg/compute/tasks/cloud_account_sync_task.go index 0760197312..93a6321768 100644 --- a/pkg/compute/tasks/cloud_account_sync_task.go +++ b/pkg/compute/tasks/cloud_account_sync_task.go @@ -83,11 +83,9 @@ func (self *CloudAccountSyncInfoTask) OnCloudaccountSyncReady(ctx context.Contex return } - if syncRange.FullSync { - err := models.SyncCloudaccountResources(ctx, self.GetUserCred(), cloudaccount, &syncRange) - if err != nil { - log.Errorf("SyncAccountResources error: %v", err) - } + err := models.SyncCloudaccountResources(ctx, self.GetUserCred(), cloudaccount, &syncRange) + if err != nil { + log.Errorf("SyncAccountResources error: %v", err) } cloudproviders := cloudaccount.GetEnabledCloudproviders()