refactor: Implementing sigs.k8s.io YAML to remove .proto yaml annotations (#9780)

## Description

Draft of: #9705 

Started off with changing codec `MarshalYaml` function to directly go from JSON to yaml using the new library. Replaced the only usage of UnmarshalYaml per request.
---

### Author Checklist

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed

### Reviewers Checklist

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [x] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed 
- [x] reviewed state machine logic
- [x] reviewed API design and naming
- [x] reviewed documentation is accurate
- [x] reviewed tests and test coverage
- [x] manually tested (if applicable)
This commit is contained in:
Luke Rhoads
2021-09-24 14:37:34 +00:00
committed by GitHub
parent f2652874e6
commit bf11b1bf1f
97 changed files with 2046 additions and 2199 deletions
+4 -12
View File
@@ -2,13 +2,12 @@ package client
import (
"bufio"
"encoding/json"
"io"
"os"
"github.com/spf13/viper"
"gopkg.in/yaml.v2"
"sigs.k8s.io/yaml"
"github.com/gogo/protobuf/proto"
rpcclient "github.com/tendermint/tendermint/rpc/client"
@@ -279,16 +278,9 @@ func (ctx Context) PrintObjectLegacy(toPrint interface{}) error {
}
func (ctx Context) printOutput(out []byte) error {
var err error
if ctx.OutputFormat == "text" {
// handle text format by decoding and re-encoding JSON as YAML
var j interface{}
err := json.Unmarshal(out, &j)
if err != nil {
return err
}
out, err = yaml.Marshal(j)
out, err = yaml.JSONToYAML(out)
if err != nil {
return err
}
@@ -299,7 +291,7 @@ func (ctx Context) printOutput(out []byte) error {
writer = os.Stdout
}
_, err := writer.Write(out)
_, err = writer.Write(out)
if err != nil {
return err
}
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"github.com/tendermint/tendermint/libs/cli"
yaml "gopkg.in/yaml.v2"
"sigs.k8s.io/yaml"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/bech32"
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"io"
yaml "gopkg.in/yaml.v2"
"sigs.k8s.io/yaml"
cryptokeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
)