From 89ad3778cd9f144131519d40319aed499db504b2 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Sun, 15 Aug 2021 00:05:50 +0800 Subject: [PATCH] fix(cloudevent): hcso event fix --- pkg/cloudevent/models/cloudproviders.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/cloudevent/models/cloudproviders.go b/pkg/cloudevent/models/cloudproviders.go index 448e24d446..2bf4961983 100644 --- a/pkg/cloudevent/models/cloudproviders.go +++ b/pkg/cloudevent/models/cloudproviders.go @@ -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 @@ -331,6 +332,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 }