Skip to content

Commit e9e5951

Browse files
committed
🌱 deps: switch from gopkg.in/yaml.vX to go.yaml.in/yaml/vX
The latter is a maintained fork of the former. https://github.com/yaml/go-yaml#project-status While at it, upgrade from 2.4.0 to 2.4.2 and 3.0.1 to 3.0.4, these were already indirectly used. 2.4.0 are identical, 2.4.0...2.4.1 diff: https://gist.github.com/scop/57f94f2bf97fb6a2d01349fa59d88530 3.0.1 are identical, 3.0.1..3.0.2 diff: https://gist.github.com/scop/57f94f2bf97fb6a2d01349fa59d88530 Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
1 parent 525a930 commit e9e5951

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

attestor/policy/attestation_policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121

2222
"github.com/gobwas/glob"
23-
"gopkg.in/yaml.v2"
23+
"go.yaml.in/yaml/v2"
2424

2525
"github.com/ossf/scorecard/v5/checker"
2626
"github.com/ossf/scorecard/v5/checks"

config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"io"
2121
"strings"
2222

23-
"gopkg.in/yaml.v3"
23+
"go.yaml.in/yaml/v3"
2424

2525
sce "github.com/ossf/scorecard/v5/errors"
2626
"github.com/ossf/scorecard/v5/internal/checknames"

cron/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"strconv"
2727
"strings"
2828

29-
"gopkg.in/yaml.v2"
29+
"go.yaml.in/yaml/v2"
3030
)
3131

3232
const (

docs/checks/internal/reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
_ "embed"
2121
"fmt"
2222

23-
"gopkg.in/yaml.v2"
23+
"go.yaml.in/yaml/v2"
2424
)
2525

2626
//go:embed checks.yaml

docs/probes/internal/generate/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"gopkg.in/yaml.v3"
25+
"go.yaml.in/yaml/v3"
2626

2727
pyaml "github.com/ossf/scorecard/v5/internal/probes/yaml"
2828
)

e2e/attestor_policy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
25-
"gopkg.in/yaml.v2"
25+
"go.yaml.in/yaml/v2"
2626

2727
"github.com/ossf/scorecard/v5/attestor/command"
2828
"github.com/ossf/scorecard/v5/attestor/policy"

finding/finding.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"reflect"
2222
"strings"
2323

24-
"gopkg.in/yaml.v3"
24+
"go.yaml.in/yaml/v3"
2525
)
2626

2727
// FileType is the type of a file.

finding/finding_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/google/go-cmp/cmp"
2323
"github.com/google/go-cmp/cmp/cmpopts"
24-
"gopkg.in/yaml.v3"
24+
"go.yaml.in/yaml/v3"
2525
)
2626

2727
func errCmp(e1, e2 error) bool {

finding/probe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"strings"
2121

22-
"gopkg.in/yaml.v3"
22+
"go.yaml.in/yaml/v3"
2323

2424
"github.com/ossf/scorecard/v5/clients"
2525
pyaml "github.com/ossf/scorecard/v5/internal/probes/yaml"

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ require (
2727
github.com/spf13/cobra v1.10.2
2828
github.com/xeipuuv/gojsonschema v1.2.0
2929
go.opencensus.io v0.24.0
30+
go.yaml.in/yaml/v2 v2.4.2
31+
go.yaml.in/yaml/v3 v3.0.4
3032
gocloud.dev v0.44.0
3133
golang.org/x/text v0.32.0
3234
golang.org/x/tools v0.39.0 // indirect
3335
google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 // indirect
3436
google.golang.org/protobuf v1.36.10
35-
gopkg.in/yaml.v2 v2.4.0
36-
gopkg.in/yaml.v3 v3.0.1
3737
mvdan.cc/sh/v3 v3.12.0
3838
)
3939

@@ -212,8 +212,6 @@ require (
212212
go.opentelemetry.io/otel/trace v1.38.0 // indirect
213213
go.uber.org/multierr v1.11.0 // indirect
214214
go.uber.org/zap v1.27.0 // indirect
215-
go.yaml.in/yaml/v2 v2.4.2 // indirect
216-
go.yaml.in/yaml/v3 v3.0.4 // indirect
217215
go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect
218216
golang.org/x/mod v0.30.0 // indirect
219217
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
@@ -224,6 +222,8 @@ require (
224222
google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect
225223
gopkg.in/inf.v0 v0.9.1 // indirect
226224
gopkg.in/ini.v1 v1.67.0 // indirect
225+
gopkg.in/yaml.v2 v2.4.0 // indirect
226+
gopkg.in/yaml.v3 v3.0.1 // indirect
227227
k8s.io/api v0.29.3 // indirect
228228
k8s.io/apimachinery v0.29.3 // indirect
229229
k8s.io/client-go v0.29.3 // indirect

0 commit comments

Comments
 (0)