cron: adding validation for range or hyphenated inputs for start and …

…end (#1836) Signed-off-by: Ritikaa96 <[email protected]>
kedacore · Jun 2, 2021 · dff7b32 · dff7b32
1 parent e882be5
commit dff7b32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/pkg/scalers/cron_scaler.go b/pkg/scalers/cron_scaler.go
@@ -74,11 +74,17 @@ func parseCronMetadata(config *ScalerConfig) (*cronMetadata, error) {
 		return nil, fmt.Errorf("no timezone specified. %s", config.TriggerMetadata)
 	}
 	if val, ok := config.TriggerMetadata["start"]; ok && val != "" {
+		if strings.Contains(val, "-") {
+			return nil, fmt.Errorf("error parsing start schedule. %s: range or hyphenated inputs are not allowed", config.TriggerMetadata)
+		}
 		meta.start = val
 	} else {
 		return nil, fmt.Errorf("no start schedule specified. %s", config.TriggerMetadata)
 	}
 	if val, ok := config.TriggerMetadata["end"]; ok && val != "" {
+		if strings.Contains(val, "-") {
+			return nil, fmt.Errorf("error parsing end schedule. %s: range or hyphenated inputs are not allowed", config.TriggerMetadata)
+		}
 		meta.end = val
 	} else {
 		return nil, fmt.Errorf("no end schedule specified. %s", config.TriggerMetadata)

diff --git a/pkg/scalers/cron_scaler_test.go b/pkg/scalers/cron_scaler_test.go
@@ -31,6 +31,11 @@ var testCronMetadata = []parseCronMetadataTestData{
 	{validCronMetadata, false},
 	{map[string]string{"timezone": "Asia/Kolkata", "start": "30 * * * *", "end": "45 * * * *"}, true},
 	{map[string]string{"start": "30 * * * *", "end": "45 * * * *", "desiredReplicas": "10"}, true},
+	{map[string]string{"timezone": "Asia/Kolkata", "start": "30-33 * * * *", "end": "45 * * * *", "desiredReplicas": "10"}, true},
+	{map[string]string{"timezone": "Asia/Kolkata", "start": "30 * * * *", "end": "45-50 * * * *", "desiredReplicas": "10"}, true},
+	{map[string]string{"timezone": "Asia/Kolkata", "start": "-30 * * * *", "end": "45 * * * *", "desiredReplicas": "10"}, true},
+	{map[string]string{"timezone": "Asia/Kolkata", "start": "30 * * * *", "end": "-50 * * * *", "desiredReplicas": "10"}, true},
+	{map[string]string{"timezone": "Asia/Kolkata", "start": "30 * * * *", "end": "50 * * -3 *", "desiredReplicas": "10"}, true},
 }
 
 var cronMetricIdentifiers = []cronMetricIdentifier{