From 711fbb6c3bee0e6ff5a951e7ecefa395db4ab0fa Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 18 Jun 2021 18:04:04 +0800 Subject: [PATCH] fix(region): skip disabled project mapping --- pkg/compute/models/cloudproviders.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 41f55dcbae..42f1818d7b 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -123,7 +123,13 @@ type pmCache struct { func (self *pmCache) GetProjectMapping() (*SProjectMapping, error) { if len(self.ManagerProjectMappingId) > 0 { - return GetRuleMapping(self.ManagerProjectMappingId) + pm, err := GetRuleMapping(self.ManagerProjectMappingId) + if err != nil { + return nil, errors.Wrapf(err, "GetRuleMapping(%s)", self.ManagerProjectMappingId) + } + if pm.Enabled.IsTrue() { + return pm, nil + } } if len(self.AccountProjectMappingId) > 0 { return GetRuleMapping(self.AccountProjectMappingId)