opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11905 from ioito/hotfix/qx-cloudevent-hcso

Browse Source 
fix(cloudevent): hcso event fix
This commit is contained in:
Zexi Li
2021-08-15 00:12:38 +08:00
committed by GitHub
parent 569bde0a3d 6f129378e0
commit c4c979deca
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudevent/models/cloudproviders.go
+13 -2
View File
@@ -303,8 +303,9 @@ func (self *SCloudprovider) GetNextTimeRange() (time.Time, time.Time, error) {
}
type SCloudproviderDelegate struct {
Id string
Name string
Id string
Name string
CloudaccountId string
Enabled bool
Status string
@@ -336,6 +337,16 @@ func (self *SCloudprovider) GetDelegate() (*SCloudproviderDelegate, error) {
if err != nil {
return nil, errors.Wrap(err, "result.Unmarshal")
}
if provider.Provider == api.CLOUD_PROVIDER_APSARA || provider.Provider == api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK {
result, err := modules.Cloudaccounts.Get(s, provider.CloudaccountId, nil)
if err != nil {
return nil, errors.Wrapf(err, "modules.Cloudaccounts.Get")
}
err = result.Unmarshal(&provider.Options, "options")
if err != nil {
return nil, errors.Wrap(err, "result.Unmarshal")
}
}
return provider, nil
}