Skip to content

Commit 167b647

Browse files
authored
chore(deps): switch from gopkg.in/yaml.v3 to go.yaml.in/yaml/v3 (#611)
See https://github.com/yaml/go-yaml#project-status. Various dependencies have already switched, most recently [cobra in 1.10.2](https://github.com/spf13/cobra/releases/tag/v1.10.2). For a diff between the old 3.0.1 and the new 3.0.2, see https://gist.github.com/scop/6ec72debf62a9603cff9dc97e6814ddd. 3.0.1 are identical. Upgrade to 3.0.4 while at it: yaml/go-yaml@v3.0.2...v3.0.4
1 parent b59191d commit 167b647

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ require (
1919
github.com/spf13/viper v1.21.0
2020
github.com/stretchr/testify v1.11.1
2121
github.com/zalando/go-keyring v0.2.6
22+
go.yaml.in/yaml/v3 v3.0.4
2223
golang.org/x/crypto v0.46.0
2324
golang.org/x/sync v0.19.0
2425
golang.org/x/term v0.38.0
25-
gopkg.in/yaml.v3 v3.0.1
2626
helm.sh/helm/v3 v3.19.2
2727
k8s.io/api v0.34.2
2828
k8s.io/apimachinery v0.34.2
@@ -128,7 +128,6 @@ require (
128128
go.uber.org/multierr v1.11.0 // indirect
129129
go.uber.org/zap v1.27.0 // indirect
130130
go.yaml.in/yaml/v2 v2.4.2 // indirect
131-
go.yaml.in/yaml/v3 v3.0.4 // indirect
132131
golang.org/x/net v0.47.0 // indirect
133132
golang.org/x/oauth2 v0.30.0 // indirect
134133
golang.org/x/sys v0.39.0 // indirect
@@ -140,6 +139,7 @@ require (
140139
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
141140
gopkg.in/inf.v0 v0.9.1 // indirect
142141
gopkg.in/yaml.v2 v2.4.0 // indirect
142+
gopkg.in/yaml.v3 v3.0.1 // indirect
143143
k8s.io/apiextensions-apiserver v0.34.0 // indirect
144144
k8s.io/apiserver v0.34.0 // indirect
145145
k8s.io/cli-runtime v0.34.2 // indirect

internal/commands/kubernetes/config.go

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

1212
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
1313
"github.com/spf13/pflag"
14-
"gopkg.in/yaml.v3"
14+
"go.yaml.in/yaml/v3"
1515
"k8s.io/client-go/tools/clientcmd"
1616
"k8s.io/client-go/tools/clientcmd/api"
1717
)

internal/commands/kubernetes/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/jedib0t/go-pretty/v6/text"
1818
"github.com/stretchr/testify/assert"
1919
"github.com/stretchr/testify/mock"
20-
"gopkg.in/yaml.v3"
20+
"go.yaml.in/yaml/v3"
2121
"k8s.io/client-go/tools/clientcmd"
2222
"k8s.io/client-go/tools/clientcmd/api"
2323
)

internal/commands/stack/supabase/supabase.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/stack"
1212
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
1313
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
14-
"gopkg.in/yaml.v3"
14+
"go.yaml.in/yaml/v3"
1515
)
1616

1717
type ChartVersion string

internal/output/yaml.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package output
22

33
import (
4-
"gopkg.in/yaml.v3"
4+
"go.yaml.in/yaml/v3"
55
)
66

77
// JSONToYAML converts JSON bytes into YAML bytes. This allows using key names from JSON field tags also for YAML output. This has some side-effects (e.g., timestamps will be double-quoted in output) but this is lesser evil than adding yaml field tags everywhere in our Go types.

0 commit comments

Comments
 (0)