opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: create lb listener rules fail due to domain not found (#19786)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2024-03-26 09:49:56 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 87e5add5e8
commit d690f923ed
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/fetch.go
+1 -1
View File
@@ -271,7 +271,7 @@ var (
"project_domain_id",
"domain_id",
"project_domain",
"domain",
// "domain",
}
)
pkg/compute/models/loadbalancerlistenerrules.go
+6 -5
View File
@@ -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)