From 5bad22a4df4897093133532083678b69bb51991b Mon Sep 17 00:00:00 2001 From: Silas Davis Date: Tue, 21 Apr 2020 22:26:52 +0100 Subject: [PATCH] Update yaml test cases to reflect fact yaml.v3 uses 4 spaces by default Though this can be customised, see: https://ubuntu.com/blog/api-v3-of-the-yaml-package-for-go-is-available Signed-off-by: Silas Davis --- pkg/chartutil/yaml/from_json.go | 2 +- pkg/chartutil/yaml/to_json.go | 2 +- pkg/chartutil/yaml/yaml_test.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/chartutil/yaml/from_json.go b/pkg/chartutil/yaml/from_json.go index f9d47b64a..005bc7b55 100644 --- a/pkg/chartutil/yaml/from_json.go +++ b/pkg/chartutil/yaml/from_json.go @@ -1,6 +1,6 @@ package yaml -import "gopkg.in/yaml.v2" +import "gopkg.in/yaml.v3" // Convert JSON to YAML. func FromJSON(j []byte) ([]byte, error) { diff --git a/pkg/chartutil/yaml/to_json.go b/pkg/chartutil/yaml/to_json.go index 288df67db..066d88aab 100644 --- a/pkg/chartutil/yaml/to_json.go +++ b/pkg/chartutil/yaml/to_json.go @@ -7,7 +7,7 @@ import ( "reflect" "strconv" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func ToJSON(y []byte) ([]byte, error) { diff --git a/pkg/chartutil/yaml/yaml_test.go b/pkg/chartutil/yaml/yaml_test.go index e0eb75fc5..3fbb6501d 100644 --- a/pkg/chartutil/yaml/yaml_test.go +++ b/pkg/chartutil/yaml/yaml_test.go @@ -76,8 +76,8 @@ func TestYAMLToJSON(t *testing.T) { }, { "- t: a\n" + "- t:\n" + - " b: 1\n" + - " c: 2\n", + " b: 1\n" + + " c: 2\n", `[{"t":"a"},{"t":{"b":1,"c":2}}]`, nil, }, { @@ -85,8 +85,8 @@ func TestYAMLToJSON(t *testing.T) { `[{"t":"a"},{"t":{"b":1,"c":2}}]`, strPtr("- t: a\n" + "- t:\n" + - " b: 1\n" + - " c: 2\n"), + " b: 1\n" + + " c: 2\n"), }, { "- t: \n", `[{"t":null}]`,