From e1afda96a096710a11828f48b9e85681c83b1b55 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Fri, 17 Mar 2023 16:51:20 +0800 Subject: [PATCH] refactor: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml` (#3445) * refactor: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml` At the time of making this commit, the package `github.com/ghodss/yaml` is no longer actively maintained. `sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively maintained by Kubernetes SIG. Signed-off-by: Eng Zer Jun * Update changelog.md Signed-off-by: Eng Zer Jun --------- Signed-off-by: Eng Zer Jun --- changelog.md | 3 ++- go.mod | 3 +-- go.sum | 1 - ignite/pkg/chaincmd/runner/runner.go | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index 00c8d85495..aa51e06130 100644 --- a/changelog.md +++ b/changelog.md @@ -58,6 +58,7 @@ - [#3244](https://github.com/ignite/cli/pull/3244) Update `actions.yml` for resolving deprecation message - [#3337](https://github.com/ignite/cli/pull/3337) Remove `pkg/openapiconsole` import from scaffold template. - [#3337](https://github.com/ignite/cli/pull/3337) Register`nodeservice` gRPC in `app.go` template. +- [#3445](https://github.com/ignite/cli/pull/3445) refactor: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml` ### Breaking Changes @@ -68,7 +69,7 @@ - [#3114](https://github.com/ignite/cli/pull/3114) Fix out of gas issue when approving many requests - [#3068](https://github.com/ignite/cli/pull/3068) Fix REST codegen method casing bug - [#3031](https://github.com/ignite/cli/pull/3031) Move keeper hooks to after all keepers initialized in `app.go` template. -- [#3098](https://github.com/ignite/cli/issues/3098) Fix config upgrade issue that left config empty on error. +- [#3098](https://github.com/ignite/cli/issues/3098) Fix config upgrade issue that left config empty on error. - [#3129](https://github.com/ignite/cli/issues/3129) Remove redundant `keyring-backend` config option. - [#3187](https://github.com/ignite/cli/issues/3187) Change prompt text to fit within 80 characters width. - [#3203](https://github.com/ignite/cli/issues/3203) Fix relayer to work with multiple paths. diff --git a/go.mod b/go.mod index cab1b2a252..d130655443 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,6 @@ require ( github.com/cosmos/ibc-go/v6 v6.1.0 github.com/emicklei/proto v1.11.1 github.com/emicklei/proto-contrib v0.13.0 - github.com/ghodss/yaml v1.0.0 github.com/go-delve/delve v1.9.1 github.com/go-git/go-git/v5 v5.4.2 github.com/gobuffalo/genny/v2 v2.1.0 @@ -69,6 +68,7 @@ require ( google.golang.org/grpc v1.51.0 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.4.0 + sigs.k8s.io/yaml v1.3.0 ) require ( @@ -383,7 +383,6 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect nhooyr.io/websocket v1.8.6 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect ) replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index d7dc2c5971..893c51d1e2 100644 --- a/go.sum +++ b/go.sum @@ -655,7 +655,6 @@ github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= diff --git a/ignite/pkg/chaincmd/runner/runner.go b/ignite/pkg/chaincmd/runner/runner.go index 7db8dc7f9f..067c2c6474 100644 --- a/ignite/pkg/chaincmd/runner/runner.go +++ b/ignite/pkg/chaincmd/runner/runner.go @@ -7,8 +7,8 @@ import ( "encoding/json" "io" - "github.com/ghodss/yaml" "github.com/pkg/errors" + "sigs.k8s.io/yaml" "github.com/ignite/cli/ignite/pkg/chaincmd" "github.com/ignite/cli/ignite/pkg/cmdrunner"