From 96d2e2403440b613a8f3292b0885a0bc156d40e1 Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 20 Nov 2020 17:43:49 +0800 Subject: [PATCH] fix(region): purge account bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 忽略由于证书缓存与负载均衡监听关联导致purge账号失败的问题 --- pkg/compute/models/loadbalancercachedcertificates.go | 4 ++++ pkg/compute/models/purge.go | 2 +- pkg/multicloud/aliyun/provider/provider.go | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/loadbalancercachedcertificates.go b/pkg/compute/models/loadbalancercachedcertificates.go index 83dd6835d8..5ca4e5d6da 100644 --- a/pkg/compute/models/loadbalancercachedcertificates.go +++ b/pkg/compute/models/loadbalancercachedcertificates.go @@ -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 } diff --git a/pkg/compute/models/purge.go b/pkg/compute/models/purge.go index 34c3689bd0..0d54e8f565 100644 --- a/pkg/compute/models/purge.go +++ b/pkg/compute/models/purge.go @@ -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 } diff --git a/pkg/multicloud/aliyun/provider/provider.go b/pkg/multicloud/aliyun/provider/provider.go index 4769dce358..8fd6db40df 100644 --- a/pkg/multicloud/aliyun/provider/provider.go +++ b/pkg/multicloud/aliyun/provider/provider.go @@ -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") } }