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

fix(region): cloudaccount options (#14990)

Browse Source
This commit is contained in:
屈轩
2022-09-17 19:38:06 +08:00
committed by GitHub
parent ac3b54d7b3
commit 213dfd87e4
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+3 -14
View File
@@ -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