From 213dfd87e4fa4b306bc8878ca87327346cb906ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Sat, 17 Sep 2022 19:38:06 +0800 Subject: [PATCH] fix(region): cloudaccount options (#14990) --- pkg/compute/models/cloudaccounts.go | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index dd97c35fea..11eab645a0 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -416,27 +416,16 @@ func (manager *SCloudaccountManager) validateCreateData( input.Zone = obj.GetId() } - var endpointOptions jsonutils.JSONObject - - if input.SCloudaccountCredential.SHCSOEndpoints != nil { - endpointOptions = jsonutils.Marshal(input.SCloudaccountCredential.SHCSOEndpoints) - } - - if input.SCloudaccountCredential.SCtyunExtraOptions != nil { - endpointOptions = jsonutils.Marshal(input.SCloudaccountCredential.SCtyunExtraOptions) - } - if input.Options == nil { input.Options = jsonutils.NewDict() } + input.Options.Update(jsonutils.Marshal(input.SCloudaccountCredential.SHCSOEndpoints)) + input.Options.Update(jsonutils.Marshal(input.SCloudaccountCredential.SCtyunExtraOptions)) + if len(input.DefaultRegion) > 0 { input.Options.Add(jsonutils.NewString(input.DefaultRegion), "default_region") } - if endpointOptions != nil { - input.Options.Update(endpointOptions) - } - input.SCloudaccount, err = providerDriver.ValidateCreateCloudaccountData(ctx, userCred, input.SCloudaccountCredential) if err != nil { return input, err