Merge pull request #5 from tukaelu/fix/validategranularity

fix: missing for granularity validation
tukaelu · Oct 15, 2023 · 5c4f91c · 5c4f91c
2 parents b02e6e1 + 863db4f
commit 5c4f91c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/internal/validator/validator.go b/internal/validator/validator.go
@@ -43,7 +43,7 @@ func ValidateMetricRetantionPeriod(from, to int64) error {
 
 // ValidateGranularity ...
 func ValidateGranularity(s string) error {
-	valid := []string{"1m", "5m", "30m", "4h", "1d", "1w"}
+	valid := []string{"1m", "5m", "10m", "1h", "2h", "4h", "1d"}
 	if !slices.Contains(valid, s) {
 		return fmt.Errorf("unsupported granularity pattern %s has been set", s)
 	}

diff --git a/internal/validator/validator_test.go b/internal/validator/validator_test.go
@@ -24,3 +24,15 @@ func TestValidateMetricRetantionPeriod(t *testing.T) {
 		"specified for a metric retention period of one day beyond that specified.",
 	)
 }
+
+func TestValidateGranularity(t *testing.T) {
+	expectedErr := fmt.Errorf("unsupported granularity pattern 1w has been set")
+	assert.Equal(t, nil, ValidateGranularity("1m"), "The specified granularity that is supported.")
+	assert.Equal(t, nil, ValidateGranularity("5m"), "The specified granularity that is supported.")
+	assert.Equal(t, nil, ValidateGranularity("10m"), "The specified granularity that is supported.")
+	assert.Equal(t, nil, ValidateGranularity("1h"), "The specified granularity that is supported.")
+	assert.Equal(t, nil, ValidateGranularity("2h"), "The specified granularity that is supported.")
+	assert.Equal(t, nil, ValidateGranularity("4h"), "The specified granularity that is supported.")
+	assert.Equal(t, nil, ValidateGranularity("1d"), "The specified granularity that is supported.")
+	assert.Equal(t, expectedErr, ValidateGranularity("1w"), "Unsupported granularity was specified.")
+}