diff --git a/docs/oss/attribution.md b/docs/oss/attribution.md index 1d5ded9..09250c9 100644 --- a/docs/oss/attribution.md +++ b/docs/oss/attribution.md @@ -25,7 +25,7 @@ License and notices: [CC BY-SA 4.0](licenses/CC-BY-SA-4.0.txt) | ## go-yaml v4 -Selected module: `go.yaml.in/yaml/v4` at `v4.0.0-rc.6`. +Selected module: `go.yaml.in/yaml/v4` at `v4.0.0`. Copyright 2011-2019 Canonical Ltd @@ -37,7 +37,7 @@ SPDX-License-Identifier: Apache-2.0 AND MIT License and notices: [Apache 2.0](licenses/Apache-2.0.txt) | [MIT](licenses/MIT.txt) | -[NOTICE](https://github.com/yaml/go-yaml/blob/1c17b9cee72bf81ae73a8be50fbd7dd3a9985125/NOTICE) | -[LICENSE](https://github.com/yaml/go-yaml/blob/1c17b9cee72bf81ae73a8be50fbd7dd3a9985125/LICENSE). +[NOTICE](https://github.com/yaml/go-yaml/blob/f2f9563503f11b7a60da0c532175dcc693ce8d5a/NOTICE) | +[LICENSE](https://github.com/yaml/go-yaml/blob/f2f9563503f11b7a60da0c532175dcc693ce8d5a/LICENSE). -[Source](https://github.com/yaml/go-yaml/tree/1c17b9cee72bf81ae73a8be50fbd7dd3a9985125). +[Source](https://github.com/yaml/go-yaml/tree/f2f9563503f11b7a60da0c532175dcc693ce8d5a). diff --git a/go.mod b/go.mod index b85c355..3d1eed4 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module go.maximumdirect.net/configkit go 1.27.0 -require go.yaml.in/yaml/v4 v4.0.0-rc.6 +require go.yaml.in/yaml/v4 v4.0.0 require ( github.com/yuin/goldmark/v2 v2.1.6 // indirect diff --git a/go.sum b/go.sum index b09fd09..354b5f0 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,7 @@ github.com/yuin/goldmark/v2 v2.1.6 h1:igy0q9JcqovoFXFx/XjtU8sHVhcUHavPj2sA3EoKJU github.com/yuin/goldmark/v2 v2.1.6/go.mod h1:G6M4/qOFtfn01/o14BU1UR2Lo5N3S9Qo7xCuz/sHjGQ= go.maximumdirect.net/releasekit v0.8.0 h1:hSaHPbUI7tAhnolfbu7UMj2fvmm9FGBY+jhkygdbxR0= go.maximumdirect.net/releasekit v0.8.0/go.mod h1:QE4BLrAhVJTzi+/YTcVl21K/qZp9ojRLg5kuoy3Zb44= -go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4= -go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= +go.yaml.in/yaml/v4 v4.0.0 h1:/LG1pNO84Z4l603j/xMn69CcS5OYhMQ/f7l2LoQUGuw= +go.yaml.in/yaml/v4 v4.0.0/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= diff --git a/internal/yaml/parse.go b/internal/yaml/parse.go index bf6ad14..de4ab17 100644 --- a/internal/yaml/parse.go +++ b/internal/yaml/parse.go @@ -8,7 +8,7 @@ import ( "strings" "go.yaml.in/yaml/v4" - "go.yaml.in/yaml/v4/plugin/limit" + "go.yaml.in/yaml/v4/plugin/loaderlimits" "go.maximumdirect.net/configkit/internal/document" ) @@ -60,7 +60,7 @@ func Parse(input io.Reader, sourceID string, limits Limits) (*document.Node, []I parserDepth = limits.Depth + 2 } depthExceeded := false - plugin := limit.New(limit.DepthFunc(func(depth int, _ *limit.DepthContext) error { + plugin := loaderlimits.New(loaderlimits.DepthFunc(func(depth int, _ *loaderlimits.DepthContext) error { if depth > parserDepth { depthExceeded = true return errParserDepth diff --git a/internal/yaml/parse_test.go b/internal/yaml/parse_test.go index 6c445ad..f61c70a 100644 --- a/internal/yaml/parse_test.go +++ b/internal/yaml/parse_test.go @@ -6,7 +6,7 @@ import ( "testing" "go.yaml.in/yaml/v4" - "go.yaml.in/yaml/v4/plugin/limit" + "go.yaml.in/yaml/v4/plugin/loaderlimits" "go.maximumdirect.net/configkit/internal/document" ) @@ -167,7 +167,7 @@ func TestParserDepthCalibrationForBlockAndFlow(t *testing.T) { func observedParserDepth(t *testing.T, input string) int { t.Helper() maximum := 0 - depthPlugin := limit.New(limit.DepthFunc(func(depth int, _ *limit.DepthContext) error { + depthPlugin := loaderlimits.New(loaderlimits.DepthFunc(func(depth int, _ *loaderlimits.DepthContext) error { maximum = max(maximum, depth) return nil }))