Run same rule validation as Prometheus

cmd/pint/tests/0006_rr_labels.txt

@@ -4,9 +4,9 @@ cmp stderr stderr.txt
 
 -- stderr.txt --
 level=info msg="Loading configuration file" path=.pint.hcl
-level=info msg="File parsed" path=rules/0001.yml rules=2
-rules/0001.yml:8: incomplete rule, no alert or record key (yaml/parse)
-  - expr: sum(foo)
+level=error msg="Failed to unmarshal file content" error="0:0: group \"foo\", rule 2, \"\": one of 'record' or 'alert' must be set" lines=1-10 path=rules/0001.yml
+rules/0001.yml:1: 0:0: group "foo", rule 2, "": one of 'record' or 'alert' must be set (yaml/parse)
+groups:
 
 level=info msg="Problems found" Fatal=1
 level=fatal msg="Fatal error" error="problems found"

cmd/pint/tests/0074_strict_error.txt

@@ -0,0 +1,21 @@
+pint.error --no-color lint rules
+! stdout .
+cmp stderr stderr.txt
+
+-- stderr.txt --
+level=error msg="Failed to unmarshal file content" error="yaml: unmarshal errors:\n  line 2: field alert not found in type rulefmt.RuleGroup\n  line 3: field expr not found in type rulefmt.RuleGroup\n  line 4: field for not found in type rulefmt.RuleGroup\n  line 5: field labels not found in type rulefmt.RuleGroup\n  line 8: field annotations not found in type rulefmt.RuleGroup" lines=1-9 path=rules/strict.yml
+rules/strict.yml:2: field alert not found in type rulefmt.RuleGroup (yaml/parse)
+- alert: Conntrack_Table_Almost_Full
+
+level=info msg="Problems found" Fatal=1
+level=fatal msg="Fatal error" error="problems found"
+-- rules/strict.yml --
+groups:
+- alert: Conntrack_Table_Almost_Full
+  expr: ((node_nf_conntrack_entries / node_nf_conntrack_entries_limit) * 100) > 75
+  for: 5m
+  labels:
+    component: conntrack
+    priority: "3"
+  annotations:
+    summary: Conntrack table is at {{ $value|humanize }}%

docs/changelog.md

@@ -18,6 +18,11 @@
   the results. Previously it would try to run a single query for a whole week
   and if that failed it would reduce time range until a query would succeed.
 
+### Fixed
+
+- Strict parsing mode didn't fully validate rule group files, this is now fixed
+  and pint runs the same set of checks as Prometheus.
+
 ## v0.21.1
 
 ### Fixed

internal/discovery/discovery.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/prometheus/prometheus/model/rulefmt"
-	"gopkg.in/yaml.v3"
 
 	"github.com/cloudflare/pint/internal/output"
 	"github.com/cloudflare/pint/internal/parser"
@@ -53,20 +52,21 @@ func readFile(path string, isStrict bool) (entries []Entry, err error) {
 	fileOwner, _ := parser.GetComment(string(content), FileOwnerComment)
 
 	if isStrict {
-		var r rulefmt.RuleGroups
-		if err = yaml.Unmarshal(content, &r); err != nil {
-			log.Error().
-				Err(err).
-				Str("path", path).
-				Str("lines", output.FormatLineRangeString(contentLines)).
-				Msg("Failed to unmarshal file content")
-			entries = append(entries, Entry{
-				Path:          path,
-				PathError:     err,
-				Owner:         fileOwner.Value,
-				ModifiedLines: contentLines,
-			})
-			return entries, nil
+		if _, errs := rulefmt.Parse(content); len(errs) > 0 {
+			for _, err := range errs {
+				log.Error().
+					Err(err).
+					Str("path", path).
+					Str("lines", output.FormatLineRangeString(contentLines)).
+					Msg("Failed to unmarshal file content")
+				entries = append(entries, Entry{
+					Path:          path,
+					PathError:     err,
+					Owner:         fileOwner.Value,
+					ModifiedLines: contentLines,
+				})
+				return entries, nil
+			}
 		}
 	}
 

internal/discovery/glob_test.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/prometheus/prometheus/model/rulefmt"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
 
 	"github.com/cloudflare/pint/internal/discovery"
 	"github.com/cloudflare/pint/internal/parser"
@@ -33,8 +32,7 @@ func TestGlobPathFinder(t *testing.T) {
 	testRules, err := p.Parse([]byte(testRuleBody))
 	require.NoError(t, err)
 
-	var r rulefmt.RuleGroups
-	strictErr := yaml.Unmarshal([]byte(testRuleBody), &r)
+	_, strictErrs := rulefmt.Parse([]byte(testRuleBody))
 
 	testCases := []testCaseT{
 		{
@@ -92,7 +90,7 @@ func TestGlobPathFinder(t *testing.T) {
 			entries: []discovery.Entry{
 				{
 					Path:          "bar.yml",
-					PathError:     strictErr,
+					PathError:     strictErrs[0],
 					ModifiedLines: []int{1, 2, 3, 4},
 					Owner:         "bob",
 				},

internal/parser/parser_test.go

@@ -35,7 +35,7 @@ func TestParse(t *testing.T) {
 			shouldError: true,
 		},
 		{
-			content: []byte(string("- 0: 0\n  00000000: 000000\n  000000:00000000000: 00000000\n  00000000000:000000: 0000000000000000000000000000000000\n  000000: 0000000\n  expr: |")),
+			content: []byte("- 0: 0\n  00000000: 000000\n  000000:00000000000: 00000000\n  00000000000:000000: 0000000000000000000000000000000000\n  000000: 0000000\n  expr: |"),
 			output: []parser.Rule{
 				{Error: parser.ParseError{Err: fmt.Errorf("incomplete rule, no alert or record key"), Line: 6}},
 			},