Skip to content

Use go.yaml.in/yaml/v3 #48

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

Closed
sylr wants to merge 1 commit into from
Closed

Use go.yaml.in/yaml/v3 #48

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
2 changes: 1 addition & 1 deletion cmd/decrypt/decrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"filippo.io/age"
"filippo.io/age/armor"
"github.com/spf13/cobra"
"go.yaml.in/yaml/v3"
"golang.org/x/term"

"sylr.dev/yage/v2/utils"
yage "sylr.dev/yaml/age/v3"
"sylr.dev/yaml/v3"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion cmd/encrypt/encrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"filippo.io/age"
"filippo.io/age/armor"
"github.com/spf13/cobra"
"go.yaml.in/yaml/v3"
"golang.org/x/term"

"sylr.dev/yage/v2/utils"
yage "sylr.dev/yaml/age/v3"
"sylr.dev/yaml/v3"
)

var (
Expand Down Expand Up @@ -288,6 +288,7 @@ func EncryptYAML(recipients []age.Recipient, in io.Reader, out io.Writer) error
decoder := yaml.NewDecoder(in)
encoder := yaml.NewEncoder(out)
encoder.SetIndent(2)
encoder.CompactSeqIndent()
defer encoder.Close()

for {
Expand Down
2 changes: 1 addition & 1 deletion cmd/rekey/rekey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"filippo.io/age"
"filippo.io/age/armor"
"github.com/spf13/cobra"
"go.yaml.in/yaml/v3"
"golang.org/x/term"

"sylr.dev/yage/v2/cmd/decrypt"
"sylr.dev/yage/v2/utils"
yage "sylr.dev/yaml/age/v3"
"sylr.dev/yaml/v3"
)

var (
Expand Down
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ go 1.22
require (
filippo.io/age v1.2.1
github.com/spf13/cobra v1.8.1
go.yaml.in/yaml/v3 v3.0.4
golang.org/x/crypto v0.32.0
golang.org/x/term v0.28.0
sylr.dev/yaml/age/v3 v3.0.0-20221203153010-eb6b46db8d90
sylr.dev/yaml/v3 v3.0.0-20220527135632-500fddf2b049
sylr.dev/yaml/age/v3 v3.1.0
)

require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/pretty v0.2.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/sys v0.29.0 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
Expand All @@ -35,7 +37,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
sylr.dev/yaml/age/v3 v3.0.0-20221203153010-eb6b46db8d90 h1:m6tG0qH6xGIEMPIAgDCBb+GtRZVjkAh54ncls6SnXsQ=
sylr.dev/yaml/age/v3 v3.0.0-20221203153010-eb6b46db8d90/go.mod h1:HhKNGjkt9lNS4jF16MEcvbfdNtssNFeZQ3dBWku2y6w=
sylr.dev/yaml/v3 v3.0.0-20220527135632-500fddf2b049 h1:YPPgk82gEmgUGbtTpTokBrnWnpCbHGqzwggHNrOlw40=
sylr.dev/yaml/v3 v3.0.0-20220527135632-500fddf2b049/go.mod h1:4Zku0VUqOuAOvzh8sDnNBOWxgBFIbfHfWtGZI+Qjwx4=
sylr.dev/yaml/age/v3 v3.1.0 h1:jSs9GO9MWynxSxjO7XmRQGQZDBYbTdH4Q/E5SEeQnhs=
sylr.dev/yaml/age/v3 v3.1.0/go.mod h1:1kBAk8eEtpOoNFu2wGG1HlTShjCeLQfcroOo9X1kk+k=