Merge pull request #6016 from icanhazbroccoli/icanhazbroccoli-dev-v3-sigs-yaml

Replaced ghodss/yaml with sigs.k8s.io/yaml [dev-v3]

Gopkg.toml

@@ -112,3 +112,7 @@
 [[constraint]]
   name = "github.com/spf13/cobra"
   version = "0.0.4"
+
+[[constraint]]
+  name = "sigs.k8s.io/yaml"
+  version = "1.1.0"

cmd/helm/init.go

@@ -23,9 +23,9 @@ import (
 	"os"
 
 	"github.com/Masterminds/semver"
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/cmd/helm/require"
 	"helm.sh/helm/pkg/getter"

cmd/helm/printer.go

@@ -21,7 +21,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chartutil"
 	"helm.sh/helm/pkg/release"

pkg/action/get_values.go

@@ -17,7 +17,7 @@ limitations under the License.
 package action
 
 import (
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chartutil"
 )

pkg/action/install.go

@@ -31,8 +31,8 @@ import (
 	"time"
 
 	"github.com/Masterminds/sprig"
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 	"helm.sh/helm/pkg/chartutil"

pkg/action/output.go

@@ -1,11 +1,11 @@
 package action
 
 import (
-	"fmt"
 	"encoding/json"
+	"fmt"
 
-	"github.com/ghodss/yaml"
 	"github.com/gosuri/uitable"
+	"sigs.k8s.io/yaml"
 )
 
 // OutputFormat is a type for capturing supported output formats
@@ -70,4 +70,4 @@ func ParseOutputFormat(s string) (out OutputFormat, err error) {
 		out, err = "", ErrInvalidFormatType
 	}
 	return
-}
+}

pkg/action/show.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 	"helm.sh/helm/pkg/chart/loader"

pkg/chart/loader/load.go

@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 )

pkg/chartutil/chartfile.go

@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 )

pkg/chartutil/create.go

@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 	"helm.sh/helm/pkg/chart/loader"

pkg/chartutil/jsonschema.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	"github.com/xeipuuv/gojsonschema"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 )

pkg/chartutil/save.go

@@ -24,8 +24,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 )

pkg/chartutil/values.go

@@ -22,8 +22,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 )

pkg/downloader/manager.go

@@ -27,8 +27,8 @@ import (
 	"sync"
 
 	"github.com/Masterminds/semver"
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 	"helm.sh/helm/pkg/chart/loader"

pkg/lint/rules/template.go

@@ -20,8 +20,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart/loader"
 	"helm.sh/helm/pkg/chartutil"

pkg/plugin/plugin.go

@@ -23,7 +23,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	helm_env "helm.sh/helm/pkg/cli"
 )

pkg/provenance/sign.go

@@ -25,11 +25,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/openpgp"
 	"golang.org/x/crypto/openpgp/clearsign"
 	"golang.org/x/crypto/openpgp/packet"
+	"sigs.k8s.io/yaml"
 
 	hapi "helm.sh/helm/pkg/chart"
 	"helm.sh/helm/pkg/chart/loader"

pkg/releasetesting/test_suite.go

@@ -20,9 +20,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/hooks"
 	"helm.sh/helm/pkg/release"

pkg/releaseutil/manifest_sorter.go

@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chartutil"
 	"helm.sh/helm/pkg/hooks"

pkg/releaseutil/manifest_sorter_test.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chartutil"
 	"helm.sh/helm/pkg/release"

pkg/repo/chartrepo.go

@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart/loader"
 	"helm.sh/helm/pkg/getter"

pkg/repo/index.go

@@ -28,8 +28,8 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver"
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/chart"
 	"helm.sh/helm/pkg/chart/loader"

pkg/repo/repo.go

@@ -22,8 +22,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 )
 
 // ErrRepoOutOfDate indicates that the repository file is out of date, but

pkg/repo/repotest/server.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/helmpath"
 	"helm.sh/helm/pkg/repo"

pkg/repo/repotest/server_test.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/pkg/repo"
 )

pkg/strvals/parser.go

@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/yaml"
 )
 
 // ErrNotList indicates that a non-list was treated as a list.

pkg/strvals/parser_test.go

@@ -18,7 +18,7 @@ package strvals
 import (
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 func TestSetIndex(t *testing.T) {