From a75c3a99325b1db55da965e1322af2184bf86260 Mon Sep 17 00:00:00 2001 From: Will Roden Date: Sat, 1 Apr 2023 18:12:30 -0500 Subject: [PATCH] back to yaml.v2 for formatting --- cmd/bindown/dependency.go | 2 +- config.go | 2 +- configfile.go | 4 ++-- go.mod | 1 + go.sum | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/bindown/dependency.go b/cmd/bindown/dependency.go index 2a4dfa9..cd5f1a9 100644 --- a/cmd/bindown/dependency.go +++ b/cmd/bindown/dependency.go @@ -9,7 +9,7 @@ import ( "github.com/alecthomas/kong" "github.com/willabides/bindown/v3" "github.com/willabides/bindown/v3/cmd/bindown/ifaces" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) type dependencyCmd struct { diff --git a/config.go b/config.go index b08aba9..e5d54b0 100644 --- a/config.go +++ b/config.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) // Config is our main config diff --git a/configfile.go b/configfile.go index a4d3dde..b164dd1 100644 --- a/configfile.go +++ b/configfile.go @@ -8,12 +8,12 @@ import ( "path/filepath" "sort" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) // ConfigFile is a file containing config type ConfigFile struct { - Filename string + Filename string `json:"-"` Config } diff --git a/go.mod b/go.mod index 2423fc3..711563a 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/willabides/kongplete v0.3.0 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 + gopkg.in/yaml.v2 v2.2.2 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 2c6c272..d310313 100644 --- a/go.sum +++ b/go.sum @@ -98,6 +98,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=