Minor cleanup of validate fallback logic

Signed-off-by: Misha Griffiths <mishamo@gmail.com>
kedacore · Jul 7, 2021 · 2c4d7f3 · 2c4d7f3
1 parent ee560c5
commit 2c4d7f3
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/pkg/provider/fallback.go b/pkg/provider/fallback.go
@@ -38,26 +38,20 @@ func (p *KedaProvider) getMetricsWithFallback(scaler scalers.Scaler, metricName
 
 	p.updateStatus(scaledObject)
 
-	if !validateFallback(scaledObject, metricSpec) {
-		logger.Info("Failed to validate ScaledObject Spec. Please check that parameters are positive integers")
-		return nil, err
-	}
-
 	switch {
 	case !isFallbackEnabled(scaledObject, metricSpec):
 		return nil, err
+	case !validateFallback(scaledObject):
+		logger.Info("Failed to validate ScaledObject Spec. Please check that parameters are positive integers")
+		return nil, err
 	case *healthStatus.NumberOfFailures > scaledObject.Spec.Fallback.FailureThreshold:
 		return doFallback(scaledObject, metricSpec, metricName, err), nil
 	default:
 		return nil, err
 	}
 }
 
-func validateFallback(scaledObject *kedav1alpha1.ScaledObject, metricSpec v2beta2.MetricSpec) bool {
-	if !isFallbackEnabled(scaledObject, metricSpec) {
-		return true
-	}
-
+func validateFallback(scaledObject *kedav1alpha1.ScaledObject) bool {
 	return scaledObject.Spec.Fallback.FailureThreshold >= 0 &&
 		scaledObject.Spec.Fallback.Replicas >= 0
 }