mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-24 16:03:43 +08:00
fix(region): purge account bugfix
忽略由于证书缓存与负载均衡监听关联导致purge账号失败的问题
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user