Skip to content

Commit 3f565ea

Browse files
sylrsylr
committed
Use go.yaml.in/yaml/v3
Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
1 parent 7b9af9e commit 3f565ea

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

‎cmd/decrypt/decrypt.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"filippo.io/age"
2020
"filippo.io/age/armor"
2121
"github.com/spf13/cobra"
22+
"go.yaml.in/yaml/v3"
2223
"golang.org/x/term"
2324

2425
"sylr.dev/yage/v2/utils"
2526
yage "sylr.dev/yaml/age/v3"
26-
"sylr.dev/yaml/v3"
2727
)
2828

2929
var (

‎cmd/encrypt/encrypt.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"filippo.io/age"
2020
"filippo.io/age/armor"
2121
"github.com/spf13/cobra"
22+
"go.yaml.in/yaml/v3"
2223
"golang.org/x/term"
2324

2425
"sylr.dev/yage/v2/utils"
2526
yage "sylr.dev/yaml/age/v3"
26-
"sylr.dev/yaml/v3"
2727
)
2828

2929
var (
@@ -288,6 +288,7 @@ func EncryptYAML(recipients []age.Recipient, in io.Reader, out io.Writer) error
288288
decoder := yaml.NewDecoder(in)
289289
encoder := yaml.NewEncoder(out)
290290
encoder.SetIndent(2)
291+
encoder.CompactSeqIndent()
291292
defer encoder.Close()
292293

293294
for {

‎cmd/rekey/rekey.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
"filippo.io/age"
2020
"filippo.io/age/armor"
2121
"github.com/spf13/cobra"
22+
"go.yaml.in/yaml/v3"
2223
"golang.org/x/term"
2324

2425
"sylr.dev/yage/v2/cmd/decrypt"
2526
"sylr.dev/yage/v2/utils"
2627
yage "sylr.dev/yaml/age/v3"
27-
"sylr.dev/yaml/v3"
2828
)
2929

3030
var (

‎go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ toolchain go1.25.1
77
require (
88
filippo.io/age v1.2.1
99
github.com/spf13/cobra v1.9.1
10-
golang.org/x/crypto v0.40.0
11-
golang.org/x/term v0.33.0
12-
sylr.dev/yaml/age/v3 v3.0.0-20221203153010-eb6b46db8d90
13-
sylr.dev/yaml/v3 v3.0.0-20250402092439-6b2768c4dfde
10+
go.yaml.in/yaml/v3 v3.0.4
11+
golang.org/x/crypto v0.41.0
12+
golang.org/x/term v0.34.0
13+
sylr.dev/yaml/age/v3 v3.1.1
1414
)
1515

1616
require (
1717
filippo.io/edwards25519 v1.1.0 // indirect
1818
github.com/inconshreveable/mousetrap v1.1.0 // indirect
19+
github.com/kr/pretty v0.3.1 // indirect
1920
github.com/spf13/pflag v1.0.7 // indirect
20-
golang.org/x/sys v0.34.0 // indirect
21+
golang.org/x/sys v0.35.0 // indirect
2122
)

‎go.sum‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@ filippo.io/age v1.2.1/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004=
55
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
66
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
77
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
8+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
89
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
910
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
1011
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
1112
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
1213
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
1314
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
14-
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
15-
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
16-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
17-
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
18-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
15+
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
16+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
17+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
18+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
19+
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
20+
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
21+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
22+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
1923
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
2024
github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
2125
github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
@@ -26,17 +30,17 @@ github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wx
2630
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
2731
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
2832
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
29-
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
30-
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
31-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
32-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
33-
golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
34-
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
33+
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
34+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
35+
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
36+
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
37+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
38+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
39+
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
40+
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
3541
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3642
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
3743
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
3844
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
39-
sylr.dev/yaml/age/v3 v3.0.0-20221203153010-eb6b46db8d90 h1:m6tG0qH6xGIEMPIAgDCBb+GtRZVjkAh54ncls6SnXsQ=
40-
sylr.dev/yaml/age/v3 v3.0.0-20221203153010-eb6b46db8d90/go.mod h1:HhKNGjkt9lNS4jF16MEcvbfdNtssNFeZQ3dBWku2y6w=
41-
sylr.dev/yaml/v3 v3.0.0-20250402092439-6b2768c4dfde h1:RH1Bb/QZT037KRlYNQuhPEvIMvIK7Etcktzb0We4+4w=
42-
sylr.dev/yaml/v3 v3.0.0-20250402092439-6b2768c4dfde/go.mod h1:4Zku0VUqOuAOvzh8sDnNBOWxgBFIbfHfWtGZI+Qjwx4=
45+
sylr.dev/yaml/age/v3 v3.1.1 h1:6nbHekDTridLJD21xohkZA233oZn+j3z4CI2PY/BHzY=
46+
sylr.dev/yaml/age/v3 v3.1.1/go.mod h1:b66lyaPEHPlQYgPm2Pbroc1RoY9vHB7GPXUwXI80dCA=

0 commit comments

Comments
 (0)