vendor: github.com/spf13/cobra v1.10.2, migrate to go.yaml.in/yaml/v3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
composeLoader "github.com/docker/cli/cli/compose/loader"
|
||||
composetypes "github.com/docker/cli/cli/compose/types"
|
||||
"github.com/spf13/cobra"
|
||||
"gopkg.in/yaml.v3"
|
||||
"go.yaml.in/yaml/v3"
|
||||
)
|
||||
|
||||
// configOptions holds docker stack config options
|
||||
|
||||
@@ -28,7 +28,7 @@ import (
|
||||
"github.com/moby/moby/api/types/network"
|
||||
"github.com/moby/moby/client/pkg/versions"
|
||||
"github.com/sirupsen/logrus"
|
||||
"gopkg.in/yaml.v3"
|
||||
"go.yaml.in/yaml/v3"
|
||||
)
|
||||
|
||||
// Options supported by Load
|
||||
|
||||
@@ -333,7 +333,7 @@ func TestInvalidTopLevelObjectType(t *testing.T) {
|
||||
|
||||
func TestNonStringKeys(t *testing.T) {
|
||||
// FIXME(thaJeztah): opkg.in/yaml.v3, which always unmarshals to a map[string]any, so we cannot produce a customized error for invalid types.
|
||||
t.Skip("not supported by gopkg.in/yaml.v3, which always unmarshals to a map[string]any")
|
||||
t.Skip("not supported by go.yaml.in/yaml/v3, which always unmarshals to a map[string]any")
|
||||
_, err := loadYAML(`
|
||||
version: "3"
|
||||
123:
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
"go.yaml.in/yaml/v3"
|
||||
"gotest.tools/v3/assert"
|
||||
"gotest.tools/v3/golden"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user