Fix ruler tests.

Signed-off-by: Peter Štibraný <[email protected]>

Author: pstibrany

pkg/ruler/api.go

@@ -18,7 +18,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/rulefmt"
 	"github.com/weaveworks/common/user"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/ruler/rulespb"

pkg/ruler/mapper.go

@@ -10,7 +10,7 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/prometheus/model/rulefmt"
 	"github.com/spf13/afero"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // mapper is designed to enusre the provided rule sets are identical

pkg/ruler/mapper_test.go

@@ -395,3 +395,37 @@ func sliceContains(t *testing.T, find string, in []string) bool {
 
 	return false
 }
+
+func TestYamlFormatting(t *testing.T) {
+	l := log.NewLogfmtLogger(os.Stdout)
+	l = level.NewFilter(l, level.AllowInfo())
+	setupRuleSets()
+
+	m := &mapper{
+		Path:   "/rules",
+		FS:     afero.NewMemMapFs(),
+		logger: l,
+	}
+
+	updated, files, err := m.MapRules(testUser, initialRuleSet)
+	require.True(t, updated)
+	require.Len(t, files, 1)
+	require.Equal(t, fileOnePath, files[0])
+	require.NoError(t, err)
+
+	data, err := afero.ReadFile(m.FS, fileOnePath)
+	require.NoError(t, err)
+
+	expected := `groups:
+    - name: rulegroup_two
+      rules:
+        - record: example_rule
+          expr: example_expr
+    - name: rulegroup_one
+      rules:
+        - record: example_rule
+          expr: example_expr
+`
+
+	require.Equal(t, expected, string(data))
+}