Merge pull request #1407 from cloudflare/issue-1405

Fix relaxed parser

Author: prymitive

docs/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.73.1
+
+### Fixed
+
+- Fixed `relaxed` parsing mode not finding all rules in some files - [#1405](https://github.com/cloudflare/pint/issues/1405).
+
 ## v0.73.0
 
 ### Changed

internal/parser/parser.go

@@ -101,18 +101,20 @@ To allow for multi-document YAML files set parser->relaxed option in pint config
 func (p *Parser) parseNode(node, parent *yaml.Node, group *Group, offsetLine, offsetColumn int, contentLines []string) (groups []Group) {
 	switch node.Kind { // nolint: exhaustive
 	case yaml.SequenceNode:
-		if parent != nil && nodeValue(parent) == "groups" {
-			for _, n := range unpackNodes(node) {
-				if g, rulesMap, ok := tryParseGroup(n, offsetLine, offsetColumn, contentLines); ok {
-					groups = append(groups, p.parseNode(rulesMap.val, rulesMap.key, &g, offsetLine, offsetColumn, contentLines)...)
-				}
+		// First check for group list
+		for _, n := range unpackNodes(node) {
+			if g, rulesMap, ok := tryParseGroup(n, offsetLine, offsetColumn, contentLines); ok {
+				groups = append(groups, p.parseNode(rulesMap.val, rulesMap.key, &g, offsetLine, offsetColumn, contentLines)...)
 			}
+		}
+		if len(groups) > 0 {
 			return groups
 		}
-		// Try parsing rules.
+
 		if group == nil {
 			group = &Group{} // nolint: exhaustruct
 		}
+		// Try parsing rules.
 		for _, n := range unpackNodes(node) {
 			if ret, isEmpty := parseRule(n, offsetLine, offsetColumn, contentLines); !isEmpty {
 				group.Rules = append(group.Rules, ret)
@@ -122,7 +124,9 @@ func (p *Parser) parseNode(node, parent *yaml.Node, group *Group, offsetLine, of
 		if len(group.Rules) > 0 || (parent != nil && nodeValue(parent) == "rules" && len(groups) == 0 && group != nil) {
 			groups = append(groups, *group)
 		}
-		return groups
+		if len(groups) > 0 {
+			return groups
+		}
 	case yaml.MappingNode:
 		for _, field := range mappingNodes(node) {
 			groups = append(groups, p.parseNode(field.val, field.key, group, offsetLine, offsetColumn, contentLines)...)

internal/parser/parser_test.go

@@ -5037,6 +5037,100 @@ groups:
 				},
 			},
 		},
+		{
+			input: []byte(`
+- name: xxx
+  interval: 3m
+  query_offset: 1s
+  limit: 5
+  labels:
+    foo: bar
+  rules:
+  - record: up:count
+    expr: count(up)
+`),
+			output: parser.File{
+				IsRelaxed: true,
+				Groups: []parser.Group{
+					{
+						Name:        "xxx",
+						Interval:    time.Minute * 3,
+						QueryOffset: time.Second,
+						Limit:       5,
+						Labels: &parser.YamlMap{
+							Key: &parser.YamlNode{
+								Value: "labels",
+							},
+							Items: []*parser.YamlKeyValue{
+								{
+									Key: &parser.YamlNode{
+										Value: "foo",
+									},
+									Value: &parser.YamlNode{
+										Value: "bar",
+									},
+								},
+							},
+						},
+						Rules: []parser.Rule{
+							{
+								Lines: diags.LineRange{First: 9, Last: 10},
+								RecordingRule: &parser.RecordingRule{
+									Record: parser.YamlNode{
+										Value: "up:count",
+										Pos:   diags.PositionRanges{{Line: 9, FirstColumn: 13, LastColumn: 20}},
+									},
+									Expr: parser.PromQLExpr{
+										Value: &parser.YamlNode{
+											Value: "count(up)",
+											Pos:   diags.PositionRanges{{Line: 10, FirstColumn: 11, LastColumn: 19}},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			input: []byte(`
+
+- interval: 3m
+  query_offset: 1s
+  limit: 5
+  labels:
+    foo: bar
+  rules:
+  - record: up:count
+    expr: count(up)
+`),
+			output: parser.File{
+				IsRelaxed: true,
+				Groups: []parser.Group{
+					{
+						Name: "",
+						Rules: []parser.Rule{
+							{
+								Lines: diags.LineRange{First: 9, Last: 10},
+								RecordingRule: &parser.RecordingRule{
+									Record: parser.YamlNode{
+										Value: "up:count",
+										Pos:   diags.PositionRanges{{Line: 9, FirstColumn: 13, LastColumn: 20}},
+									},
+									Expr: parser.PromQLExpr{
+										Value: &parser.YamlNode{
+											Value: "count(up)",
+											Pos:   diags.PositionRanges{{Line: 10, FirstColumn: 11, LastColumn: 19}},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 
 	alwaysEqual := cmp.Comparer(func(_, _ any) bool { return true })