Merge pull request #7735 from rainzm/schedulertask/fix

fix(compute): return InputParameterError while ValidateCreateData

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 {

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{"", "一", "二", "三", "四", "五", "六", "日"}