feat: switched to strict unmarshal in rule check

thanos-io · May 11, 2019 · 864a74c · 864a74c
1 parent 7631da5
commit 864a74c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/cmd/thanos/check.go b/cmd/thanos/check.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	thanosrule "github.com/improbable-eng/thanos/pkg/rule"
 	"github.com/oklog/run"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
@@ -56,6 +55,16 @@ func checkRulesFiles(logger log.Logger, files *[]string) error {
 	return nil
 }
 
+type ThanosRuleGroup struct{
+    PartialResponseStrategy string `yaml:"partial_response_strategy"`
+    rulefmt.RuleGroup `yaml:",inline"`
+}
+
+type ThanosRuleGroups struct {
+	Groups []ThanosRuleGroup `yaml:"groups"`
+}
+
+
 func checkRules(logger log.Logger, filename string) (int, tsdb.MultiError) {
 	level.Info(logger).Log("msg", "checking", "filename", filename)
 	checkErrors := tsdb.MultiError{}
@@ -66,8 +75,8 @@ func checkRules(logger log.Logger, filename string) (int, tsdb.MultiError) {
 		return 0, checkErrors
 	}
 
-	var rgs thanosrule.RuleGroups
-	if err := yaml.Unmarshal(b, &rgs); err != nil {
+	var rgs ThanosRuleGroups
+	if err := yaml.UnmarshalStrict(b, &rgs); err != nil {
 		checkErrors.Add(err)
 		return 0, checkErrors
 	}
@@ -89,7 +98,7 @@ func checkRules(logger log.Logger, filename string) (int, tsdb.MultiError) {
 	return numRules, checkErrors
 }
 
-func thanosRuleGroupsToPromRuleGroups(ruleGroups thanosrule.RuleGroups) rulefmt.RuleGroups {
+func thanosRuleGroupsToPromRuleGroups(ruleGroups ThanosRuleGroups) rulefmt.RuleGroups {
 	promRuleGroups := rulefmt.RuleGroups{Groups: []rulefmt.RuleGroup{}}
 	for _, g := range ruleGroups.Groups {
 		group := rulefmt.RuleGroup{

diff --git a/cmd/thanos/check_test.go b/cmd/thanos/check_test.go
@@ -17,6 +17,7 @@ func Test_checkRules(t *testing.T) {
 		[]string{"./testdata/rules-files/non-existing-file.yaml"},
 		[]string{"./testdata/rules-files/invalid-yaml-format.yaml"},
 		[]string{"./testdata/rules-files/invalid-rules-data.yaml"},
+		[]string{"./testdata/rules-files/invalid-unknown-field.yaml"},
 	}
 
 	logger := log.NewNopLogger()

diff --git a/cmd/thanos/testdata/rules-files/valid.yaml b/cmd/thanos/testdata/rules-files/valid.yaml
@@ -4,7 +4,6 @@ groups:
     interval: 2m
     rules:
       - alert: TestAlert
-        partial_response_strategy: "warn"
         expr: 1
         labels:
           key: value
@@ -17,4 +16,3 @@ groups:
     rules:
       - record: test_metric
         expr: 1
-        partial_response_strategy: "warn"