Migrate from gopkg.in/yaml.v3 to go.yaml.in/yaml/v3, upgrade to v3.0.5

The former is no longer maintained, ref
https://github.com/yaml/go-yaml#project-status

Upgrade to v3.0.5 while at it.
This commit is contained in:
Ville Skyttä
2026-10-01 10:29:11 +03:00
parent c9cac841af
commit be346509eb
28 changed files with 29 additions and 29 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ import (
bridge_env "github.com/carapace-sh/carapace-bridge/pkg/env"
"github.com/carapace-sh/carapace/pkg/xdg"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func Completers(filter choices.Choice, parse bool) (completer.CompleterMap, error) { // TODO rename parse - init? if false returned completers cannot be executed
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"path/filepath"
spec "github.com/carapace-sh/carapace-spec"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func loadSpec(path string) (string, *spec.Command, error) {
@@ -4,7 +4,7 @@ import (
"time"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func ActionConfigKeys() carapace.Action {
@@ -8,7 +8,7 @@ import (
"path/filepath"
"syscall"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
const (
@@ -3,7 +3,7 @@ package config
import (
"errors"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// ConfigMap This type implements a low-level get/set config that is backed by an in-memory tree of Yaml
@@ -4,7 +4,7 @@ import (
"fmt"
"slices"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// Config This interface describes interacting with some persistent configuration for gh.
@@ -8,7 +8,7 @@ import (
"strings"
"github.com/carapace-sh/carapace-bin/completers/common/gh_completer/cmd/action/ghinstance"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// This type implements a Config interface and represents a config file on disk.
@@ -4,7 +4,7 @@ import (
"os"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func LoadAliases() (aliases map[string]string, err error) {
@@ -4,7 +4,7 @@ import (
"os"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func ActionConfigHosts() carapace.Action {
@@ -7,7 +7,7 @@ import (
"github.com/carapace-sh/carapace/pkg/util"
"github.com/pelletier/go-toml"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func configPath() (path string, err error) {
@@ -4,7 +4,7 @@ import (
"os"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// ActionDbTasks completes db:* leaf tasks
@@ -6,7 +6,7 @@ import (
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace/pkg/util"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type pkgFile struct {
+2 -2
View File
@@ -15,14 +15,14 @@ require (
github.com/pelletier/go-toml v1.9.5
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
go.yaml.in/yaml/v3 v3.0.5
golang.org/x/mod v0.41.0
gopkg.in/ini.v1 v1.67.3
gopkg.in/yaml.v3 v3.0.1
)
require (
github.com/pelletier/go-toml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
require (
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/carapace-sh/carapace/pkg/style"
"github.com/carapace-sh/carapace/pkg/xdg"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type variablesMap map[string]func() variables
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type openapi struct {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"os"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type profile struct {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path/filepath"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// ActionInputs completes inputs of the current environment
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace/pkg/traverse"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type hostConfig map[string]struct {
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"syscall"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
const (
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import (
"errors"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// ConfigMap This type implements a low-level get/set config that is backed by an in-memory tree of Yaml
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"slices"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// Config This interface describes interacting with some persistent configuration for gh.
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"strings"
"github.com/carapace-sh/carapace-bin/completers/common/gh_completer/cmd/action/ghinstance"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// This type implements a Config interface and represents a config file on disk.
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"os"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type goreleaserConfig struct {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"os"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type repositoriesFile struct {
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace/pkg/util"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
type version string
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace/pkg/style"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
// ActionLogins completes logins
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings"
"github.com/carapace-sh/carapace"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func fixYamlOutput(b []byte) []byte {
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/carapace-sh/carapace"
spec "github.com/carapace-sh/carapace-spec"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func ReadSpecs(dir, group string, parse bool) (CompleterMap, error) {