Merge #157800

craig[bot] · RaduBerinde · craig[bot] · commit fd29a935f443 · 2025-11-21T01:35:48.000Z
157800: go.mod: upgrade to yaml v4 r=RaduBerinde a=RaduBerinde The https://github.com/go-yaml/yaml (import path `gopkg.in/yaml.v3`) repository has been archived. The YAML team took over maintenance in a separate fork at a very confusingly named https://github.com/yaml/go-yaml (import path `go.yaml.in/yaml/v4`). This commit updates uses of v3 to `v4.0.0-rc.3` from the new repository. No code changes are required. Upgrading v2 uses to v4 will be done separately, as that requires code changes. Epic: none Release note: None Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -10473,6 +10473,16 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/yaml.v3/in_gopkg_yaml_v3-v3.0.1.zip",
         ],
     )
+    go_repository(
+        name = "in_yaml_go_yaml_v4",
+        build_file_proto_mode = "disable_global",
+        importpath = "go.yaml.in/yaml/v4",
+        sha256 = "d5ca6a029979bc52760f17ed1a9393637a46095b9e0e8f504f1dc5d70ece46ac",
+        strip_prefix = "go.yaml.in/yaml/v4@v4.0.0-rc.3",
+        urls = [
+            "https://storage.googleapis.com/cockroach-godeps/gomod/go.yaml.in/yaml/v4/in_yaml_go_yaml_v4-v4.0.0-rc.3.zip",
+        ],
+    )
     go_repository(
         name = "io_etcd_go_bbolt",
         build_file_proto_mode = "disable_global",
diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -1044,6 +1044,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/go.uber.org/multierr/org_uber_go_multierr-v1.7.0.zip": "abee21bbd1cb62b0721680430ef8e098717299d10b4382876b9aa40664e6556c",
     "https://storage.googleapis.com/cockroach-godeps/gomod/go.uber.org/tools/org_uber_go_tools-v0.0.0-20190618225709-2cfd321de3ee.zip": "988dba9c5074080240d33d98e8ce511532f728698db7a9a4ac316c02c94030d6",
     "https://storage.googleapis.com/cockroach-godeps/gomod/go.uber.org/zap/org_uber_go_zap-v1.19.0.zip": "6437824258873fed421b7975b8e4cafd1be80cdc15e553beaa887b499dd01420",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/go.yaml.in/yaml/v4/in_yaml_go_yaml_v4-v4.0.0-rc.3.zip": "d5ca6a029979bc52760f17ed1a9393637a46095b9e0e8f504f1dc5d70ece46ac",
     "https://storage.googleapis.com/cockroach-godeps/gomod/goji.io/io_goji-v2.0.2+incompatible.zip": "1ea69b28e356cb91381ce2339004fcf144ad1b268c9e3497c9ef304751ae0bb3",
     "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/arch/org_golang_x_arch-v0.0.0-20180920145803-b19384d3c130.zip": "9f67b677a3fefc503111d9aa7df8bacd2677411b0fcb982eb1654aa6d14cc3f8",
     "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/crypto/org_golang_x_crypto-v0.44.0.zip": "31a0dbb663b78708159bc1cbdb09a6a8370cbf507d742f96dc78b4ad023498ec",
diff --git a/go.mod b/go.mod
@@ -244,12 +244,12 @@ require (
 	go.opentelemetry.io/otel/sdk v1.17.0
 	go.opentelemetry.io/otel/trace v1.17.0
 	go.opentelemetry.io/proto/otlp v0.11.0
+	go.yaml.in/yaml/v4 v4.0.0-rc.3
 	golang.org/x/perf v0.0.0-20251112180420-cfbd823f7301
 	golang.org/x/term v0.37.0
 	gonum.org/v1/gonum v0.15.1
 	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc
 	gopkg.in/yaml.v2 v2.4.0
-	gopkg.in/yaml.v3 v3.0.1
 	honnef.co/go/tools v0.6.1
 )
 
@@ -467,6 +467,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -2404,6 +2404,8 @@ go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE=
 go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
+go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=
+go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
 goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk=
 golang.org/x/arch v0.0.0-20180920145803-b19384d3c130/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8=
 golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
diff --git a/pkg/ccl/sqlproxyccl/BUILD.bazel b/pkg/ccl/sqlproxyccl/BUILD.bazel
@@ -126,7 +126,7 @@ go_test(
         "@com_github_pires_go_proxyproto//tlvparse",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//status",
     ],
diff --git a/pkg/ccl/sqlproxyccl/proxy_handler_test.go b/pkg/ccl/sqlproxyccl/proxy_handler_test.go
@@ -54,7 +54,7 @@ import (
 	"github.com/pires/go-proxyproto/tlvparse"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 const frontendError = "Frontend error!"
diff --git a/pkg/cli/BUILD.bazel b/pkg/cli/BUILD.bazel
@@ -276,7 +276,7 @@ go_library(
         "@com_github_spf13_pflag//:pflag",
         "@com_google_cloud_go_storage//:storage",
         "@in_gopkg_yaml_v2//:yaml_v2",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
         "@io_storj_drpc//:drpc",
         "@org_golang_google_api//option",
         "@org_golang_google_grpc//:grpc",
diff --git a/pkg/cli/tsdump_upload.go b/pkg/cli/tsdump_upload.go
@@ -32,7 +32,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 const (
diff --git a/pkg/cmd/mirror/npm/BUILD.bazel b/pkg/cmd/mirror/npm/BUILD.bazel
@@ -44,7 +44,7 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "@com_google_cloud_go_storage//:storage",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
         "@org_golang_google_api//googleapi",
         "@org_golang_google_api//iterator",
         "@org_golang_x_sync//errgroup",
diff --git a/pkg/cmd/mirror/npm/main.go b/pkg/cmd/mirror/npm/main.go
@@ -19,10 +19,10 @@ import (
 	"strings"
 
 	"cloud.google.com/go/storage"
+	"go.yaml.in/yaml/v4"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/iterator"
-	yaml "gopkg.in/yaml.v3"
 )
 
 // getUnmirroredUrls finds packages in each provided pnpm-lock.yaml (each of
diff --git a/pkg/roachprod/install/BUILD.bazel b/pkg/roachprod/install/BUILD.bazel
@@ -51,7 +51,7 @@ go_library(
         "@com_github_alessio_shellescape//:shellescape",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_version//:version",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
         "@org_golang_x_exp//maps",
         "@org_golang_x_sync//errgroup",
         "@org_golang_x_sys//unix",
@@ -89,7 +89,7 @@ go_test(
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
 
diff --git a/pkg/roachprod/install/cluster_settings.go b/pkg/roachprod/install/cluster_settings.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachprod/roachprodutil/codec"
 	"github.com/cockroachdb/cockroach/pkg/roachprod/vm/gce"
 	"github.com/cockroachdb/errors"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // ClusterSettings contains various knobs that affect operations on a cluster.
diff --git a/pkg/roachprod/install/cluster_settings_test.go b/pkg/roachprod/install/cluster_settings_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 func TestClusterSettingOptionListCodec(t *testing.T) {
diff --git a/pkg/roachprod/roachprodutil/codec/BUILD.bazel b/pkg/roachprod/roachprodutil/codec/BUILD.bazel
@@ -5,7 +5,7 @@ go_library(
     srcs = ["types.go"],
     importpath = "github.com/cockroachdb/cockroach/pkg/roachprod/roachprodutil/codec",
     visibility = ["//visibility:public"],
-    deps = ["@in_gopkg_yaml_v3//:yaml_v3"],
+    deps = ["@in_yaml_go_yaml_v4//:yaml"],
 )
 
 go_test(
@@ -18,6 +18,6 @@ go_test(
     deps = [
         "//pkg/util/yamlutil",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/roachprod/roachprodutil/codec/types.go b/pkg/roachprod/roachprodutil/codec/types.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"strings"
 
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 type (
diff --git a/pkg/roachprod/roachprodutil/codec/types_test.go b/pkg/roachprod/roachprodutil/codec/types_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 type (
diff --git a/pkg/sql/schemachanger/rel/BUILD.bazel b/pkg/sql/schemachanger/rel/BUILD.bazel
@@ -43,7 +43,7 @@ go_library(
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_google_btree//:btree",
         "@in_gopkg_yaml_v2//:yaml_v2",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
 
diff --git a/pkg/sql/schemachanger/rel/internal/cyclegraphtest/BUILD.bazel b/pkg/sql/schemachanger/rel/internal/cyclegraphtest/BUILD.bazel
@@ -13,7 +13,7 @@ go_library(
     deps = [
         "//pkg/sql/schemachanger/rel",
         "//pkg/sql/schemachanger/rel/reltest",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
 
diff --git a/pkg/sql/schemachanger/rel/internal/cyclegraphtest/schema.go b/pkg/sql/schemachanger/rel/internal/cyclegraphtest/schema.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel/reltest"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // testAttr is a rel.Attr used for testing.
diff --git a/pkg/sql/schemachanger/rel/internal/entitynodetest/BUILD.bazel b/pkg/sql/schemachanger/rel/internal/entitynodetest/BUILD.bazel
@@ -13,7 +13,7 @@ go_library(
     deps = [
         "//pkg/sql/schemachanger/rel",
         "//pkg/sql/schemachanger/rel/reltest",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
 
diff --git a/pkg/sql/schemachanger/rel/internal/entitynodetest/schema.go b/pkg/sql/schemachanger/rel/internal/entitynodetest/schema.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel/reltest"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 type entity struct {
diff --git a/pkg/sql/schemachanger/rel/query_lang_clauses.go b/pkg/sql/schemachanger/rel/query_lang_clauses.go
@@ -7,7 +7,7 @@ package rel
 
 import (
 	"github.com/cockroachdb/errors"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // Clauses exists to handle flattening of a slice of clauses before marshaling.
diff --git a/pkg/sql/schemachanger/rel/query_lang_yaml.go b/pkg/sql/schemachanger/rel/query_lang_yaml.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/cockroachdb/errors"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 func valueForYAML(v interface{}) interface{} {
diff --git a/pkg/sql/schemachanger/rel/reltest/BUILD.bazel b/pkg/sql/schemachanger/rel/reltest/BUILD.bazel
@@ -18,6 +18,6 @@ go_library(
         "//pkg/util/intsets",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/sql/schemachanger/rel/reltest/attribute.go b/pkg/sql/schemachanger/rel/reltest/attribute.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // AttributeTestCases exercise the mappings of fields to attribute values.
diff --git a/pkg/sql/schemachanger/rel/reltest/compare.go b/pkg/sql/schemachanger/rel/reltest/compare.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // ComparisonTests exercise the comparison logic of the rel package.
diff --git a/pkg/sql/schemachanger/rel/reltest/database.go b/pkg/sql/schemachanger/rel/reltest/database.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/util/intsets"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // DatabaseTest tests a set of queries in the context of a database which
diff --git a/pkg/sql/schemachanger/rel/reltest/registry.go b/pkg/sql/schemachanger/rel/reltest/registry.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/cockroachdb/errors"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // Registry stores entities by name. It helps to serialize things in an
diff --git a/pkg/sql/schemachanger/rel/reltest/reltest.go b/pkg/sql/schemachanger/rel/reltest/reltest.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel"
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 var rewrite bool
diff --git a/pkg/sql/schemachanger/scbuild/BUILD.bazel b/pkg/sql/schemachanger/scbuild/BUILD.bazel
@@ -104,6 +104,6 @@ go_test(
         "//pkg/util/yamlutil",
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/sql/schemachanger/scbuild/builder_test.go b/pkg/sql/schemachanger/scbuild/builder_test.go
@@ -42,7 +42,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/yamlutil"
 	"github.com/cockroachdb/datadriven"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 func TestBuildDataDrivenWithSQLDependencies(t *testing.T) {
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/BUILD.bazel
@@ -19,6 +19,6 @@ go_library(
         "//pkg/util/log",
         "//pkg/util/timeutil",
         "@com_github_cockroachdb_errors//:errors",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel
@@ -68,6 +68,6 @@ go_test(
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/current/rules_test.go b/pkg/sql/schemachanger/scplan/internal/rules/current/rules_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
 	"github.com/cockroachdb/datadriven"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // TestRulesYAML outputs the rules to yaml as a way to visualize changes.
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/registry.go b/pkg/sql/schemachanger/scplan/internal/rules/registry.go
@@ -21,7 +21,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // ApplyDepRules adds dependency edges to the graph according to the
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_25_3/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/release_25_3/BUILD.bazel
@@ -64,6 +64,6 @@ go_test(
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_25_3/rules_test.go b/pkg/sql/schemachanger/scplan/internal/rules/release_25_3/rules_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
 	"github.com/cockroachdb/datadriven"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // TestRulesYAML outputs the rules to yaml as a way to visualize changes.
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_25_4/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/release_25_4/BUILD.bazel
@@ -66,6 +66,6 @@ go_test(
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_stretchr_testify//require",
-        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@in_yaml_go_yaml_v4//:yaml",
     ],
 )
diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_25_4/rules_test.go b/pkg/sql/schemachanger/scplan/internal/rules/release_25_4/rules_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
 	"github.com/cockroachdb/datadriven"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v4"
 )
 
 // TestRulesYAML outputs the rules to yaml as a way to visualize changes.
diff --git a/pkg/storage/storageconfig/BUILD.bazel b/pkg/storage/storageconfig/BUILD.bazel
diff --git a/pkg/storage/storageconfig/encryption_spec.go b/pkg/storage/storageconfig/encryption_spec.go
diff --git a/pkg/storage/storageconfig/size.go b/pkg/storage/storageconfig/size.go
diff --git a/pkg/storage/storageconfig/store.go b/pkg/storage/storageconfig/store.go
diff --git a/pkg/storage/storageconfig/store_test.go b/pkg/storage/storageconfig/store_test.go
diff --git a/pkg/util/metric/BUILD.bazel b/pkg/util/metric/BUILD.bazel
diff --git a/pkg/util/metric/prometheus_rule_exporter.go b/pkg/util/metric/prometheus_rule_exporter.go
diff --git a/pkg/util/yamlutil/BUILD.bazel b/pkg/util/yamlutil/BUILD.bazel
diff --git a/pkg/util/yamlutil/yaml_util.go b/pkg/util/yamlutil/yaml_util.go

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ import (`
`54`	`54`	`"github.com/pires/go-proxyproto/tlvparse"`
`55`	`55`	`"github.com/stretchr/testify/assert"`
`56`	`56`	`"github.com/stretchr/testify/require"`
`57`		`- "gopkg.in/yaml.v3"`
	`57`	`+ "go.yaml.in/yaml/v4"`
`58`	`58`	`)`
`59`	`59`
`60`	`60`	`const frontendError = "Frontend error!"`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`"github.com/cockroachdb/cockroach/pkg/util/syncutil"`
`33`	`33`	`"github.com/cockroachdb/cockroach/pkg/util/timeutil"`
`34`	`34`	`"github.com/cockroachdb/errors"`
`35`		`- "gopkg.in/yaml.v3"`
	`35`	`+ "go.yaml.in/yaml/v4"`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`const (`