From e5289f8a4c3a9529465013d1e3cdc5df11894294 Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 20 Nov 2020 15:45:10 +0800 Subject: [PATCH] fix(region): delete aliyun account bugfix --- pkg/compute/regiondrivers/managedvirtual.go | 2 +- pkg/multicloud/aliyun/elasticcache_instance.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index 7b1302a876..fc76b988f0 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -2289,7 +2289,7 @@ func (self *SManagedVirtualizationRegionDriver) RequestElasticcacheUpdateBackupP } func (self *SManagedVirtualizationRegionDriver) ValidateCreateElasticcacheAccountData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { - if name, _ := data.GetString("name");name == "root" { + if name, _ := data.GetString("name"); name == "root" { return nil, httperrors.NewConflictError("account name 'root' is not allowed") } diff --git a/pkg/multicloud/aliyun/elasticcache_instance.go b/pkg/multicloud/aliyun/elasticcache_instance.go index 0b3c425852..7d1af2b347 100644 --- a/pkg/multicloud/aliyun/elasticcache_instance.go +++ b/pkg/multicloud/aliyun/elasticcache_instance.go @@ -882,7 +882,8 @@ func (self *SElasticcache) GetSecurityGroupIds() ([]string, error) { func (self *SElasticcache) GetICloudElasticcacheAccount(accountId string) (cloudprovider.ICloudElasticcacheAccount, error) { segs := strings.Split(accountId, "/") if len(segs) < 2 { - return nil, errors.Wrap(fmt.Errorf("%s", accountId), "elasticcache.GetICloudElasticcacheAccount invalid account id ") + log.Debugf("elasticcache.GetICloudElasticcacheAccount invalid account id %s", accountId) + return nil, errors.Wrap(cloudprovider.ErrNotFound, "invalid account id") } return self.GetICloudElasticcacheAccountByName(segs[1])