Skip to content

Migrate from gopkg.in/yaml.v3 to go.yaml.in/yaml/v3 #4353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pietern wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate from gopkg.in/yaml.v3 to go.yaml.in/yaml/v3 #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ go-ini/ini - https://github.com/go-ini/ini
Copyright ini authors
License - https://github.com/go-ini/ini/blob/main/LICENSE

go-yaml/yaml - https://github.com/yaml/go-yaml
Copyright (c) 2011-2019 Canonical Ltd
Copyright (c) 2006-2011 Kirill Simonov
License - https://github.com/yaml/go-yaml/blob/v3/LICENSE

—--

This software contains code from the following open source projects, licensed under the MPL 2.0 license:
Expand Down Expand Up @@ -130,3 +135,8 @@ https://github.com/darccio/mergo/blob/master/LICENSE
https://github.com/gorilla/mux
Copyright (c) 2023 The Gorilla Authors. All rights reserved.
https://github.com/gorilla/mux/blob/main/LICENSE

go-yaml/yaml - https://github.com/yaml/go-yaml
Copyright (c) 2011-2019 Canonical Ltd
Copyright (c) 2006-2011 Kirill Simonov
License - https://github.com/yaml/go-yaml/blob/v3/LICENSE
2 changes: 1 addition & 1 deletion acceptance/internal/bundle_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"

"dario.cat/mergo"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func MergeBundleConfig(source string, bundleConfig map[string]any) (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion acceptance/internal/bundle_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestMergeBundleConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bundle/direct/dresources/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"

"github.com/databricks/cli/libs/structs/structpath"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

// ResourceLifecycleConfig defines lifecycle behavior for a resource type.
Expand Down
2 changes: 1 addition & 1 deletion bundle/internal/schema/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"slices"
"strings"

yaml3 "gopkg.in/yaml.v3"
yaml3 "go.yaml.in/yaml/v3"

"github.com/databricks/cli/bundle/internal/annotation"
"github.com/databricks/cli/libs/dyn"
Expand Down
2 changes: 1 addition & 1 deletion bundle/internal/schema/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/databricks/cli/libs/dyn/yamlloader"
"github.com/databricks/cli/libs/jsonschema"
"github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func copyFile(src, dst string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bundle/generate/alert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/databricks/databricks-sdk-go/service/sql"
"github.com/databricks/databricks-sdk-go/service/workspace"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func NewGenerateAlertCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bundle/generate/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/databricks/databricks-sdk-go/service/dashboards"
"github.com/databricks/databricks-sdk-go/service/workspace"
"github.com/spf13/cobra"
"go.yaml.in/yaml/v3"
"golang.org/x/exp/maps"
"gopkg.in/yaml.v3"
)

type dashboard struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bundle/generate/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/databricks/cli/libs/textutil"
"github.com/databricks/databricks-sdk-go/service/jobs"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func NewGenerateJobCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bundle/generate/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/databricks/cli/libs/textutil"
"github.com/databricks/databricks-sdk-go/service/pipelines"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func NewGeneratePipelineCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/labs/project/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/databricks/cli/libs/python"
"github.com/databricks/databricks-sdk-go/logger"
"github.com/fatih/color"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"

"github.com/spf13/cobra"
)
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ require (
github.com/spf13/cobra v1.10.1 // Apache 2.0
github.com/spf13/pflag v1.0.10 // BSD-3-Clause
github.com/stretchr/testify v1.11.1 // MIT
go.yaml.in/yaml/v3 v3.0.4 // MIT, Apache 2.0
golang.org/x/crypto v0.47.0 // BSD-3-Clause
golang.org/x/exp v0.0.0-20250911091902-df9299821621
golang.org/x/mod v0.32.0
Expand All @@ -38,7 +39,6 @@ require (
golang.org/x/sys v0.40.0
golang.org/x/text v0.33.0
gopkg.in/ini.v1 v1.67.1 // Apache 2.0
gopkg.in/yaml.v3 v3.0.1
)

// Dependencies for experimental MCP commands
Expand Down Expand Up @@ -92,4 +92,5 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
google.golang.org/grpc v1.75.1 // indirect
google.golang.org/protobuf v1.36.9 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6
go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
Expand Down
2 changes: 1 addition & 1 deletion libs/apps/runlocal/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/databricks/cli/libs/env"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

type AppEnvVar struct {
Expand Down
2 changes: 1 addition & 1 deletion libs/dyn/yamlloader/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/databricks/cli/libs/dyn"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

type loader struct {
Expand Down
2 changes: 1 addition & 1 deletion libs/dyn/yamlloader/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"

"github.com/databricks/cli/libs/dyn"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func LoadYAML(path string, r io.Reader) (dyn.Value, error) {
Expand Down
2 changes: 1 addition & 1 deletion libs/dyn/yamlloader/yaml_error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/databricks/cli/libs/dyn/yamlloader"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestYAMLErrorMapMerge(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions libs/dyn/yamlloader/yaml_spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func TestYAMLSpecExample_2_11(t *testing.T) {
input, err := os.ReadFile(file)
require.NoError(t, err)

// Note: non-string mapping keys are not supported by "gopkg.in/yaml.v3".
// Note: non-string mapping keys are not supported by "go.yaml.in/yaml/v3".
_, err = yamlloader.LoadYAML(file, bytes.NewBuffer(input))
assert.ErrorContains(t, err, `: key is not a scalar`)
}
Expand Down Expand Up @@ -530,7 +530,7 @@ func TestYAMLSpecExample_2_22(t *testing.T) {
),
"spaced": dyn.NewValue(
// This is parsed as a string, not a timestamp,
// both by "gopkg.in/yaml.v3" and by our implementation.
// both by "go.yaml.in/yaml/v3" and by our implementation.
"2001-12-14 21:59:43.10 -5",
[]dyn.Location{{File: file, Line: 5, Column: 9}},
),
Expand Down
2 changes: 1 addition & 1 deletion libs/dyn/yamlloader/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/databricks/cli/libs/dyn/yamlloader"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func loadYAML(t *testing.T, path string) dyn.Value {
Expand Down
2 changes: 1 addition & 1 deletion libs/dyn/yamlsaver/saver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"

"github.com/databricks/cli/libs/dyn"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

type saver struct {
Expand Down
2 changes: 1 addition & 1 deletion libs/dyn/yamlsaver/saver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/databricks/cli/libs/dyn"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestMarshalNilValue(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion libs/structs/structpath/path_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func TestPathNode(t *testing.T) {
Expand Down