From d690f923ede6a5374884b5a55636a13d4b4c6291 Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Tue, 26 Mar 2024 09:49:56 +0800 Subject: [PATCH] fix: create lb listener rules fail due to domain not found (#19786) Co-authored-by: Qiu Jian --- pkg/cloudcommon/db/fetch.go | 2 +- pkg/compute/models/loadbalancerlistenerrules.go | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/cloudcommon/db/fetch.go b/pkg/cloudcommon/db/fetch.go index 70be13bf03..45417019ee 100644 --- a/pkg/cloudcommon/db/fetch.go +++ b/pkg/cloudcommon/db/fetch.go @@ -271,7 +271,7 @@ var ( "project_domain_id", "domain_id", "project_domain", - "domain", + // "domain", } ) diff --git a/pkg/compute/models/loadbalancerlistenerrules.go b/pkg/compute/models/loadbalancerlistenerrules.go index 351f948edf..69b11cc62b 100644 --- a/pkg/compute/models/loadbalancerlistenerrules.go +++ b/pkg/compute/models/loadbalancerlistenerrules.go @@ -513,18 +513,19 @@ func (manager *SLoadbalancerListenerRuleManager) FilterByUniqValues(q *sqlchemy. func (man *SLoadbalancerListenerRuleManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, - input *api.LoadbalancerListenerRuleCreateInput) (*api.LoadbalancerListenerRuleCreateInput, error) { + input *api.LoadbalancerListenerRuleCreateInput, +) (*api.LoadbalancerListenerRuleCreateInput, error) { var err error input.StatusStandaloneResourceCreateInput, err = man.SStatusStandaloneResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, input.StatusStandaloneResourceCreateInput) if err != nil { - return nil, err + return nil, errors.Wrap(err, "SStatusStandaloneResourceBaseManager.ValidateCreateData") } if len(input.Status) == 0 { input.Status = api.LB_STATUS_ENABLED } listenerObj, err := validators.ValidateModel(ctx, userCred, LoadbalancerListenerManager, &input.ListenerId) if err != nil { - return nil, err + return nil, errors.Wrap(err, "ValidateModel LoadbalancerListenerManager") } listener := listenerObj.(*SLoadbalancerListener) if listener.ListenerType != api.LB_LISTENER_TYPE_HTTP && listener.ListenerType != api.LB_LISTENER_TYPE_HTTPS { @@ -532,12 +533,12 @@ func (man *SLoadbalancerListenerRuleManager) ValidateCreateData(ctx context.Cont } region, err := listener.GetRegion() if err != nil { - return nil, err + return nil, errors.Wrap(err, "listener.GetRegion") } if region.GetDriver().IsSupportLoadbalancerListenerRuleRedirect() { _, err := validators.ValidateModel(ctx, userCred, LoadbalancerBackendGroupManager, &input.BackendGroupId) if err != nil { - return nil, err + return nil, errors.Wrap(err, "ValidateModel LoadbalancerBackendGroupManager") } } return region.GetDriver().ValidateCreateLoadbalancerListenerRuleData(ctx, userCred, ownerId, input)