util: add yamlutil

Add an `UnmarshalStrict()` wrapper to match the same function in
yaml.v2 or earlier. Also add a `Marshal()` that indents to two spaces.

Epic: none
Release note: None

Author: RaduBerinde

pkg/BUILD.bazel

@@ -840,6 +840,7 @@ ALL_TESTS = [
     "//pkg/util/uuid:uuid_test",
     "//pkg/util/vector:vector_test",
     "//pkg/util/vfsutil:vfsutil_test",
+    "//pkg/util/yamlutil:yamlutil_test",
     "//pkg/util:util_test",
     "//pkg/workload/bank:bank_test",
     "//pkg/workload/cli:cli_test",
@@ -2850,6 +2851,8 @@ GO_TARGETS = [
     "//pkg/util/vector:vector_test",
     "//pkg/util/vfsutil:vfsutil",
     "//pkg/util/vfsutil:vfsutil_test",
+    "//pkg/util/yamlutil:yamlutil",
+    "//pkg/util/yamlutil:yamlutil_test",
     "//pkg/util:util",
     "//pkg/util:util_test",
     "//pkg/workload/bank:bank",

pkg/roachprod/install/BUILD.bazel

@@ -85,6 +85,7 @@ go_test(
         "//pkg/util/randutil",
         "//pkg/util/retry",
         "//pkg/util/syncutil",
+        "//pkg/util/yamlutil",
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//require",

pkg/roachprod/install/cluster_settings_test.go

@@ -6,9 +6,9 @@
 package install
 
 import (
-	"bytes"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 )
@@ -22,10 +22,7 @@ func TestClusterSettingOptionListCodec(t *testing.T) {
 	require.NoError(t, err)
 
 	var decOpts ClusterSettingOptionList
-	dec := yaml.NewDecoder(bytes.NewReader(data))
-	dec.KnownFields(true)
-	err = dec.Decode(&decOpts)
-	require.NoError(t, err)
+	require.NoError(t, yamlutil.UnmarshalStrict(data, &decOpts))
 
 	require.Equal(t, opts, decOpts)
 	require.Equal(t, MakeClusterSettings(opts...), MakeClusterSettings(decOpts...))

pkg/roachprod/roachprodutil/codec/BUILD.bazel

@@ -16,6 +16,7 @@ go_test(
     ],
     embed = [":codec"],
     deps = [
+        "//pkg/util/yamlutil",
         "@com_github_stretchr_testify//require",
         "@in_gopkg_yaml_v3//:yaml_v3",
     ],

pkg/roachprod/roachprodutil/codec/types_test.go

@@ -6,10 +6,10 @@
 package codec
 
 import (
-	"bytes"
 	"reflect"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 )
@@ -60,10 +60,7 @@ func TestDynamicTypes(t *testing.T) {
 	require.NoError(t, err)
 
 	var decoded ListWrapper[Animal]
-	dec := yaml.NewDecoder(bytes.NewReader(data))
-	dec.KnownFields(true)
-	err = dec.Decode(&decoded)
-	require.NoError(t, err)
+	require.NoError(t, yamlutil.UnmarshalStrict(data, &decoded))
 
 	// Verify equality of the decoded list and the original list.
 	require.Equal(t, animals, decoded.Get())

pkg/sql/schemachanger/scbuild/BUILD.bazel

@@ -101,6 +101,7 @@ go_test(
         "//pkg/util/log",
         "//pkg/util/mon",
         "//pkg/util/randutil",
+        "//pkg/util/yamlutil",
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_stretchr_testify//require",
         "@in_gopkg_yaml_v3//:yaml_v3",

pkg/sql/schemachanger/scbuild/builder_test.go

@@ -39,6 +39,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/mon"
+	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/cockroachdb/datadriven"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
@@ -272,10 +273,8 @@ var _ sort.Interface = nodeEntries{}
 func formatElementForDisplay(t *testing.T, e scpb.Element) []byte {
 	marshaled, err := sctestutils.ProtoToYAML(e, false /* emitDefaults */)
 	require.NoError(t, err)
-	dec := yaml.NewDecoder(strings.NewReader(marshaled))
-	dec.KnownFields(true)
 	var n yaml.Node
-	require.NoError(t, dec.Decode(&n))
+	require.NoError(t, yamlutil.UnmarshalStrict([]byte(marshaled), &n))
 	walkYaml(&n, func(node *yaml.Node) { node.Style = yaml.FlowStyle })
 	data, err := yaml.Marshal(&n)
 	require.NoError(t, err)

pkg/storage/storageconfig/BUILD.bazel

@@ -33,6 +33,7 @@ go_test(
     deps = [
         "//pkg/testutils/datapathutils",
         "//pkg/util/leaktest",
+        "//pkg/util/yamlutil",
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_stretchr_testify//require",
         "@in_gopkg_yaml_v3//:yaml_v3",

pkg/storage/storageconfig/store_test.go

@@ -6,13 +6,13 @@
 package storageconfig
 
 import (
-	"bytes"
 	"fmt"
 	"math"
 	"math/rand/v2"
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
+	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/cockroachdb/datadriven"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
@@ -165,9 +165,7 @@ func randSize(rng *rand.Rand, minBytes, maxBytes int64, minPercent, maxPercent f
 
 func unmarshal(data []byte) (Store, error) {
 	var s Store
-	dec := yaml.NewDecoder(bytes.NewReader(data))
-	dec.KnownFields(true)
-	if err := dec.Decode(&s); err != nil {
+	if err := yamlutil.UnmarshalStrict(data, &s); err != nil {
 		return Store{}, err
 	}
 	return s, nil

pkg/testutils/lint/lint_test.go

@@ -1674,7 +1674,7 @@ func TestLint(t *testing.T) {
 			filter,
 			stream.GrepNot(`nolint:yaml`),
 		), func(s string) {
-			t.Errorf("\n%s <- forbidden; use 'yaml.UnmarshalStrict' instead", s)
+			t.Errorf("\n%s <- forbidden; use 'yamlutil.UnmarshalStrict' instead", s)
 		}); err != nil {
 			t.Error(err)
 		}