suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-05 03:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switching to YAML org supported go-yaml

Browse Source
This commit is contained in:
Mike Farah 2025-07-10 13:00:56 +10:00
parent 7696723d5c
commit c10bfe0602
7 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -17,10 +17,10 @@ require (
github.com/spf13/cobra v1.9.1 github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6 github.com/spf13/pflag v1.0.6
github.com/yuin/gopher-lua v1.1.1 github.com/yuin/gopher-lua v1.1.1
go.yaml.in/yaml/v3 v3.0.4
golang.org/x/net v0.41.0 golang.org/x/net v0.41.0
golang.org/x/text v0.26.0 golang.org/x/text v0.26.0
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
gopkg.in/yaml.v3 v3.0.1
) )
require ( require (

2
go.sum
View File

@ -49,6 +49,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
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/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

2
pkg/yqlib/candidate_node_yaml.go
View File

@ -3,7 +3,7 @@ package yqlib
import ( import (
"fmt" "fmt"
yaml "gopkg.in/yaml.v3" yaml "go.yaml.in/yaml/v3"
) )
func MapYamlStyle(original yaml.Style) Style { func MapYamlStyle(original yaml.Style) Style {

2
pkg/yqlib/decoder_yaml.go
View File

@ -8,7 +8,7 @@ import (
"regexp" "regexp"
"strings" "strings"
yaml "gopkg.in/yaml.v3" yaml "go.yaml.in/yaml/v3"
) )
type yamlDecoder struct { type yamlDecoder struct {

2
pkg/yqlib/encoder_yaml.go
View File

@ -9,7 +9,7 @@ import (
"strings" "strings"
"github.com/fatih/color" "github.com/fatih/color"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
) )
type yamlEncoder struct { type yamlEncoder struct {

7
pkg/yqlib/yaml_test.go
View File

@ -84,6 +84,13 @@ var yamlFormatScenarios = []formatScenario{
} }
var yamlParseScenarios = []expressionScenario{ var yamlParseScenarios = []expressionScenario{
// {
// description: "with a unquoted question mark in the string",
// document: "foo: {bar: a?bc}",
// expected: []string{
// "D0, P[], (!!map)::a: hello # things\n",
// },
// },
{ {
document: `a: hello # things`, document: `a: hello # things`,
expected: []string{ expected: []string{

1
release_notes.txt
View File

@ -2,6 +2,7 @@
- Added INI support - Added INI support
- Fixed 'add' operator when piped in with no data #2378, #2383, #2384 - Fixed 'add' operator when piped in with no data #2378, #2383, #2384
- Fixed delete after slice problem (bad node path) #2387 Thanks @antoinedeschenes - Fixed delete after slice problem (bad node path) #2387 Thanks @antoinedeschenes
- Switched to YAML org supported go-yaml!
- Bumped dependencies - Bumped dependencies