opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18625 from swordqiu/hotfix/qj-cloud-provider-external-id

Browse Source 
fix: cloudprovider external id
This commit is contained in:
Zexi Li
2023-11-10 16:40:09 +08:00
committed by GitHub
parent ca29c4d441 404b26d8b1
commit c5c57cdd20
3 changed files with 308 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/cloudprovider.go
+2
View File
@@ -245,6 +245,8 @@ type CloudproviderListInput struct {
ManagedResourceListInput
apis.ProjectizedResourceListInput
apis.ExternalizedResourceBaseListInput
UsableResourceListInput
CloudregionResourceInput
pkg/compute/models/cloudaccounts.go
+300 -286
View File
File diff suppressed because it is too large Load Diff
pkg/compute/models/cloudproviders.go
+6
View File
@@ -53,6 +53,7 @@ import (
type SCloudproviderManager struct {
db.SEnabledStatusStandaloneResourceBaseManager
db.SProjectizedResourceBaseManager
db.SExternalizedResourceBaseManager
SProjectMappingResourceBaseManager
SSyncableBaseResourceManager
@@ -75,6 +76,7 @@ func init() {
type SCloudprovider struct {
db.SEnabledStatusStandaloneResourceBase
db.SProjectizedResourceBase
db.SExternalizedResourceBase
SSyncableBaseResource
@@ -1341,6 +1343,10 @@ func (manager *SCloudproviderManager) ListItemFilter(
if err != nil {
return nil, errors.Wrap(err, "SSyncableBaseResourceManager.ListItemFilter")
}
q, err = manager.SExternalizedResourceBaseManager.ListItemFilter(ctx, q, userCred, query.ExternalizedResourceBaseListInput)
if err != nil {
return nil, errors.Wrap(err, "SExternalizedResourceBaseManager.ListItemFilter")
}
managerStrs := query.CloudproviderId
conditions := []sqlchemy.ICondition{}