fix(region): purge account bugfix

忽略由于证书缓存与负载均衡监听关联导致purge账号失败的问题
This commit is contained in:
TangBin
2020-11-20 17:43:49 +08:00
parent 767e06a1d0
commit 96d2e24034
3 changed files with 7 additions and 3 deletions
@@ -114,6 +114,10 @@ func (self *SCachedLoadbalancerCertificate) ValidateDeleteCondition(ctx context.
return nil
}
func (self *SCachedLoadbalancerCertificate) ValidatePurgeCondition(ctx context.Context) error {
return nil
}
func (self *SCachedLoadbalancerCertificate) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
return nil
}
+1 -1
View File
@@ -176,7 +176,7 @@ func (lbcert *SCachedLoadbalancerCertificate) purge(ctx context.Context, userCre
lockman.LockObject(ctx, lbcert)
defer lockman.ReleaseObject(ctx, lbcert)
err := lbcert.ValidateDeleteCondition(ctx)
err := lbcert.ValidatePurgeCondition(ctx)
if err != nil {
return err
}
+2 -2
View File
@@ -191,11 +191,11 @@ func validateClientCloudenv(client *aliyun.SAliyunClient) error {
if isFinanceAccount {
if regions[0].GetCloudEnv() != "FinanceCloud" {
return errors.Wrap(httperrors.ErrInvalidCredential,"aksk is aliyun finance account")
return errors.Wrap(httperrors.ErrInvalidCredential, "aksk is aliyun finance account")
}
} else {
if regions[0].GetCloudEnv() == "FinanceCloud" {
return errors.Wrap(httperrors.ErrInvalidCredential,"aksk is not aliyun finance account")
return errors.Wrap(httperrors.ErrInvalidCredential, "aksk is not aliyun finance account")
}
}