From f11a1df3a5af1a72fa827b926a1162e15fdd0663 Mon Sep 17 00:00:00 2001 From: rainzm Date: Thu, 3 Sep 2020 15:19:04 +0800 Subject: [PATCH] fix(compute): return InputParameterError while ValidateCreateData --- pkg/compute/models/scaling_trigger.go | 9 ++++++--- pkg/compute/models/scheduled_tasks.go | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/compute/models/scaling_trigger.go b/pkg/compute/models/scaling_trigger.go index ec0903d716..53ad0841ec 100644 --- a/pkg/compute/models/scaling_trigger.go +++ b/pkg/compute/models/scaling_trigger.go @@ -171,10 +171,13 @@ func (st *SScalingTimer) ValidateCreateData(input api.ScalingPolicyCreateInput) var err error if input.TriggerType == api.TRIGGER_TIMING { input.Timer, err = checkTimerCreateInput(input.Timer) - return input, err + } else { + input.CycleTimer, err = checkCycleTimerCreateInput(input.CycleTimer) } - input.CycleTimer, err = checkCycleTimerCreateInput(input.CycleTimer) - return input, err + if err != nil { + return input, httperrors.NewInputParameterError(err.Error()) + } + return input, nil } func (st *SScalingTimer) Register(ctx context.Context, userCred mcclient.TokenCredential) error { diff --git a/pkg/compute/models/scheduled_tasks.go b/pkg/compute/models/scheduled_tasks.go index 2833ad97d7..f9c1c6dccf 100644 --- a/pkg/compute/models/scheduled_tasks.go +++ b/pkg/compute/models/scheduled_tasks.go @@ -178,7 +178,10 @@ func (stm *SScheduledTaskManager) ValidateCreateData(ctx context.Context, userCr } else { input.CycleTimer, err = checkCycleTimerCreateInput(input.CycleTimer) } - return input, err + if err != nil { + return input, httperrors.NewInputParameterError(err.Error()) + } + return input, nil } var wdsCN = []string{"", "一", "二", "三", "四", "五", "六", "日"}